gentoo resync : 25.08.2020

2968 files changed, 20137 insertions, 46985 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.1.ebuild b/dev-python/GitPython/GitPython-3.1.1.ebuild
deleted file mode 100644
index 828e9672b499..000000000000
--- a/dev-python/GitPython/GitPython-3.1.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-3.1.0
-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/${TEST_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}/${TEST_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/GitPython-3.1.2.ebuild b/dev-python/GitPython/GitPython-3.1.2.ebuild
deleted file mode 100644
index 4c35f34de642..000000000000
--- a/dev-python/GitPython/GitPython-3.1.2.ebuild
+++ /dev/null
@@ -1,57 +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(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-3.1.0
-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/${TEST_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}/${TEST_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/GitPython-3.1.3.ebuild b/dev-python/GitPython/GitPython-3.1.3.ebuild
deleted file mode 100644
index 4ac8b651ff03..000000000000
--- a/dev-python/GitPython/GitPython-3.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-3.1.0
-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/${TEST_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}/${TEST_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/GitPython-3.1.7.ebuild b/dev-python/GitPython/GitPython-3.1.7.ebuild
new file mode 100644
index 000000000000..e7aa556f3932
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.7.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..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.5
+SMMAP_P=smmap-3.0.4
+
+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/${TEST_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}/${TEST_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
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	rm test/test_installation.py || die
+	# broken apparently (also fails in git clone)
+	sed -e 's:test_rev_parse:_&:' \
+		-i test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 1ac7e9f561bf..d6672e33aa05 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,10 +1,6 @@
-DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3
-DIST GitPython-3.1.1.tar.gz 430310 BLAKE2B f6402c4f8d72f4352bf97b72ac0c39b347683c411dcb7b74405119773954a185fe7dc11e13232d56f4a9f938e64b865f42cbd3a857427d985e29f024eb4e0880 SHA512 a913fb611479456d4b804c56039ed8d8ac8cb183f58c874e265141f2b5b46befd4a8a2f5d94ac1cf8ea7fc99e901568a9fc054d50df0ac242d7d184add8ca1b3
-DIST GitPython-3.1.2.tar.gz 430474 BLAKE2B bda0fc9d591dd3b64158e318386349c18ed0775f462c487726faed7ce10781296103133b64cdbfd56947e38621790b177b6c9869596dc8a523a17b00690fe5e4 SHA512 051b59b56a163839bf7754860bfc8e21cfde08b8e7d0fd66239c234b89ba5a83fa7e8540a12c5df3563e5353d1e01119dd1b0a5ea1c22daf7e071fb963cbc3a4
-DIST GitPython-3.1.3.tar.gz 430558 BLAKE2B 0a36e066ad4d3d994ebaa76492f4953c0eaf8b4a0fc163af646f288ed45591e0dee532502c03007af5f6d6cf5633a32bc12a9a777fad6d745bdbc286a4815de4 SHA512 ea4043c8be79cec7ffc9c6b6383be37dcf7b4a877cf02d6fc8c9e7d39a5005e088c8780dd6e0fcd72c0711c997228f417773c82572f569c5ca1128f5ebe56736
-DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960
-DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104
-EBUILD GitPython-3.1.1.ebuild 1565 BLAKE2B 188eee0c7d2caafe5aa17989fa5bec5f903b42ec644805b69b03fedb82325aaa3a47987062d685e5b427775505b6320b974cc594cff1ceb5878468914796cf9b SHA512 5153569d57e66bd7698de8e7adc3fcfa8ecbf79ab929364bd16a368afdb01390d79195f1880b17e9e9e2e67b22aa4713e812eeea4c65e00c19cca329fde47723
-EBUILD GitPython-3.1.2.ebuild 1568 BLAKE2B 5bd129321bc6012432a32586c2c6c13dc96821bc7cb6f322cf7cb03763c06d746d4907e628c9376fcb154d2c45f52a6dd40d61f08372f91d778a8ccbba1ce331 SHA512 4688e66c53578accc218eaa25f4aa2fcbffc4c24782a5dd2a23067e6c60f9bdfb008771aee62f8dd98082766da16b4a71d777307a25aa5378144946d62d0aba8
-EBUILD GitPython-3.1.3.ebuild 1567 BLAKE2B a1d065baf60b83b194cd0d2e7751546e1540de4d49ecf5f941ea19c5864474ea004897c257c2052b2b2ecd6305a34512537976556695d1f238459456d9599b25 SHA512 be6f9cb0d027fa9424fc88661f34f721ce94d706f45d221539a52a398bbba32c274709bd66eab7ba61182d1b8c1f60bb530104e9666cc1ba2bea7bbe54c8f1b2
-MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
+DIST GitPython-3.1.7.gitbundle 8821099 BLAKE2B 96b6cb8cce9778099001d9c3066b9d3b7f4c3c4b4283e521f7b41e93cf5f3990a8758853c261e3458cd6a8c8c48661526e1dd2ce2208e02d3ee895358a135b4a SHA512 c311a464e79c769be92b08a216d52487a47af6c8807e880b6c2225d04eb7cd772808a6675660a2e727ce3ddf47746203646fb96f9a947d4ae2ad4b916f8dc984
+DIST GitPython-3.1.7.tar.gz 169134 BLAKE2B aba0464b18bfbcfd5e219c6483a1af70cb89da45d26e41e18a26b661985d2ab414e72b60a5366a9dd1ff0603876907a7fd642bc49bae01973ef6c8ba7906ec31 SHA512 7c434312be303288b58fabea4d6a84bf417dfff60d61695384af594e5f1231efc8d79d250aa63e04263b4c9aa4f19efceb98c5eea1a466fb0b433113ddb4af46
+DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
+DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
+EBUILD GitPython-3.1.7.ebuild 1591 BLAKE2B b28668afcd02953756d822212888cd7d05f3e27ab6407b9d963aa9a877852db082fd82d72b66be85bd25b1fd8ddac02fe65dae43f892ab0ed8164930f947668a SHA512 2ddca8c8fe89ff8c7a2402c9a81883d61af089ea92c554149fe08bb89467da87ba869d31cd64fb6942fd202d61e4c2307d8de7b4640e18369b50244365185401
+MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/GitPython/metadata.xml b/dev-python/GitPython/metadata.xml
index 7e626312fece..1e0c7269c568 100644
--- a/dev-python/GitPython/metadata.xml
+++ b/dev-python/GitPython/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">GitPython</remote-id>
 		<remote-id type="github">gitpython-developers/GitPython</remote-id>
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index be45f0d9d826..2bb62012b4d1 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
index c224c3582679..fa17454b516d 100644
--- a/dev-python/HeapDict/Manifest
+++ b/dev-python/HeapDict/Manifest
@@ -1,3 +1,3 @@
 DIST HeapDict-1.0.0.tar.gz 7713 BLAKE2B 19aedc2e7a61c74b93aa8883603520bc6ffeebae4ac4c4a4003023bf6b1c65ff55f9ef571a3e61ea92620a18eed281ad603a61e1df4f03a8811096e9f0964ab9 SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5
-EBUILD HeapDict-1.0.0.ebuild 466 BLAKE2B 6c939c57a0e98fda91e31af60e85a8a808e86a662a0afee7e9e830a13f95df282bd20536210f4c8cc17394cfbea5c87964ad5fbcdb5e392092793bb64e5f055e SHA512 a3bcd29071ad2bf55e54b3d283ee34beb843ec63218fc5e0d8c9f713272fa5dc0d7edcd0cf9e91d68d529d852dba1f8cad385d3f51ce959d66e7b4576e730224
+EBUILD HeapDict-1.0.0.ebuild 478 BLAKE2B 3010668a9343a28b58136614d3b56b7464bcd26be658b189f47ba3fc82816b627e5ebdf61f6f0177484aba80b31b411242e1fced7e27647d8bede14eb1731e5a SHA512 c35c0842dbbf1d25e1b5d220067cdf4aa846ab788b8d81c66dda0f40f36d911f7d16156418aa3f135954692c6eaf7a0be90c3a88a8450ba600b89cc8df7d2013
 MISC metadata.xml 522 BLAKE2B a4feb2dcf86b348f8e07a76c82261db274d46668bcddd36677e8896eeb993badf321987a592ddc37bd85a9f4e237bd12c6df1cbe289fe3b3354b37352ab70786 SHA512 aca6d43cfb9d6eee3f47079bc26874f12e95f8efbdd4bdcf2685b65374b5a6500de2f12d065bdbce12b82496b931c3c00ff9ffb7aa1e040c11ea033e12304be8
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b3cb61a9bf63..4cb52e0ae4b5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
deleted file mode 100644
index 364b302f3516..000000000000
--- a/dev-python/Numdifftools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST numdifftools-0.9.17.zip 363422 BLAKE2B fa57ef2b9cb6dcaa669f14720f3fd1ed105f48b16549acd7bb6d7633b17cd45355022c9949a6099c3cbddc6b1a74b0f669344c4dd5e6f5ad56cc640549f4650c SHA512 acef3865861c76f0850b6f1c5ca5633f695603a7458c79569bbe887404c8490845d935693c57ea18468fe3cb7f864fe5481285f731dc933b6c0b521e3b888328
-EBUILD Numdifftools-0.9.17-r1.ebuild 1349 BLAKE2B 671a4d7af7f3a9dacb1669b511cdc5033480d2dde14b61598b9941bce5dceea6c820a303be925612453fe68e6b1c02013979de760122f53b443af9127a2d1844 SHA512 e7168dbb02fb48d43568c81014c2a7effdd54f10a2fc9adf3a904d21c8edd49044c621a2f8a034c6f6394d97543433b76e2150c8de70067af81488e6a6601f81
-MISC metadata.xml 398 BLAKE2B 859e4b9cffa1d28cf7758198b04c30e17f86e29f3595e0bf2f55b62e80e6d6ed9c10d6fc8199eba90b35adb155de2a7055cdabd19f7655a6c7f9a860dc761cf3 SHA512 a56df8a9f061f0ee318e5ab2297caa7a3e8001e61dad2425c6d70104ceef999f12468fdc1e20d714aad33a56c980e1cff0677f815375ce7adbb639137016ab35
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17-r1.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17-r1.ebuild
deleted file mode 100644
index 610789b9e011..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.9.17-r1.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 )
-
-inherit distutils-r1
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
-	|| (
-		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-	|| (
-		>=dev-python/numpy-python2-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	app-arch/unzip
-	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pyscaffold[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# pulls coverage test
-	sed \
-		-e '/tests_require/d' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/metadata.xml b/dev-python/Numdifftools/metadata.xml
deleted file mode 100644
index 0f633d69c9fd..000000000000
--- a/dev-python/Numdifftools/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>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Numdifftools</remote-id>
-    <remote-id type="github">pbrod/numdifftools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index f6450c2efa8d..181d1c61a4a2 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,3 @@
-DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
 DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4 SHA512 95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd
-EBUILD PyContracts-1.8.12.ebuild 1057 BLAKE2B cd6ba13dfe122c2d24022587a476a6b99a383bfde35f32a6b389d6e223cef42ea64b6c294b9d41fa6fd65ace8eb906e4ebd686992096b514f855319027d57478 SHA512 ea6b803b023e44480766d087a90170bb1e669ee729c2b67d41b24b78205873a345bfeacefe933b1a6c7a1b3abe71c9c6ac8abd2366163db2f29afe8bd367661f
-EBUILD PyContracts-1.8.14.ebuild 984 BLAKE2B 36cb035b6653ee7acfe46ab03e96e38e167ba5f38eff3edd30aa92a5546a52efc2fcf2f908e9d546194fb3be6fbfd58a0919b51fdd919b793d5fe088c131f954 SHA512 324c30ee8ce6d0c38e2f19287e99eec20f211b1b6ede66022f6565e4f34de6a29be78570f72cbf21fe8900e35da51a73c3f8fa47bbe469abf44fa869f41779c3
+EBUILD PyContracts-1.8.14.ebuild 975 BLAKE2B 23e4893af93b0ed82789e6b32850aa4ce91f544e89497e2a9b2d5dca886306cad613fcda616a596ee8b31aed94aa68308beaab401c9ad3c726c11739f4f87273 SHA512 864739777fc56a214b24311f8847df470c92d79173c32b64944826b174b79150d21474264ec9d2bbdae03966320e41cb2d05450b804d7434c8ff3be8b88bf6c3
 MISC metadata.xml 412 BLAKE2B 168aead3c24da61c3e95e4d178546b196b07f4a1f5a51f3f5fe893222e209608e4f4d570a673c617085839756fbc3107e8544fa5db631429b596b6d7748eef9f SHA512 58a8491f4d6b1f1dca9c59036a0f3ecf20b71811d5696fa886452ebf5217f70ebc94615b86f16e130ad520ff39860128a801ed6c5566ac55a548985a56654267
diff --git a/dev-python/PyContracts/PyContracts-1.8.12.ebuild b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
deleted file mode 100644
index fe88478ac91f..000000000000
--- a/dev-python/PyContracts/PyContracts-1.8.12.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=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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/decorator[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests -v \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
diff --git a/dev-python/PyContracts/PyContracts-1.8.14.ebuild b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
index 8cf28d8a55cb..52346ca9fc52 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
@@ -14,7 +14,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 ~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/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index b68976241dd2..7d6dd75b7794 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,5 @@
-DIST PyGithub-1.46.gh.tar.gz 2882667 BLAKE2B a65a359750c146947b69ff72a4775f6f1532420c3d15e0d7df34c69c3c552aa201740c1ea2cff2dd40daddf7cdc7743b4354698e1bc701f175a5f7dcfc83dd97 SHA512 1c03920434491b279e1709550a658ff125c0d91390160b1de5e5fadf5cf5eeb722477fd913f47ec686cce052a8c34d916de753ea36fecb227d955e60d064a0b6
 DIST PyGithub-1.51.gh.tar.gz 2950990 BLAKE2B 214014b8205d954c559f2d19a38c7bc93800f40500c294397f16d55a4a027b7827910c93d98b6f5dd867bb0049ad1c9618c08ff72996f3717480ad17ce0ec64d SHA512 617b7bbc1fbd680735d5a57910ac1863cf67d9b2afc037d20fbd140a32aaa146164a76f73d76f2395aff1eee1fb13eac7a146c9cd05791b27db9a06a28d520e0
-EBUILD PyGithub-1.46.ebuild 971 BLAKE2B f0c9ba982987b4fe9c1b7cc49b33b29d482bab811501f09a239852bf6de6a33c903af4502f9aeceab0831216dafdde0db30acba54eb9875d454cdab8c8198858 SHA512 d2c397a49946b1388b00df611ea6da08a1ccaa4299e06eaae9d3b3c50b6acab950c86e5d5b3a49b7abcc7fb0766b4dd771c48cf00009f4f791424e448543e29b
-EBUILD PyGithub-1.51.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
-MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
+DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
+EBUILD PyGithub-1.51.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
+EBUILD PyGithub-1.53.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
+MISC metadata.xml 471 BLAKE2B 1d1b80ed6b439d4e66af20c29e7ff4a2c229e29bcd9c3b8c4735c7e15f8176c0fcecd88d2cc26745edc52f99c75e9e70ffb70df1a1acc2b46c29d8801973effc SHA512 a6c6fb332c408fd4219ec277d30233693397b9badf6a8bf438ff65ae3cbb9431caaf4124c2291cf9cc9b1dc671f162bb6018de7ec6495f6a9740daf9a25bffb1
diff --git a/dev-python/PyGithub/PyGithub-1.46.ebuild b/dev-python/PyGithub/PyGithub-1.46.ebuild
deleted file mode 100644
index cc689d21ef9f..000000000000
--- a/dev-python/PyGithub/PyGithub-1.46.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=( 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"
-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_test() {
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.51.ebuild b/dev-python/PyGithub/PyGithub-1.51.ebuild
index 0a466756e898..ae1dba794d4a 100644
--- a/dev-python/PyGithub/PyGithub-1.51.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.51.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"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/PyGithub-1.53.ebuild b/dev-python/PyGithub/PyGithub-1.53.ebuild
new file mode 100644
index 000000000000..0a466756e898
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.53.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..9} )
+
+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}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index e39e603758de..5a8ef9e1446a 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">PyGithub/PyGithub</remote-id>
   </upstream>
diff --git a/dev-python/PyICU/Manifest b/dev-python/PyICU/Manifest
new file mode 100644
index 000000000000..0fcbab5da194
--- /dev/null
+++ b/dev-python/PyICU/Manifest
@@ -0,0 +1,3 @@
+DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
+EBUILD PyICU-2.5.ebuild 470 BLAKE2B c9782693ea1983db6b9e897e1d7e86675d6adc2e9c015e4785666f684d62902324069267454ec54597cd9648e470a0ec0fb8ab66e4cb9c3436c076422cf448f0 SHA512 27ab45263d354436f54cf4d1a7a33afc54e4a8b1d0ab329e1ac15b17153239b6769601cf1137c0a2287e47b674148839054a4a7258995ffedb5c3bba7639b421
+MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/PyICU/PyICU-2.5.ebuild b/dev-python/PyICU/PyICU-2.5.ebuild
new file mode 100644
index 000000000000..9a4833b145dd
--- /dev/null
+++ b/dev-python/PyICU/PyICU-2.5.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyicu/metadata.xml b/dev-python/PyICU/metadata.xml
index ce15e15687da..ce15e15687da 100644
--- a/dev-python/pyicu/metadata.xml
+++ b/dev-python/PyICU/metadata.xml
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index b4c665eec664..359a5404c709 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,7 @@
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
-EBUILD PyQt5-sip-4.19.22.ebuild 2149 BLAKE2B 2041761c23aedb1d17596f59ca891e3289f730e907c1aa46c0e809e98364e2fd8cb34cbaaaffb3c08facfadd37304b6c8b685814316632a8ed5fc15cfc6a0105 SHA512 b023c90e43e30376b95355abbe66df3160995c0bb352db01ced54dfcf264bff486f677c1c28831c8281907b3b9e62c1897adf72dc96d253eac75246cadc8139e
-EBUILD PyQt5-sip-4.19.23.ebuild 2153 BLAKE2B 5d6c9245a3db34b81ac48bfc4662af00413ae10f873ab6754d33afee233e08868daecfe793824182f2b5cb6807605a1417d4c097c18b26c2bb7e1494ce65656a SHA512 3b67f2da95af4cc32c82723c533ad28a163c4be2169a2d9032e04da491e66e2601e887441e46e72fe59e04365576cab95fa1f72941b19949d5907c5a009d67e5
+DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
+EBUILD PyQt5-sip-4.19.22-r1.ebuild 2053 BLAKE2B 0925192dce6fab7d8106f83ec522c8f1a9828f5a4a8a654370adf75e82c427453a3345ec9c6f005b5dc861c5b60a92c909077624a87a455839e5db5b13fbf6bd SHA512 d12679262992b88569f41a66b1df7c38c4330f0fde21fdf874081066459581131ac6ddd883473268cf797502f36a7f4f14bfe870abc042d61cc1450cb9099db4
+EBUILD PyQt5-sip-4.19.23-r1.ebuild 2057 BLAKE2B 11461c7345631242eabc7a8f234cfcf6effefb678d7104278e8b13ef194bcb85522121e19ffae23c980a6ecf0bf7de1593fcccda00c8ff67e548e6d7c4fea32c SHA512 e846c688c4732add0fed0bb4b971c880becbcea2728e4a510f9d7dc6de906a0ca743405a060866c56b6f0ac2d04e9a089b7ec17419a16600f366a14b38775c3d
+EBUILD PyQt5-sip-4.19.24.ebuild 2054 BLAKE2B e211951d238a5d4878875f6337fa4c7541e79d5dfe35d8b198cc0f64fbd132e10f2a1a5ba787862523db88b8365a07d67c0f1f41be5bb2e6fb947f29a6554d42 SHA512 eb91552a1fadb4e0c4e1f1a4a6ae29014323735e8e81f0e2f3baef6792fe643ff4958b50a10f64846c8763a80bf408e543ceb69fc3555bc26f8c71d039ab0daf
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
new file mode 100644
index 000000000000..9313ec901ef5
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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() {
+		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.22.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
deleted file mode 100644
index a69499758b4f..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.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,8,9} )
-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.23-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
new file mode 100644
index 000000000000..c61529a6f32a
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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() {
+		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.23.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
deleted file mode 100644
index 2c211f51a220..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.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,8,9} )
-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.24.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
new file mode 100644
index 000000000000..d5d6640ea134
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+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() {
+		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/Manifest b/dev-python/PyQt5/Manifest
index bb19bc694766..be78bf3e22bb 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
 DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
-EBUILD PyQt5-5.14.2.ebuild 6055 BLAKE2B 78fe31e1a5f1fdc6a6ac41f20529a4b11adae36219fc59877c95eb535aff360a91d38adff5e05302b8073cb48c7e77c5aba27eb37e7db397e14753c82f400e33 SHA512 513a2652d9a9263bc3af836b3a85ec54bab56e5073b23eb7367cd0d8d4efe79572d94ab90ed212d2c96cb25c5d2a25407c72979105bba80a04ac2ebf78bffc2e
-EBUILD PyQt5-5.15.0.ebuild 6067 BLAKE2B d0cc1bd723d1184fad838bc87931f495bf65b0a246de487fb33827d9a68ac159e7ada3014bd0a12a570d55baf28bd3ee549d7f790fa65b9ec7375ae01fcee3e5 SHA512 9bc5abbe91c29fb6721fbd1c60c2d2076a8fb969490ca2ec6c8099e678ea6687b819e5dea55e7413fce12f69ba3616f383c3a45df148c4a8fe00eb28589ae6d4
+EBUILD PyQt5-5.14.2-r1.ebuild 5728 BLAKE2B be7eb17461a7de96db7093a308760f5bc8e7291cf33c85a3ec23cd587c06448d27b83d91c2359ef6bd5f2fd0fa07ac8839e79bb378e9314ad14e20c08ae79ce4 SHA512 6a29fbc177ee262d0f5551b3246d2512f6f2ec0b47db991a0885372c5c0afa5ce8a4d3e712791746894b90a334ce5bc33649b6a290ebb2d9c7a96adfc77c6c85
+EBUILD PyQt5-5.15.0-r1.ebuild 5740 BLAKE2B ef0da446f5bcc809cd0bb1c1d194a6183cc0dba0ddeee12658995d127542377d19bb75c46a4fbfa9353f8462b4f74cca16b81e5bed03bd1aac2dbaa5f8ddf461 SHA512 2d077f9eb58f623f835cdf0d13a8b5686037a553e4bad4ad7a14771fa58e0234f9ed9fecc580b43d98430f09afe101431e3b1098467960e6cf73df19740bb107
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
new file mode 100644
index 000000000000..6f47872f089c
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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
+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.12:5"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	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
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
+
+		# 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
+		rm -r "${uic_dir}"/port_v2 || die
+
+		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.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2.ebuild
deleted file mode 100644
index 04c639a05ba6..000000000000
--- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild
+++ /dev/null
@@ -1,206 +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,9} )
-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
-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.12:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	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.15.0-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
new file mode 100644
index 000000000000..075b00012939
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+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, QtQuick3D, QtRemoteObjects
+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.12:5"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	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.23[${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
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
+
+		# 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
+		rm -r "${uic_dir}"/port_v2 || die
+
+		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.15.0.ebuild b/dev-python/PyQt5/PyQt5-5.15.0.ebuild
deleted file mode 100644
index 3d51e939103e..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.0.ebuild
+++ /dev/null
@@ -1,206 +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..9} )
-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, QtQuick3D, QtRemoteObjects
-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.12:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
-	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	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.23[${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/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index d8b322c6a3c7..e58535cd1204 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine-5.15.0.tar.gz 48308 BLAKE2B 18a0b83c245a738f144cb21ddc483646099dc6469b0ecfe634d0341c555db17724cb97901082d2d93668a9e64b9163496afba8d7928f8e49013bcdcdb3747105 SHA512 9bc74e4c7c49a42a5a1a75c75cf14d30e7e9202b6f98591d79dd7f47d44909a1c95a1b38cd47adc8182429c43d1d45d90b2c3d0f105b90ed7ebfbb33a2622322
-EBUILD PyQtWebEngine-5.14.0.ebuild 1676 BLAKE2B 2efe92296137c658c62d9300062e6b649c9be91b4a3dc1633d8b4b4ddfa65c34fec81bea0aede6db1182a86a9cae1931366277ca2262cfade1c3c159aaba817d SHA512 876c06b3f50d75cacc473109d5c859f99070606cb6e5ad9322d02704e9a0e6057876498cf979d84834e45d1043795a6c90a4e819b87db6a11392c11a7069cb0d
-EBUILD PyQtWebEngine-5.15.0.ebuild 1678 BLAKE2B 3df1591f025cccc318c3e012a9ce546a3875fb23329a3b812028a0f7b5a692c6390ca5bce82a12a3f1bcac464b7eae1d8a5e14d8c2e0f27752df00e808a271ea SHA512 a5cd1bb633b3fdaabcc4e6754e9f78ca8f81b77c55aca410d436207483c52766b0415a1486921ebffe934a5acf5b1037a4fb2360ba8c16e43ed469d3720ef633
+DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117 SHA512 1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
+EBUILD PyQtWebEngine-5.14.0.ebuild 1666 BLAKE2B 50ceeff152ddfc9bd8809eadf514ed5be1363829d7533d4431f7ee5d23a6d3d172dd96303912dd05770391b633774c2931e11ecf9a1eb9cb5b10294f25a557a7 SHA512 ac328a51e306f15d4fea2101968dab5df731935642938915bc62399ce9eacc1a79bb5666af51594db0d37efc1ec9efdcc6d4168e44eb7c6d9a6e54515ec4c0a8
+EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index 7846273daf9f..0f869cca5363 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.0.ebuild
deleted file mode 100644
index 4d322572d51e..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.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=( python2_7 python3_{6..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/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 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${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 install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# 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() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
new file mode 100644
index 000000000000..94183f43f9bb
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/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 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.22[${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 install_pep484_stubs install_api' \
+			${PN}.pro || die
+
+		# 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() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index ec8ffe2b31b0..db08fb263eb8 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
 EBUILD PyRSS2Gen-1.1-r1.ebuild 454 BLAKE2B 880945c0a67f38e98bca34242d5c4fceff4f0143850a51fa3e7c2047c21b74d687ed0bd7ad84c6cc6a184a339e0a46bbb9bd5822317d592aa28f073027f129f6 SHA512 4652943de98b1243cef0dd97db577f14e55947048f03603fb2becd6b3775d899f09c6ff9c26a33dd9e8484c3ec22b207981762d29752d6a5545f887dc0dded3d
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index 7a38bb900964..a32d600f949d 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index f7b9ac09742f..721341f143c9 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,5 +1,4 @@
-AUX PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch 1812 BLAKE2B 7551d27fe1044d9a7bbe741fd70417f3f180d722915e53ff4374efc5575c70c8171cf4032d26e3b7703eb39e7da4998c6d867447a5338c76897ae84e598192ac SHA512 1a26d4db26b5fbc3c259c110825dbefa272e5c565928d041951438d1ed2012a67b3a06b2158b1c2a7c57685ab6e22363c3841e8bb3bf2e54ea21553b386c89cf
-AUX PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch 950 BLAKE2B e4baf35535ff37a845ba65127d6e580d2c5086e60df0d03a6939b5fee7dac860475503b01644097d9af2a21209e25258524f0feacd45729574034095615ecaf3 SHA512 50b1785d02290ce9544743cea245e216f8cbbadaf9dfc0c865fadd21e1beea88a64d89a304bcfb72e8b2cc19a961fba3c23de028b7caf7e16739f9665dd9aa1a
-DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
-EBUILD PySDL2-0.9.6.ebuild 1905 BLAKE2B 7dcb8cf810ddf63ec416401cca6d564b619a006fa68c6d7394b751f4fa72efbd9ac2e7eef994e84d3c3f4348ce8aa6aa51326f3fb237a4a53a4bf5e8a77a382a SHA512 0eac1a09aa60fabb1d3b690bed3782be724fcf92ec00e5b55e1522cf3b5e632c58a621e7a5266085f90a5f4ab14d29871e2dbaa727626f9078b5a642297817c7
+AUX PySDL2-0.9.7-nameerror.patch 942 BLAKE2B e8f0bb42f4e1ab6ec975a68911a82da2b2bc726dfb88ddde6a6eacdc65cc44acdac1de9aa4c1fd77c4ebd059b5230d267f02730235042dfa4a4a0db7ce26c195 SHA512 e0fa73ab8408384771769a24e016776c7a7878900cf84e622312847243b6c63634a7133599b79d31969c17a6107b692f7a0e927aba6d4275c81587570ba51513
+DIST PySDL2-0.9.7.tar.gz 1079253 BLAKE2B 986a21d8c2f4f45df683d85a8369be7b39f102e59a1b3fd37e2941065a1174d5cd6dd056f78fbc66663e2cf50228ee40abf67352e5ae75176a9c000fb6f672fb SHA512 10d40063762272eaaae1cb6290e007481887806938ba0ba17d28974a3a3c8b36570054587001d00eb9ab4aa2375c616c43a81c7e7308fbb9b61b55b3eb7da5ac
+EBUILD PySDL2-0.9.7.ebuild 1544 BLAKE2B ed38e3bdd83709909ba709327afb00f4d2bbeb1e3ebc6baba799c19078264ad8d82a05fc23fc96a2253633218b26e713860dcfec814ee42a507ddd999cfc62b6 SHA512 7a1dae796822e7542ac20b4819e5c878b1d8a43bd59b2c35884e6ecd78fd8af85537f60734fb8f6b9b40f6eacd1dcdd307a11ac0a8213758ce0f81d6bd5adb3c
 MISC metadata.xml 451 BLAKE2B 2bc91faee3235d8d971aaba13051362ffe22563c5bc5a33a4dcaa0fa59abb7f238310d271a5311c98d4f69b112f731e11d1c8c49fa1a1d2bed1a5acf36c905f5 SHA512 50ba020088e640ca59a7ab64e30ff760b4708866ebc54b91fa2a12e4408463ebb0b04cfe990113bb7f556cbe8a4fc369fe86e3da4ec5b79a76752868cd08a62c
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
deleted file mode 100644
index 85eed5b0afaa..000000000000
--- a/dev-python/PySDL2/PySDL2-0.9.6.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Optional deps:
-# - dev-python/numpy,
-# - dev-python/pillow,
-# - media-libs/sdl2-* (loaded dynamically via ctypes).
-#
-# If a reverse dependency needs the specific module, it should
-# explicitly depend on the optional module in question. You also
-# probably need to explicitly require some media-libs/libsdl2 flags.
-RDEPEND="media-libs/libsdl2"
-
-# Require all of SDL2 libraries and at least the most common subsystems
-# for better test coverage.
-DEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer
-		media-libs/sdl2-ttf
-	)"
-
-PATCHES=(
-	# fix tests to allow newer versions of libsdl2
-	"${FILESDIR}"/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
-	# fix tests to handle missing haptic support gracefully
-	"${FILESDIR}"/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
-)
-
-src_prepare() {
-	# tarball uses DOS line endings
-	find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
-		-type f -exec sed -i -e 's/\r$//' {} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# from .travis.yml
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=dummy
-	local -x SDL_RENDER_DRIVER=software
-
-	"${PYTHON}" -m unittest discover -v \
-		-s sdl2/test -p '*_test.py' || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PySDL2/PySDL2-0.9.7.ebuild b/dev-python/PySDL2/PySDL2-0.9.7.ebuild
new file mode 100644
index 000000000000..e35d95277021
--- /dev/null
+++ b/dev-python/PySDL2/PySDL2-0.9.7.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Optional deps:
+# - dev-python/numpy,
+# - dev-python/pillow,
+# - media-libs/sdl2-* (loaded dynamically via ctypes).
+#
+# If a reverse dependency needs the specific module, it should
+# explicitly depend on the optional module in question. You also
+# probably need to explicitly require some media-libs/libsdl2 flags.
+RDEPEND="media-libs/libsdl2"
+
+# Require all of SDL2 libraries and at least the most common subsystems
+# for better test coverage.
+DEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-gfx
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer
+		media-libs/sdl2-ttf
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nameerror.patch
+)
+
+src_prepare() {
+	# tarball uses DOS line endings
+	find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
+		-type f -exec sed -i -e 's/\r$//' {} + || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# from .travis.yml
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=dummy
+	local -x SDL_RENDER_DRIVER=software
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch b/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
deleted file mode 100644
index 0b72f9036637..000000000000
--- a/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d34a898bb8d8bfd9cb4a85ff880826e4c7f2b0f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 1 Jan 2018 12:31:52 +0100
-Subject: [PATCH 1/2] test: Always allow greater patch-version of SDL2
-
-Similarly to sdlimage_test, allow newer patch-version of other SDL2
-libraries. There is no technical reason to prevent people from upgrading
-libsdl2 while having old PySDL2 installed, and there is no reason to
-make tests fail every time libsdl2 happens to be upgraded.
-
-(backported for 0.9.6)
-
-Closes: https://github.com/marcusva/py-sdl2/issues/115
----
- sdl2/test/sdlmixer_test.py | 2 +-
- sdl2/test/version_test.py  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sdl2/test/sdlmixer_test.py b/sdl2/test/sdlmixer_test.py
-index 00c2ca6..1cebe55 100644
---- a/sdl2/test/sdlmixer_test.py
-+++ b/sdl2/test/sdlmixer_test.py
-@@ -27,7 +27,7 @@ class SDLMixerTest(unittest.TestCase):
-         self.assertIsInstance(v.contents, version.SDL_version)
-         self.assertEqual(v.contents.major, 2)
-         self.assertEqual(v.contents.minor, 0)
--        self.assertEqual(v.contents.patch, 1)
-+        self.assertGreaterEqual(v.contents.patch, 1)
- 
- if __name__ == '__main__':
-     sys.exit(unittest.main())
-diff --git a/sdl2/test/version_test.py b/sdl2/test/version_test.py
-index 51b5065..60e5bcf 100644
---- a/sdl2/test/version_test.py
-+++ b/sdl2/test/version_test.py
-@@ -25,7 +25,7 @@ class SDLVersionTest(unittest.TestCase):
-         self.assertEqual(type(v), version.SDL_version)
-         self.assertEqual(v.major, 2)
-         self.assertEqual(v.minor, 0)
--        self.assertEqual(v.patch, 6)
-+        self.assertGreaterEqual(v.patch, 6)
- 
-     def test_SDL_VERSIONNUM(self):
-         self.assertEqual(version.SDL_VERSIONNUM(1, 2, 3), 1203)
--- 
-2.16.0.rc0
-
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch b/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
deleted file mode 100644
index 2b03fed4d09d..000000000000
--- a/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4a38a0ef4c13ec3c518b78c0e56550fb8af43119 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 1 Jan 2018 13:29:16 +0100
-Subject: [PATCH 2/2] test: Handle missing haptic support gracefully
-
----
- sdl2/test/sdl_test.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sdl2/test/sdl_test.py b/sdl2/test/sdl_test.py
-index 70c2e98..402e549 100644
---- a/sdl2/test/sdl_test.py
-+++ b/sdl2/test/sdl_test.py
-@@ -47,7 +47,8 @@ class SDLTest(unittest.TestCase):
-                      "FreeBSD des not support haptic input yet")
-     def test_SDL_INIT_HAPTIC(self):
-         ret = SDL_Init(SDL_INIT_HAPTIC)
--        self.assertEqual(ret, 0, SDL_GetError())
-+        if ret != 0:
-+            self.skipTest('Haptic subsystem not supported')
-         ret = SDL_WasInit(SDL_INIT_HAPTIC)
-         self.assertEqual(ret, SDL_INIT_HAPTIC)
-         SDL_QuitSubSystem(SDL_INIT_HAPTIC)
--- 
-2.16.0.rc0
-
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
new file mode 100644
index 000000000000..c94d354c576f
--- /dev/null
+++ b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
@@ -0,0 +1,24 @@
+From 635048e81402f3dcc9719c060a67f33e6950649c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 12 Jul 2020 08:18:06 +0200
+Subject: [PATCH] Fix NameError when calling SDL_SetColorKey()
+
+---
+ sdl2/ext/image.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sdl2/ext/image.py b/sdl2/ext/image.py
+index 1a413e1..49d897d 100644
+--- a/sdl2/ext/image.py
++++ b/sdl2/ext/image.py
+@@ -154,6 +154,6 @@ def load_image(fname, enforce=None):
+             # If the image has a single transparent palette index, set
+             # that index as the color key to make blitting correct.
+             if 'transparency' in image.info and isinstance(image.info['transparency'], int):
+-                sdl2.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
++                surface.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
+ 
+     return imgsurface
+-- 
+2.27.0
+
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 3771c769f768..f0517fa4285d 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,4 +1,4 @@
 AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
-EBUILD PyUtilib-5.7.2.ebuild 1326 BLAKE2B 844a689d2d787dd33960ad75d32076437ce0d9700ab34e57a4358b01c214804321fb56626d19763a7d00d56ac1db73f62c476d64488a58acbc4ad081c63ba9a6 SHA512 37c6ed3574864de1fff6dac55dcd080bcb68d09f5b7c6d9ced2aed05c8a0a6e5a07cb1a57f445f06feadbea3fe5601dd696c03b7b6d4ae2d622fc9dc6dee7788
+EBUILD PyUtilib-5.7.2.ebuild 1178 BLAKE2B 2b9f5f43c213a14439400a73a80ef62b310dbafd34327fb9573edd9fd4db7af90fbfdc8a9b18ad46d36ffe14243b880e3f8ea0a9169f54530b6ba46258bfe8a8 SHA512 29089dbb9b073af2b8c723d1af6c85b1a0d7b90a3c510a359e785696df30f3a6342b3926466cadd1f203f0a131a7687fdfc2fe35561f0bdd67b6a24c8f520012
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index 38d68ddf6073..6382c7fad2b2 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -51,11 +51,4 @@ python_install_all() {
 
 python_install() {
 	distutils-r1_python_install
-
-	if ! python_is_python3; then
-		printf "# Placeholder for python2\n" \
-			> "${D}$(python_get_sitedir)/${PN,,}/__init__.py"
-
-		python_optimize
-	fi
 }
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index c37aec9c3090..8d432c5e42ad 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,3 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.9.0-r2.ebuild 930 BLAKE2B 306d95e8d642e1e3b1443710b84e2875150b758e5633e318a185967a275d23d9877d64bb72c528c392843ccea7b22283788627ee3ca944f22965ec07997afd2c SHA512 2b2af09b75fbe7e9809dada369d690624294ae205dbee2492e375cef80a73fe8754a3b80806610f6550cb27f998944e8292bbbb19c5b6d373789967dbe510838
-MISC metadata.xml 1268 BLAKE2B 6efd4418ad56825334d01ac1a8fdc56697dbc80f8d5e915b73b366b3bb7f8d9d1f8ae664e666d19f0088ab05de8454335ee940fbc9e58a32e65a025378744602 SHA512 968f8cd0f4dfcb3217d100f88d41ec3f3301dc70c1f2648698967783161d2f7cfa816edb6dcc5f83aceda6693fb92bdf0d4a2acde7ad00c3ebc5bd8146b51b42
+EBUILD QtPy-1.9.0-r2.ebuild 956 BLAKE2B fafbe66ff696b4e6ef04640b405f84d0412416fbe84adee44e6cb5bad825d72bba8826b191ec5f25d457d63c0031ffb7e4df2223dc95ea34d4601b7e8802c694 SHA512 6562f295cf5112d77062fbed56c044ccac3cf871b172d33ba418f7a2d3333969c3fa2d1466cf3a051507dddc421f86f44ca65dc376f847033040b5b3f3d6a139
+MISC metadata.xml 1350 BLAKE2B 1871f64db7308ed1232a209c8e4b93b061727ceb3c39f4c1ec1f4e70341aafb422f2053070de1f3327e98dd904fe1933bb750f60170f07c77fa7628ff1bd65b2 SHA512 6dc3acac74cb60e1b1c9fbd357d14fca2ca1c49d3ca8ff1fcbfd923c53c5e862c7c580857329a00fb1ba707f856dcf171e1441e8bedb7622501717c9bdfcbe62
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index ea4bf2866229..73b4b1e1e656 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,11 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="designer gui opengl svg testlib webengine"
+KEYWORDS="amd64 arm64 x86"
+IUSE="designer gui opengl printsupport svg testlib webengine"
 
 RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
 	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 076f782a9d63..a19bcec18947 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,6 +18,7 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
+    <flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index 19e9923aacf3..7b4337f56fce 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,5 +1,3 @@
-DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
 DIST Rx-3.1.0.tar.gz 890293 BLAKE2B 268f6df5450d1235d50f9aee5cd43fe6e229acf7b2ddab5f1f97e80594aeff7beaa280fe272ac9cc8b80dc6874f4bb76e438e94c09712f2c37e72d8d40f9f283 SHA512 1d9f6639ef08dc991326b95fcbf0978adea55b35acab653fc16bd94ccf2ad3a1515e8cb4e8d2ff38d7a506306e310394339a8651a2a02fa22bfb7f17d86297f1
-EBUILD Rx-1.6.1.ebuild 347 BLAKE2B 8e84f4c7daa13436e5c9ecb3deb22f41e37ba448f1c830836f931d08c0e7852c8a70e19ea56ae0baefe9188d0541eb3f69f072843e8956310c1639fac6d1cbbf SHA512 9355868035c59f3c253f3c580a357dcb08fab50778b17defa0aff712879be908eac6d2c2d50f801586aa2429ba23ee7cfbba95fbf920b89c491e1522b019f368
 EBUILD Rx-3.1.0.ebuild 605 BLAKE2B bfebdb964ca3a47f98a54bd5a4d9190c58e89631a423da327f974b5eea94450fab0e0c8bf87ee0ef05a9dfaa86496e9ebc60baabe0e2f1d27d3c68e120e75fe0 SHA512 34ae9fcdc055fa742ebe7157523bceb38a76ea155337639166da2fab4d5e49d52deca5acf85f3361d23e2a3457e4342b50d24423d1d8dc05ca359809749a77bb
 MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-1.6.1.ebuild b/dev-python/Rx/Rx-1.6.1.ebuild
deleted file mode 100644
index 82172fce71f3..000000000000
--- a/dev-python/Rx/Rx-1.6.1.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Reactive Extensions for Python"
-HOMEPAGE="http://reactivex.io/"
-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/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index f1286dcb077a..dac5a321077f 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,6 +1,4 @@
 AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c356219efb36d89371ec473bc9fe77aafd637d5310077db0312c7c594d3569821d12524c0ff30710018f9d481ac12706df246b0f SHA512 5ffd4e6bc726633a0957796ab531bb3a566a6a8cc39fc59df888afa7ce53c4b2b7fbbcf5e64dc111e5a603ecda3d7c5920f436b986f11df0ae4fdf9ad042b81e
-DIST SaltTesting-2018.1.16.tar.gz 88951 BLAKE2B 41061e691f97e95ac672b463cb7dc02af4ea70553577ac80d63800198aba8de8565c021381718a32fe76fd958446c3057dec25312a1f961b7696e19570dcee93 SHA512 1ea200ebd7688de35049a45816d87fb3b24f0a862384419a3796f191efb268cdad8a69187261db91de1151f7df8147251910170fd56a50335612bf2f29f09c0a
 DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8
-EBUILD SaltTesting-2018.1.16.ebuild 674 BLAKE2B e4f7beadfc662c96f5cc156b96b5f3233a5c4c9b49da52dadbb0c33ca306c7f8a55f340d9f1c0cc217ffb234607449be59bc500ea253bf7f88c21440f418fdbc SHA512 bfa57ef9c1c2a1df1f4c448fd186f1aa16ba9e8c58deb39147769ebcdbbc88fb94e8df963abfb7667585aa4589be56f5139ab21600a922655a2c77de57c8e072
 EBUILD SaltTesting-2018.9.21.ebuild 815 BLAKE2B 45615df962de6ccd3800d5665b6010f27135a55d9f1cc4595c0fc6f1a56cb9ab7bb07ebd0f361ce0549210003238348576feabaff189f7e772a7be423c37c38a SHA512 7800a7899da9432a8fe9e37d360953b1ace4951394f7688be82b2c609824f192c4764530e0b69f9039c3e63b1e35025ddc69c0a767ed6f2b6a1ddf54dcc15ba3
 MISC metadata.xml 333 BLAKE2B e600956c630527e61c16aeba7e9146732252ed6351301052a3aa1c6187f1b496a162ae7f656cb2c1fc6be3112a7920503af30028df8b4410aa460cc1975dbb31 SHA512 ea35cbbfa8be4ef354636ca16d31caf69cbde213be302049874e03d5167a7435c28605b3dbfe8d8285784375ba2a73718eaa24bf5e9985c559cb04a6b8ffb74a
diff --git a/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild b/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild
deleted file mode 100644
index 17983e6fffc8..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2018.1.16.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 eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/SchemaObject/Manifest b/dev-python/SchemaObject/Manifest
index 38e1d6ce6c9e..3577fdbd4953 100644
--- a/dev-python/SchemaObject/Manifest
+++ b/dev-python/SchemaObject/Manifest
@@ -1,7 +1,3 @@
-DIST SchemaObject-0.5.3.tar.gz 19921 BLAKE2B bed623dd8709e3c9c270d1e527d63260500bb39e00a3a4ae710dfa0c29de35a65ef4c6e41844a06a31b8744f827d3c4ea1c61783e95b20792a5f9f303b86596e SHA512 5f46672b6e069979db47aa96c4b1989f2575853803db84e27a4e15d40219829866e3aaf9e2a7f6f59a24cea7e6e166b8f310941a86f4f459cbe331ac6b3564d2
-DIST SchemaObject-0.5.7.tar.gz 13943 BLAKE2B 416b0b9a3a4883518cc2853abd7df5d8a1932915435443e9cf037609b5ca706dfc8f3ab7614473e23c3c84141d4ea6f19ebb626c9970a1ef1c084891022b0322 SHA512 b9ffd0a0927fd274440473d604ccc2fa58931c2c8c3594c53b6665d096ff9052c1dbcbe201548f3e38ea0a64807371cf7c606913df098cf2c7d5dcfd119be4ba
 DIST SchemaObject-0.5.8.tar.gz 13909 BLAKE2B bbb3d16b22cc5915803f64cd2b158ed73cf93492448bffc8301b9b25cc13774e51eb7d47b7d107f1b7495660c4f0267b00310596176ea0da66df8ae85e43fb9b SHA512 656a0f27fe9618be39d0be45275f83bc53f1c8437d249d97aec7cd18b5c873af1258ae6ffbcf53459705ec213e2d4a6bbe4971749fc245771de50fae0d2faf55
-EBUILD SchemaObject-0.5.3-r1.ebuild 499 BLAKE2B 92f2358c7cb44eeba91e6d6ed1213ead923331df2a49c1cf483d3bbe7b3322a9f06f3d68d353b119ccdb54193450113f7f38fee3f9730db048729ccbb7dd10b2 SHA512 97c4758472ba1a08381ec03d03fd931e7dfd6e99f8df6fa77ae2d5d338ed08b8d347a8b58ad8f7bc45bbfad03b6d6da7035f29aeda0592c658cf1573716e5eef
-EBUILD SchemaObject-0.5.7.ebuild 456 BLAKE2B 22f869491fd5114f8bd61ad9b0b4bdf74085bcce58e3184ae664f2af88c925c4c063c67791be8aeb4eb3bf160c574a3b91c264c22dda8858731c6719d4dc27b1 SHA512 26c0f9f66c438977258ae3bc5d3ed40ff6c441cf88e5f0b7e1607124ffd8b9f8cef1f0da33f48c4857f5431a89779254207d4067ccee6d7fb8135113a5a3410f
 EBUILD SchemaObject-0.5.8.ebuild 456 BLAKE2B ceb03f620edcba16f545435a199c7484b4c7fde97994635714ca6787413709ab5bd06655436d5a4d438ddc3d96e66fcd5257474806637fabeb532304a7e69d23 SHA512 4da3910d74b080fbb99c70e77e94bca8481bd33559a991f5607557104f3c78f97b45ec0fe2e0a63ba07daa9bc2b7cb47dd280ad4591b4fb38ac7c87d6269ed0d
 MISC metadata.xml 388 BLAKE2B ede95453d68c2bd620b956fba9e491d29a02596a3978cdcd0342f7fe43a0640998e6a061d15c4d9c49f68de42ca68d4039a4540c1ba7f1c5a83434e877e834cf SHA512 b0630ad281d27b9422ccde414e8a5990eb437b14a1f1fd1152cb83794617fed59f2cd9b593e57a70948b386921e9b2c9e40ab879fc39d25402837c278c165e82
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild
deleted file mode 100644
index 31fc0c2d9da0..000000000000
--- a/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python object interface to a MySQL database schema"
-HOMEPAGE="https://github.com/mmatuson/SchemaObject"
-# old download location is down
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN,,}"
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild
deleted file mode 100644
index ff742456ffa7..000000000000
--- a/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild
+++ /dev/null
@@ -1,18 +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="A simple Python object interface to a MySQL database schema"
-HOMEPAGE="https://github.com/mmatuson/SchemaObject"
-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}]"
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index c0d111d980f1..f9a8ff49240a 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,3 @@
-DIST absl-py-0.7.1.tar.gz 215669 BLAKE2B 6c7eeea6c21f03a493448dce12bd30b62a34e087b1bf932f10d638190dbeecb79ff40d90698b80bc2a62b6c45d9254f6ff4a789d8e8139b8317516ef2f7b5fea SHA512 19fc41effaeb22f6a4376b9ce32560fa8e3f36b7004e17806ac64fb6775525f3530b36ea8b224d1ccf2f1ee076ed0671039971b061b9185fe37c8f2495110a84
 DIST absl-py-0.8.1.tar.gz 220234 BLAKE2B 5ce5bc83bf456794f1e38a00ac7c52397e262c8d69e35248b008a5f682fdd8d1cfc33fc5313783644a6baa0be7f32660c4eb2b0e72d86259f40abbfbc1eb868b SHA512 84f751dde2bf725e08adfb8bd34e3d43a13bf557d2c2e3b3fc98ec4fca78c8a17a714cd7804cdeae86dbf758c5021d1d92c688df25f7eb83e633c312303efd36
-EBUILD absl-py-0.7.1.ebuild 550 BLAKE2B 2399a7ead37d866d8f06871494c4bbcde2ccdce723091b668129a23f2725414f51b2c4ec331f813cd9776391dca99cfd5c80e36d10cf5df18762e99e96751979 SHA512 2f9627b6e1782a40cc78a6056d45b1d8bd6a398207215ebabea7e48b35b131a16600fc5370b9a9346cce391c6e1d6261d36535edfb7041e71e9aa3effe089eff
-EBUILD absl-py-0.8.1.ebuild 552 BLAKE2B 78f70b6f5927fdbaf8598c10c064257838e5d0d15d3f1ddd67c7a5d2cabde78d6f3db224d3113ecc5089b2f8bbd17c94e383be1fc9ca122543840e492f0b3757 SHA512 a429880a7a64e0356b5a598b4a76ca72e4f8e258ad3c0d2ba0ca47902b2b9e520ce9ea598b1f1b23bb934e5dc89d82035783d1f89e1ba4434000971d3a7357d1
-MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
+EBUILD absl-py-0.8.1.ebuild 550 BLAKE2B 2399a7ead37d866d8f06871494c4bbcde2ccdce723091b668129a23f2725414f51b2c4ec331f813cd9776391dca99cfd5c80e36d10cf5df18762e99e96751979 SHA512 2f9627b6e1782a40cc78a6056d45b1d8bd6a398207215ebabea7e48b35b131a16600fc5370b9a9346cce391c6e1d6261d36535edfb7041e71e9aa3effe089eff
+MISC metadata.xml 531 BLAKE2B 3db4e14f8e949a75079014a516b9644b1a5fb17d7c3ca877cc8db4681a8a80c37641363a91ba84000bfc4b11d33fdad2f68f637a29233267be16caf287a20a3f SHA512 a66b08837eca504da558917c1a6c9a7aeae5d4f52622b74ecd365f89268b19f1b569478d7d1468b390a74a72ddd4f67f206d4b9932c7a32fe6e92e7bc4fcfaa1
diff --git a/dev-python/absl-py/absl-py-0.7.1.ebuild b/dev-python/absl-py/absl-py-0.7.1.ebuild
deleted file mode 100644
index e6d6a58c0918..000000000000
--- a/dev-python/absl-py/absl-py-0.7.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="Abseil Python Common Libraries"
-HOMEPAGE="https://github.com/abseil/abseil-py"
-SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/absl-py/absl-py-0.8.1.ebuild b/dev-python/absl-py/absl-py-0.8.1.ebuild
index 4c68bafaefdc..e6d6a58c0918 100644
--- a/dev-python/absl-py/absl-py-0.8.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/absl-py/metadata.xml b/dev-python/absl-py/metadata.xml
index 84edbf679113..56c13a3fb082 100644
--- a/dev-python/absl-py/metadata.xml
+++ b/dev-python/absl-py/metadata.xml
@@ -9,6 +9,7 @@
 		Collection of Python library code for building Python applications. The
 		code is collected from Google's own Python code base.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">abseil/abseil-py</remote-id>
 	</upstream>
diff --git a/dev-python/aiocontextvars/Manifest b/dev-python/aiocontextvars/Manifest
index 662006d721f5..967aa17daca1 100644
--- a/dev-python/aiocontextvars/Manifest
+++ b/dev-python/aiocontextvars/Manifest
@@ -1,3 +1,3 @@
 DIST aiocontextvars-0.2.2.tar.gz 17329 BLAKE2B 96c77d6222456b84a99454d60aa5f30d8256297f716d729398a07a3d9bcfa4a64fa44d183163c47deccda75d5e761140aecb6d5f5df2865e1c52f9cd6682cce8 SHA512 87de2be27217b664615ebfec2b4bd4da8542913649ce2b4f23357e7d8b07c9776d633f7f781caedc6eb4e261bdd762228486ab69d6b776e40013942e593f19bf
-EBUILD aiocontextvars-0.2.2.ebuild 708 BLAKE2B 91e447ab7dd17d7b97b4e9af7ca5e9e5a89d840c9af8b9379e40219960f5e6a7f5f44a254c7507a245ddbecddd6b5530d4b978de3d64961a3aa8d65e555741c3 SHA512 3e6443d4c5b39a8e4fea6dc4feb1c827dbe66d87912d7f85b1f9fb3c41ba68eb90af3c7a5377ea0e34236dadb371c0fab3b3a806cd446dc2e54b0a12c57995cd
+EBUILD aiocontextvars-0.2.2.ebuild 748 BLAKE2B 269ee9620dcdc0232ee99afefa69cd790d99a0ab29fd3dd45eeec527cef4a7c6d221ec9ae6a016491cb2b5a244b973b378e58cc443a28e0a72f62cbe8191701a SHA512 19fd082a0b4fd611a3a6e6e36dd347966a0c68dfbef23904c8cd5d5d0b3b6d9e7a0533406705e46e53917ec88d84bc9a5e3cd1916727214c7b1acb366aa95525
 MISC metadata.xml 356 BLAKE2B b803eba6f4ba59df603e711eea6fe7b169a304ec1e1df8e9133575f8540d2ef002b3fb8ecf186d9ab522b00a7fc6ffaf188bb8930d07d66f10b01ed86614534e SHA512 7aedb0c4fe2e58f969a1cc457d4eb43354a7cac4c82add69b8d2aa384fae6888a8f4b82601a8db1ead5466f8924a3350a4794c3a408a6b4ecf4dff1eca819015
diff --git a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
index fa25b811305c..05e3c3c4dca3 100644
--- a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
+++ b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+# this is a backport, do not add extra impls
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Asyncio support for PEP-567 contextvars backport"
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index d1e3d6a7a274..ba3baa448121 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,3 +1,3 @@
 DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
-EBUILD aiodns-2.0.0-r1.ebuild 831 BLAKE2B 2388f981fcbd95c3554f30c5ad4718dbd0ebc60c6f662a1906a4737cce3330c8a57236356ddcc20cb70a9b008e374d0830143cc4c56cd666f269df0533c5d60b SHA512 43fd2e1dd0232fd092fd4c944aeb38bf7b85ef3f1a51d7d1f9820286718e89237a3cf185c4d7ad27990fcd6a9ba43810159adc978c095b29b13e7e61a720020e
+EBUILD aiodns-2.0.0-r1.ebuild 832 BLAKE2B 8785b46f1c4658b07f492c0cd136466995645d3895ac3b720cb691db20ad71e1f469ddd8f8ab87c88b75022141fced8a8efd764f7d20ea4326d231edaeaca8ea SHA512 e02aae417df83362660d632599bdab25bd9acdcee76240cfe93d25f070de2160487cba223236f03ce3610976495cc25d8a46aa23a5aa6a2de2f303c8dc84f3d8
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index 8553565e66da..454882ebac99 100644
--- a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.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..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 7b2148927180..4726b856bfd1 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,3 +1,3 @@
-DIST aiofiles-0.4.0.tar.gz 12942 BLAKE2B c8e6570f0759cf97b642a8feec4a572dc40a86906c9f7e749fa5b20346b61000d62d72c1ef8316e03adc1352021ec622fe9c670e916fdf84f41845ce37f1de51 SHA512 9e1f8b2beb3ca2996b35de9281ceafbb8ccdeab4b213f9605cb5908558c5f495d1cf4481ac229ca44bb236ad99826d89d137ec6ac4386c23b6e056b657a6bf4a
-EBUILD aiofiles-0.4.0.ebuild 560 BLAKE2B fa744dd1773fba196d4f68875fac8212666b4da703d1ddb2007adcfd18c77fecb658bd273b0f4dec6e965593d90bef02af8b5c3c5d139ec7e40049b5ce05f875 SHA512 fac5b7b7cef4ae2a5299b64bd038e39c4a279b6a297762f276de4ebe5cc69d0e8e068999eaf7e8b3b49bf58bbf5a04b1714cf5bd59928ec920b3130ccd9035d0
+DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
+EBUILD aiofiles-0.5.0.ebuild 560 BLAKE2B fa744dd1773fba196d4f68875fac8212666b4da703d1ddb2007adcfd18c77fecb658bd273b0f4dec6e965593d90bef02af8b5c3c5d139ec7e40049b5ce05f875 SHA512 fac5b7b7cef4ae2a5299b64bd038e39c4a279b6a297762f276de4ebe5cc69d0e8e068999eaf7e8b3b49bf58bbf5a04b1714cf5bd59928ec920b3130ccd9035d0
 MISC metadata.xml 510 BLAKE2B f182d8530bf906c59a0557a258f2da78d1faf5c90eaae6da2e607e3db749871a7d1f8ed08136aeb867f9706ae3d51c7f934ad6bd9065f92b1da33fd3b0016c8f SHA512 3f4adfb90e2e02cd8c64dc384df7f615aa8acdee03aaf4f67464290b2860b5686e3384e6f4df35a3f001b3f7ce010bbcf44d87882dafd66c3400c5447e5680e5
diff --git a/dev-python/aiofiles/aiofiles-0.4.0.ebuild b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
index 986e5ea1c6ff..986e5ea1c6ff 100644
--- a/dev-python/aiofiles/aiofiles-0.4.0.ebuild
+++ b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 0c7389160e78..27ee467c3c3a 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,6 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 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.7.0-r1.ebuild 914 BLAKE2B 520d9cb0dfa19ae110ef27d753469d767c3e890622de19d656ebff98d16ae157db3d1161fec22a6719162261722c26884870cd0cf365af35b81fd349f527a03f SHA512 941925c42e5df8ef78996879feefe1e916ee636032bc56c8a2c886f2ef60d46334619b815c491d0908829deda4e0d924e5ec8032eb410281eb844e50c8c6d0a2
-EBUILD aiohttp-cors-0.7.0.ebuild 842 BLAKE2B 4bbb7534da92f7c7cec32437581e0aaf0670d654319d81271cf5cb6d296928b05538958ab6f96d055bbb457cc5e218b8e4fe40645a67d4b1161ea2f771ef650f SHA512 dd3e95e9ff72ae87c0e1ea6bb4e161d1960553589b7a30ae2b9750d5bf9ae38f3e223181580a75220c36249929119dd54453a78fb7f061cc9bf90d21f773538b
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 931 BLAKE2B fe97c51de95e15e1212ef84a57513f7ce3687f9948a83df7bfa67f54948f565a6e7787f08263834a1682f843b9e1f04a2d60b4dec97e4d61ebdfab9f6a4280f3 SHA512 0012a81168ceabc54a53fec54f2aa0e65197687dfc8c5e47c9fe5b664960b5a762fab58491da55d4b455e0c8baa0ed0bc37006cfd6665794d4079798cb3327bf
 MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index eded3a043888..09c67cd66d23 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
deleted file mode 100644
index bcc29302a0a0..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.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="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"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/aiohttp-cors-0.7.0-tests.patch
-)
-
-src_prepare() {
-	sed -i -e '/^addopts=/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 09846c5a23d2..64265d369432 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,5 @@
 DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
+DIST aiohttp-socks-0.5.3.tar.gz 1360418 BLAKE2B 7282a4952d5f0301b14291a1892db5ec058af91cf553e4a17ab0e933bb327d1fae9c015d25ff7405ef69cdf56637140fefa9bd1ab1e6f2e224cdc94b9e279159 SHA512 2999f850081d05c31535c24c0fcf0948dbaaec5e421c28ed4ca68b4bfb122f881942e7e829cefc01377212b4579547aafcf273fe5a999acb3d158ee1c3f0a888
 EBUILD aiohttp-socks-0.2.2.ebuild 910 BLAKE2B 54c6dbbe842bea798ec60d15e6cf1621db8a389237b70234d0b1932207729f5f8864bb83ac9880295e144a5711191bd33658f321199ab6f7f5df063cb6afb78d SHA512 c8b121e6f22b6d0a8ef15c616483ab90afc6142e59cf74982b1942fc17331cfe502fa43cb786cd82161857ab392fe928f5c92b8533404c32ea71c3628a8dea10
-MISC metadata.xml 391 BLAKE2B b2c143f0bebedd76ce3992254b7c068b9707bcc75c552cf994239fbcd32ecb39c981a1a61bd351c29627fc4a65124fb54b5c8533fba5f8638d17b253893e50b5 SHA512 4519a8f883d724ea786cb00023c8e0efae8d343d40c0988154efd27a2bdce7b73e6884f3f406109fabef54b9e2d62e8c07cda7e7d876b148cff0090ba38c2104
+EBUILD aiohttp-socks-0.5.3.ebuild 1060 BLAKE2B 16d9962b6763a77a3aec39bac71d26feb2e781f97a1438e4da1805f7caa13f853eea7dc3df8ac4c30695f396f54142f687bb19f0310db00452d09d0ed5bfc452 SHA512 3933ddc26d565605716ac7df2e60be94859a325b9498d0fadac05ffa8a0fc87edeebf6b041d9b91698e15cb18421fba491dd818138e38a94fe7964d8defe9c71
+MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
new file mode 100644
index 000000000000..2be59ad90cdf
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.5.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Tests require Internet access, also they started failing when run
+# via ebuild (but work fine externally)
+RESTRICT="test"
+
+# TODO: optional dep on trio
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		net-proxy/3proxy
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: reenable when trio is packaged
+	rm tests/test_core_socks_async_trio.py || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	rm tests/3proxy/bin/*/* || die
+	if use test; then
+		ln -s "$(type -P 3proxy)" tests/3proxy/bin/linux/ || die
+	fi
+}
diff --git a/dev-python/aiohttp-socks/metadata.xml b/dev-python/aiohttp-socks/metadata.xml
index 829f4a58e8e5..b6e998bee27f 100644
--- a/dev-python/aiohttp-socks/metadata.xml
+++ b/dev-python/aiohttp-socks/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">aiohttp-socks</remote-id>
     <remote-id type="github">romis2012/aiohttp-socks</remote-id>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 6e797c2d1f17..04ac86d81f29 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-3.6.1.tar.gz 1113678 BLAKE2B cfdf1c650ec52c7b6423f7afd40060ccd1631a407f126bf64c2a353c51f09c31bae3912b8ce9397c0c8350a2e82a98724ae58335998d1ab08ae46a49abce0251 SHA512 4939b89d45abcd655ef212ff87f66a83882fb12dffb87d62ae57afcd9517725af61f46f9b7428112e2dcd72d3a4027524967461270ede34348ff3ead47d14c9b
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-EBUILD aiohttp-3.6.1.ebuild 2179 BLAKE2B 956ae3f0a7439a67cda6bf44834fa28f5e2db93725fed02f4841f207f7dc3eac68e4a81a78df42e2f5cfebe53dbe1dc10d1012962e57fe8961dc4df985310e1a SHA512 c1e631f18adf1e21a4a901bb6074aee8dc4635a6cae6f2d74ec6e8a00e3f08d9bd494d92c85f3699035e6ed322c709a5f8e3ea2161c0447b3412b9f1e527b74d
-EBUILD aiohttp-3.6.2.ebuild 6359 BLAKE2B 36dd3377a17cef08b98cf1b8db6e9e9d2dfb13c31dfbdc7728efc4db797fada894b036b064a328a4c3c12e44b431de347b040265188bb83891e9abbb3c71acdd SHA512 89559ca6aef2a70245bf0bbf3b6132bea7355def36e36a1025a24a84ebed1dc685de3f2a89b44a478e8e72d0518cc96b1fba87ad12a9fd5bc0c34782269edd5e
+EBUILD aiohttp-3.6.2.ebuild 6735 BLAKE2B 00434ce6c8b45397f0889f5197ca10e0ce3de1c2f7eb5741028a1b615376f8105666b0778614e6131c10d628a97d7c9287345b5fa6b536800c9d5cd5fab4686d SHA512 f5bdf64d06cbb164664b0acc7996eb3bf3f0d6917c16072eeb7d345e3b0b469eaad1360226264610349b6f8317222d7254a6cdd89224e9d5a886eadbb51a371c
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.1.ebuild b/dev-python/aiohttp/aiohttp-3.6.1.ebuild
deleted file mode 100644
index ce4a47d87b07..000000000000
--- a/dev-python/aiohttp/aiohttp-3.6.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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"
-
-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.5.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.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index cd2cfb9da4fe..2633950f67a7 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -13,7 +13,7 @@ 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 ~ia64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -29,6 +29,7 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		${COMMON_DEPEND}
+		!!dev-python/pytest-aiohttp
 		dev-python/async_generator[${PYTHON_USEDEP}]
 		dev-python/brotlipy[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
@@ -111,6 +112,9 @@ python_prepare_all() {
 	sed -e 's|^def test_aiohttp_plugin_async_fixture(|@pytest.mark.xfail\n\0|' \
 		-i tests/test_pytest_plugin.py || die
 
+	sed -e 's|^def test_static(|@pytest.mark.xfail\n\0|' \
+		-i tests/test_route_def.py || die
+
 	sed -e 's|^async def test_mixed_middleware(|@pytest.mark.xfail\n\0|' \
 		-e 's|^async def test_new_style_middleware_class(|@pytest.mark.xfail\n\0|' \
 		-e 's|^async def test_new_style_middleware_method(|@pytest.mark.xfail\n\0|' \
@@ -121,6 +125,9 @@ python_prepare_all() {
 	sed -e 's|^async def test_client_disconnect(|@pytest.mark.xfail\n\0|' \
 		-i tests/test_web_protocol.py || die
 
+	sed -e 's|^async def test_static_file_range(|@pytest.mark.xfail\n\0|' \
+		-i tests/test_web_sendfile_functional.py || die
+
 	sed -e 's|^async def test_partially_applied_handler(|@pytest.mark.xfail\n\0|' \
 		-i tests/test_web_urldispatcher.py || die
 
@@ -134,5 +141,9 @@ python_prepare_all() {
 }
 
 python_test() {
-	pytest -vv "${S}/tests" || die "Tests fail with ${EPYTHON}"
+	pushd "${BUILD_DIR}/lib" >/dev/null || die
+	ln -snf "${S}/tests" tests || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+	rm -rf .pytest_cache tests || die
+	popd >/dev/null || die
 }
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 66cccf5f8c19..91a78c7f2098 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 498 BLAKE2B 59da5e0a5dd9f35b1391503407de56f2da9b25ff32d52a82bc3b5ee957fc7abbbd3c29106861956f59cc49e347c4973f7aab8d0c9d8f804bc9323e0ecbed15a8 SHA512 19012152550039a37ad3d5be8c43024dd689b07e239b5b821d1e8e1fd7ad96481ba5e5df61e9273116c440cf84c350556bb0502f50ec72209f111e328381886b
+EBUILD alabaster-0.7.12.ebuild 488 BLAKE2B f95fc935d4f3c01d9c109f2cc679db941d62b8be857e16c484566db9e67b3f1af38c78066aeb07dbfe624bdcb40e71703353cd84459e3bf9fbf5fc99f5b166de SHA512 084df9a711ba85503712c8a1ba3ee8360a6b0dea6177116abbdd2a0ce4d8c0dbe33890b15866274a20ebe6579ac935e986a9b4ce5dd639d0ff1bf3ac34e91d9c
 MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index f4bf497e0911..fca86004f512 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index a82828d21d8c..c19723925545 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,3 @@
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
-EBUILD alagitpull-0.0.23.ebuild 542 BLAKE2B 9b283269a66129ce2a7a43ad4d29c1acedc2d459ccc625be557ff3c633f10d35b9f4e586716fa68624a6875f7282bdecac33ecd8f013bbd65f29c65be82f9b0d SHA512 28cdeb242fa09727aa145446dffa1106cb5ae096db384e5c64f2a1a52b988f53c754b98109700eaa03130af5c52ff77cf23d49dfe1535a8eb2f4768669f0d666
+EBUILD alagitpull-0.0.23.ebuild 556 BLAKE2B 8ad0faeea63ea9c15d023fe5b27a8a91cefc183fac632e5d536ede8ea5f5a56941c43f1c1bd3db504e4479d9ad23048fac05bc2f71738423824ea2c5c85948be SHA512 b7e0b5451431fb882bc19abb27e2b4e65991e8588a7157a22dc6e641ac3d8136f962b97501ba83dee38f4f0c2a1af77a9b1956be58107a51193d00033a3aad27
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/alagitpull/alagitpull-0.0.23.ebuild b/dev-python/alagitpull/alagitpull-0.0.23.ebuild
index f532a0923191..c6a405bc837f 100644
--- a/dev-python/alagitpull/alagitpull-0.0.23.ebuild
+++ b/dev-python/alagitpull/alagitpull-0.0.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/git-pull/alagitpull"
 SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="0"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 8537ffccde79..211af40619ed 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,3 @@
-DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177f96b95e2c3409a0ebc26e5323665147b2721efcc4a4d8ee2a71ada76408187f39ff5ad3745de64ed31f87d2895 SHA512 7a2ab63c6a823a32f45cd8ff5b763671806a8fa3d2b31e09c2051bdf92784fdafea1e3be217d84885d92eaf550e223ef77fd6fd387d35a5882d60ebcf042d835
 DIST alembic-1.4.2.tar.gz 1092045 BLAKE2B 5f4001a756aacbb4db509669bc0d4d7c59c38e2983c433283243efa97bf28a22e38bcfd28a4bc72573e8ab78d6590e78f4e12a5b9dd08b60cf5a84520b955056 SHA512 82bdfe442c19033aa2b802ec49edd13ed265c00a2b5a048490a83ffa8e53587c56a90b64d554e746a9189923419c528482cb7a7c950c210e0de47b32fa7c270e
-EBUILD alembic-1.0.8.ebuild 1412 BLAKE2B e8dc987cb0e1ec70a454d43828c8bd4c15d028fd6d63dd4ca6f8ab15f11b5b208b2b90d867ce95843c9dcad4b5e0d82b954c4d73e80a07e56c8dab68ec00e03c SHA512 7346c12c90fc7617de8d0c015e77f9856975b0d127c11eda15ac63732f07986d4c3030db37c3420e2caefcd7dfa831b3d5b2e6e0259caef046b565c88308f460
 EBUILD alembic-1.4.2.ebuild 1191 BLAKE2B 9f76369659af2bb4e6fa26e2016aa689f0f33e2e24f7bd1ef2983f577c8615010231d6c5c1ae53d1c2e43b889022bb1c18f782ca0b7a1e750c02f2f36097cd29 SHA512 ea7ffcca42d4863e24a5300c3b84068c8dfeff2f6805dc7d062a33d90a71657f54f6a4fa7aa4bfc15b98a2202091f012bb33084c13404631a066c0cf81c9b21e
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-1.0.8.ebuild b/dev-python/alembic/alembic-1.0.8.ebuild
deleted file mode 100644
index c19da229c3ab..000000000000
--- a/dev-python/alembic/alembic-1.0.8.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,8} )
-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.9.0[${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/algopy/Manifest b/dev-python/algopy/Manifest
deleted file mode 100644
index 6976675359b1..000000000000
--- a/dev-python/algopy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX algopy-0.5.3-fix-test-cast-ufunc.patch 1216 BLAKE2B 400a6f13fc9e9d426e35af04c1e57c812916ce73973f5f474c27b62a212e3e5fefdbba628d5280c1b9bc8af45667c1b42186ac0ecccd32f49deab2ee11d6f8f4 SHA512 760f2d9ccba579079992b59a8334a1606ac8481c7164637640916418d7ffa1fb989b81dcf1445c205b832f476ef883f1f0f18cb540909526e8b1a05e6c897442
-DIST algopy-0.5.3.tar.gz 149560 BLAKE2B 8fdb5e5c00aa161bbc2a03c584d644e36d2843bbd3d1e090b0a89ef52db9a122561f050aa7676f9fecdf78485963fa3712b3f2698e52fed90d9077ab4395838e SHA512 43b3cd4f17fa821fc61898534f595202097cd56d57133a1d13e23743c794166a0f8877947cc6eae6d2ac2fd7400e2a6527ee8229ec1b26ea660ac9c01cd22912
-EBUILD algopy-0.5.3.ebuild 844 BLAKE2B 3d46456cb576bbd741010f2f79dab6cbaf56efbd374f494d77313e1846e42c8b5625ea9c284bf3c4ee0962c4f21ea9b59a485e415662153bcda1da2c0ad7b137 SHA512 c94b4992c227e4e5f4939d1bb596dd009183feddad5dafa1e16b3540aaad9a278f4d7d93646cb5c37a91e5406ae057850e666e5102907c287d387f497acabf17
-MISC metadata.xml 319 BLAKE2B 467b55a1297cc848051e0e3d9a6d8fd6a4df43c639f3b79fbd3ce31247fe3082c208282256dc070b0ffb0e0721ec868c97bf56c43c8910a554eb29506820b1bb SHA512 032311a0f7e860ef5e890c30458a03beaebb7911d412642208e1bf60f26088e981ef99bce52a637048512eacb3460e740a7d969d5c83ad42e64cb0c584151477
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
deleted file mode 100644
index 4deca4ef6ad9..000000000000
--- a/dev-python/algopy/algopy-0.5.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Taylor Arithmetic Computation and Algorithmic Differentiation"
-HOMEPAGE="https://pypi.org/project/algopy/ https://pythonhosted.org/algopy/"
-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/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/${P}-fix-test-cast-ufunc.patch" )
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
diff --git a/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch b/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch
deleted file mode 100644
index 0b8a0eda5080..000000000000
--- a/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f563d86e72b32caa296ac77b0836ce0e36a5f6ab Mon Sep 17 00:00:00 2001
-From: Sebastian Walter <sebastian.walter@iwr.uni-heidelberg.de>
-Date: Thu, 30 Jun 2016 15:11:19 +0200
-Subject: [PATCH] Problem: numpy raised TypeError: Cannot cast ufunc add output
- from dtype('complex128') to dtype('float64') with casting rule 'same_kind'
- Solution: use numpy.add(x,y,out=x, casting='unsafe') to cast from complex to
- float if necessary
-
----
- algopy/utpm/algorithms.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/algopy/utpm/algorithms.py b/algopy/utpm/algorithms.py
-index ccf7ca4..5f2651e 100644
---- a/algopy/utpm/algorithms.py
-+++ b/algopy/utpm/algorithms.py
-@@ -1190,9 +1190,9 @@ def _dot(cls, x_data, y_data, out = None):
-         for d in range(D):
-             for p in range(P):
-                 for c in range(d+1):
--                    z_data[d,p,...] += numpy.dot(
--                            x_data[c,p,...],
--                            y_data[d-c,p,...])
-+                    tmp = numpy.dot(x_data[c,p,...],
-+                                    y_data[d-c,p,...])
-+                    numpy.add(z_data[d,p,...], tmp, out=z_data[d,p, ...], casting='unsafe') 
- 
-         return out
- 
diff --git a/dev-python/algopy/metadata.xml b/dev-python/algopy/metadata.xml
deleted file mode 100644
index d57568e5a1b7..000000000000
--- a/dev-python/algopy/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">algopy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/ament_package/Manifest b/dev-python/ament_package/Manifest
index 601c7828d3ed..82af94d8d3c7 100644
--- a/dev-python/ament_package/Manifest
+++ b/dev-python/ament_package/Manifest
@@ -1,3 +1,3 @@
-DIST ament_package-0.8.8.tar.gz 19289 BLAKE2B 60490e6b772f4b2b19090c0bdcf949c3317dc21648412ed2245492a016acecff7529e364e66f5e34ab1705cd755db58423e4f62899cd9625207610d1a6dfee72 SHA512 4e4cd851ac3014f7676237a6918529041d3dcd606ed1577c5638fd1aa740ae45f3f10e019b5ebc31232525f9cab4e77916073d149a3dbc8d9add5ce5b8d28a2f
-EBUILD ament_package-0.8.8.ebuild 680 BLAKE2B 7a05c5523e6592d6d848a9f80f03a2ef80dfcab969686699802c5683c46c4d233668d1136281443f3f0a7259d9f8a9d6c7f1d6b0945968ddfef41ac7d06c0552 SHA512 e6d65648e195e461f4dd55cfd2eb219b256f061df310111d34211bf87888927c2599490364046e0a4799c7b77dd02a9afa278cb009eff7306b5e44194507dea6
+DIST ament_package-0.9.2.tar.gz 19471 BLAKE2B 5a2f4d326fae5976ca452666149f17019ef70005142aaf0ec57369df5ba53a99a0e10d15964843e0ba841a9eee1f268df76e4584ac0c004de091fa5bd773a6e1 SHA512 eb9def5eb0faf159d3082eac436059529886644c38a9f40183a7bef8e66ab7ef4d4fc266fe434128c25f040e369d4a6b9f376b0661cbf959960f3c62280c778d
+EBUILD ament_package-0.9.2.ebuild 689 BLAKE2B 9657db63d3c2bccaa66fa4527abbb24faba2a219ae055790d178101ebb5a04346701c8431f668e8bc279be2c84cd255dcddff685b68c7ee079628eade64d2703 SHA512 31717782bb21ba3a6de4dd26aa96e711267c234947a76610c260559dfe6f2977209875797f59cc858d53f3cb0b7ddccf879bbaaa16568e14cd97ac6e929b937a
 MISC metadata.xml 333 BLAKE2B 713e60970251a9efef7c6be91de9f139953058b16efa8e2c23aa407cfc395a53f63d319c08c0a4597b22c5fb6d9ee3b57c40ed36f9318509b95786297d9958fc SHA512 87cea6fec8887053fe14091c5b76687797618f1c56bdc18215ecf92176027001fe2da63b6cb7e111bf9ce8b6fb9d1b8c0451594a13623ced562840ccc3a7b32a
diff --git a/dev-python/ament_package/ament_package-0.8.8.ebuild b/dev-python/ament_package/ament_package-0.8.8.ebuild
deleted file mode 100644
index b86d5e0d90da..000000000000
--- a/dev-python/ament_package/ament_package-0.8.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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="Parser for the manifest files in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_package"
-SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/ament_package/ament_package-0.9.2.ebuild b/dev-python/ament_package/ament_package-0.9.2.ebuild
new file mode 100644
index 000000000000..18b4b08c1e7d
--- /dev/null
+++ b/dev-python/ament_package/ament_package-0.9.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-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="Parser for the manifest files in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_package"
+SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 007c78b57065..77e65e7948a6 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,3 @@
-DIST amodem-1.15.0.tar.gz 28779 BLAKE2B abc2afbce47cf5e3b2ae34bd54228618e887b3f0b919d421114ce5e56e3e8a14477f130f03d77851c1e256afb22d4b657367c8e59954438dec72f3059278de64 SHA512 5d39e08d47410a55c218ed2dc5a413cbbba602fe1049d3e8824ca62b439d029c42294b2a17e4077b2c746336b1471a4a94ffa19b9eb3145869dfc158404bcad8
-EBUILD amodem-1.15.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
+DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
+EBUILD amodem-1.15.1.ebuild 515 BLAKE2B 5e2d42b9e9b11dc65f640ef9ef23d811cb92c2d4e6c04246e10893b01088b4b3a3f8b698c88ed319161427de78b1637477d8ad2871d2719f68134c5f6231227a SHA512 e6e5221452ebd854ceef0132fbe9081c4dd62e86fcee565dfff6f0ac34a4e20f1604144829162532523708f4ae45ec5299a450b8476ed6330465b1285c7db394
 MISC metadata.xml 514 BLAKE2B a9a520e6446c6d3713bd0e56d69d19f2ff0731dae551184279ade5591b300446f4fb2b4db14f495fbca2bb3fa126de168e6c0d8d27fdd8ac3737b15c7472b997 SHA512 6544f7a44ad78931b88b85d7046dfc03967076efc5ff5395c44a84cd7a649adb1bce38221fb7d86c4569cfb912ae4fb0ddf031f27109fbc8ff60e187f4eb4a83
diff --git a/dev-python/amodem/amodem-1.15.0.ebuild b/dev-python/amodem/amodem-1.15.0.ebuild
deleted file mode 100644
index 99aa9b456180..000000000000
--- a/dev-python/amodem/amodem-1.15.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/amodem/amodem-1.15.1.ebuild b/dev-python/amodem/amodem-1.15.1.ebuild
new file mode 100644
index 000000000000..7e8618ff0c0a
--- /dev/null
+++ b/dev-python/amodem/amodem-1.15.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_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 4c91b93c6825..39f6d6c9bbac 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,6 +1,3 @@
-AUX aniso8601-4.0.1-mock.patch 3115 BLAKE2B abc21dc08430c62ddc7019706343402e882de46bf72e6e8199248838736663ab38087d4aea005827852cbf1540352d6db4e8137691b7d09045de2bf643d7c7c4 SHA512 1ec5cca9c542c5d8f82bd560fe86f64b344cd98ff352851115e729f88c6b4347d19c748473c03ba4bd8dfe6709fac902133162dd34f3f45b4eeb8c6ddfc9eef3
-DIST aniso8601-4.0.1.tar.gz 109849 BLAKE2B 487bf340e181997219c2e39ed887161c3f5daa336cee79ce947b55a11c463b439086c3985fc93184de550f5e34e03f2d855ccb9a3072c0dc16ac21bf02a7e78f SHA512 5638ebf82a1a1aceee866eb17e8e4b5c8023961a9e31ce3e12123b89dba0ea0924e10a6aa458c838fcfdb72b94af4e81b3e9e8805cb534a1eccaf5a51f2026c9
 DIST aniso8601-8.0.0.tar.gz 37007 BLAKE2B bb5f42928308fab7746cbea364c03db4813b1b25883495d0488eb755e14f465300662b07c4ccfd03328a0c0f07ed87056ccc13f2652648c4838b0433740fc3ab SHA512 1e6c43f77993e829833d819f7c2b9b1d31f30ca46e258faac0e0b3be864da07436ae34f05710309302477bb3eede5966c95ef3b124c9b353b306c2272dc4cb9d
-EBUILD aniso8601-4.0.1.ebuild 720 BLAKE2B 3fbd728c31c0a58b000ca0890dd634f0f1a21cb41823b16caa0721ef04262ebf5c8dcba9bcc86898340b2b5cac65afe4dffa43adbd3934384eda90c1be353c18 SHA512 39ea4077f428dfa5771ae4de971ac903d8ca9bbae546866b19807cc4071b43b639707c8417a6f17704c87584137d20f80bf4c37f3f5e89185159f364c016e532
-EBUILD aniso8601-8.0.0.ebuild 523 BLAKE2B 224a6912129e228160e14b86fc89bacd3269b324cc2af9bcfb5d770fcf5ff85daa374ea5d9df041aed4569c94bd81cb7777bc7ee3b6646149c7025a0e76a523c SHA512 5e371c96f4291fd546af54bb979141fb3bba918d98c3e3b8905bac74630bd49660b3e2cfe5b7b8d87e0537aca6e18aad82bd3c916b28b390d9421d82eda1ca6d
-MISC metadata.xml 385 BLAKE2B 665a2f5886166953707e75ee9f5bc225154157431ae9a9b6bb7cbcb8103150753a848ff184100c73177f40f6c5b11f1ccb4d0037504d67513810cd6dac8a1f34 SHA512 43b38fe6bef338dd41825197e7d3d0bfd3f040ce52073a6db93592f1b49bea4141a58ecc55e71b742c498a62000a2666c456b08d15bf25888858dce310e38121
+EBUILD aniso8601-8.0.0.ebuild 520 BLAKE2B c2ca8a08c88eee1b72124028a0c3d8fe2168b9f923c7922fcf246705f7a544a9d76f8cb3d33785ae269bb82662d423bcaabd53f8aeaf17c4e7667670e962f4b9 SHA512 c7e6be54f58aeca1f65cc3888672a9987b1c351d0264441c4dcb58f72154ae1d1df4f916e51c04c1d03f268655e48c6eca2bf4f7d9b0845f4f9974883897806a
+MISC metadata.xml 410 BLAKE2B a90d3f803fe5f99e83046d3cc1ebf5ec993c18e8aafdbddc2c8928a6b5e4b961e511a027366a59b4133fad65c425393513c1ab9960c32d8119c06da7ec113ee9 SHA512 2ea6cd3e1268d3e14817f2334e3946671161422cba8be852cb7b74ddbe60ceb89fdde07629d2d8be5677cb2820e05db7f67c335a95b74d42a3e23a91a7d8b603
diff --git a/dev-python/aniso8601/aniso8601-4.0.1.ebuild b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
deleted file mode 100644
index c4edf99b8b64..000000000000
--- a/dev-python/aniso8601/aniso8601-4.0.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} 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-mock.patch )
-
-python_test() {
-	"${PYTHON}" -m unittest discover ${PN}/tests -v || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aniso8601/aniso8601-8.0.0.ebuild b/dev-python/aniso8601/aniso8601-8.0.0.ebuild
index 118b9c5c1bc4..f05ce8ac852a 100644
--- a/dev-python/aniso8601/aniso8601-8.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-8.0.0.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"
 
 RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/aniso8601/files/aniso8601-4.0.1-mock.patch b/dev-python/aniso8601/files/aniso8601-4.0.1-mock.patch
deleted file mode 100644
index 11cf4ca70cf6..000000000000
--- a/dev-python/aniso8601/files/aniso8601-4.0.1-mock.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 12c2e06a88832fa208c9c0361e5ce91436a5d5ac Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Thu, 27 Dec 2018 01:42:45 -0600
-Subject: [PATCH] Use mock from unittest for python3.
-
----
- aniso8601/tests/test_builder.py  | 5 ++++-
- aniso8601/tests/test_date.py     | 5 ++++-
- aniso8601/tests/test_duration.py | 5 ++++-
- aniso8601/tests/test_interval.py | 5 ++++-
- aniso8601/tests/test_time.py     | 5 ++++-
- aniso8601/tests/test_timezone.py | 5 ++++-
- 6 files changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/aniso8601/tests/test_builder.py b/aniso8601/tests/test_builder.py
-index 453f781..aafc7fe 100644
---- a/aniso8601/tests/test_builder.py
-+++ b/aniso8601/tests/test_builder.py
-@@ -9,7 +9,10 @@
- import datetime
- import pickle
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- import dateutil.relativedelta
- 
-diff --git a/aniso8601/tests/test_date.py b/aniso8601/tests/test_date.py
-index 2c60245..a991be1 100644
---- a/aniso8601/tests/test_date.py
-+++ b/aniso8601/tests/test_date.py
-@@ -7,7 +7,10 @@
- # of the BSD license.  See the LICENSE file for details.
- 
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- 
- from aniso8601.exceptions import ISOFormatError
-diff --git a/aniso8601/tests/test_duration.py b/aniso8601/tests/test_duration.py
-index ed8383f..b835e1b 100644
---- a/aniso8601/tests/test_duration.py
-+++ b/aniso8601/tests/test_duration.py
-@@ -7,7 +7,10 @@
- # of the BSD license.  See the LICENSE file for details.
- 
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- 
- from aniso8601.exceptions import ISOFormatError, NegativeDurationError
-diff --git a/aniso8601/tests/test_interval.py b/aniso8601/tests/test_interval.py
-index d05909d..d14045d 100644
---- a/aniso8601/tests/test_interval.py
-+++ b/aniso8601/tests/test_interval.py
-@@ -7,7 +7,10 @@
- # of the BSD license.  See the LICENSE file for details.
- 
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- 
- from aniso8601.exceptions import ISOFormatError
-diff --git a/aniso8601/tests/test_time.py b/aniso8601/tests/test_time.py
-index 6cca13d..bade083 100644
---- a/aniso8601/tests/test_time.py
-+++ b/aniso8601/tests/test_time.py
-@@ -7,7 +7,10 @@
- # of the BSD license.  See the LICENSE file for details.
- 
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- 
- from aniso8601.resolution import TimeResolution
-diff --git a/aniso8601/tests/test_timezone.py b/aniso8601/tests/test_timezone.py
-index 77903cb..1f43052 100644
---- a/aniso8601/tests/test_timezone.py
-+++ b/aniso8601/tests/test_timezone.py
-@@ -7,7 +7,10 @@
- # of the BSD license.  See the LICENSE file for details.
- 
- import unittest
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import aniso8601
- 
- from aniso8601.exceptions import ISOFormatError
--- 
-2.20.1
-
diff --git a/dev-python/aniso8601/metadata.xml b/dev-python/aniso8601/metadata.xml
index 3543616a84e9..6c7edb3b894b 100644
--- a/dev-python/aniso8601/metadata.xml
+++ b/dev-python/aniso8601/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">aniso8601</remote-id>
     <remote-id type="bitbucket">nielsenb/aniso8601</remote-id>
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index d8bb8064c6c3..dd47633357ac 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1,3 @@
-DIST ansi-0.1.3.tar.gz 4561 BLAKE2B 33f1bb49dac19879a1e98dc75706e1963a11665a31c80161a6ff9580b5e2c0ec50de7e168860cde647488c67d2bb5bfd1418b9f4637c9db2f3d68d1b49bcfb47 SHA512 824ba1a9125af8fc23f402ab4de26c82250dad7be0080e0050585ad955337801393792c01ed3affa8a25551fa07b3caaedecde1889401293d415249e70a72705
-EBUILD ansi-0.1.3.ebuild 452 BLAKE2B c52fc7bd4309b545be9eaa16887f513e4a84133f598b9ee308fd334ce7152fdd4c4575b239eb2f09845b30a120d4bcfd01723d2b42fffb0824a1e9260b281058 SHA512 1556576affd4171ff6f19d69be7e4ad15303cf94b928b8b3553d8caeb763e16a2f3e80743fa4553fc34ac2d770aee8c467afca93ff70645cfb8bc5677d1aa081
+DIST ansi-0.1.5.tar.gz 4606 BLAKE2B 5f88319f05262511e99c8385946b61e2ed7219217ae8e811e8c1762fbd402f2fcaf69bcd6e4caf35d1f982afebcce5a98c721e2598032891382010ff7b928c55 SHA512 03365aca71b4966ca0c78b1563400afe414c86288b4e8ede969fb9c79cd4da4722de8cedae4e86c2f536f82eda42845482e041a396cb33852d3e4ff639dbbb64
+EBUILD ansi-0.1.5.ebuild 462 BLAKE2B 4234514e1e5253d7542df2a3813a1d975dc3a081f6336d48e98c45caa60b0cf95b4bdb4af075e1526950c2d9fbc1560b30eafbceb5a422d5f058b0229fa56fe7 SHA512 90d5a616146ceac763be59a97957b057554a7ddfcfc435d364111378fae213a71efd111511a0e0ad770191fed6bebb4b761a45a7fa0c657799d82ca261c19649
 MISC metadata.xml 366 BLAKE2B bb092fb0749c188b5367ff6c352e7614fcd4761d81063f7ed4c07958e6fe2752e88e0dcdb93f48cc58a0e35b8aa2f5ba280ca082767c303118f956d7c5ed5c46 SHA512 4fdd976a6c082c245474c4c5d4809b9b17ad90fc237b2ea08cd3fd3022ae3e3a0a92b8f27b53429ae8f1a1bf964ea1af65523f9f43128a40e296d6714b1b4711
diff --git a/dev-python/ansi/ansi-0.1.3.ebuild b/dev-python/ansi/ansi-0.1.3.ebuild
deleted file mode 100644
index 640bd0e16757..000000000000
--- a/dev-python/ansi/ansi-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=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/ansi/ansi-0.1.5.ebuild b/dev-python/ansi/ansi-0.1.5.ebuild
new file mode 100644
index 000000000000..ab480d057429
--- /dev/null
+++ b/dev-python/ansi/ansi-0.1.5.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=( python{3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI cursor movement and graphics in Python"
+HOMEPAGE="https://github.com/tehmaze/ansi"
+SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index dae36ba7f96c..4078411960cd 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,8 +1,3 @@
-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 990 BLAKE2B 75f05088a27bac4cbde392e8750bf5679197896700d5e60dba0b091f3a59503c059f8e080e554ed367aff10f7ddfd250fce5eca3416a1d056bf818ae3d218a43 SHA512 86c192c6018b4c4cac06c311aec8f962e84b3c1464581e356fcb8f81244ee5d4b645b2854abaa4fec4f266eb10a463f9a87608a44857068ef7cce3ca816143c3
-EBUILD ansi2html-1.5.1.ebuild 911 BLAKE2B b434211c7419242d6dcdffefedb7b6d303c8535767579080d7bf24d5847e4d1690a3254396545dade23991f16a018e5325db85ab89c2a3ff285472de6a85cffa SHA512 fe38cf1303b2ca9701672dce5c9824c13d80e463c2958cbd4ed087b0ec4a3cf4128c145cb1e6bd1bc84aa52d6060efb9b430aeba38bb6bc78eef57a7f87bf747
-EBUILD ansi2html-1.5.2-r1.ebuild 898 BLAKE2B e61534ac600f311229394c6569f657d96949283edf516403439c8739fb9fe06ad261bf1b739be2788473a5f68731a458141d5709446987a406009863523ee87c SHA512 2e2163f62dc4dd34facec9b4f8c17f729365bcb0fd65048c36e061460d04c478bb8b4b7cc061e910211af535deda2cc7a88887fd364ab9fc832eea22281b6a68
-EBUILD ansi2html-1.5.2.ebuild 908 BLAKE2B 58494bcbe4a8f1241fe58e3f441bd33ef15ca1421b8117942415ca652e8502da19f91503825ea3421634b4dd594535682f573828af8a11b947126dca165a97b6 SHA512 714bae01fae939e04b13b98bf3f2c23d3bbd25e15810d6966b6a91bd29aa6a2bf6b8b93e021c4dcd745c972dbdcac6d505fec999e97eaa7432fb5c843df838e6
+EBUILD ansi2html-1.5.2-r1.ebuild 895 BLAKE2B e6dfb3970f37f8219e7ef910d8b06bbda4b407405ff1f0341201522e37b328fbfed0d1b4bfb1562c85cbfc32339ed1a17f0671a38761c2589be8b47f4103b8f9 SHA512 3e315f50ff68bce0ece556af6b5089a3eabd53df323cd61afd8becf060539ca6cc20640ae81f3af4fd63003f7ddc2efab23e00bca5028c314dba74c708215879
 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
deleted file mode 100644
index 11e0fd4e1bc2..000000000000
--- a/dev-python/ansi2html/ansi2html-1.4.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-
-# They miserably fail.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( app-text/asciidoc )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-src_compile() {
-	use doc && emake man/${PN}.1
-	distutils-r1_src_compile
-}
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && doman man/${PN}.1
-	DOCS=( README.rst man/${PN}.1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.5.1.ebuild b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
deleted file mode 100644
index dbe978a6042c..000000000000
--- a/dev-python/ansi2html/ansi2html-1.5.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	doman man/${PN}.1
-	DOCS=( README.rst man/${PN}.1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild b/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
index 68135b1df10a..aacd6affe8b5 100644
--- a/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ansi2html/ansi2html-1.5.2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
deleted file mode 100644
index 8f6a5190749c..000000000000
--- a/dev-python/ansi2html/ansi2html-1.5.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	doman man/${PN}.1
-	DOCS=( README.rst man/${PN}.1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index ddf1ffce9708..9da3ff391eec 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,3 @@
 DIST anyqt-0.0.8.tar.gz 43519 BLAKE2B cd70564e858fc344d89b85a5e5556cdd35dd584f51bba2bc39b9e015dcacdb8f0964b0d6dd435ba6e219543aafbca2fda0f49309e8df07e790bd75660d8585b0 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641
-EBUILD anyqt-0.0.8-r1.ebuild 476 BLAKE2B 69ef38c11e39bebcf883858099f0a0dc5e5d5976b07264f4d24af4c1c0a5f6b7c445d9aca5ab6a59d260d736f1e54363ad7c3545bf7ffd5f1d84e708ed12201a SHA512 e6ea4a1742753bb8a92e7660521de6ba90fd944ddd1f5c61b83cb17c5b904dc276ec2df583a0ffe3d42fcca789e118c2bbcd4a28134d0a3c199795d3b180e6cf
+EBUILD anyqt-0.0.8-r1.ebuild 438 BLAKE2B 276ddb5ff1115f7d7d9ab66912acc19b037fdb7c77c905a35e120a5741fe464641dd8f92e6348d13a515eb2acffd362b09b85acf1f544bb084f953bfb6df71b5 SHA512 87c599497ec90a604d5bd5dc07a35cf0c32d7ef82b3e4964748c026aac8aaab0c9fe33a22b1cb6b806aaa4525cc336e3ebf5027ac4ca0a0d0fafeaf37c094d4b
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
index 109bb075285c..21ff1bcf320b 100644
--- a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
+++ b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
@@ -1,9 +1,11 @@
 # 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_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -15,8 +17,3 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-
-RDEPEND=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 9ebc7e004a01..53a6f327a04c 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,6 +1,4 @@
 AUX apispec-3.3.0-tests.patch 697 BLAKE2B 5bec31aa9f049547921a73a21f5065da40881e1f587a3924f2ca2aabc1876c9d9026cf9c77b8111427d8315b75dc0ed13ee29c094b3336436453e9ecccdaab5e SHA512 b4c764b340b3630dfc3a2ece59858d6e2f03d4718e8b57f828a8db51954cc7c6656e0a6af8d1e6eee034cf4a2a2226cd170bfa3a0b687855ed2e1d52a67834e5
-DIST apispec-0.35.0.tar.gz 47684 BLAKE2B 3067a0d50a6f53378f46a9a07596da53679f399732619f5bd3d1bedd85d088c6901560dc46be22b42d77537c437d9d97840a55f0b1513e39c87760e9e6c8ea0c SHA512 45a3034c49169ca7998480a8b8e0ac6415d49b6235885fba31eaaccb1c008b4ea845a6743f10cc3492215affe20b690d73a9a06e0e0c3942e0327f381415fa57
 DIST apispec-3.3.0.tar.gz 61687 BLAKE2B f1bcd212494d9196441e44acd4fd0d06063d7f80859ce49cd50dd5a4cbc4ddace974c2388031ddc8ef015b44f10a8f5d97c6d0f4fed96c1336dfc7282fa7c173 SHA512 c94cc48702ced17baa01175be2ff261dd7203cb0f49477f4be633080ef5f8029e5654579609370b4c1cd852d71f0b6fc116a05ee34515b22e7a0877a19d49a27
-EBUILD apispec-0.35.0.ebuild 809 BLAKE2B d456eeff4a9e93bc6967746ae7a6a7e31cac04a7da2d2da8ec80bc61b23a4f045e21c9b76d5014524debfa13d3cf94b497396c6dc786495828f740ab92f7dbd4 SHA512 34e4340ae0af84b2f49dcc00fcb06f7182497125dbeeadd7bc6ff27b54c9817676efc35e4f2041b2d91b592f917a966cc9b97d22ae542a9633986afaf2ddf7c9
 EBUILD apispec-3.3.0.ebuild 746 BLAKE2B 6c4f1b217c28de70c885c6bbf817828e3b5e208034e50c5c83da02af0ff403c359dbadf2e0a14a2896a8680b238b69acc26e2a80508c4e700d196677a02821b4 SHA512 c02cfc7772b4183b473736658cbf70f6494656c3a12c6c71d26535c1a7dee52182e264c043b13f59af4892b23db832d4e11da2854ae34188592a67d8d199cf66
 MISC metadata.xml 352 BLAKE2B e072e5a12d891408ee029e0f51b9c2a232e8a31e941352d43695e0bec949c4f0d1d709707c052971a3bac490763d3f79a264bf85cf97e6f6b2bd62064f1fbcc7 SHA512 ba1e41f1977b0afa34de52bbd96bba0c4e517e5f6b0094356d37c36b4365cd7ffaa055caef08888a4e1da912e1d3616e8545cb6f8de20538ea15f338a5dfb0f6
diff --git a/dev-python/apispec/apispec-0.35.0.ebuild b/dev-python/apispec/apispec-0.35.0.ebuild
deleted file mode 100644
index 29c537f4aca7..000000000000
--- a/dev-python/apispec/apispec-0.35.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 pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-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/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	rm tests/test_swagger.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index fc903583be65..3fa825a8cae1 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,7 +1,4 @@
-AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 AUX appdirs-1.4.4-distutils.patch 700 BLAKE2B 8986f3b3da992b836b4cb1f0e212b91c2f82a714abf94080de0a48a3e5ea8ee5f23b88fca357d56a409b3a57f0cb08b4612d81931c665354a9225db57bdde07d SHA512 add351286f307ce49c340b92ddab731b5c675b32062107c4076002e7e1ec098f5bb541b1985fe6f1881620714446475419d5c7229ab371ffb683c37e00e91494
-DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
-EBUILD appdirs-1.4.3-r1.ebuild 1211 BLAKE2B 83c2bd72ecc3934923ac57911e3c05c7e706404602cda9afbbf3a685c27acda4e8871cc5b8c6937af6061d58b277a113e7a9a857edae0d26b8ccd10410be7e34 SHA512 7db1a40c67c797ff2a1910b786fda7eb02a3eede9eba8235bbd7f24c76b83b64a77b39ed8387bdcbffe831a61403b9fd556c92d858565513b9f9338ff1931aeb
-EBUILD appdirs-1.4.4.ebuild 829 BLAKE2B d0c0ffc9cbdd775fec3112930fe3879ef2d8cc8738fd7ade4ff0b51d8f6a9eb82c04dfdd47755b5bb974cdd2542ad7d525d657eee0b8db9a52f5db10c9fd0bb3 SHA512 9d528b92666bbc7d6a0ca9127f00f8d0148cb5f3c566878533b8bc7b69d5f3dd4b0f894b4ad1f988bcca4dbd7e060686174d98f4392900ad97606bb8e3467480
+EBUILD appdirs-1.4.4.ebuild 820 BLAKE2B 2a4d4a6f25af1e60db65424e8b34098a52b12e6e5754b163e96da178b759d1fc877791d5a70e0c9f5db0700232f0b04fc802639680bf361f6d3a11a115252d42 SHA512 7abc1a1e007ea54d80b89abda2ab7bbd2de24569f1200da2176b65fb6d72bbcce886a94886f3e99e73d29f792fc8a365660aa4fc7764c5c9bb394a0708f9755d
 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
deleted file mode 100644
index fd8ec908ad0d..000000000000
--- a/dev-python/appdirs/appdirs-1.4.3-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
-
-# note the patch below
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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 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 )
-
-python_test() {
-	"${PYTHON}" test/test_api.py -v || 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/appdirs-1.4.4.ebuild b/dev-python/appdirs/appdirs-1.4.4.ebuild
index 76734e15ac07..fff25cbf188f 100644
--- a/dev-python/appdirs/appdirs-1.4.4.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4.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 ~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.4-distutils.patch )
 
diff --git a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
deleted file mode 100644
index e5245f255fef..000000000000
--- a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Force setup.py to use distutils in order to break setuptools cyclic dependency.
-
---- a/setup.py
-+++ b/setup.py
-@@ -3,10 +3,7 @@
- import os
- import os.path
- # appdirs is a dependency of setuptools, so allow installing without it.
--try:
--    from setuptools import setup
--except ImportError:
--    from distutils.core import setup
-+from distutils.core import setup
- import appdirs
- 
- tests_require = []
-@@ -45,8 +42,6 @@
-         Programming Language :: Python :: Implementation :: CPython
-         Topic :: Software Development :: Libraries :: Python Modules
-         """.split('\n') if c.strip()],
--    test_suite='test.test_api',
--    tests_require=tests_require,
-     keywords='application directory log cache user',
-     author='Trent Mick',
-     author_email='trentm@gmail.com',
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index e44e06a7da56..ae1a200798e9 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,4 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
-DIST apsw-3.25.2_p1.zip 682975 BLAKE2B f9f471378cddd7da1c06158b7a041d9377da4d4123846318c0cfc24167734bc1813f667e64c4c6bf643c6a618c9cabf58301dfbaad0998082d764212ea369fff SHA512 073b2fe9170fb00ac6f2ba52eb638d64d79875ba74b09f0307fa2c075e714bb91465fd2edd46341dac5cedc0bee0a1099888b6c1cee706fc04fa6b9ad99c47d7
-EBUILD apsw-3.25.2_p1.ebuild 1044 BLAKE2B b85006b8c6d2074c4dd51cd57dc3ec03e2ae26d77c16d8175f9f77c2686a0f937fb630881b0c22afe073bb31c5e9824ac21f92a4f97bb1ed790b938b54aeb823 SHA512 b755a1043f3a48a869fdee65a4aa48f8b85091ce09b022e7c8b832159958c927e9d26315c317b518ed160e1e4289a9e24e21d17da1b94a55d1acd4c88aeea303
+DIST apsw-3.32.2_p1.zip 679785 BLAKE2B fb58a60f95a677a805b0347a0d8876e49c657092deeadb60a057f4afc62031313faf5a86b600d1d306e42f305c9af599d2439a7051e400cbba2d9185c213d5d1 SHA512 718de699c43eec139747f63c3c26da206aa20f104ec1c478009d29cedff7a432138726131b2458ecd3a67675254af77e94e50e8e96a208600fe2a94aa9d924c7
+EBUILD apsw-3.32.2_p1.ebuild 986 BLAKE2B 66ebe2aca74404da6a5b05ba5c1a267b686805184d39df49d2c7b8280c1d4b5ba6804fc7ec72c30727a559e603cb930d230692a900d1e54b6d6b40cb69afc207 SHA512 4b94acd23e349db090e65c61845e3d4b4028883964092cf160e9fef6e8ee35912ac4a1dd57d1d534408659034d859c222fc53244437dd7fb9a41be8c594f1032
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.25.2_p1.ebuild b/dev-python/apsw/apsw-3.25.2_p1.ebuild
deleted file mode 100644
index 1cf991929222..000000000000
--- a/dev-python/apsw/apsw-3.25.2_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{3_6,3_7} )
-
-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.32.2_p1.ebuild b/dev-python/apsw/apsw-3.32.2_p1.ebuild
new file mode 100644
index 000000000000..534bde71037d
--- /dev/null
+++ b/dev-python/apsw/apsw-3.32.2_p1.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..9} )
+
+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() {
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 7547f075935d..32bc8f179259 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,7 +1,4 @@
 AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009afe8e98f8bc4529db2e4a5aafecce674f0cd4dd8e6e1354b19f00ed9f2afefc8038e938713872115613545c51933ffa6e4cf1 SHA512 0d187868ecf3428d0840fc97311c542c782a938cf039caa777e521a9073b525d3dd0a8e376ca9fe0dd4260313642854b21a0bd3d9c2f9a3fbbed8b4edd6ed3be
-DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
-DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
-EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
-EBUILD argcomplete-1.11.1-r1.ebuild 898 BLAKE2B 742f17949c4a59c2b630c20afbca518f73252334cd70eb8b0e273674aa9d3e89b6396c9dbb7b762eca3bbe4557a34c11eb90da8fcda9d785999bd4a42163a127 SHA512 25cd4c71319a0a5da418dce52f53961b4d26a663c0b56c409bdcdc0af5403116419c308a73c007fc2bb98bdca89cfede211512b1c646d4b153d4896cbbb978f4
-EBUILD argcomplete-1.11.1.ebuild 877 BLAKE2B 1447f620cf4b54262454de2f128b3e74e82b41b805ae4f50656c314d02030b868c6b02d70facc2f7e0de5304a94e8cf892abfb4dd84621bc1bb443b0eaae94cc SHA512 bb33d42173aedcc74bdb8ee41c144b22e7214dc71e10c42a66ec6f23c4e5e176387c449cb1e3d3093e166f0766eca6c5836be6e609e6255a5212bbf7fa90b483
+DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
+EBUILD argcomplete-1.12.0.ebuild 836 BLAKE2B c2740735d631fed9216d85c1792d5e5ece2211273a1dc8264b902992290a2676736c7502b42e6f784c3edd0368b03776e94935508148366990383a9e97b31dfb SHA512 910dfb6c9bc36cfef979db9206f98a0a85609324e56e3b87c40a11b3514a6a1f461e200b5fca3f37f13bf13d93337273a977bf704d80f6acd08144ac2a34687b
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.0.ebuild b/dev-python/argcomplete/argcomplete-1.11.0.ebuild
deleted file mode 100644
index 9281e2937d7a..000000000000
--- a/dev-python/argcomplete/argcomplete-1.11.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=( 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 )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# 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.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
deleted file mode 100644
index 036d621fad96..000000000000
--- a/dev-python/argcomplete/argcomplete-1.11.1-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=( python{2_7,3_{6..9}} 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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/argcomplete-1.11.1-fish-xpass.patch
-)
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.11.1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
deleted file mode 100644
index 581d3ea7604f..000000000000
--- a/dev-python/argcomplete/argcomplete-1.11.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=( 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# 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.12.0.ebuild b/dev-python/argcomplete/argcomplete-1.12.0.ebuild
new file mode 100644
index 000000000000..72f021a112db
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.12.0.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=( python{2_7,3_{6..9}} 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index ac5ebc0984dd..14863bf17b0b 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
-EBUILD argon2-cffi-20.1.0.ebuild 754 BLAKE2B 6d1a5af93bf210b9b9b34212ff9498078c97873e418556ec527f281daf918554a4977475f2e1012e287d77e52afa1ffccc4d9cdd27bb0ec6684d03c138b6b776 SHA512 e13ac8ec2b0f9927fb20670c6acfb94733d4e2caec97db5a8e6f04d0da734a0d70b9423da7f359e6f2bc541085d678d3b90258727c84d421782d361aae3038e3
+EBUILD argon2-cffi-20.1.0.ebuild 765 BLAKE2B 79572018db95eb7e529c935c78351a2db27348b2e46de5ac0e153700fa17f25c101d96be8ccc2f4f36e811a5bcd4281d61834e2f29981aa51428c04995bbc28e SHA512 e900e8a0919df77c7dda29c1486de27e8f9336a5f795184f5aa4864b0ed6ba624fa7ce24d912ee585229242f4843d6665b059d05472225dc5cc4cfa35b86ad97
 MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index fd169244b16c..d738d22c5c6f 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index 8f21e15c0a10..1b5b7c35ee84 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,3 +1,3 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
-EBUILD args-0.1.0-r1.ebuild 428 BLAKE2B 38d1542c2bcc15f95604e434bcd777122e0feb6f5c12fecf03c1a7db64a62c33e2c7da3fe282e66a18575eeff4bdea8c366a329e49161b8070a3ae391b18f919 SHA512 a1ac6b63b9909ef98f4d08c5951a006cc78fec79ef106f7623203e80c20258010190c9365229d4aa5398b506b6f27f7557fc8b6e5fe94b240f62c212c24fd317
-MISC metadata.xml 289 BLAKE2B 9c506f540fde2d50daea0c83d559dc27456e9de951493e87d2df4f9dccd50ea7b26046815c05587608667939108dc7a335792ca923b8ef731ff6511024a2e003 SHA512 ad6f17d093352ca14bbef50d96672c676a617d17fbb0813ac36b469b0c72e88858afa427f788877f40496a4300af6d6e893d80b6ad0eaf64759e1a19bfcd97fa
+EBUILD args-0.1.0-r1.ebuild 436 BLAKE2B 8b93dc2ca9c7eb91d67ff772f7fc080cb6b5aa65c15f1b58812aa6d0bcfe0cd2224f5fc8eaa88aa18c754f04034b2e4f26fef7f2fad0abfd89154d3d3f07c8bf SHA512 73f28f553337675a092b2d72a3d6cbfb7be18f83fd6d412f861573b58f668c1935a89032b120830e35623a2f5af6eecef81e22628f9d64b953e40507cf51f64a
+MISC metadata.xml 297 BLAKE2B c5947002d631d50d8764a3d5c25dd577523f555bfd45bf6341c4393fc1d2667656c3a21212957af13cf9ebb4e4938cccf0dbdeaa5115eeffd87c97095294e227 SHA512 df9140d329afba0ebc1880724f1fc75728ef5ccdd4013c2395199bfd0871e7e3342dcb8e9bdde0b8f986484d1263db8add5fc380c9bab945fb38319d5886d0d6
diff --git a/dev-python/args/args-0.1.0-r1.ebuild b/dev-python/args/args-0.1.0-r1.ebuild
index 04f5875479e6..fbe868546446 100644
--- a/dev-python/args/args-0.1.0-r1.ebuild
+++ b/dev-python/args/args-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Command Arguments for Humans"
-HOMEPAGE="https://github.com/kennethreitz/args"
+HOMEPAGE="https://github.com/kennethreitz-archive/args"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/args/metadata.xml b/dev-python/args/metadata.xml
index 5fd0c8752fa5..d0d9dfb92744 100644
--- a/dev-python/args/metadata.xml
+++ b/dev-python/args/metadata.xml
@@ -4,6 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">args</remote-id>
-		<remote-id type="github">kennethreitz/args</remote-id>
+		<remote-id type="github">kennethreitz-archive/args</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index 6dd96b4ba52a..b0737fec836e 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,3 @@
-DIST arpeggio-1.9.0.tar.gz 757412 BLAKE2B f89850a16b2ac1a87cbac3ae0f10d4c04af6097bfb9292abec24c8b938bdf3b837c4d292650b2e335ee5b4b03cd149e1722e35ceabf1b59fd4577ba7e62a8e44 SHA512 179ec76813476823f316471e1b313f377064a75879c52060e547fd755ae72947594dc4d6e58a798150620e82c8b123fbd88484881c12ccb311c47bc93a45a0cd
 DIST arpeggio-1.9.2.tar.gz 761920 BLAKE2B ba8c8a5cb8965325c1c3be68a481e024b0ab703d5f60fd9ccb2589fe5efe2618fd24f2b9bc36823005897c83e233bc97372a0e3d2010cf2e2399b96aec58feb5 SHA512 fa1057caaa0b5d26937c6e5aed719f64b293d3332e3ce0277a586bd48ca136792a4811c292fd87f2e58148874e008a6f2f621630052c5dfaf0e0efe2e8039353
-EBUILD arpeggio-1.9.0.ebuild 760 BLAKE2B 4ee6b61f29f5c3e389a9099014faff50ac733ce33ab576bbbe752b93c9085432b5edd14c602fe007dd71b40c734862339ee48f3cef9cd6b6484de761b545ba75 SHA512 20dbc2b3c8b560db655198614388e084279d161fcd83a5bcfdb9b42c2a6d155e53bd83d952766b8787722fa45cf41885c11b2352b38dff56f5d7883d91090556
-EBUILD arpeggio-1.9.2.ebuild 974 BLAKE2B 2eabb5b9931ce4a5f271af5f6754ed609fdacdb14d43c27433524bf9d6e58779091b14362ced0f7baa25b88eeee0b3237f6c71c0cf6b7de0f37d0ea07ba86864 SHA512 297613cf955ff0f14c9ac10f4d9ba023152f1b9127ade9ff842ca130c84664ebcc5c836e0954834d620e1a5e29625d86d7bfe28dfed8c16d137fa9080d7da915
+EBUILD arpeggio-1.9.2.ebuild 974 BLAKE2B 8340254357d475a6914e5b245012598a08e0943f5ca6587b6882c7f4f0d1073bbb1d3cf91bd7ee1a5f577cde3157771fafb97ec8e99bb8fbfaff75bfe33fa902 SHA512 43128d92c47a4541cba32405a31d8bcae4fd4b283424af508f9a63a3f31fe5044f93b0a33c521b5e25c221107c0cde4acdd9a62fd11aab6b48b2f0121093f6d3
 MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
diff --git a/dev-python/arpeggio/arpeggio-1.9.0.ebuild b/dev-python/arpeggio/arpeggio-1.9.0.ebuild
deleted file mode 100644
index 2724273a463a..000000000000
--- a/dev-python/arpeggio/arpeggio-1.9.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=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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="https://github.com/igordejanovic/${MY_PN}/archive/v${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/memory_profiler[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Testing failed"
-}
diff --git a/dev-python/arpeggio/arpeggio-1.9.2.ebuild b/dev-python/arpeggio/arpeggio-1.9.2.ebuild
index e2b49275b80f..9cc5deeb5b0f 100644
--- a/dev-python/arpeggio/arpeggio-1.9.2.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/igordejanovic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 4c606867ac17..f2a92d4d2d6c 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,10 +1,7 @@
-AUX arrow-0.15.5-remove-dateparser.patch 1250 BLAKE2B b9fc76fd97b74f11bb8a9511ff86a046f46dbf942187d64d7937f6b0392fb062eb33463754708fa4f6732a23b19fd61bf1e9dd4987c736e5ade20354e9c2b6ed SHA512 9bc8017bbef9768069c62e760120ce90d79d5ebcee470a4dc8a8fc88754c477779d3a6b0ffa07ca886c0d35b3afd5cafc57bc162d80abf601ba7116db4d10bc1
-DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
-DIST arrow-0.15.5.tar.gz 82264 BLAKE2B 2091e16921a5f9f944de3f25ce853b50973d970d982b880fafa75ee37f98110dde05bfd02bb8ce27518ed17600e5bcfb8602c353d7e3af249aa4bfc4b642356d SHA512 cb147a1f2976e6cedddbf2d2d0d5ce69a4a609d4c0c3d68f96b317fc2af334552cb0c1a94aa5bb38e6d74ca7e1beab1ae8a325920a15efd79c35835c92df2409
-DIST arrow-0.15.6.tar.gz 83160 BLAKE2B 1a79e91a3185b8866653646f1a553d141b0c20b4712ab809add0362c76f7f9086a259db9827423074387017c439664e5c8bd663b719eadf725a4de608f370cc2 SHA512 c56316f8c535c6f14ccaab32e2559b45309170fd47e8728cdd8c0e2af9398264f90fbdd0ece82d14e3f959d24b186fac3e8bb52cf7a64fe0dcd4c247650c73b5
 DIST arrow-0.15.7.tar.gz 89278 BLAKE2B 591fbd63aaeb644ab21f0499df7929cdafe181ad9065459677c84347395dcc694e39db47d596b4d3f920e32e3f1e03da1d9e85c8f197d545dd335e9055a65f47 SHA512 28cfc9edbf013ee03bb52c9794333d725a4fc967f0c8c6837931fc6994e08c367763deb193b8eae8b931cf849294bfce3470316c0a1b73340eb96ca1c9d8959c
-EBUILD arrow-0.13.1.ebuild 732 BLAKE2B f41fddc75737387efa31433f3d923a028a74a938b8e5ec5414b9d298df8f6326a31c4af9d3ea313bc6c885e23862fc929b4b3f290b2771210e495075eea3c87b SHA512 79bd09eee7f07b0893b444200cda484a63e4b65053a07b76f9de117d32ef8937ec24614f10d1c115fc4f74d2a6dad768072c9fbdbd641f4a997f7c071a629f39
-EBUILD arrow-0.15.5.ebuild 706 BLAKE2B 04fe820f518415378b6af72e9b9514de3a00a1bc25f1c8f86ddb6afd98aed03fd8c6edc9ad8947ba9813cc0a18c3fc75ffe5e46c7449a24c93ecc37f100e88c3 SHA512 70e515edac5aed1d9b5a15c3c79a1ba831401daaa6e12d0624bd3ca82833ae805a475d5ea07e8b5c177ddd4fd07e330b3fded39a7776c4d76d192a5df5ce5f8f
-EBUILD arrow-0.15.6.ebuild 698 BLAKE2B 4130f9faf46dcd064fc56f506a49bfe4392e4f76dce6fe01352461d703f4b402973edcd4eeb0a7c0449da24b46e6bef8ed0f994dadd099cde3d649a2c3b8bc62 SHA512 ba31024b9c81bf0e2cba8400f840668c492e37ed3e9c0bbeefb35842144f2dae176fcccf67f80642720ed12b4fb342c957f306fad7ff0b324c0207b2548e0c8b
-EBUILD arrow-0.15.7.ebuild 695 BLAKE2B 3f2eba848502d058d2858188e71a227d7f82a512865c3e63a08f5efa3049a002bbd87b93c01880ab4f4253c77131be8368f3a272c6b3cfb399deb3c612212804 SHA512 44d62ab72071526f7fe6a95e0201f5b2d34fbfea7b23ae508417ea7cf32c535810d3910c9ef72638e670bffe834a76d59d4f985a340963baaa724a078583b1b8
-MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
+DIST arrow-0.15.8.tar.gz 92220 BLAKE2B 8650d31b5b75c6222d86b5e13f253ae6baff66e91044a74235eda4589a47ebf680b31e2007fb13c83287402ffeaa446437aace9124637e6952ef139388aa51fa SHA512 93d161cbeb48636f2e3f91ebcc51cddbb3b21175ae31f5d9251a22358c7d1934663a8e47a82efd8773bf30c28efefcd8d2a3baf581fe191777cd41f12f29d4d2
+DIST arrow-0.16.0.tar.gz 94403 BLAKE2B 9d2ad18732cce5bafdb628a2e9b825e6d1ebd94f7848391c0a0752a802a7e2e8a34afe0da7474df0265c4a83016530a1c070f4f1629c8fee8172812a53a3a7af SHA512 e48316bd31a86d640e50987010bd56c6859e972522e753c00d83730f1ce4764716eb9a22c4aa9aa0d64949f25acb7e1a3479ce0e1c62058fcb887a442f2247d6
+EBUILD arrow-0.15.7.ebuild 693 BLAKE2B 1a17920f4be6b1636a112c4836fd5df0d70752cf731cc5dd6336cacce74a0b7582b74464b153c4665651c9ac9c0c7edb486bcaa8a107e168052a065c54c00bb3 SHA512 737b3519042b7f72f6fb36a03f3cb1ca99940ed6bdc1daeb7b3b0823ad97a4fcc6cc0d5fd2851f9e4f26ff52b40d42b7a857ca8fdfdc47de87ee2005bfd5b0fa
+EBUILD arrow-0.15.8.ebuild 695 BLAKE2B 3f2eba848502d058d2858188e71a227d7f82a512865c3e63a08f5efa3049a002bbd87b93c01880ab4f4253c77131be8368f3a272c6b3cfb399deb3c612212804 SHA512 44d62ab72071526f7fe6a95e0201f5b2d34fbfea7b23ae508417ea7cf32c535810d3910c9ef72638e670bffe834a76d59d4f985a340963baaa724a078583b1b8
+EBUILD arrow-0.16.0.ebuild 703 BLAKE2B 5974df6331c78efa84ef7dbe22555d20bc963a327446445688199003bd5c539e8e012839eaf24d0358d59ae8494012d46927231bd8ce4a29f9081c403242eb88 SHA512 52894163dbc1fbf14d6f489d1c5300154a57a8d7b243a6b79b4d5c0aa3622e051bc7081e8090e849fece78a9efe0cb7004ab0b4156d415ca116a12e0ed643573
+MISC metadata.xml 388 BLAKE2B 68ef136715f60b69973bcfa1957f23ddf81a8d1cb99d2edaf955562b78f6d92a6187b97f208366b320c0bf140d2ce0d9b62aa9a8d6631b9277f58dd60cfdf5bf SHA512 66f3d1a07042e4e935dcac1e5417893b9fd7b9e97b9f7e3670c85960dc2344e101715cfc11fd2776aeddad8b622c4e8fbe509ee5d93c5250183486a7dd53e16b
diff --git a/dev-python/arrow/arrow-0.13.1.ebuild b/dev-python/arrow/arrow-0.13.1.ebuild
deleted file mode 100644
index 32e2d4b9a904..000000000000
--- a/dev-python/arrow/arrow-0.13.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=( python{3_6,3_7} )
-
-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 ~arm64 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.15.5.ebuild b/dev-python/arrow/arrow-0.15.5.ebuild
deleted file mode 100644
index 4c301a3683a4..000000000000
--- a/dev-python/arrow/arrow-0.15.5.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} )
-
-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 ~arm64 x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/chai[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/arrow-0.15.5-remove-dateparser.patch
-)
diff --git a/dev-python/arrow/arrow-0.15.6.ebuild b/dev-python/arrow/arrow-0.15.6.ebuild
deleted file mode 100644
index 055eb05fe410..000000000000
--- a/dev-python/arrow/arrow-0.15.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-0.15.7.ebuild b/dev-python/arrow/arrow-0.15.7.ebuild
index be803b27abc6..575b3b8a087f 100644
--- a/dev-python/arrow/arrow-0.15.7.ebuild
+++ b/dev-python/arrow/arrow-0.15.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/arrow/arrow-0.15.8.ebuild b/dev-python/arrow/arrow-0.15.8.ebuild
new file mode 100644
index 000000000000..be803b27abc6
--- /dev/null
+++ b/dev-python/arrow/arrow-0.15.8.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..9} )
+
+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 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/arrow/arrow-0.16.0.ebuild b/dev-python/arrow/arrow-0.16.0.ebuild
new file mode 100644
index 000000000000..1056296f2129
--- /dev/null
+++ b/dev-python/arrow/arrow-0.16.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..9} )
+
+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 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch b/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
deleted file mode 100644
index ea3b7847964b..000000000000
--- a/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 00b34547e99259eda92d7bd1ca406e74693d6861 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 19 Apr 2020 18:30:20 +0200
-Subject: [PATCH] Remove test requiring dateparser
-
----
- tests/factory_tests.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/tests/factory_tests.py b/tests/factory_tests.py
-index abdd0d0..65fa1bb 100644
---- a/tests/factory_tests.py
-+++ b/tests/factory_tests.py
-@@ -2,7 +2,6 @@
- import time
- from datetime import date, datetime
- 
--import dateparser
- from chai import Chai
- from dateutil import tz
- 
-@@ -113,14 +112,6 @@ class GetTests(Chai):
- 
-         assertDtEqual(self.factory.get(tz.gettz("US/Pacific")), self.expected)
- 
--    # regression test for issue #658
--    def test_one_arg_dateparser_datetime(self):
--        expected = datetime(1990, 1, 1).replace(tzinfo=tz.tzutc())
--        # dateparser outputs: datetime.datetime(1990, 1, 1, 0, 0, tzinfo=<StaticTzInfo 'UTC\+00:00'>)
--        parsed_date = dateparser.parse("1990-01-01T00:00:00+00:00")
--        dt_output = self.factory.get(parsed_date)._datetime.replace(tzinfo=tz.tzutc())
--        self.assertEqual(dt_output, expected)
--
-     def test_kwarg_tzinfo(self):
- 
-         self.expected = (
--- 
-2.26.1
-
diff --git a/dev-python/arrow/metadata.xml b/dev-python/arrow/metadata.xml
index 2115d1102a30..731d99c54338 100644
--- a/dev-python/arrow/metadata.xml
+++ b/dev-python/arrow/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">crsmithdev/arrow</remote-id>
 		<remote-id type="pypi">arrow</remote-id>
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 93eb4c8c6d99..cac8c9b0ee87 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,9 +1,3 @@
 DIST asgiref-3.2.10.tar.gz 25669 BLAKE2B 2cd0328054b218ae8abf840f85c7da6d9183dd5a52cef78176756020eb1f565fded9717fced3bc7fc4b85f9f1ff34b46ea95231b74afec0cbcc5000f9468c28b SHA512 8688d71103dfe569978712481161a88cce9aa6587eacbf29ea42d585817c813625360724d1d561d12456a6580647f9d4a098f194bd780f3c9f7e52a1e0aa8c88
-DIST asgiref-3.2.7.tar.gz 25350 BLAKE2B a92d573330b1d10ba9c8d963c0824bce93151f0e38533f81a292ec0b98bc218e3b214e44ed1dadcaf10b94e94fd626cea00a5da40c5dc129b7f40ca2c5afa432 SHA512 a7b8b94e14299ced539c7ca60d310bbbde2af0f40bfa404d176a95bb6cd37402bf6bef5a5a309cdcdda4852908717a83763d7deb520b05ce74977a3bca4621e9
-DIST asgiref-3.2.8.tar.gz 25469 BLAKE2B c6c3510159aa3a5a35f5d16b427d074b72973576cc4747076caf43854567c628eb37703bb5916cfda9d9dac45c700f881957cbc6a991ab13731c54ef2f6aca53 SHA512 895a0ff28a7d11facc0a41ae603099afb49c2e01ff2d912655d27fff2e2aa0ee8d84fcba45fe873260b39de0e3dd225ca5218100d4bb96c83e63d1fe36f4683a
-DIST asgiref-3.2.9.tar.gz 25482 BLAKE2B 0bb99c8b207bd384e7c691696fd64dcd08d02037da98c76d6e401d6d37db432443a10d08a3908fd17908d991455d1ac2faae82726062271a3dd17e4a68e7a2e4 SHA512 1810b19bb045fdb4bf47ec7e5caabd0f8869410a6f81503de2148fd024a88da40ed93cce1b47905d7e99f7e89f08a61a9980b88ab738e783664520c6f27e346c
-EBUILD asgiref-3.2.10.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
-EBUILD asgiref-3.2.7.ebuild 550 BLAKE2B 4d9b62d01f03f0d78042eec0b19749d1ab7bc1bcf5bcba9f9a2c3e524e9c0d9ebd303a699d46ef7980bf1c3b77f228485f09fc928d38f302a25dab3e879f3edb SHA512 09ba3fd1cf10fc34b63005fe6b7ea551b89797a90162e81323103ce1635d88a7b12aef3122aa0b93c323a13cf09bf6cbabdd2163b4adaecf40b135fd29752044
-EBUILD asgiref-3.2.8.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
-EBUILD asgiref-3.2.9.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD asgiref-3.2.10.ebuild 548 BLAKE2B 7c776c87ea7924f04ae2bcac60b42ee9203e1ea453ce99162081334a705656bd32df039411c87120e45308b5e5cacebee079b2ebca70ffdbb37ee3ec86f847a7 SHA512 1afc809b2684b352f167cab9a846900ae04c369808381c249f48eecc42d7a610014e899b5de88ebb5125504f4a72bfd954cec0f2ea046d558576234d63477d8e
+MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/asgiref/asgiref-3.2.10.ebuild b/dev-python/asgiref/asgiref-3.2.10.ebuild
index 105d875af283..a0f13c87fd5d 100644
--- a/dev-python/asgiref/asgiref-3.2.10.ebuild
+++ b/dev-python/asgiref/asgiref-3.2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/asgiref/asgiref-3.2.7.ebuild b/dev-python/asgiref/asgiref-3.2.7.ebuild
deleted file mode 100644
index 5a179cf49004..000000000000
--- a/dev-python/asgiref/asgiref-3.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.2.8.ebuild b/dev-python/asgiref/asgiref-3.2.8.ebuild
deleted file mode 100644
index 105d875af283..000000000000
--- a/dev-python/asgiref/asgiref-3.2.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.2.9.ebuild b/dev-python/asgiref/asgiref-3.2.9.ebuild
deleted file mode 100644
index 105d875af283..000000000000
--- a/dev-python/asgiref/asgiref-3.2.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/metadata.xml b/dev-python/asgiref/metadata.xml
index 7f4f33c6dbc9..4c43a15ce6f4 100644
--- a/dev-python/asgiref/metadata.xml
+++ b/dev-python/asgiref/metadata.xml
@@ -5,4 +5,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 4e1e6d181aed..827f25768703 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,4 @@
-AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
-DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
 DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
-EBUILD astroid-2.3.3-r2.ebuild 1419 BLAKE2B 58a8ff2ac83e43c980dbd1cccfc2addf994817267c94fbb12dc33cc8fce57f49e42af5ea934c4e2c92273b82ce181a37b602a3047da2392a586c8c5ccc509c17 SHA512 0f28599a319172926d3c522bc75fdad347a4e77e943d898dd797e9f08844b1e1beff1395c8eb2231338df3a1fe6a90dc81500513c52340cade63dfd376f717ec
-EBUILD astroid-2.4.2.ebuild 1359 BLAKE2B 851eca202c7deaaca203ffc977104ba7d27c2a409dcabae463679534293d8d8bb229c308cdaafadb1de5979d8398e1e289e27317e480f0c2c7bec77fe4fa8f6a SHA512 38b6f3b8ceb719ef3ae0e12e770fba60d8fcd593fe038ee2101270f0452a175e9c07341d45f23258eb66881e783b58b43d9e815dbbe8bbe812be20adfe5b886d
+EBUILD astroid-2.4.2.ebuild 1352 BLAKE2B d3a1804b4d05fd0813bbbb4afa5009f1ac908fc52469f92e50ab8fa9beca334a5268abe11e16377fb73fc9f462a102c1edb2a9abeb38357acd0c9a3c8cb826b8 SHA512 335f6ae90e9d40295f9d0e6b5e6e2b1bc42453a857e22029ab5a4afa3e1f8ff79db38f72e185a68df034198732bf21f84ba76a00e02021c2ef7f722b07bc6e43
 MISC metadata.xml 1147 BLAKE2B 6fd688ecaf19f5de658caecd0e4a5b5b451ece67b0e55afc8fc65cae8f99f0a2cb09c5e70b2cf3b68a4748ee10a417dfcd93569cc35e866aec7404d6ec9ecac4 SHA512 5eab195b147e8e1551871f537d61d0a4460ff8be0420c7e1661f6774f7fe8ace43f665f64d61677bdf890788d8a53206ac54350a8c6b73f87ba9a6edd44d56da
diff --git a/dev-python/astroid/astroid-2.3.3-r2.ebuild b/dev-python/astroid/astroid-2.3.3-r2.ebuild
deleted file mode 100644
index f472f8238809..000000000000
--- a/dev-python/astroid/astroid-2.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=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.4.2.ebuild b/dev-python/astroid/astroid-2.4.2.ebuild
index 4b6254b039d1..3ec264b0ee07 100644
--- a/dev-python/astroid/astroid-2.4.2.ebuild
+++ b/dev-python/astroid/astroid-2.4.2.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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch
deleted file mode 100644
index 5dd24f2e2c43..000000000000
--- a/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 439ceafa..2ad55d6b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -43,7 +43,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/astunparse/Manifest b/dev-python/astunparse/Manifest
index f4f0d66d888c..8acf0880bb77 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,7 +1,4 @@
-AUX astunparse-1.6.2-py38.patch 8802 BLAKE2B e6e303142bd91147fa6c90193c15319b77cb9b34535bcfc0eeec19de4233a22e8f954ae8460bf624590227a3f92e68be3d17c35330862fe9e447e63873276bca SHA512 18cf287f965c6cc9de961854e1bb3b344eb46557149a25f6f28bb70c4361ae15431a5a4579bf5c38a14ddad29e85fd2c13da3fa810c2e7474c4c7f6a5f001049
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
-DIST astunparse-1.6.2.tar.gz 16339 BLAKE2B d35d63b8313718c1d873d55b7da824465be9b4bc9e486ff82dac7db2df5185f8a59bfb283844d7108927b04ee02879fe921c87f9da8bd87c157341e6022b40cc SHA512 1e344354481dab7345d8790791e15e2ce733b8985839972a1771b97adebbfc2b42c8fb258ea36f245baed553d3b8e5007872d6559ebcc5ef1eb6f6c6a5d66c81
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
-EBUILD astunparse-1.6.2.ebuild 758 BLAKE2B ed28575ac18b3737755b6a7b3b53d31949cabceea4a1c673f564563bb433fb8029918a2f3dfbbe28aa2f550dcf0e2f8c2234d812615ae5eec8b680cbea352cdc SHA512 d8681984f8ec4942a9011fae5cc9ad936d3f3ffd7f04e90f0d76a53eb7035869e18ed734529eceb93e05262e76e12c9d21dbadbedeaa95d1f25c60e684eaf108
 EBUILD astunparse-1.6.3.ebuild 618 BLAKE2B e8e190bf898ec04aea08b8edc6310b11c81a5e421a4c24b9fcf993e1756506041c28b5069a1efc9104c366424c7043b3b5524f8e48e2ed20db3beaa897de37d4 SHA512 7bcad61d4ea1bfdf04daec87b1d4f21da117880d96e645e7d2c6300f7745358b65cfb74c5ad697b677d14b983d2b01a5514f05d4df2ed52fe72d350ad6c9da33
 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
deleted file mode 100644
index f57695d4f84c..000000000000
--- a/dev-python/astunparse/astunparse-1.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="Astun parser for python"
-HOMEPAGE="https://github.com/simonpercivall/astunparse"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.23.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}/astunparse-1.6.2-tests.patch"
-
-	# https://github.com/simonpercivall/astunparse/commit/2bd946919076f993cee1173611914372a0a25f00
-	"${FILESDIR}/astunparse-1.6.2-py38.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc *.rst
-}
diff --git a/dev-python/astunparse/files/astunparse-1.6.2-py38.patch b/dev-python/astunparse/files/astunparse-1.6.2-py38.patch
deleted file mode 100644
index aa27112393c0..000000000000
--- a/dev-python/astunparse/files/astunparse-1.6.2-py38.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff --git a/lib/astunparse/unparser.py b/lib/astunparse/unparser.py
-index edf8c68..0ef6fd8 100644
---- a/lib/astunparse/unparser.py
-+++ b/lib/astunparse/unparser.py
-@@ -29,7 +29,7 @@ class Unparser:
-     output source code for the abstract syntax; original formatting
-     is disregarded. """
-
--    def __init__(self, tree, file=sys.stdout):
-+    def __init__(self, tree, file = sys.stdout):
-         """Unparser(tree, file=sys.stdout) -> None.
-          Print the source for tree to file."""
-         self.f = file
-@@ -89,6 +89,13 @@ class Unparser:
-         self.fill()
-         self.dispatch(tree.value)
-
-+    def _NamedExpr(self, tree):
-+        self.write("(")
-+        self.dispatch(tree.target)
-+        self.write(" := ")
-+        self.dispatch(tree.value)
-+        self.write(")")
-+
-     def _Import(self, t):
-         self.fill("import ")
-         interleave(lambda: self.write(", "), self.dispatch, t.names)
-@@ -120,11 +127,11 @@ class Unparser:
-
-     def _AnnAssign(self, t):
-         self.fill()
--        if not t.simple:
--            self.write("(")
-+        if not t.simple and isinstance(t.target, ast.Name):
-+            self.write('(')
-         self.dispatch(t.target)
--        if not t.simple:
--            self.write(")")
-+        if not t.simple and isinstance(t.target, ast.Name):
-+            self.write(')')
-         self.write(": ")
-         self.dispatch(t.annotation)
-         if t.value:
-@@ -189,6 +196,14 @@ class Unparser:
-         self.fill("nonlocal ")
-         interleave(lambda: self.write(", "), self.write, t.names)
-
-+    def _Await(self, t):
-+        self.write("(")
-+        self.write("await")
-+        if t.value:
-+            self.write(" ")
-+            self.dispatch(t.value)
-+        self.write(")")
-+
-     def _Yield(self, t):
-         self.write("(")
-         self.write("yield")
-@@ -328,12 +343,19 @@ class Unparser:
-         self.dispatch(t.body)
-         self.leave()
-
--    def _generic_FunctionDef(self, t, async_=False):
-+    def _FunctionDef(self, t):
-+        self.__FunctionDef_helper(t, "def")
-+
-+    def _AsyncFunctionDef(self, t):
-+        self.__FunctionDef_helper(t, "async def")
-+
-+    def __FunctionDef_helper(self, t, fill_suffix):
-         self.write("\n")
-         for deco in t.decorator_list:
-             self.fill("@")
-             self.dispatch(deco)
--        self.fill(("async " if async_ else "") + "def " + t.name + "(")
-+        def_str = fill_suffix+" "+t.name + "("
-+        self.fill(def_str)
-         self.dispatch(t.args)
-         self.write(")")
-         if getattr(t, "returns", False):
-@@ -343,14 +365,14 @@ class Unparser:
-         self.dispatch(t.body)
-         self.leave()
-
--    def _FunctionDef(self, t):
--        self._generic_FunctionDef(t)
-+    def _For(self, t):
-+        self.__For_helper("for ", t)
-
--    def _AsyncFunctionDef(self, t):
--        self._generic_FunctionDef(t, async_=True)
-+    def _AsyncFor(self, t):
-+        self.__For_helper("async for ", t)
-
--    def _generic_For(self, t, async_=False):
--        self.fill("async for " if async_ else "for ")
-+    def __For_helper(self, fill, t):
-+        self.fill(fill)
-         self.dispatch(t.target)
-         self.write(" in ")
-         self.dispatch(t.iter)
-@@ -363,12 +385,6 @@ class Unparser:
-             self.dispatch(t.orelse)
-             self.leave()
-
--    def _For(self, t):
--        self._generic_For(t)
--
--    def _AsyncFor(self, t):
--        self._generic_For(t, async_=True)
--
-     def _If(self, t):
-         self.fill("if ")
-         self.dispatch(t.test)
-@@ -586,8 +604,9 @@ class Unparser:
-
-     def _comprehension(self, t):
-         if getattr(t, 'is_async', False):
--            self.write(" async")
--        self.write(" for ")
-+            self.write(" async for ")
-+        else:
-+            self.write(" for ")
-         self.dispatch(t.target)
-         self.write(" in ")
-         self.dispatch(t.iter)
-@@ -612,26 +631,27 @@ class Unparser:
-
-     def _Dict(self, t):
-         self.write("{")
--        def write_pair(pair):
--            (k, v) = pair
-+        def write_key_value_pair(k, v):
-+            self.dispatch(k)
-+            self.write(": ")
-+            self.dispatch(v)
-+
-+        def write_item(item):
-+            k, v = item
-             if k is None:
--                self.write('**')
-+                # for dictionary unpacking operator in dicts {**{'y': 2}}
-+                # see PEP 448 for details
-+                self.write("**")
-                 self.dispatch(v)
-             else:
--                self.dispatch(k)
--                self.write(": ")
--                self.dispatch(v)
--            self.write(",")
--        self._indent +=1
--        self.fill("")
--        interleave(lambda: self.fill(""), write_pair, zip(t.keys, t.values))
--        self._indent -=1
--        self.fill("}")
-+                write_key_value_pair(k, v)
-+        interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values))
-+        self.write("}")
-
-     def _Tuple(self, t):
-         self.write("(")
-         if len(t.elts) == 1:
--            (elt,) = t.elts
-+            elt = t.elts[0]
-             self.dispatch(elt)
-             self.write(",")
-         else:
-@@ -656,10 +676,9 @@ class Unparser:
-             self.dispatch(t.operand)
-         self.write(")")
-
--    binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%",
-+    binop = { "Add":"+", "Sub":"-", "Mult":"*", "MatMult":"@", "Div":"/", "Mod":"%",
-                     "LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
--                    "FloorDiv":"//", "Pow": "**",
--                    "MatMult":"@"}
-+                    "FloorDiv":"//", "Pow": "**"}
-     def _BinOp(self, t):
-         self.write("(")
-         self.dispatch(t.left)
-@@ -689,7 +708,7 @@ class Unparser:
-         # Special case: 3.__abs__() is a syntax error, so if t.value
-         # is an integer literal then we need to either parenthesize
-         # it or add an extra space to get 3 .__abs__().
--        if isinstance(t.value, ast.Num) and isinstance(t.value.n, int):
-+        if isinstance(t.value, getattr(ast, 'Constant', getattr(ast, 'Num', None))) and isinstance(t.value.n, int):
-             self.write(" ")
-         self.write(".")
-         self.write(t.attr)
-@@ -760,18 +779,22 @@ class Unparser:
-     def _arguments(self, t):
-         first = True
-         # normal arguments
--        defaults = [None] * (len(t.args) - len(t.defaults)) + t.defaults
--        for a,d in zip(t.args, defaults):
-+        all_args = getattr(t, 'posonlyargs', []) + t.args
-+        defaults = [None] * (len(all_args) - len(t.defaults)) + t.defaults
-+        for index, elements in enumerate(zip(all_args, defaults), 1):
-+            a, d = elements
-             if first:first = False
-             else: self.write(", ")
-             self.dispatch(a)
-             if d:
-                 self.write("=")
-                 self.dispatch(d)
-+            if index == len(getattr(t, 'posonlyargs', ())):
-+                self.write(", /")
-
-         # varargs, or bare '*' if no varargs but keyword-only arguments present
-         if t.vararg or getattr(t, "kwonlyargs", False):
--            if first: first = False
-+            if first:first = False
-             else: self.write(", ")
-             self.write("*")
-             if t.vararg:
-@@ -839,14 +862,6 @@ class Unparser:
-             self.write(" as ")
-             self.dispatch(t.optional_vars)
-
--    def _Await(self, t):
--        self.write("(")
--        self.write("await")
--        if t.value:
--            self.write(" ")
--            self.dispatch(t.value)
--        self.write(")")
--
- def roundtrip(filename, output=sys.stdout):
-     if six.PY3:
-         with open(filename, "rb") as pyfile:
-diff --git a/setup.py b/setup.py
-index 6f62fd9..e5a277a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -48,11 +48,10 @@ setup(
-         "Programming Language :: Python :: 2",
-         'Programming Language :: Python :: 2.7',
-         'Programming Language :: Python :: 3',
--        'Programming Language :: Python :: 3.3',
--        'Programming Language :: Python :: 3.4',
-         'Programming Language :: Python :: 3.5',
-         'Programming Language :: Python :: 3.6',
-         'Programming Language :: Python :: 3.7',
-+        'Programming Language :: Python :: 3.8',
-         'Topic :: Software Development :: Code Generators',
-     ],
-     test_suite='tests',
-diff --git a/tests/common.py b/tests/common.py
-index c8db903..95b9755 100644
---- a/tests/common.py
-+++ b/tests/common.py
-@@ -215,6 +215,7 @@ class AstunparseCommonTestCase:
-         self.check_roundtrip("not True or False")
-         self.check_roundtrip("True or not False")
-
-+    @unittest.skipUnless(sys.version_info < (3, 6), "Only works for Python < 3.6")
-     def test_integer_parens(self):
-         self.check_roundtrip("3 .__abs__()")
-
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index d71fdd79508f..2596b7b09710 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 528 BLAKE2B 235da3565cdee54b50a54072bd10297db9f2b30d6b968d6b8610e8fbd0652f086ca5c91c7d4b39ea4b0175d46af3518b8aa21665d6aa33785b06f9e562019ce9 SHA512 aca4682a1f657c18007a85f7350d042170e17dc9f48a01c8da8a70ce6636f101492c3581586f0cd2b702664c26be7086df8c44dd9dcd21c52454bb764570a2ad
+EBUILD async_generator-1.10.ebuild 678 BLAKE2B 702057e80949e47082696d43df31bf5353ae1da2e8e1aa176cd9882577819e7cc2c879b4d8bfe995e40712e778c1292527904825c49d34578975efd815515a3d SHA512 84202a327d42c6d8dedfdf783c8aaae3442f5fd1ad2a92ebc2acf26e64a5f2316aa906ecc6eb5bff0648150706c442a761e52fbe03841fc80b0c8f563057682f
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 51b8ddbb5188..c440c8ba8343 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,8 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DOCS=( README.rst )
 
-distutils_enable_tests pytest
+python_test() {
+	pushd "${BUILD_DIR}/lib" >/dev/null || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+	rm -rf .pytest_cache || die
+	popd >/dev/null || die
+}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 12914ac0db12..cc50490fae6e 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 972 BLAKE2B 2c723eb4dd78ed0881e9fe1055ea51d493a3d2fd293bc092beae039339e88d4cb2b85ae9b58d4c59731e426da75152628cc18fe03771029df1ec6022f1974437 SHA512 7b60172aaa52304d5c7e2ddad5a7767d469051b83f4bb92aff5f50a9c7b5d24b3dca2f230edaa77a575b9f3aa1de4896f6c2082e71fb7611e8c90a868b459e41
+EBUILD async_timeout-3.0.1.ebuild 978 BLAKE2B c7c2fda29da3d3d15f29c059b550573afc57e937de9bf0b071629fd51369d3773a1bac90a07f102b9595cc52c73d6337e61b2036dc50ecc3095f2596530e04e8 SHA512 5bce4f60c5db54a94dec2a95cbe11fe370e1e025310910bf894c8b9f54005b65595f147d0531eb4829244eaf70f6259edc54a40d0ed5dc516791ff0c0273ac34
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index b0788bc692f7..cb2456d5cf47 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 7e1e9b1c050c..291662f08e6d 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,5 +1,3 @@
-DIST atomicwrites-1.3.0.tar.gz 11699 BLAKE2B 7f1d61547f753a69f28f86dc4f7ea66010c12c68fa9babc7913848b011e956b6cfb30b595cc3d06bd6a3555ecea0b5d1eca703a0fec3f1dc0631fea2a12c7565 SHA512 9b619b622f4509c2a41ad340f91bd6e74f238cf9a35f4662fa70f1f957a78069cb89f9bf16f8da70a597bc43a0c6c4fdea6afd0d157364a53a2fa5d8f4272a61
 DIST atomicwrites-1.4.0.tar.gz 11790 BLAKE2B 98a262f46acdfb94f56175368bebe3dbd5d46c1bd694362f5c9211c7be2016821c9a833f1061f41f77adadb3a26b6c6d3ac1761a13bec1f9ac2c3c0a35a58ad2 SHA512 493fd15174880917650643db1fe85e2703add730189c23fcff11ceb87175f546b9251050ade506d0b48300e0f2a39ee5a4dcd4da8cb3e27680fd05553d6662cb
-EBUILD atomicwrites-1.3.0.ebuild 667 BLAKE2B 7be4794dabb32383dfd1f4fb497481c5b2a90082352093c78d2ec0e1879e9947f932e3bb053af0de524f08f5e4532e3fdaff3da57ed5178810afcbf7bc676f5c SHA512 278ee52415b0272c46fc4a456cb32c7879ba61aeb051939dae19d53c94c2c6f3629df0f59f3a4555e4715f9e6a86a7fc41643ff0218dcfb407f6fa56e42b70c0
-EBUILD atomicwrites-1.4.0.ebuild 675 BLAKE2B 75383d94bd6f47fc056e95238f94cc2e62fc9a73ae1d148b87b57735792556d412acdb4695290a224ba89722563bed1e66e28c2f42f3c3e7cc3cf05f5a32a4f1 SHA512 91382fd4ebd3eb2b7e0546ce4f2d8ed6ffeb37d1f53def6dc610936fd16bd2c23a01a67120df23f8f30c36f33a624c9d370a89c801950b00f55c4137610919d0
-MISC metadata.xml 539 BLAKE2B d3281a777b3dfb1bb0c7e5f2cbe815996723a4e4f795ccd763de5e0b54869613561f4e525766748e41760620c2608ad54e50734f252c33f77136cafde61bf0d9 SHA512 f3797857459b8e8a09dbd1cee0f8042f525dd6aed8b4923771725568aef539459d21cc3f9f5fecb1f8341005602bfafb3afb1a8a2b67b7b9ee43713f9dbc8380
+EBUILD atomicwrites-1.4.0.ebuild 667 BLAKE2B 7be4794dabb32383dfd1f4fb497481c5b2a90082352093c78d2ec0e1879e9947f932e3bb053af0de524f08f5e4532e3fdaff3da57ed5178810afcbf7bc676f5c SHA512 278ee52415b0272c46fc4a456cb32c7879ba61aeb051939dae19d53c94c2c6f3629df0f59f3a4555e4715f9e6a86a7fc41643ff0218dcfb407f6fa56e42b70c0
+MISC metadata.xml 563 BLAKE2B f94f86b14e9060fc13a8cb562f340ab33fdeefe40165c9bba0da8b6c70e7ee789aeadffd7a6bfad97fbfbb8fa98797905926f173719c7fb5aa02b640f178c73c SHA512 7cfd438d7dc12815ae8f91e042397b1de749a0276dd82eea86a3a6edc646d3c79ca077de27b295a1a1dcfac2b89d44581de97b6a0b7cc5711c818a434c31def4
diff --git a/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild b/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
deleted file mode 100644
index 714f4693765f..000000000000
--- a/dev-python/atomicwrites/atomicwrites-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 python{2_7,3_{6,7,8,9}} )
-
-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 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0.ebuild
index d7a1eb3cd858..714f4693765f 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.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 ~sparc ~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="
 	test? (
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
index 1b008d1f05c3..13f0b6a55a29 100644
--- a/dev-python/atomicwrites/metadata.xml
+++ b/dev-python/atomicwrites/metadata.xml
@@ -8,6 +8,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<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 ce1cea253ff9..47a1bc7fa661 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1,5 @@
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
+DIST attrs-20.1.0.tar.gz 160766 BLAKE2B 65170484648318b9e6466789a9d212475dd8233c2d89fdd7bdf3b24dab4fd5018f981f30a0fa0df83271a8bcc915f13b03a55e7e42da2e1d8a3a0684430107be SHA512 0be286c9263ea26fbb29a89a1c9a37577577b1147cbf440de257a3652147bcb559c8fc4118a900cef558b9f49b59074a276c8a4843f3e8829278eaae5b70e913
 EBUILD attrs-19.3.0.ebuild 868 BLAKE2B eabe886f699ddfdc462847003e10d102ad3ed75bf901af6e12158197490bed29983b89a65d1fd584bd10edcc620591b0cb207f4eea877e0d247e4533182c7a19 SHA512 ab4542831afe2178c61e6056cd444ba77ea5a4e26c5ec388ecf2aca644b4771b3a46080d8c1c5bd7a20b25bd136a9f2be1a7bbd3bceaea857df7e77cedb07942
+EBUILD attrs-20.1.0.ebuild 836 BLAKE2B 9a919f6c9ff877b2aa5a0e6dfc0f2c6167cc41761b0717ead724813824239b7e11798dd256bda57ba6ff359b4402c8379bd82af2ae1a9fbbb473a48c678a5524 SHA512 f3ab234e60abf4dab6da95d24abe300f5f19c35f6d15780d9051942c12e3449f6da2c99a137f47c5229bb76774dd142dc4e54602454b902d0938568cea628ad8
 MISC metadata.xml 495 BLAKE2B e9a4bb16661c2b059e33b2f4182da181bca463091c53e4f1ff61c54137030bc9982b746ad9544dc0c293be4d05cc14949b1e2fcda773846de04ed879eef59d97 SHA512 439bf5cd48fd1647fb72a6bb320b493adbfef6be38298d1f6aa77c3d4594dbc03082701390a69f9324dd76fd3367472d865a39c7b5ba48e2a5a0ec56e04c5d39
diff --git a/dev-python/attrs/attrs-20.1.0.ebuild b/dev-python/attrs/attrs-20.1.0.ebuild
new file mode 100644
index 000000000000..8f8f2085fd45
--- /dev/null
+++ b/dev-python/attrs/attrs-20.1.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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.org/project/attrs/"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index db0f7b7495e8..ab13fbe389dd 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,3 @@
-DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
-EBUILD authres-0.800.ebuild 586 BLAKE2B 59c53928f8d774278ee5fdac8fd50b9502520d1b7dd7591bc0ec76860b81084984de9ebbdfd1b23387addd46b87b9f3426e16118dfd1084c2ce090f323478fff SHA512 e343e23a9db914d2226e25fdbe562475379c754c74b51c29e483969bb9c157d9d726026e9deefd31a24c76ee884e7f65b975350cafad6fcf63d12c1b1029187d
-EBUILD authres-1.2.0.ebuild 554 BLAKE2B 85c03e35678f65729664d0d6f91c17ff9c8fa5bf6b37c6c49d7454aa02b23a246c8a60cec8dd5bcd171da921ed135b7c30546ee1c5dd2e80e8bf38c74811c178 SHA512 22828246cc668554a20f46badcecb1faeb942c931893d9d6d664c2a5bde380c50b76ef8248770999bfe1d74e582a5778f7ef4b923728305ac1eee67876c24a4c
+EBUILD authres-1.2.0.ebuild 553 BLAKE2B 3e37a3528590372753145477bb3d7947e08093eebb3597d9acd0d1b8f10b74432e07eb6c8cbcdd919e847adb5f5298af510a15ddded679ade0778b98d2c488e7 SHA512 818ee98b2c497f17688bb2f1dcc61f355ee27d311cb2cee61250c377475d4a2df2b4bc51fe0f8622db47e8220fb1a275bffe23071f5086a7ef6a5b459f064703
 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
deleted file mode 100644
index b3a088be0c34..000000000000
--- a/dev-python/authres/authres-0.800.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="Authentication Results Header Module"
-HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.org/project/authres/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-python_test() {
-	"${PYTHON}" -c "import sys, ${PN}, doctest; f, t = doctest.testfile('${PN}/tests'); \
-		sys.exit(bool(f))" || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
index ae527433ce74..11a410532d3b 100644
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ b/dev-python/authres/authres-1.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/authentication-results-python
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 8d654c20d92e..f58c975822f5 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,8 +1,5 @@
-AUX autobahn-18.3.1-Fix-cs-test-955.patch 3736 BLAKE2B eece2b356181b4dac4849dacf555b5c64499f8484ca959c402cd124badccb8d5e8aea20d2310c8f5920d3dbde8854dcdf2c2abd93dd9e0effa8808eed3c78ea0 SHA512 380e3641d5b203a0f9dbdeca21dd7dc0802bf8675271a847824a5059c3867cd92a5f51db90414e74c0749337db191df9693a9d36562b16ed090bb9a508c7b66b
-DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382
-DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
-EBUILD autobahn-17.5.1-r2.ebuild 1746 BLAKE2B 58518e8cd04b6c01710a01d8b269496ce0c08b7fa9513e3f7f767e6012b3bf8d65dda993ce68e65f0c1ea17ba75bda36b11770a35e8d84241c7b0f80c5c0336d SHA512 6b5d81c6a25161d515acb187d1cc319399e81886af2806074d40e3c626ed4f51681d16b4ed9478ae941ebc4e028bb3fafe3fb9974398fb0ae81553307302ef82
-EBUILD autobahn-18.3.1.ebuild 2112 BLAKE2B 35fb84e5a25f80ea08dc8994d940b19ae9758bf1120b2b70d2bc2280e1b29efa6a1f3a8d01917c27d593a7e602ebbc64af236f05b9e279d5820e3d965c414fd2 SHA512 2ce04471413d1252d58cf43e80d65be5c2d0b3049426b0863387d624762b5a9fc1060d8d9a7d657d1d4e9b54dd6a16174ab5e40c4e7962158958e57270152bf3
-EBUILD autobahn-20.4.3.ebuild 2437 BLAKE2B b3c6a2728146163423cd42ba36c7b01c8045bad291e74201ef8ef1fb5a39b811ff38bea73c9107da40af5ad8fb36a8d0e4d3d606e5167617192f17df8bba60a6 SHA512 067080cb643272e9ea8626bc0d4c3e9415ae730b8162f1f9efcdc95318ab84f957900cb263d0dcfd1befd3ea9bd9db98a68c330551bf0bc378f6e2c455051076
-MISC metadata.xml 397 BLAKE2B 2953764a2489f28c0ac996cc8ddb805720cd037ab685d342421b9f735eca7a794c830d551159c4a58e8c22c2101dd7180b298d3b28dd936f651834b9bf3a1838 SHA512 730d7bf2c742cba64c8d64117c928d4712efb46b87b71dfc9195f0a014c26c778c653ddf1386b3e274ed556c30c28347ce4502b0fc2447fc8c51b0a65941bc00
+DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
+EBUILD autobahn-20.4.3.ebuild 2451 BLAKE2B 3d5427b1164f94073c6da8724f11b9af14135f07bca9d2659c1d865fa646288cd50e980d51543cba6a53f039ebe12b17d30a692e96e90f324b135b7ae6502a33 SHA512 ea12ce096373c081376e66c26552e9f5a67822ed926a91e0726b9dba980cecdc9b8052aa2724fbe2a43d50e04cc0346d96d34b2c88f67ad157bd49f312bd54da
+EBUILD autobahn-20.7.1.ebuild 3001 BLAKE2B 425c79f8a968758816845df5888ca59910e3b2f5e0752304c5ae4a8d4bdd90e9317b2710125153d1ef33e0643dd90b4bcfad1936721a9070756de5a9ea0090ce SHA512 48425fe2c81bddc4fc16a55aa275e084a21e3f711fb5e5414c15c121ec60ff501b2310d1d3854d4a490a1c2bc98e24f18deb917412ea121e568e487a2dcea915
+MISC metadata.xml 555 BLAKE2B 35f1b962dcae81339cc00ddec0d51e0addfc78fe7263471bef713b512b75b90d0e88ee49d5757e8670c689bcc549ae6c4efb43f80423a1c3c87ddbe25fa7ce5b SHA512 d81264ea358930680a128403fc2f54173033a30c70969cd0e22790e0f78f30f7e6e575c3f671500e0da3fd0c13dd08a83ef6bc9b500b7121c8dc4e02a79c8702
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
deleted file mode 100644
index ff8c6a009590..000000000000
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ /dev/null
@@ -1,66 +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 x86"
-IUSE="crypt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-16.0.0
-	)
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	#esetup.py test
-	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
deleted file mode 100644
index 9be3fd5f6a50..000000000000
--- a/dev-python/autobahn/autobahn-18.3.1.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
-
-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 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="crypt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Fix-cs-test-955.patch"
-)
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	echo "Testing all, cryptosign using twisted"
-	export USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	py.test -v || die
-	echo "RE-testing cryptosign using asyncio"
-	export USE_TWISTED=false
-	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_cryptosign.py || die
-	rm -r .pytest_cache || 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-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index e3bfba3353da..61cfc0c4b7cd 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="crypt test"
 RESTRICT="!test? ( test )"
 
@@ -39,7 +39,7 @@ 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/service_identity-18.1.0
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
 	)
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/autobahn/autobahn-20.7.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
new file mode 100644
index 000000000000..4b6e54bf13c2
--- /dev/null
+++ b/dev-python/autobahn/autobahn-20.7.1.ebuild
@@ -0,0 +1,104 @@
+# 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
+
+MY_P=${PN}-$(ver_rs 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 ~arm64 ~x86"
+IUSE="crypt scram test xbr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-20.3.1[${PYTHON_USEDEP}]
+	>=dev-python/ujson-2.0.0[${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-18.1.0[${PYTHON_USEDEP}]
+	)
+	scram? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/argon2-cffi[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${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_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	echo "Testing all, cryptosign using twisted"
+	export USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	echo "RE-testing cryptosign and component_aio using asyncio"
+	export USE_ASYNCIO=true
+	py.test -v autobahn/wamp/test/test_cryptosign.py || die
+	py.test -v autobahn/wamp/test/test_component_aio.py || die
+	unset USE_ASYNCIO
+	rm -r .pytest_cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# delete the dropin.cache so we don't have collisions if it exists
+	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch b/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch
deleted file mode 100644
index a62f48569ce1..000000000000
--- a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 604bc53a3beec173020c944ce9cb38afca2a9126 Mon Sep 17 00:00:00 2001
-From: Tobias Oberstein <tobias.oberstein@crossbario.com>
-Date: Fri, 9 Mar 2018 10:37:31 +0100
-Subject: [PATCH] Fix cs test (#955)
-
-* encode test string
-
-* already an instance
-
-* add extra deps (encryption)
-
-* add extra deps
-
-* deactivate py 3.3, tx < 15.4
-
-* systematic version coverage
-
-* fix coverage (hopefully)
-
-* another try
-
-* actually need to yield, as a future is returned
----
- .travis.yml                           | 58 ++++++++++++++++++++++++++++++++---
- Makefile                              |  3 ++
- autobahn/asyncio/rawsocket.py         |  2 +-
- autobahn/wamp/test/test_cryptosign.py | 18 +++++++++--
- tox.ini                               | 32 ++++++++++---------
- 5 files changed, 89 insertions(+), 24 deletions(-)
-
-diff --git a/autobahn/asyncio/rawsocket.py b/autobahn/asyncio/rawsocket.py
-index 130a8e41..bbb83337 100644
---- a/autobahn/asyncio/rawsocket.py
-+++ b/autobahn/asyncio/rawsocket.py
-@@ -408,7 +408,7 @@ class WampRawSocketClientProtocol(WampRawSocketMixinGeneral, WampRawSocketMixinA
-     @property
-     def serializer_id(self):
-         if not hasattr(self, '_serializer'):
--            self._serializer = self.factory._serializer()
-+            self._serializer = self.factory._serializer
-         return self._serializer.RAWSOCKET_SERIALIZER_ID
- 
-     def get_channel_id(self, channel_id_type=u'tls-unique'):
-diff --git a/autobahn/wamp/test/test_cryptosign.py b/autobahn/wamp/test/test_cryptosign.py
-index 700ca3cc..78f8d556 100644
---- a/autobahn/wamp/test/test_cryptosign.py
-+++ b/autobahn/wamp/test/test_cryptosign.py
-@@ -25,9 +25,21 @@
- ###############################################################################
- 
- from __future__ import absolute_import
-+
- import hashlib
-+import os
-+
- from mock import Mock
- 
-+import txaio
-+
-+if os.environ.get('USE_TWISTED', False):
-+    txaio.use_twisted()
-+elif os.environ.get('USE_ASYNCIO', False):
-+    txaio.use_asyncio()
-+else:
-+    raise Exception('no networking framework selected')
-+
- from autobahn.wamp.cryptosign import _makepad, HAS_CRYPTOSIGN
- from autobahn.wamp import types
- from autobahn.wamp.auth import create_authenticator
-@@ -59,14 +71,14 @@ def setUp(self):
-         self.key = SigningKey.from_ssh_data(keybody)
-         self.privkey_hex = self.key._key.encode(encoder=HexEncoder)
-         m = hashlib.sha256()
--        m.update("some TLS message")
-+        m.update("some TLS message".encode())
-         self.channel_id = m.digest()
- 
-     def test_valid(self):
-         session = Mock()
-         session._transport.get_channel_id = Mock(return_value=self.channel_id)
-         challenge = types.Challenge(u"ticket", dict(challenge="ff" * 32))
--        signed = self.key.sign_challenge(session, challenge)
-+        signed = yield self.key.sign_challenge(session, challenge)
-         self.assertEqual(
-             u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00',
-             signed.result,
-@@ -81,7 +93,7 @@ def test_authenticator(self):
-         session = Mock()
-         session._transport.get_channel_id = Mock(return_value=self.channel_id)
-         challenge = types.Challenge(u"cryptosign", dict(challenge="ff" * 32))
--        reply = authenticator.on_challenge(session, challenge)
-+        reply = yield authenticator.on_challenge(session, challenge)
-         self.assertEqual(
-             reply.result,
-             u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00',
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 6ea7ef02739b..72fb58a68e09 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>dolsen@gentoo.org</email>
-        <name>Brian Dolbec</name>
-    </maintainer>
-  <upstream>
-    <remote-id type="pypi">autobahn</remote-id>
-    <remote-id type="github">crossbar/autobahn</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<use>
+		<flag name="scram">Add support for WAMP-SCRAM authentication</flag>
+		<flag name="xbr">Add support for XBR decentralized data markets and etherium blockchain</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">autobahn</remote-id>
+		<remote-id type="github">crossbar/autobahn</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 9c4cf38fdf4d..0d531bb9005b 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,7 +1,5 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
-DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-0.8.0-r1.ebuild 1610 BLAKE2B 3edea0d85c0a95f7473bb567df6ba321ac61336b2a6c6f5c212e9949dd65a6b054f492c76d77443dfe0631378e2ca0c164d2fae86caaca24f5bb83c3e113d0b7 SHA512 f2a292c3610f3a8dfadce8602e437de777e64dc5bff6ac3f333f91f2f62d727910158b9d37096040f5a59af4208b535cd4bb3a94f7111d19b071ed2b6bec096e
-EBUILD automat-20.2.0.ebuild 1628 BLAKE2B 2da86504c921aad90a754fa2838fc7b72001eb63ba0969f74730611e3aa88a213c706b6c4480e6c526513d546e39603cb26d30728181ae441cc5796030bff1ca SHA512 a431b832d18326efc456e0eaa967b9432ac7da0f1c821c43c862b5764a6db4be89d3fac02e81927d738626e98384acf19272c800c5fc5d410f874cc96e71ca5f
-MISC metadata.xml 645 BLAKE2B 6190e3ad235c93d189fddf477414ebb9a784a8e5fb5b51dc02123515c1673bf94c74af976f9d701d36d30d638f75b4ebe825ea9e853247f474707e8fd6759ed9 SHA512 9cdab2ff1f5671f1b9a55b8b74281e868aeb2eb702abeb9d51e71c7e0a6524844caad7c9b0d0d888435dd74d69519b2d66edd1ea985145290b92906955508565
+EBUILD automat-20.2.0.ebuild 1609 BLAKE2B c704e366cf4c4e817068be3e3ad8544bcc8780e6463f07cbd71f17a3b968c3cade794b72d06aeda06f5505bee28bdaab5f8251577610d482626a2ff67f01bfa4 SHA512 68bdb45cff53f01930a9de788bf5437bb0bbb58702a0969097b7222c8ccfad31034ca4ee15da30c0c1879c45903f49ca716def96f213228ba8b5c625d289c564
+MISC metadata.xml 669 BLAKE2B 22b4ba427dc89c8f651aa4f5d31dbde255937d32f3c3f15e1b5a44f13e574822523d6051b087066f18f22f15001629d6a012961be2603b16f561a567826c453c SHA512 a3683067d91582e4b0262a8d66fbb86d15fdff9093916d4298c9ca8f94a81db4357338be8a4f18513b0670e1f209f138bc28b8bf5df5e0b5ed4b0978dcaf6083
diff --git a/dev-python/automat/automat-0.8.0-r1.ebuild b/dev-python/automat/automat-0.8.0-r1.ebuild
deleted file mode 100644
index 35f0f151aaf2..000000000000
--- a/dev-python/automat/automat-0.8.0-r1.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=( python2_7 python3_{6..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="A${PN:1}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	dev-python/m2r[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
-	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test ; then
-		# Remove since this is upstream benchmarking tests
-		rm -r benchmark || die "FAILED to remove benchmark tests"
-	fi
-
-	# avoid a setuptools_scm dependency
-	sed -r -i "s:use_scm_version=True:version='${PV}': ;
-		s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index dc4053b4c831..3ca1eac96eef 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.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..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -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 ~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="examples"
 
 RDEPEND="
diff --git a/dev-python/automat/metadata.xml b/dev-python/automat/metadata.xml
index 94441be933ea..ef26299dcce7 100644
--- a/dev-python/automat/metadata.xml
+++ b/dev-python/automat/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>glyph@twistedmatrix.com</email>
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index d72655685446..8f00cfeb7513 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,4 @@
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
-EBUILD autopep8-1.4.4.ebuild 828 BLAKE2B 5165808ba2ceebf03711638b4bcc118e07500047bb8db18627578dbc344e9149cd98dc87367f82be89e331400926ef70d2bdf1ee0ad2943fe7399b9265ae277a SHA512 b1f3adfd7ef7cee3e180cd8d2307b20ca08bb826de128652945f63127e6e0643e3426945fa92faca1608a2ad5ecc07efb9184ae23b6ce90f00a40102a7b4d717
-EBUILD autopep8-9999.ebuild 805 BLAKE2B 2cf72deacc03c5063d3230e6d2c1cc2cac0fa5ae320be4e14e107286c69036774316d9ea79771a8253986841d575d844370ffb151e2ce3b6a09ca0a693eab0dd SHA512 ac92e7ec145f7186806a2e0a7c85e081cc0d997894718135f7f944421d000ac6b69f890ffda6406880f0ccf15b77fd7d51d70d74709625ed31e05739e68e9b3a
+EBUILD autopep8-1.4.4.ebuild 822 BLAKE2B 166a16771249241a262188451b1d0ffdd629bc8c6755b804a7f4bd1bf103bb99dfdcdcf96e1ff651b6442bcfb847524809e58724d493ee01d483c53c1c9196cd SHA512 ee8f3ef92a8454b7d51a56e42c5373f5ff3861d5a92518926dc96ee83c2315e41fc5605fb737053bb3db2661a6aa378dc4d507c4167c3675a872653aa05d7ac6
+EBUILD autopep8-9999.ebuild 799 BLAKE2B a0a3cb93be6e0d566e42a7f92906de125f88e7519c3c19852977567e08e44c39059af4ca53c6c6741689d9633df6317d0e3bf48fc29ba137ebf66d0778977348 SHA512 79ad3a98848af6ca1cf60a4dda33b6adf41e5e0fd9e6ef13b3c04bf61ce060c6111962d35d0e894e909fabb9a336cb73b06674c6a573baada40a22de5b803dcf
 MISC metadata.xml 378 BLAKE2B c45e6a1e950f4288d6bf63969fb59c426a483c9e27294b6aa18c85d827f0cbce3cad2111852f6c7bb9347a17650b92b98fc3234989742459c57652fb6600adcb SHA512 e7ac8c3772bcdef589f909947f23d6c97d09ca98eb3aafbd88cf4af53ed56c12f85741e0d8f872ffceefd59012e11f4c98939b0daa79590255685cbbf04acf80
diff --git a/dev-python/autopep8/autopep8-1.4.4.ebuild b/dev-python/autopep8/autopep8-1.4.4.ebuild
index 1370a111334f..df9895f59c98 100644
--- a/dev-python/autopep8/autopep8-1.4.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 136de80ed7ad..90456b8815b5 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index dca6e5e9909d..0631493751e2 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,9 +1,5 @@
-DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
-DIST aws-sam-translator-1.22.0.tar.gz 5092855 BLAKE2B 596d4162938889fd7fc1dcddfa7317bc772b2a5629940a2a0ce1329c8e05c063872ce15dce95d99aadbb80409c015c00a5ce0e4f066de2609f21008e3c5c1faa SHA512 070a9d72683251d11c3f3d41d5ae5e51249f27bd8c7890fb77254b81e9e1267fd2324dac7a246b2b1067210da9beb78cb97dc0f4a31b29e3990a300a05bd4a4a
-DIST aws-sam-translator-1.24.0.tar.gz 5142130 BLAKE2B 43c1f3741296a70af6560655363d144bd654d7184d3654b9aaee6dece52a2a5fd557f605040d46f530886abc9cb4ae55703f588bdfbf70e5eabedfda3f5e0d56 SHA512 f5278be23e9426c5b9be8960cfce442e8f1302afbe99aa76c119ed11b9de40151195534cdb8d72e3eb13f40af2f2efe54dfbd55c6bf3c5f8ce2450848bc047a5
 DIST aws-sam-translator-1.25.0.tar.gz 5144283 BLAKE2B f04f2715f140b2ea0df71bb830e033442d212db88ae1f08a8027d0875e6c4d2a3404f2855d54109b1623e3c290aa7ee8f2d7d205ce2163ebdfbddcbb46215fc8 SHA512 4dd428750c7e0c73987dea89b8a257fad33a59680c282136f6adaff16e3695123d0d3d42b45cd85da5311e1b38f2a2879d54170db7d5303e6e8d9086becf66b1
-EBUILD aws-sam-translator-1.11.0.ebuild 824 BLAKE2B 65c797b5020337329d624225cdd4083a0b883c20523dce972f6aff6501c7398b8784de815be9430058269b8ef907d4c366fe207f922c563cecd15a7c1f6ad3aa SHA512 ba3b300c41aade2dc975e3b0a55d8f28cda4f33836f18f26733df6898b7cb84bbd8260d4e8b06374325da1fa082ac16a2a7e33998fd512affee21fe22a2f00e5
-EBUILD aws-sam-translator-1.22.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
-EBUILD aws-sam-translator-1.24.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
-EBUILD aws-sam-translator-1.25.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
-MISC metadata.xml 586 BLAKE2B 218aa559f6245f355cad9eb9cdb59734f2de73a88c9fe83cc17c78c2157e69968b5ac5b703b36743e4daafac249ba5d6866c2697d7081bc897f07ce6c457ac42 SHA512 8076d6c6af7184be3008268713819abe9027acd7be22155cc0130a8e626afc1fb45f64b63db6b86185942867293154835244842b889c24b0b05ab5d54d7734e0
+DIST aws-sam-translator-1.26.0.tar.gz 793347 BLAKE2B 701cefdf0f2c220b96104f6a0df4d2c5d2b9ccd9076a216601414407c4fe5fabfef4fd3d6cbd305a6ce94587e8d4fe937ae730c30bbb785f65a6cf53564f41d8 SHA512 2ffc3953d8591e9e4bcc9d593cb34fdc57580f043ee19e6db49068bf0c5d870c5d5902ef3887400256c36774d0b3ce0dfaa962e6be3f6066fbe1caf31bd14498
+EBUILD aws-sam-translator-1.25.0.ebuild 1288 BLAKE2B a927d205039497629e89cb76026c3938a9c537ee5c57c11ee464e1046ec7a6d4ba4165c80e6777c2edae14dca6283ec194fe05d29dcd58955e08fee14b1ed151 SHA512 114e61a919ee401bc1ed87fabf4597aa3b74b32399d4588432b8e22769f62b76728210eb28701df5ed845610b8e8c0692dab68f6d564ddb827b84a6ae122709d
+EBUILD aws-sam-translator-1.26.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
+MISC metadata.xml 610 BLAKE2B 687fc6be648204f31de275e8cc2da9cc11e74a1f91a5474e0df5f163202f998d92e6f15847eccff364da46b4b7185017dbabc2c3016d4c1dd2a5f873f04cb1d1 SHA512 770b2f5748d6b6edc1be7c546035854cb4a0bf851f214b811867f376d5e260011f6542f6e43a80d2465e93f23cb912d61af385ceeea17d1e117f5f4f13a298b0
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
deleted file mode 100644
index 8e16b1cf1f71..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.11.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-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=""
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RESTRICT="test"
-
-python_test() {
-	PYTHONPATH=${BUILD_DIR}/lib \
-		esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
deleted file mode 100644
index e570b035756d..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.22.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=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
deleted file mode 100644
index e570b035756d..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.24.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=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild
index e570b035756d..6c24007905d3 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.26.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.26.0.ebuild
new file mode 100644
index 000000000000..fa1227477627
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.26.0.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index d20a897dcc58..5c610e171af9 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">awslabs/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 2d1886568330..53c28a35ec20 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,5 +1,3 @@
-DIST aws-xray-sdk-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
 DIST aws-xray-sdk-python-2.6.0.gh.tar.gz 255978 BLAKE2B f43204a25027d0ec135222879bf9158aef65ba5ca948e734be0b984d8f2582741bb36d9ae0a874dffae6ffc5209e25fa1c69069c261256c3bee71a4fe717411c SHA512 17a4716467b7f6dc2912d969143e0b7c8c0b9ab15bc57f873ec415876ad2080218c3c526f4aa2c1bbf4d1caaca62eaf122c87debb45c925fd84a1bcf00ab741f
-EBUILD aws-xray-sdk-python-2.4.2.ebuild 826 BLAKE2B 46d407c86eb1050c03cdd3b3b7636aca7f81d634f809e7b9e9eddbd429b2edc00692a34ce5e1323433aa0a5e679827c9e5afa9cbb8d9f9271b4cbf8e2058bd3f SHA512 73cdca73f719bc40fc504079904d5417fc50d8d5a2f217ece4e46aaa577b30aa928306690341081769d1bb180da2451967ebbf084777a50f5e3065e0d764956d
-EBUILD aws-xray-sdk-python-2.6.0.ebuild 1462 BLAKE2B 9575e7447cb8c37c0b497a70156c1477d8d0ff5c28ee748e4f6f080421298850ba327251f37e6a020feb85478f692d7624777e5bab87b4b10b91be9c7758cb3a SHA512 fc2d7ddc25d80cf796bc9283007c3b908c177a665dc887480c9d3dcc7570b37b5c084c5e1a902a8983cc8293bd8e067b518c882b1d329c3ec4cfab0deec33414
-MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
+EBUILD aws-xray-sdk-python-2.6.0.ebuild 1472 BLAKE2B 6425138645d48feabf4ce105b130f1fd86c75fbe7d74dbf3ac2c3b0e57062c03c2b2ce96025afe2bd49215a3cf54df1e5f3ec5f732b35a197de62a48a4a65b87 SHA512 e04b2a10970741203f6bae25f7ee3e931d1be4256b0f8a09e25a4bbd9b2e614d3fc9e337f69b26176432b51e3bc0fad78b83cc7e3368b6bf1a12ae2706660c79
+MISC metadata.xml 477 BLAKE2B e68a8686e491164d7f547d858c230a47290cec6062dc7feff60322135dcb269d59ee0b53208d8eaed14eb6b3c03183898888bb42663309818010a6ab3529b45a SHA512 fdfad8d869df01fccdfd19b3395374c67793cc2c96f9e8e02962921d8357df5ddb0fae391907c7f1e987ae57618616a3263a1f0dcde0a8f84576f605ed15ae34
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
deleted file mode 100644
index b21281ca806a..000000000000
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN=${PN%-python}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="AWS X-Ray SDK for Python"
-HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-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}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
index 6d59ba398b05..98b5fcefa8f1 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-xray-sdk-python/metadata.xml b/dev-python/aws-xray-sdk-python/metadata.xml
index 80f5a6bc406b..ea3b1602d61c 100644
--- a/dev-python/aws-xray-sdk-python/metadata.xml
+++ b/dev-python/aws-xray-sdk-python/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aws/aws-xray-sdk-python</remote-id>
 		<remote-id type="pypi">aws-xray-sdk</remote-id>
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 1a54520b8c27..8109c0d40629 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,5 +1,3 @@
-DIST awscli-1.18.62.tar.gz 1739551 BLAKE2B 029119e6c4d9078f46507c1837c2122f86ab3bc83e8e34bdf6ddb969426769845ea6ae49d8f1cff3e4c9d2951ce562e6bf395b67082efd3eeade0e2c36638ab4 SHA512 08e996d4cdcb941553969310b998a033a4a4dfeec1de44167e8cd3c4a46e751858285a8d33ddc348c1133c90d25bb73da6ee33f6e2c94c3dd8dd79f56b85014b
-DIST awscli-1.18.70.tar.gz 1758807 BLAKE2B 493bb9193ebf3f01e8088c4928036ef806d2a2802b3de6bfc7ca7c2f17d655a367601876be939e89fa7c28b4a7f5a5b6c9286707d3ddd1f7339cfcc35e2f85de SHA512 f81f7077299291a80a2965da91f2f09ca40918bc12faa3312030f5783df73503d61da9765bef4b17b71b318a71f8808dda9ede0aa276c4f055b2d5a69e299c1a
-EBUILD awscli-1.18.62.ebuild 1300 BLAKE2B 9469c174230b8029cea1cb1f441132bc151a833f48304413969394afa5025c083b6184286f19b5b85df428df861c3e81282b0ff1e86362964a3d0ccbe33bd3d6 SHA512 c035056da8db246c8196c4ae57654a01bf553e2e784ca014f57a3aeba22e813d6d73c7f983be0811123a1e5779a281a3a743af20b945b52414833bc0c0b51569
-EBUILD awscli-1.18.70.ebuild 1300 BLAKE2B 1251b30a7529c3d1ce816070e45e5cf70cb5456862752c20d7d11bd821ec4c142550e5ba74b294f7bf03fd1791ceaf89a78fb58650623cb32ac19bdcd22864b8 SHA512 ebc439a2ca2f296ba77510419a98ec428f5e9fce6a85273ddc7e6f9b6a0f91a6f3ae4f467182a3ec1031c5bde8986630f2e61835dce3f3c145ecbfb0ff50cb85
+DIST awscli-1.18.117.tar.gz 1846974 BLAKE2B 7da993763f9e3082cf66a39c474e857885b33a6fe4ad136faaa1589e2c7ffc59daf6628f01dff867e8f2e92b0feb2881fab0ec45128b6ebed327454f3884679b SHA512 96e8ef0b217e1fcfb2e6995aecea81501c35ce8d050e82f77d58c5d68e4bd4ed0b0aff9dd91f7b69aac2c6d455d85188e1f855e685b05fc60c9f79630eb7c87d
+EBUILD awscli-1.18.117.ebuild 1291 BLAKE2B 17c30ec2f621a4aa865521cf0fbb9cf460796a1403022686fc8e54bcb7d3db29faa5b9e7d05eb5baed76cbc2d4fcce7798245402a40f8483142cf6aeb29a3ec8 SHA512 598936787f438880d8bb0683465791b1a029d6b7012c94a4580fd458961826bedb27c622934b2cbe1a3c566bb421f8b4ee69ed6829c2d148fd9188d8d56b1a58
 MISC metadata.xml 429 BLAKE2B 6bf226a38913939d1184f9026bb30d07ffdeef758f8a3e953676fcd89bd6fcc1c780b9afe38b209b3c6bd16de44de86551b71c48f8ec40a4772d915ff6c3a21e SHA512 b189f9d0078a3abdb9115365df9cb5ea0b1f8ec3ca10a1b05658d5fe4fb4fb4bab5ad9ac91b095938bed18f875e1336777ac89f23813d0e54ffcaab0fb52054d
diff --git a/dev-python/awscli/awscli-1.18.117.ebuild b/dev-python/awscli/awscli-1.18.117.ebuild
new file mode 100644
index 000000000000..f9d8bf63f0e7
--- /dev/null
+++ b/dev-python/awscli/awscli-1.18.117.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 ~arm64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.16.20[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${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.62.ebuild b/dev-python/awscli/awscli-1.18.62.ebuild
deleted file mode 100644
index e1bc7ef907d5..000000000000
--- a/dev-python/awscli/awscli-1.18.62.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 ~arm64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.16.12[${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.70.ebuild b/dev-python/awscli/awscli-1.18.70.ebuild
deleted file mode 100644
index b46fe39b26d5..000000000000
--- a/dev-python/awscli/awscli-1.18.70.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 ~arm64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.16.20[${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/babelfish/Manifest b/dev-python/babelfish/Manifest
index df182a12e4f9..34582bd8552c 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,4 +1,4 @@
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
-EBUILD babelfish-0.5.5-r1.ebuild 529 BLAKE2B 2f5dad5190c8dc96f83b3233313cf5b5f65d2ec9ac096ecb8370eacee5f2f22789cab327fdee9c00bf52a623e6ee1a58a205dee73cc0b32bbf9346d3006acf25 SHA512 68f18fa7928d3decb16da32d926318cae7553e6458fc4eda1e34e58fc56aa6400c5b84dbd0b8e329b4654bce033b5051a745e2d368971967fd5294d4577f13cc
-EBUILD babelfish-9999.ebuild 521 BLAKE2B 331b3daca4d202f1aa39347f55861455ba9039f013c2847cdf7a8ef3206f85c601916910a776e8907d28247e49d24994dbb020a56ba6bd1feba843d523881b91 SHA512 2568a358b19b9b2b91fd2bd04f0e275dbe1bfe43b78f6d2d55bec9aef5e2095c74a220794a3bfb1cdedcfce2510a63003ce1452556dab9cce5afea78db6dfce6
-MISC metadata.xml 295 BLAKE2B 8753e4e51cd05d5389050cea0d9c1c105c22f795affe060fbcd4b8746e8ea4bb0c424e6c431678e820b358c599f4cf32e5d716da9b37ece8c9897a73ab4b44e6 SHA512 837f0811f7168be64415b914c7d36900ef1965bf133d635e5e61f1fdecb7bb6fa462fafc7a794ab1264d7603d748fa0d65c8a176dc1b89962561a562b7b4eaf8
+EBUILD babelfish-0.5.5-r1.ebuild 451 BLAKE2B b21626b5e93bbe7c148831db945bd7e8193f647a74324c79f18160d51ab2453925304949cfe8745cfe59f8c122eccc4e690c449325cdd61fdf4efcf51c3b3b7d SHA512 ec7019d52dd7a57fd3da6582c70bd2d17ff27a2719a262c817e8df367f5a82762be35aab9c5462ffde12bbb7100b7fc22998dc9afdfad7407e6bc4c9781233a3
+EBUILD babelfish-9999.ebuild 435 BLAKE2B 92e29c09eca9a5362b6fabc4e2ee7eca4820c9d192b0762465fb2846295d57754f2175d35f0df72d632e1388696aa2f9982a1d6bfef75afd428c621c0119caf6 SHA512 89d6949ef625f4e04589c5bd62bb50cbd28ce3713a7f50090cb022fa05eff427c27f11773310fd2e3f41aea519b880327b1923376e798972caccc472f0120a04
+MISC metadata.xml 319 BLAKE2B e16594ed95b5c5fe602a2606ce330499c9a42a5b8f5ef45ab1e23c27fa2c3bd83c2f9c9c9338ac93890dd4f13bb50968edea9573b73096687e04c00971a7e954 SHA512 0b2b5fe7e255f3534eae94b6d637ccaa16695f054454d15d93c3972d530b0311defd67f8aa9e7c4a0ec43ab55baf29ff78b6ae48fcc1a0e90bf9c2fab4ffda75
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index 878569ad886f..d279ec9809e2 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.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,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,11 +14,5 @@ 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="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index dcc8f1dacc4e..382197499a3f 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.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_{7,8,9} )
 
 inherit distutils-r1 git-r3
 
@@ -13,12 +13,5 @@ EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
index 70240e51bab2..600c19293e34 100644
--- a/dev-python/babelfish/metadata.xml
+++ b/dev-python/babelfish/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/babelfish</remote-id>
 		<remote-id type="pypi">babelfish</remote-id>
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index bfbe80e45c52..f2d73181c488 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,5 +1,3 @@
-DIST backcall-0.1.0.tar.gz 9690 BLAKE2B 975944b508a4488cd78620b2f6efa8b0ebd7404966db5a53e409000c11641c979abb269289d3e570d01dc50961c881fe80ebbc2c6b79a01ce563d4e3f855af63 SHA512 359c483fbc8998fc2420daee2a6af7566c47fb03f64e465aa226589a2f98a4b219ab5e5b90e5f677087827a1ac658c02ec3062e9ffe9ac1ebfd9db3bb40339cd
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.1.0-r1.ebuild 488 BLAKE2B e99b8b5634e20f6d11cf882759b1faf175a25e1d880c49c5aed0419f742ddb769650ccb1989917f8583bfa31ebe7b7281539656fa0c5e12dd33d7092611bc1cf SHA512 68a05026b1696e375be1b920b6a56b9b864182d122e1313e988d3d8faf578635f96d7c18ce69525fa49da8810af6b74ead507b63141fdd88d81fb6638fbc27fc
-EBUILD backcall-0.2.0.ebuild 491 BLAKE2B e61d16b9ef5129a73cffb6e261b4de402148b93f7afc8b1d400b8ac93a9a1237318178f3280468d6e18cfb93470e6df95f6f9ee47ea7038359995daabef12407 SHA512 66d4124b0ccb29a3791566ac1cfc0dca939d2190c7a4462e6d0aaa03e96be1b35dff52f3814d276d582d184de8819b2edb8cd0445d3c0d7600be65812c70b5c0
-MISC metadata.xml 311 BLAKE2B 7930b7db6a4df8fe11e5490dc1df86b4468954db1a5d7508e95007780b5df1cfc07a2783638310cc9d52ffee52ffe702d4f6f46146d8c88adb4e9036bc5de8f2 SHA512 bf3b5d9da6f976f24f791baca8e2703dca2fa1e7d0e7e3958951147770c0448300b6875c405bd4d09cec2561ad6856d4d562a511c57e94f342adda68538708d0
+EBUILD backcall-0.2.0.ebuild 487 BLAKE2B eb26983771b311509dc51d0f427ba29ee9622ec25be61a590fd55ea22a730060b54a8423d4eab87bac27c8ad3b752f68e8184fdfa09da8a418787687cda6ecc8 SHA512 55364c09b350327233adb2fec9043cbb82300e7016f1bf75e99c39898a170b30a52270eef254e35e8f34790146d262682ee3164045c7d466a54a67b34041392e
+MISC metadata.xml 335 BLAKE2B 558ac1afbb0fc8c1219d42695ebf1b74214252209d6faf39f23acf1c8512920d1874cf5e69ec13b35d184cd07eb2f0b7901f473d2b9135e3adca0ed279db2ee2 SHA512 167da4e5a744c9327b5dade5001d74d418a6426597ed988db29b083b1d39d66cb2714ebc2a812a91430271837e8ebe6f6512899387309d308eefd2744a4e2531
diff --git a/dev-python/backcall/backcall-0.1.0-r1.ebuild b/dev-python/backcall/backcall-0.1.0-r1.ebuild
deleted file mode 100644
index 4cdb8b03978b..000000000000
--- a/dev-python/backcall/backcall-0.1.0-r1.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..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index 75f09c046268..f379287d83a9 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -12,6 +12,6 @@ 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/backcall/metadata.xml b/dev-python/backcall/metadata.xml
index ca0712e086eb..787d25753065 100644
--- a/dev-python/backcall/metadata.xml
+++ b/dev-python/backcall/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">backcall</remote-id>
 	</upstream>
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 5c8c6f62b8f5..4767d145668e 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,3 +1,3 @@
 DIST backports.lzma-0.0.13.tar.gz 42552 BLAKE2B 85cff01ee9b5481a056fe6fa993a44ec3799eed3ef8e12f98f7b94d8af85c196c3244df4555b957fbdb566416c1bfaa4e8654e16115c9bea986a72bb9d834b3f SHA512 e022de691bc1eef917286da40e2c0ee477300a0af20fba9e972bffd3d0ca1155d5d2607e7601e28d70d1e721b93c785f81adb1c7c73172659ab7615708e55aa2
-EBUILD backports-lzma-0.0.13.ebuild 1069 BLAKE2B ab0585f3f03ee1dd4d44c4d08e8772c6fb57df1d46c835aeea632f0fd0463d57bb8c8d0095b9057e278d27be7698fc195df2c12d110b45ac3767dd0b957a17b6 SHA512 66d6458b1725f6139aafb54385c9b27e6331765da85c58688544984fd6b3ab34db2e2fd9e8368cd76e0655d3e23ae040ea9263e44c174492cf01a034e12ffb5d
+EBUILD backports-lzma-0.0.13.ebuild 1188 BLAKE2B 53a9de35ae4e7fa6a5e55dde5f2b1e8dc7da19937d8fb861f6655f83e067d8902b5a9f4c0e8768b295fce4131d3a21cadedbbbc7b8f9c84a7b751c54387e2c20 SHA512 e1ad1c476e4b2a9496dd386a1d0d9174df42fb216ec5a09f416169798a1e16d5eb143a4991c0bc93302e50d24f39d4df17577a895186d0cc41fde508fae1c872
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
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 63344d21c828..38f82d82fa25 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	# unforce -L/usr/lib
+	sed -i -e '/library_dirs =/,/\]/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	"${EPYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index abcffea91873..d0b45fd8720a 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 1017 BLAKE2B c7dc0528213d02c07d9cfec42c652df2ec5458609fc98dc46e858a7b2fe2119f683523a33baa06c7b3fc9f779661eac0dd7b7e2666e12e48ccb7602e8cbc6279 SHA512 914aac0b3ec46296b2949529eeb2cae326227fcf83f55737cf329fd1694bfdc8b360bd91ed04d97bcc1e7d4456f1b9a280cedc6a1d7550a36ef76f88a974ee11
+EBUILD backports-os-0.1.1.ebuild 1007 BLAKE2B 8b3b739ae3db9f2387bc681bf8e48574bae2cb434d337f69fe36c81c6e507337ab17cb1496f00edfb3f81483a518540f62ddafede294cd035769f243d0fb1a3d SHA512 5cf3d591cbed44976237f00f89feaa5aed8c8be1ceb6c96a746c53d738e7446fd4fad6aab46055315c565849bb79038e7d556c6c16380163a9ac60760473f382
 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 eab837aadda7..ddb578ca2545 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Backport of new features in Python's os module"
diff --git a/dev-python/backports-tempfile/Manifest b/dev-python/backports-tempfile/Manifest
index 56f63f2e9da4..2dbd8f8f5e4e 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 1162 BLAKE2B 9c2809372ca42be0182c957510f471ccd766ecaa86b09e8a5e22e0013af8680bb8bfc964bb46a4996dab7109977e7753571f326174fb81a3df8c777a5996ef1b SHA512 adf5c302b726dbe639e53f561695e479634d18552b31f74edd4ac5e02cb8040c3acb5024c1115f2fba7d8ee8b9bf0a3b18126adcfd7afe96b4d0f5d1c35abba1
+EBUILD backports-tempfile-1.0.ebuild 1174 BLAKE2B e301633140bac851414894b790d12451853284914f63e33a1c2cd3eb704a4f277ffd536a240c8a3b8f9777bd42cbe8f7d9ba00e980f68e4f41584d580cfed118 SHA512 372048ef19d3953ecd0dd28c53e4089b46711545e016da3a2c6e842f38153282867c43d1c93ca6258c3000bfa3e9fe3a763026f4a9a9541244f29d36b7f57c63
 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 23e57dc7bc5c..7a1f774c2f86 100644
--- a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
 	dev-python/backports-weakref[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index fd6fbb2d27ad..084242097778 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.5-r1.ebuild 1611 BLAKE2B 293b9b36a5e8cc3b26cda944c606b48116096f7760483fc296cf56dc2ee8e8c21166f9a6f97473cdbfbaec3adc47f7a0cf94a53593400c0e2021a9b53a4e294c SHA512 d0d3c4dbfe4c2d0f8d145dc5dafc607ffb86a34b55a567c96628aa8a79a556fe110431937e17a15ada103e7dbec2dc423f703d1645a4e29ccbad9430b0a132bb
+EBUILD backports-unittest-mock-1.5-r1.ebuild 1605 BLAKE2B 2a56838ba5cb467358546852341ede30f043acb9a44960b118cfca128d5779f74f6cfa1d304f0d618e8e3a95794be0d0f687c036c5593bc5e2ad53c9e01b5654 SHA512 79e96f3c4812a8ca16709b07edb8377ad8a563379f2b7027dbe0762f897a99ef73432ec53f2ccf956051070270c749fa8ce4a1fc373361890cc60551772b746b
 MISC metadata.xml 681 BLAKE2B 22de012464edfac5f0affab83c4cad95d416b1c822f9f50e788e60cd4a5d438ef3ece606c55621896ffe1778c1d17595c23449bf41199b964a7c153cb98e90bb SHA512 161c7de36344fbeca29706e7a7e12b9acb1e22ae82dd179b336054b64e04bea7a5af53386c0d4a06b45584146103cbc8546e83e6f5aa51eb345243aee8a6bf15
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 d81eb8d9fa1b..3cc0eb0d8c6d 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
@@ -6,7 +6,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}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-weakref/Manifest b/dev-python/backports-weakref/Manifest
index 3bbc1d48933f..fff0961d75df 100644
--- a/dev-python/backports-weakref/Manifest
+++ b/dev-python/backports-weakref/Manifest
@@ -1,3 +1,3 @@
 DIST backports.weakref-1.0.post1.tar.gz 10574 BLAKE2B a53a64dc22d8d1ac93a157bef4a858156f620593ae3d9e69b99762298e9aed73a04fd0557d98f53eed8816e746869718bc028aeda619330ce7c031f8b6f346b1 SHA512 27fb7ffd3313e62ca5ac220efe5ce0a9ae2ba8a589c80d3c5cf98741e913da7f713e1ecf2af848510383f574fa3bc3b7b3c21e6696f0a252fb517fe836c07cc7
-EBUILD backports-weakref-1.0_p1.ebuild 1129 BLAKE2B 73efd969a264e6c192d110bd04af55682f811fd460435fa4b6a02fbd1b7ab6f6f3d8d2384c7002d00c8736c7a4c6351c128485657cb5af2b74837de4afb5f49b SHA512 f67f7bdf4cde85156956bc9706b3e0d37d3e4b2d33cfed3ce31e7b4298dedc397b08c1047a4a74e0934dc77fde9bc9466ee7c855d16524636b34bc4378774ea0
+EBUILD backports-weakref-1.0_p1.ebuild 1131 BLAKE2B 32d78344a3ae3758b8c16323b8860679d6cbe58545fd106ff4bf9e674fee44443dd452365e9a8dbf5f341cc9dacb946f5f3b105adeaa8c4e3b87c36d3709cd6a SHA512 2df1dd103514b96ef3d30bd88f959aef76b7be79080487ae9535fb3b0489693ec2bfe7a4294e0d958b4dc0299f294b9e4703d92fa2e083b19dbc50df9cc593f6
 MISC metadata.xml 466 BLAKE2B a722c32d4462c21ac4fc1ce66a92571a26c283d10cabb187a8cc107604632c4ab79ad74290e07c318b3ee634a624459b667b9963c2a0a8485c470fba6ea982aa SHA512 77a6a25be5149dd2b146364f46e70585320f03cfd88f037f012df3601a8d74c789f33ab111d99d77667cc41be80050b398536e0b687014ac094436a7605b62d6
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
index cb1d11c06227..41ffcc609078 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1.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
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 811b0ebc3828..e82f89a118c9 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 632 BLAKE2B d4de957ffc17d7af653f807b05d64ffd7d080789ca49a377339ee93fdf41ae6e7f9557707a18b7a1dd65b1dfeb0b6a7036f0e92d4f8f3c5af7bd52dc362a18b7 SHA512 bc39fa1455290f9fc2a51e268c86af74804edcf2a2ca3aabbbbca8823dfd523a58a6515a40673d05dc6fe77787b05832e583ab220b97131bdb7ba0f324f8b2ea
-MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
+EBUILD backports-1.0.ebuild 592 BLAKE2B 244fd054bd032a1ba4211d0041050280cae70727e5b5f5141936af0621aeafb7e15818d3670c09c2fa22db7f4705f495c9e183331dddfefd43a4ab017f62537f SHA512 1a1b56efeb610740883264d46f9f31704310f40f688a2fac846de211cb767fa52f7dcd922a86de2551ee1bba6bc567f114ae477e6473ee4c8b86a621b3b441b3
+MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index dcc2f943f7a1..ac529fb3e105 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://bitbucket.org/brandon/backports https://pypi.org/project/backports/"
+HOMEPAGE="https://pypi.org/project/backports/"
 SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
index a138879cbf49..e24dd86faa2a 100644
--- a/dev-python/backports/metadata.xml
+++ b/dev-python/backports/metadata.xml
@@ -5,7 +5,4 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">brandon/backports</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 6250b102dfb4..560f2f8fd2c7 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,3 +1,3 @@
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
-EBUILD bareos-19.2.7.ebuild 535 BLAKE2B 36e29280708faabef8209da385989a966e9334ca6bbb5c6401c349f8811cb66c9230feea6c2c33d0237cf4a31401c4ae6ea2a7ba039f1945baebce445a683fe8 SHA512 959a4475cc6ef5e68fa4ff10d6226320e41fea65a09ba07228ea6cf60b7fbe2c2f2ff9180e86ae309db2f1771ec82c151f4177c23b1351ed7a6c2c7ae0cc3cbf
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+EBUILD bareos-19.2.8.ebuild 525 BLAKE2B 201f92ac9f2846588d9a5a50ed424417a1e35b5e9dc5a0db879b88f0cdc4ce2f21e999e7a3495e7e63430a31e34302b8fc87aa71a14c489d6617d41a5e77c7aa SHA512 f65b7da77d707f0e258513e9bd5a16a2620e4b8dff0e9e07cbffddbdc19e7b1fa55cd764b3baef5c977a8b2704e4269acf034e4747e8317d4392e05de9719056
 MISC metadata.xml 328 BLAKE2B 47dda9d82b55f78bbf9b78f8ac463db48ede507dd62dfecd1fec01426e834f2669203956b0a5da31ae133bb0f362ab1263123318babf65abaa6619e1feb209f1 SHA512 c16ba92ff73595406f24c4f2cb18bb2059d7990273d2c91c4f83486f1349ab0ca3d709f27f929956987b60a24ff8426687dafc7f79be0d32df0a176ee2528d93
diff --git a/dev-python/bareos/bareos-19.2.7.ebuild b/dev-python/bareos/bareos-19.2.7.ebuild
deleted file mode 100644
index c66b7e5732e2..000000000000
--- a/dev-python/bareos/bareos-19.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
-inherit distutils-r1
-
-DESCRIPTION="python bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
diff --git a/dev-python/bareos/bareos-19.2.8.ebuild b/dev-python/bareos/bareos-19.2.8.ebuild
new file mode 100644
index 000000000000..cb507a579a96
--- /dev/null
+++ b/dev-python/bareos/bareos-19.2.8.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..8} )
+inherit distutils-r1
+
+DESCRIPTION="python bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 6286b28e3c34..d4a014c86952 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,3 +1,5 @@
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.7-r2.ebuild 759 BLAKE2B 357b082c2e69725ca6332a21193a4f7c9a8069a8eafdffb914ab4087b7753a355c9ab075a6777a0722e19c92bad00d7951a461deb9c23c889097fabe1399ef52 SHA512 b6d849e19900c83797cd45d1a51f92a5c7bf274f50ce08b2b9aa5cf2349df014287b7d28244e677fb78ad4b973b662bc20e6067cf9f602e3cc7487729bfd4518
+DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
+EBUILD bcrypt-3.1.7-r2.ebuild 749 BLAKE2B 616ac74130346028188c70b150c5c9095de9bfb47d5d1aab97435db1f0db8f4cd73ed6386dfafb9698fb081584d9f844e0f417633e6ee906e112c65b544bd941 SHA512 43a77dd7ef01017083875e72f41432e69ed850c260a1929444eba09aeb5ef8f0ed92c96ca30d99c6c165f45b980dd1910505a4e3897eedf37fcd8752719929aa
+EBUILD bcrypt-3.2.0.ebuild 758 BLAKE2B 8c77697b8d3ac4972b61fcf1012e03fef6240f4ae4fadbc3760f78629f9ef8c86993abef9add8758a7f7a54d8a06ed1c8f37f2fa298958b9150f971a4090d8bd SHA512 9b98d8f570ae4962093be77a52fa67578edae225cc323b45885407a4d5663aa94ece719f01f4273ba23bff63912060ccc8ba476289c16e5224e7f9c30360ecc9
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index 9148b9379f84..042389cebc98 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
new file mode 100644
index 000000000000..cc0bd6f01842
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-3.2.0.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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/beagle/Manifest b/dev-python/beagle/Manifest
index 86c5596375fd..a710f0f62836 100644
--- a/dev-python/beagle/Manifest
+++ b/dev-python/beagle/Manifest
@@ -1,3 +1,3 @@
-DIST beagle-0.2.1.tar.gz 12628 BLAKE2B f1d68134065a5d71f6662770b0a6a7c201a3019b57c12c3200cb59db00e664b5bba27b8a4029c0515e8095ac3c7153058b22d43e3245c3012e52e2ca734ce2bd SHA512 4cd58c05764dcca8959b2137f5bcfe627d83b576878eb77ae28ae38cd5d2cef16d045ed5d186fdf7eda6be821abe4d2eeee106fc505a5e59f027f59ab82ce653
-EBUILD beagle-0.2.1.ebuild 676 BLAKE2B fbdc4fe44e6f91847935beb5ceca0ad85cfa3e9728cefe9d49a6f7a70be9607792719076f48b8e9a0e854bf259b0eba06399c7c5418e4831b6b2b7991d17cba7 SHA512 47e51658326aa26019cbcc1165e616fcb40e7f263b31a50f5bdee3149f3d71dd17491326c713bef4e4f1b49c5a656e7b1b2253cd8156f20e680a44bbce05021c
-MISC metadata.xml 574 BLAKE2B fdf6ea50667c20fd2eb8a0f7d1810b4828b99b482bafb5a0fa013818ebdddbdaaa1fbc0c3582d8b95403c305e2605a7b9737de50a02d0b2665217f525cfb4c0a SHA512 0698273824072d90953026383d2e1fff8cb1631104097cafdb4e4d853c25cb4c4db54f7870a8dab15026d8faa06399983220e93da846202a4885a876b94635ca
+DIST beagle-0.3.0.tar.gz 13830 BLAKE2B fcf3dd0ca2e38aa9c8a737553d86648614be8b5833985d3f3ce2ef608e73884d5e8463a36d157eea1179ae70c6d7ffea19a4191431a0a177962a9bb221aac345 SHA512 a7c685a20e2c431b92bb82891c8d183ada256cb1fe922f13470cad5b436b431232ae4d34826cb04cb5e6862fa5092624b287fc60d401f37f941b255ef55f30c4
+EBUILD beagle-0.3.0.ebuild 686 BLAKE2B 000171492adfb0a3fad1fdcfc561c3a2d6dd3fe1758ff84f994ae8e26f0d291a3ae84233da53ecfb8d1b6e0a140659036c0e32262109220615854e532609c37e SHA512 d5a1b10005407c743601bc4eb1d1f4f2b72b5512989b1affad55673f69516dfe8b3f29ae3dd76b265879b97044a1de1dc32b84c60d1d8ec5308d95b30e5f0cb3
+MISC metadata.xml 458 BLAKE2B 63d529fb7a40fb0dbe4f0333b600b318590174e3d6565ec2dd3e9fa6fa22558030918b70cd930f035c87a1fda16fa1e3d7bc898d57f1cd07c80189bba27e653e SHA512 5cfbb0e1a95b2ac6ab16771820912db1f8886ef67a7ef048f1e4c22a6cf2b54e8210791f66da458d3153a7843108900e5144f539a1b25b8ad2cf24bcbdc8a1e2
diff --git a/dev-python/beagle/beagle-0.2.1.ebuild b/dev-python/beagle/beagle-0.2.1.ebuild
deleted file mode 100644
index b793dbd0fc41..000000000000
--- a/dev-python/beagle/beagle-0.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=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Hound, the code search tool."
-HOMEPAGE="https://beagle-hound.readthedocs.io/en/latest/
-	https://github.com/dhellmann/beagle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/cliff-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/beagle/beagle-0.3.0.ebuild b/dev-python/beagle/beagle-0.3.0.ebuild
new file mode 100644
index 000000000000..64fefecbcd9f
--- /dev/null
+++ b/dev-python/beagle/beagle-0.3.0.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 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Hound, the code search tool."
+HOMEPAGE="https://beagle-hound.readthedocs.io/en/latest/
+	https://github.com/beaglecli/beagle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/beagle/metadata.xml b/dev-python/beagle/metadata.xml
index 21e97c0a0755..d3c102d35dc3 100644
--- a/dev-python/beagle/metadata.xml
+++ b/dev-python/beagle/metadata.xml
@@ -8,11 +8,8 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Beagle is a command line client for Hound, the code search tool.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">beagle</remote-id>
-		<remote-id type="github">dhellmann/beagle</remote-id>
+		<remote-id type="github">beaglecli/beagle</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index cf18f5deb919..fcd6aaf48438 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,5 @@
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
-EBUILD beautifulsoup-4.8.2.ebuild 865 BLAKE2B fddd64a95914844deee42bf9e6f16ab74899b5aba97531ed8f0c28569fe38cceb7ae4873468749d1c05bb5cb5f73abb4e80489cd744cc55723783751e413a463 SHA512 7dc8966ebcf3e1b55e1e7e83a9c62a15721a94058a766102df6469acb34b4026c31b36eafdb02797151976291b610dc50eb4512ea6cb1103f4bf3fe0d4ac0588
+DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
+EBUILD beautifulsoup-4.8.2.ebuild 868 BLAKE2B d835b9cbd772d58f124ead4a7195f9b54820ab111c936e38d6c112d3037ab799cf8489d691f9be03785e516998ee7fe3f180989d99208a81022f678f5ef21428 SHA512 8a9f1b0a898560a83597b1ff09a9b84f779483b28da91ce2204104c653f8588f7d4292cb681352dfa8b15b33fa6e6cf5ac0a519f0957157e17019610b4bc668e
+EBUILD beautifulsoup-4.9.1.ebuild 873 BLAKE2B 7653e2add6dc81cd5d78e02721a65bf1ffca1d06f3d237c9d1cba08c51229e0c93b9cec2fe422006f192e32198ef5ae2da5b00fdbd850291e35de615e343b30a SHA512 28c8d0f7cc910d02fcdb3813d969d6e90e99a7d4e04dece0223654121d503238e2732afa965fd73e3e1c3eee71018bf25bb2cd69b410beaa5a3efcc8d353f1cd
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
index 67171073bb41..7721c03ee437 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,10 +17,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
-	dev-python/soupsieve[${PYTHON_USEDEP}]
+	<dev-python/soupsieve-2[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
new file mode 100644
index 000000000000..bea89dc44f97
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.1.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,9} 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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/soupsieve[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc/source
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
index 494a84296ada..1ddb08383ed3 100644
--- a/dev-python/betamax-matchers/Manifest
+++ b/dev-python/betamax-matchers/Manifest
@@ -1,3 +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
+EBUILD betamax-matchers-0.4.0.ebuild 600 BLAKE2B c99504fa951dd26e5e2f1ec6ab8116831ada9bb254702bb1484fce3be93bea887cf1394c46a794abaac18b9592fbe4e21ad71bae5146cf5545ff909f78ec3d7c SHA512 ab88ffa9423f9e7b14cbe8c33b93852658eb032c999d69403805156ed97c79d44baf2fbfbb54126cf23202f8b1234fb69e378636af51e6fefc12f6977a308bc6
 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
index 18539cb8ed65..0d16c3b3f718 100644
--- a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
+++ b/dev-python/betamax-matchers/betamax-matchers-0.4.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,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index c3e868edd69a..efa4c68a14e6 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1191 BLAKE2B 322e0e82bcb20a224f8bf78149cfb46ba5d6ff9c6036c0f4674cd4b8e6d2dc6b1f3031bb7d1391b127add5d75ffb33f61db77fd3704ffd7dc42831df45527f56 SHA512 886642777b5aa44dd04d3cdf92304739aeebd153a5d35823a094415fe32e4b5c501caf5f0df2b688aa7bbb8b3e9cc16277663ddeee136bddad2acb6a6169a064
+EBUILD betamax-0.8.1.ebuild 1101 BLAKE2B fbd5531099e10d04d65c74977eec025ac519c037110a62d6ae91a91e6bba50c18226809f267d26356645bef278dfa47aa8e4b6c9fadb12ef1095e6f6c74f8edf SHA512 b2f5cf1be0140aba3bfb3797d3d5211ebcd3c68f496368ba7c7d0e0a7e8a754360044e39b8d572f2b1c3ae5fdfcb2df2b1001fc3eb06187e67496dffb366b542
 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 6fd86ef812c5..61bdd95d4858 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,15 +13,11 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
+DEPEND="test? ( ${RDEPEND} )"
 
 PATCHES=(
 	"${FILESDIR}/betamax-0.8.1-tests.patch"
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index 0bc94c94cf8e..3fc580d1682e 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,3 +1,3 @@
 DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
-EBUILD billiard-3.6.0.0.ebuild 1135 BLAKE2B 26a4ac6911bf55933af52c70884598a98be4083a1462f7b1eacbb0c3b3bfb3087a6eed5b050958a60ca77e5f960f6cdcfa9bd0bd65020461ba15b50ca741f89e SHA512 97b799414f91571d4559b9b0c7a4fc5cc14056f402013331b6622c78d70e136e5536c23b22bec9874d481ef6b9a7bb920e9d5d315c87c54068b25cf7a6dcdfd7
+EBUILD billiard-3.6.0.0.ebuild 987 BLAKE2B b497ffe9ef520fb5d911e04ec361ad2a517ff1b29daa419bb4491da1f2aa3af4238612f1b4d835fc7deea57a390bc268be50a76c0b1d035757ee67ff2250e080 SHA512 abd88d782d30b5ea1f01b82c6676e50bab476a361b103533ac10eb43f15bc11f190a11c56d7cb42a555784c5b1795e87c93a809d9f99bb9349494418b58e01e2
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
index 0f1f5c0d5662..b578e10b1b1a 100644
--- a/dev-python/billiard/billiard-3.6.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.6.0.0.ebuild
@@ -29,14 +29,6 @@ DEPEND="
 # 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/
 }
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index daa43792885c..ee5d54ea15e7 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,3 +1,3 @@
 DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
-EBUILD bitarray-0.8.3.ebuild 531 BLAKE2B 48ed88b88a0d69fbc52329eac9fe4d34e752ae110af2bc3faa3323cce94168eb9d1462af34270efb1adffae46a762881e1222e4b28b9225542388e998d268721 SHA512 53e7db257401a98b189a5e8c73cd05a3dd7c62edf79b35ff2d8ccc80d40aabfbe8911fc49246201c4dc90d126958ae2f3daef42f05f297475735c0d23868786a
+EBUILD bitarray-0.8.3.ebuild 527 BLAKE2B ce6786cab1edff56808a905475c04fa603a8f64247fbf17c891e77c62a9f44377106187f51843c1d77c04ede5fc8f68567404f996eb53ea791f6329b6360d818 SHA512 1a345e9d4691846082e4438ff4cf48ed508e7b063c85ebc5884a195aea35fb37876d1166211d88dfa022e2e2d0bc163b5ffd4b9cdbe4d8e6a7f699eaf0c32d8a
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
index fa78eb627c03..43f4112ed502 100644
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -3,7 +3,7 @@
 
 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/bitstring/Manifest b/dev-python/bitstring/Manifest
index 7dce6fe41bcc..8d50feb2823c 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,5 @@
 DIST bitstring-3.1.6.tar.gz 751557 BLAKE2B e35735fac2f99832585e909b48faecec2c03f0bf41cb73d1eb1361269811c32a921c8f61762e107b2065adba38bbb40103e53909ed14dd84814eb323b73bc911 SHA512 d78d91f92f60044948199e4fa5ec48c8007268f725e5230d6c8be44a6ced578e61a2c2f8751822f191a909057f38d358a8c944f357a5f9ea98adb6baae3a0da2
-EBUILD bitstring-3.1.6.ebuild 732 BLAKE2B 002589993c5c235b4c09daaf4f3edbc38213fb135d11de4a3b87992126d45b00a03139cc90a3aef89409fa867b257b461116ee5fd1b6a3e37f61757332330b53 SHA512 753e53fc64bd655d0bc55269451954fa97470fb5cff577214fadccc5173d58040f2e5b214584bc549c88184ee35e9c9f61fb585b94f2a288c0d1aab990fcea4d
+DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
+EBUILD bitstring-3.1.6.ebuild 731 BLAKE2B fe8d3030e0ac1b5e737b3d33c10e117fd1bdd8444abc25f7b5f3a8680c2258220033ce625cdd915a85db511812bb9577cf906d070c8837bcb81048e4944f5c63 SHA512 a39308c269f0f84f3b37ec23450fb0b0c2abdac058554baaedb3ae14952fee6028b8e24446c2c1d88b491f366014908b42df77432e87dc5506f1873ba144082c
+EBUILD bitstring-3.1.7.ebuild 605 BLAKE2B bcd7b98ea6fb14a96082ee435631bc8b577267333e969a59884e9c76a5ed5d200c8afb08e766ef937cc5fa2720794fc256d312f5356f0c4a97af995f823d35f6 SHA512 a1fc85e0448860ee334772f00ec2098d8095a25a9f3503b2468320ef54dfd61983c65db6e8945aee67bcd57616ffb9e57bc88e138545459868da71a605eb7393
 MISC metadata.xml 661 BLAKE2B c6adcf300502376851157d3fb869c9327f49f4ae61f820ff59379816fddae11ec5c2952eb708d817facc9899ab347517a41c1307ac0bab4dcf34a4ff877bd704 SHA512 666cfe84898096825c292dd1e37af3b8d962f199199b8a73813b366fa4c14cc3a5373c4ed4fb8153b8e1c05321f4dae87204e1bf5a53e6fe07ab0117704b7f2d
diff --git a/dev-python/bitstring/bitstring-3.1.6.ebuild b/dev-python/bitstring/bitstring-3.1.6.ebuild
index 57771fd55f93..f30abb4874ba 100644
--- a/dev-python/bitstring/bitstring-3.1.6.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python module for creation and analysis of binary data"
diff --git a/dev-python/bitstring/bitstring-3.1.7.ebuild b/dev-python/bitstring/bitstring-3.1.7.ebuild
new file mode 100644
index 000000000000..1b5e8ad15076
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.7.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
+
+DOCS=( README.rst release_notes.txt )
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index a34930dfabf1..4f08e88349a0 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,4 @@
 AUX black-19.10_beta0-setuptools_scm.patch 706 BLAKE2B da031160089a1bf505656b301c0d8b43736a4dab641d4f1ea9cd5c98286e9ed10415cfadbd2197499d8b91553ff8f664a0e782593fe7ae10322b149001a2133b SHA512 ee8356ddf6208a20fc93e16142a5ccc37d471dfddf60e0b40fb4d03045ab2fc7e5f3c547a0cb1dcef032d8a24074d60e8ec413be36e981d2d9dfc39d7f93e5c2
 DIST black-19.10b0.tar.gz 1008099 BLAKE2B e8a6e286e7a60f880f8b5d37a2b07278faeb4efffd15feb511764e449c36b4e54d5ac5b910f583a15948a2f92eb5e61ae210073be7a57251b2b01e69d2e5b373 SHA512 778909c26afa65548a77524451b50a2692a7b4e297fa52fc80567f7fea94dd5aae9e61cf0f1de718c28a733f1813c8e2c6974ab58e6b0e891de331bb4f245968
-EBUILD black-19.10_beta0.ebuild 1693 BLAKE2B 7987cb2da1ed8d6d93166a73f4fae5f0682538499c71e395b252ac9f3a94e842ec8242fdf092b4f3862b8fba300bc33b50de095c8253a83b88a0a80052c1c6a4 SHA512 8364031096552f27fed2498b3856e1b3c66c819838bd50d86d20e5a950bb6ad4c25e75b39736699709014f62c083f99693ce201655800c34916f54007cc9e1c4
+EBUILD black-19.10_beta0.ebuild 1711 BLAKE2B 543b88e3f24b7ba39485fc96013c47f36238b59ac02d457d6cbd0eddcb85d02abeacc688460d3035e70791b453c652f87c538f0393692b7a32a6d2fe6a65b668 SHA512 07b09e094417b1f36128fd27f4bf7d7b3401985ed49c881e56779e1934730a186056583c1f629a24b3e8b79fb1ec6a6d745ce71c9102ac588dc54421bac50a27
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
index fa3a4c50efbb..ff49d1d84e1d 100644
--- a/dev-python/black/black-19.10_beta0.ebuild
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index cc25bf4fa8e6..e9ebe95a3754 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,4 @@
 AUX bleach-3.1.5-py39.patch 1043 BLAKE2B 9af8ba9c8e05eecc96ba6e85424e748cbc8c36ff251144fc32b78987f3c1b902fa725c05aa0d750184cd4ca98ee0a3f577020d7351cb0869949cbe038f819444 SHA512 c1b9b81b3a2c79a468aed858d75be143d441a10ceea5ea95f131e9e84502633a7c35dfead709fffce1c137093200123bbdcaec4d71180f747d839cb945e98afa
-DIST bleach-3.1.4.tar.gz 177813 BLAKE2B 446740fcb7f2aa137d7353b0fbbebd57db9d571248b67f4d0a6a47baf3581aa3793431f68cf340bc8a0478d21e84aafca17538d069d74657285fdc4a06869586 SHA512 da233794954aad4e63e334d3c3bab9089e7767e0d784b8c51d12d2862ac6ed73ad5122b4d9cfd291ba7d9fc86a4a3b515429d7e383f241a46e3290acefa2ffc6
 DIST bleach-3.1.5.tar.gz 177972 BLAKE2B 6033871f757247f05ee67f66b3596c7a76a9bc5105113206bc8749f9ed103fb6a7c91630540f5f17ddc17e261b24043cc2edcc2562ea7f4cf54774080854de32 SHA512 20db9ab6924a1e884107f30e1059f774b45fd169d3965a61a4ff028e3de17e30be81474d7da89d9275b2173a005c5504a9d11f0e0ca528bf36a9bf08aeed0607
-EBUILD bleach-3.1.4-r1.ebuild 867 BLAKE2B 4ee516e3b87a244dd4e065ab8ebc75e17ce257ec5d32826add063b5f71ac53409a63c3d2be2a1b4459087250dcd9be96768fc1254a1735f7ddca0619f411347d SHA512 be209bccb8f10374c9090042f030177176684e9cde540a18c30976405ebbb59a7a4e5fff7a2dfc45c6fa02c559ce8a3b5626a7f9e95b04892e8c22a07d873d0f
-EBUILD bleach-3.1.5.ebuild 959 BLAKE2B 8368842a064f8f783ae464dcfa75ea555e799c0c7cc54dd2e341d4304327c389dcf684334bb3bc06efcd6edda44969adcdc3111b76e9a476ad417020e0bd6986 SHA512 804bcad8b8f390120a7db8f40fe269a842fc68ac7242eb6f298256689cd2aae67d635d2a93606490d14db847fa87efa973256734db90f1c25221ac0ddeb917e5
-MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
+EBUILD bleach-3.1.5.ebuild 940 BLAKE2B 5315ab3d17d8bb34c94476e8002fb39797a250fcc27d80d2742d4fd4d094ddfc1dd05e45444f6129f6f3bde9b43094ccaf5d07a4785180dd84e182a6583973fd SHA512 90b38022a46803687d0cd0ca59d34096b326eb41794890ee39989b0bee48d8ce7434d2dba5b2ccefcfba24eae0065e681993915cf627608ee73e28d3f8a2f7b9
+MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.1.4-r1.ebuild b/dev-python/bleach/bleach-3.1.4-r1.ebuild
deleted file mode 100644
index d80fe336be4a..000000000000
--- a/dev-python/bleach/bleach-3.1.4-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=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/bleach/bleach-3.1.5.ebuild b/dev-python/bleach/bleach-3.1.5.ebuild
index db2a844f98ff..1143f03d1777 100644
--- a/dev-python/bleach/bleach-3.1.5.ebuild
+++ b/dev-python/bleach/bleach-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~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/bleach/metadata.xml b/dev-python/bleach/metadata.xml
index 31fa019aef43..c644cc3836b2 100644
--- a/dev-python/bleach/metadata.xml
+++ b/dev-python/bleach/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">bleach</remote-id>
     <remote-id type="github">mozilla/bleach</remote-id>
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index dbbed3dbdf7f..0e95d3b5b426 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,5 +1,5 @@
-DIST blessed-1.17.5.tar.gz 14030669 BLAKE2B e2692c6863599462914f1cee36bd487d42fb1e44e15f841d81ee622619da22a34cda4d78523b07bbd94a9a70e41c9b8342d0da650389d0fbe4ef7a46868535cc SHA512 5973070199d16a71d70c6b25b783a92d72f9dd8d27ca5cdb25b18e07e4b351e1cba751b96113665230c3c01bd1916adafe89d4689e2b341a88640535b7f91317
-DIST blessed-1.17.8.tar.gz 6697594 BLAKE2B be279f1962e8643fdd2f03c63292700ebcdd89f29163f72de89d649990663e9677391a134e19e97fc51c64341f2efc9dbb8a13a467f864c04341a55fe31a87c1 SHA512 fbdeea8159f535824600bd4e9b080998d0a8336731c1d53ff5b89c7488363d35b87752b8e424317f64f2b90aec3c62ce3368503b1a864a67c1de48245dc2fbbf
-EBUILD blessed-1.17.5.ebuild 1246 BLAKE2B f91427e6e66f6172c9d3ac7585ce6c6863d8fc9290313ee38967961d86d28d87138cb121ea40dfdc0a4886d99f69d82fd358eaef6d64d9e28fb1a209336c37ee SHA512 adade6c585167ca0b8dab2cc7d98bf466a3e3e958905c0ead79d0151c5c1596105c8b1e9deca72dddb6c7e30c7c6246e1f9778ffe66a32b2abf364e50cbce5aa
-EBUILD blessed-1.17.8.ebuild 1246 BLAKE2B f91427e6e66f6172c9d3ac7585ce6c6863d8fc9290313ee38967961d86d28d87138cb121ea40dfdc0a4886d99f69d82fd358eaef6d64d9e28fb1a209336c37ee SHA512 adade6c585167ca0b8dab2cc7d98bf466a3e3e958905c0ead79d0151c5c1596105c8b1e9deca72dddb6c7e30c7c6246e1f9778ffe66a32b2abf364e50cbce5aa
+DIST blessed-1.17.10.tar.gz 6697685 BLAKE2B de0f687fcfa0c2182173d21042e742cb370768286ce5b3486da1b93b5de087da121d32df2d644de89a861bf785d93a5e8293beebcb2f1bdf66c022aab7054f2d SHA512 e16da345b8631ff2758d60ee71a95af260f3b582a76a240a2de3cace7860f0b6557341a844cda921216ee5245ec3dbc1bf1cc6ab0532f8fe9efd135fee4d3ee1
+DIST blessed-1.17.9.tar.gz 6648453 BLAKE2B 75de7585de7712cb4314ca22fd30ea811e446e1373ccd9a8750526e9fd0b5ea31d4bd0cedbcb35f7814bda32c75f8d58141beb32f131cc8fcfa127e89c255c25 SHA512 0ead3e3a4b96213acb2834fa8a0d8f0c590027a1d3bd49253ea58af9da55fd687beea6b5dfe3a8f7e6f9868967e24e468abcbe260a3cd55018f32d7b81a58d6c
+EBUILD blessed-1.17.10.ebuild 1276 BLAKE2B 1ef99e20d53b684faf5f2aa102d5c80925cc1520d7246afe8da703d4042fe981addafc79342ffd91df8b0971f5b392df6d24a5ea01dadda683c42b23340e3c68 SHA512 5a729cb464295c62968174e58dc860c09bb874927a13bf018ecadbedde990f9af0fa3c4a63531c3f881f1014f4995b83b76e71286a52f792309bf9d969986496
+EBUILD blessed-1.17.9.ebuild 1276 BLAKE2B 1ef99e20d53b684faf5f2aa102d5c80925cc1520d7246afe8da703d4042fe981addafc79342ffd91df8b0971f5b392df6d24a5ea01dadda683c42b23340e3c68 SHA512 5a729cb464295c62968174e58dc860c09bb874927a13bf018ecadbedde990f9af0fa3c4a63531c3f881f1014f4995b83b76e71286a52f792309bf9d969986496
 MISC metadata.xml 431 BLAKE2B b957fcf973dc786a7358b8554d5969688c86974ad0d304ac752f1f48d246ba955a9acbe4ccedd0a670a3039488c1b9dfc6815b08e08e7085fbef39e62c447f59 SHA512 b962ca5f456fe442dd2d88866d9aec050d0b456b53f22900cda6ec304a055909c0befe2de085775283c9b098fc9d7f53351b9e67d55eeca1744fb09622eebc01
diff --git a/dev-python/blessed/blessed-1.17.10.ebuild b/dev-python/blessed/blessed-1.17.10.ebuild
new file mode 100644
index 000000000000..e810dfdd33a9
--- /dev/null
+++ b/dev-python/blessed/blessed-1.17.10.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=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
+HOMEPAGE="https://github.com/jquast/blessed"
+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}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Skip those extensions as they don't have a Gentoo package
+	# Remove calls to scripts that generate rst files because they
+	# are not present in the tarball
+	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
+		-e '/^for script in/,/runpy.run_path/d' \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# COLORTERM must not be truecolor
+	# See https://github.com/jquast/blessed/issues/162
+	# Ignore coverage options
+	COLORTERM= pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blessed/blessed-1.17.5.ebuild b/dev-python/blessed/blessed-1.17.5.ebuild
deleted file mode 100644
index 18fe22388d9d..000000000000
--- a/dev-python/blessed/blessed-1.17.5.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 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-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}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= pytest -vv --override-ini="addopts=" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessed/blessed-1.17.8.ebuild b/dev-python/blessed/blessed-1.17.8.ebuild
deleted file mode 100644
index 18fe22388d9d..000000000000
--- a/dev-python/blessed/blessed-1.17.8.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 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-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}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= pytest -vv --override-ini="addopts=" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessed/blessed-1.17.9.ebuild b/dev-python/blessed/blessed-1.17.9.ebuild
new file mode 100644
index 000000000000..e810dfdd33a9
--- /dev/null
+++ b/dev-python/blessed/blessed-1.17.9.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=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
+HOMEPAGE="https://github.com/jquast/blessed"
+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}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Skip those extensions as they don't have a Gentoo package
+	# Remove calls to scripts that generate rst files because they
+	# are not present in the tarball
+	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
+		-e '/^for script in/,/runpy.run_path/d' \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# COLORTERM must not be truecolor
+	# See https://github.com/jquast/blessed/issues/162
+	# Ignore coverage options
+	COLORTERM= pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index f20f5f203cf3..0b413b570231 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,3 +1,3 @@
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r1.ebuild 644 BLAKE2B 5f4ac091584e91c5cd522701a7e0e5610060278c02bbe6a6cd641c646027eb78d37c01de621f29a6c63c848aeca996f039015353d9e302e7a4f19cb0c19aade4 SHA512 0e64556d3d3be006621ef5918e305a4b414249ab438a745017a5147268716b19b4cf4955cbeee891d3513d2c2a387d589dd77d190fa8da44abe2223b0f503c60
+EBUILD blinker-1.4-r1.ebuild 643 BLAKE2B 22de03993a3a6eaedcfb8ef960326ffdee15ba629e049959380aebeed9e18978a5b46e758e270ae969092e0ef33c7f3308bccec5e75e0e9fbe47ac45c28c43c5 SHA512 b92823549ff468598424b30e77802b49f7f1606113608840762f048906f437524a2f79f3657b6aec5cf1b3b3e45fa88d1f5f9dbbed6d29d31b0ef0f40f1d58b9
 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 40919d59392f..824547158018 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="~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="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index e99401ee5262..0a0bf036ac0c 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,4 +1,6 @@
 AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
-EBUILD blockdiag-1.5.4.ebuild 1747 BLAKE2B 42e379958fa8e1f481d72b2153fa18be6679b9f55d4adb0c7dd5caf1dac630c8d96887e2b068711652dd31f36821efb42d43f4a819801f618787a5755cfd93c3 SHA512 fc8f593da23e13aa221d6390317f6f0e02a7b5a1cf543f4337e7b19d03fb1b64225f53a66e418db972c22a3e28ec011d0f0d9ecae763ddcee6a3674f57e4f49c
-MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
+DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
+EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
+EBUILD blockdiag-2.0.1.ebuild 1679 BLAKE2B 4cae7b80498e67fe1710d71fddfbb4821aa3c53c89cdfc6fe2765c132b367fd73c1c003a4df823b7a19672a422b1a568b9ba77418522305a1f2d5655f48f460b SHA512 b7c6a838931d5d53b5351d09b3f5792fde701eb8604b4ac5ab5f9f8e7555cff49a28a9f3297dc2cf0832bb4e8eea760f237bbadc69f9ca83bb94c1cf681333c6
+MISC metadata.xml 749 BLAKE2B e61c5eeedb3b8fbdaf84f013ae7b59c9502385583fb24728810acb9bf1996ad6fa45a4719b1f34d59081ddebd331b161e43c1a6fc74c357ee138e646f20adc22 SHA512 f3733f81850b4e1c332207c31ffe1a371e021fc9628246dea2a74f45cb0aa2812afcbf7311279fe618071fd3da876da6d4343a057d7c939fe20bc15d052cca72
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index 7be9f5a83637..c6b80ef607a0 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Generate block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
+HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
 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 ~ia64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
new file mode 100644
index 000000000000..a7cc79d4de7d
--- /dev/null
+++ b/dev-python/blockdiag/blockdiag-2.0.1.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
+
+DESCRIPTION="Generate block-diagram image from text"
+HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/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-3.0.0[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		media-fonts/ja-ipafonts
+	)
+"
+
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	# unnecessary dep
+	sed -i -e '/pep8/d' setup.py || die
+	# disable tests requiring Internet access
+	sed -i -e 's:test_app_cleans_up_images:_&:' \
+		src/blockdiag/tests/test_command.py || die
+	sed -i -e 's:ghostscript_not_found_test:_&:' \
+		src/blockdiag/tests/test_generate_diagram.py || die
+	rm src/blockdiag/tests/diagrams/node_icon.diag || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+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/metadata.xml b/dev-python/blockdiag/metadata.xml
index 15110b7787e2..41032d801029 100644
--- a/dev-python/blockdiag/metadata.xml
+++ b/dev-python/blockdiag/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Takeshi Komiya</name>
 		</maintainer>
 		<remote-id type="pypi">blockdiag</remote-id>
-		<remote-id type="bitbucket">blockdiag/blockdiag</remote-id>
+		<remote-id type="github">blockdiag/blockdiag</remote-id>
 	</upstream>
 	<longdescription>blockdiag generate block-diagram image file from spec-text
 	file.  Additional functionality is available with dev-python/reportlab
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index a1acfe7bf656..653e33608f22 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,6 +1,4 @@
 AUX blosc-1.9.1-unbundle.patch 1066 BLAKE2B 28138077ebd4f2efe9abd0d87e8e894299fba8df755a322fc77c6d00546cb12e106520bfeec4f0e750b9943fe448db2c6d44e75972cc6db01c10777bc943999e SHA512 dde7c2184da44bf3ed0ea3c9241550b30ae918f785727c812478fc1c085bb7dde99180d3b02a965e7d1c7126ede3c53c5cef409299fd253e2893452174c277fa
-DIST blosc-1.5.1.tar.gz 641172 BLAKE2B 2305c8a4b32192393182306c1ae074caff1bab28b7c842c14f737354c282aa30ae1f9d6cfa5c4932832c505a9d1eb1a579cd2303d1800ae42e52fc58100ca99a SHA512 76d8c5d9e0e3485aacd5646970ce62e34d6ef3ff04e134342544ab044c4d1925a537187b4ce8b7ef3f6cd327e26d47dbdf1bf04233186a8baedbc7c839071cf8
 DIST blosc-1.9.1.tar.gz 809621 BLAKE2B fdeb76e5714d94a9992b59b99926a54457850c69d9d2c217b5a57cd8ce0d8886853ec139683a68c96d3a697b11f68163a7f267cd6060eacba78f595d4ff67d5d SHA512 61ed4e184c1a3e19a2556e5eb4f30030c00294af7b2d5b6c0641160db53c65756170c138229edd684f41606b2a3ae0b1c4f5e01495e74875e5123d7e1d8ed9c2
-EBUILD blosc-1.5.1.ebuild 805 BLAKE2B e5825550ae625b6dcd17fd15f83f975838925defe91554994b132848cfd33c451b80f093041382b56a3a9d5f7ac0bcd92be52b7da72de4323eab98f122093519 SHA512 24cc25dd0ba09cc3c5ad3c4473c022a22dc94194cba71e7595634b85b29469c4243796afc19714e90fef07de5d10ea749e0857a023e34950493f828e175a2b71
-EBUILD blosc-1.9.1-r1.ebuild 1014 BLAKE2B 7261b0d8d013167ddfb48a0461475e721faffce6157386c3b3f90a41361fa515ea771c2582535c461c173f31809d67883164a88de80c3908e85a5d638ee8e0b2 SHA512 098cbb1548278d5c2446c80f92fa41191ac53b803c368cb634b0ccb77a459a6aa028a1a322ac294aac1cf5bc2740d24078926df5eab38ecdd8e407ec4a295215
+EBUILD blosc-1.9.1-r1.ebuild 1029 BLAKE2B 47a75dcb1cd08369fec2fc4ed75e7e5567c64f96ca09c494c0549ac0b1ac3d682e5b66e319f2559b9a2e039b2329ff6f9c06278ea0db5059218c57baf234c0b6 SHA512 21a1c3b5c8d1fa4ed320375744a4dacc34957df0d688ddaf09af5ffcadd42648301ddc85f4cfe77daae4aa21a7f1365bc011f9dd283ae89bffbb86d0b352bd21
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.5.1.ebuild b/dev-python/blosc/blosc-1.5.1.ebuild
deleted file mode 100644
index 741ab2ca759f..000000000000
--- a/dev-python/blosc/blosc-1.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,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/c-blosc:="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	PYTHONPATH=. nosetests -v || die
-}
diff --git a/dev-python/blosc/blosc-1.9.1-r1.ebuild b/dev-python/blosc/blosc-1.9.1-r1.ebuild
index 11fa0fc160a9..785ca86e3206 100644
--- a/dev-python/blosc/blosc-1.9.1-r1.ebuild
+++ b/dev-python/blosc/blosc-1.9.1-r1.ebuild
@@ -14,7 +14,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 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 8b38c4a9a20d..efcb2d0d4e36 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,5 +1,3 @@
-DIST booleanOperations-0.8.2.tar.gz 165059 BLAKE2B 978b992e84181e8ec437e236e6502a6c135ea011395f3b082881e6b9f5c849632077737064d1102164cf083edc8a7e47c6f4f43d858948d9046ed231c5ac8911 SHA512 3c369ce53bc7b1b53f4441ba79959d4853c9ab767fef17fc41f44812427dcb5ad905fcfac4cee0d616447cccd059fce6a1d168b0766054659fb29b33867d1fb9
 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-r1.ebuild 801 BLAKE2B f5ac958de0692f1b0ab1e95c9c582d77409157e44aa06ec6f180aed18d7acec1ef76ce7b2a53c8ced46612b65c9b9f5c54a4c8466a74fea77881f1a470ca524f SHA512 ea379ba221cbf4ba7b1041d0d7818d3fa53e69ac40f9028df03bd982d8d29f4415b861c85a6c98bb12595d69cc8602b11489890c8142d74d7284e7f98a5fd271
+EBUILD booleanOperations-0.9.0-r1.ebuild 800 BLAKE2B a7e5cfaa55dd0f239e313bc87d9b73cc6d7ec9916ffdfa37905bd9fb1331d73b24bcc5e2e068b58ba6a8dafd449a73a327be0e695ddd4e0efd89ccfbcaaa9e04 SHA512 b627bf49353ed9d881a8bcc941541daa8b3934966816592ec8233c5fa08dbcd914da0aea25be87388676e284e134bee16f69154501049eca21be6c28088a3c46
 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
deleted file mode 100644
index 80f324589a50..000000000000
--- a/dev-python/booleanOperations/booleanOperations-0.8.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=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-3.32.0[${PYTHON_USEDEP}]
-	dev-python/pyclipper[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
index 3d944a88b2be..bb6ca5bf0063 100644
--- a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 8ab198480208..9348d7b1083b 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,6 +1,6 @@
 AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199eddcb5dd08c22a3c8381af743b0aeeb7cd5642bb030e951596ee98477abf1e7507a4bfabc9d36706e7809bf031 SHA512 ba42dee03c39cf238c6cb1864500f5d6c0fabcc395021cba8745c3e4fc4e59828eb7f461d5251367d37c4e0709162117e97aeabc08f941fe07c65f6b179244d8
 AUX boto-try-to-add-SNI-support-v2.patch 4329 BLAKE2B 3be0a3a88bc252bf8cbf316d3198b58ca86ee61e991400ce1e27854433bcf3709718593c58ffc2e2ad16fa41630a54670a4b7d42efde572073adf5f5f95994e2 SHA512 48b1fa089138a22ca9749fe82a1d92abf7570edf87a6ffc48f9b2389baed8982092afc2cbf1e35bf0661f185e96ba2b2b6d21cb2c553d6d884e800805f013a9a
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.49.0-r2.ebuild 972 BLAKE2B 75b9deca3bb8c6ede255ffdb0cb2387290b5e9cdf7f1ae3a868ffe28b044a24925af5bae0c787cbb806a5943ec1d1a96d5f7fcdf134d53aa2c2e9208a09e61cf SHA512 62756c8ec6ef5b50ff31bd35ced6c7a5f4ad60aebfdfd3d59441ebdde9a1712951a9d5e9c224e0ea9d1de330aceebcac71f0e3862df4c1d6915e26160a5c0d65
-EBUILD boto-2.49.0.ebuild 716 BLAKE2B e8ddc4cf764002fc0e9e86de50b5ea4a97d06b386525f7d54d9655ad2b32b7372c5ea74b7042004edb6e45e8ec56488da46e0ceed45f4f331f0f58669204dd40 SHA512 a939e1be7b3e0d6d57564d25161404c1c51efcde213606607cb5a7cf792ab12eb72cd25fa4113a01e908da8fd4b3e27eae5232570a6bbdb8d319056e88b3a24a
+EBUILD boto-2.49.0-r2.ebuild 979 BLAKE2B 08fb685e67b9ee564a1dc69591361a8ea49b9f2b5368f373aaa7a6f9f3ba936c4196d54880074f12fc51129c3839f22abf8d08626698169fc92d745e6e942b05 SHA512 85ca95a2a703e2a49302917cfb6e39b5c65301495d9191c2b64066f29e17bfc324a6c7ee70ec147917f90740153fa356b9aa86eca9e8132839a34a5812709c96
+EBUILD boto-2.49.0-r3.ebuild 1312 BLAKE2B 50b28f77c15a23b978defca25439735b27168253a5566e3fcc4e81de3d914e0cb235f4f02fd457c73d37ee05cbd0f5fb626893d0e3ef5d68ee97ec235d253407 SHA512 a86ac0d9fa6761c10d4e456c380c8f3ab36bdd9045677aa56c637624f6b4d8c3f2bf5bbf860e029192a208bc6880329eb9b369b063e6d5a266337e240f74f905
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.49.0-r2.ebuild b/dev-python/boto/boto-2.49.0-r2.ebuild
index 0e774e24a221..979cf15da746 100644
--- a/dev-python/boto/boto-2.49.0-r2.ebuild
+++ b/dev-python/boto/boto-2.49.0-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
diff --git a/dev-python/boto/boto-2.49.0-r3.ebuild b/dev-python/boto/boto-2.49.0-r3.ebuild
new file mode 100644
index 000000000000..f95376448ca5
--- /dev/null
+++ b/dev-python/boto/boto-2.49.0-r3.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+PATCHES=(
+	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
+	"${FILESDIR}/boto-try-to-add-SNI-support-v2.patch"
+	"${FILESDIR}"/${P}-py38.patch
+)
+
+BDEPEND="
+	test? (
+		dev-python/httpretty[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# broken, not worth fixing
+	rm tests/unit/cloudfront/test_signed_urls.py || die
+	# fix tests
+	mkdir -p "${HOME}"/.ssh || die
+	: > "${HOME}"/.ssh/known_hosts || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	nosetests -v tests/unit ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/boto/boto-2.49.0.ebuild b/dev-python/boto/boto-2.49.0.ebuild
deleted file mode 100644
index ed057dd745cf..000000000000
--- a/dev-python/boto/boto-2.49.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="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="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9e9b1bbadd34..2e325f51e797 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,22 +1,8 @@
-DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
-DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
-DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
-DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
-DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124
-DIST boto3-1.14.15.tar.gz 298869 BLAKE2B 24e55039ac4a7ecb97eb2e5f61a7991422df30e089bdf1d716a5daab81df0cfec5b8fd4c543a22d4bf208351cc77c88dff2e50949d006d93a523e8287c000d40 SHA512 8f082ee1062caa38dbf4dca28a7b48125d5938f7fd1d09bb01f31bef129fcd346e99f2f18d11a67e9733d674c3c263c809800bb8e58bbe70750dcfbcaec6c731
-DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
-DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
-DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae
-DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
-EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
-EBUILD boto3-1.12.48.ebuild 1290 BLAKE2B 6e86e0733eb5c8477e9e3e4da68db82582831d19e6273eea3ef5e18e5cea40ff0ceae7fd968156ef36c6d6d4a5ca0b042e7c7bf5900292a5b01f53bb8b9a3b04 SHA512 5eb28743682edd63abbeafda5f28a38048cdd2ec9f46c6a26928d468509b4afd3690154af26a3d8fb578130dc856e6ce4980e06deb054c8cfae3145ba13c697c
-EBUILD boto3-1.13.26.ebuild 1233 BLAKE2B d5e4817534127c58a74846722b6b1251eaad1c040ec3bb87ffeecfaa71611367d589231b0b33f1d443bd4daeca4d830abfee1b6cf41236a0ff57b0286f82f8c4 SHA512 406144934c025d1901d9a5d9886622f0099749a5c729d4da945d7b95e1d6a3c3f4d2a2574f22bc57b3bdd03d6ef215787069524c0a9ce5ebf4cebe22539537b9
-EBUILD boto3-1.14.0.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
-EBUILD boto3-1.14.11.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
-EBUILD boto3-1.14.15.ebuild 1231 BLAKE2B 07ad972860be28d29f38f230b00869d93a67d3ab3434b75f81c2fb520a9fb4679823ec2d29f7f9ddef32ef66b72d6afd1eb7f6290e1a9a4b940aff39b2f19d7d SHA512 de7235c3adc687aa16c33235a246d1f3dea161a65901b3ea2b088d0b9c09f2d62788adcdac2ff8c08e41c541a85864359c0f331486d950ff3b10f6d5a5014459
-EBUILD boto3-1.14.2.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
-EBUILD boto3-1.14.5.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
-EBUILD boto3-1.14.8.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
-EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
-EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
-MISC metadata.xml 644 BLAKE2B 6d8196f27c8ec19e9d14cd52579809b40d036bea225d9c434125ddc4c210062a141d982285a2925400a34f7698ac660257e076bfdc3c9d067264af47ddce7b9d SHA512 b1c4acf5e1c9fd16381a43801c69a497505141ef3ec3d6aed6e2cced971fd310ade4714e436beceaf5c8a0d3b556e6f67b94e3cd3d296aa793b47c1b911894ce
+DIST boto3-1.14.23.tar.gz 299581 BLAKE2B 57cbb3fbd9a84f334b5874ca96490cb0269bb79f3fd2b50d4c51efcfadaa41b2e11853266ba12544b77999fa85fefb0bdf84d924667c4092b3deb72f41e33a21 SHA512 263b2abf3c220d3fb3d7acf4cd87266c11d3dcd5d7ffcafb0aab128b1e324d6f99c44de8abfb621b153b5fc51b9823b6b79ea5c529f6c59c548c900015bcdb5e
+DIST boto3-1.14.31.tar.gz 300720 BLAKE2B 9dbd002e299c629f28037572c615a00612c80773006c344797d0ad56c81c240b56bfc56e8ffe52e3b404c77a56318532aadfa2d008c254e70f7bfa91e40b7e1a SHA512 e3fe0041bbdc67affcf5d5272c26aa14ef0fa546af2efb99187311bee23531181ab1f1ebc69f2c3ed8250140642f4402334ebbc9acbf422641fa6abed5d5815f
+DIST boto3-1.14.46.tar.gz 301815 BLAKE2B e389e7e0cd9ed0907fd13a948bf37e00040e32029d7720f5a720c8c9cb3cf1fb157bb665032b4ba594b3b5f50129088f26f004535fc4f8fe72f32ab0be6ce9b9 SHA512 aa1aa0155fcaaaddcfc24697211e8f5a69eab1282a185f0cb76b02d63d1426c02ca3be71be980214484a351159f6bcc34c3422cd11b9a556d67802c01a06aed0
+EBUILD boto3-1.14.23.ebuild 1229 BLAKE2B 96cd59f3b6d4e9be48608381293cfef71ffc5fdbc4785e0fc61e7550a150219ea392724d60258c71a48798adf7c865301501ded5b6157731a6a8b278b2a07e9a SHA512 76ceac13c7b47f2653146eb37767355e4585931c5272c78645802a4f61744c765eda7d961b29dd114eff4b41f2309150ddafccdfb5dc94538636099b809cfa0c
+EBUILD boto3-1.14.31.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
+EBUILD boto3-1.14.46.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
+MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.10.2.ebuild b/dev-python/boto3/boto3-1.10.2.ebuild
deleted file mode 100644
index b19ce9f817ab..000000000000
--- a/dev-python/boto3/boto3-1.10.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=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/boto3/boto3-1.12.48.ebuild b/dev-python/boto3/boto3-1.12.48.ebuild
deleted file mode 100644
index 582b09db68d8..000000000000
--- a/dev-python/boto3/boto3-1.12.48.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="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.15.48[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (	${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.13.26.ebuild b/dev-python/boto3/boto3-1.13.26.ebuild
deleted file mode 100644
index f45344d9732f..000000000000
--- a/dev-python/boto3/boto3-1.13.26.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.16.26[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.0.ebuild b/dev-python/boto3/boto3-1.14.0.ebuild
deleted file mode 100644
index 062b762234a9..000000000000
--- a/dev-python/boto3/boto3-1.14.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.11.ebuild b/dev-python/boto3/boto3-1.14.11.ebuild
deleted file mode 100644
index 062b762234a9..000000000000
--- a/dev-python/boto3/boto3-1.14.11.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.15.ebuild b/dev-python/boto3/boto3-1.14.15.ebuild
deleted file mode 100644
index bbe6631e26ee..000000000000
--- a/dev-python/boto3/boto3-1.14.15.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.2.ebuild b/dev-python/boto3/boto3-1.14.2.ebuild
deleted file mode 100644
index 062b762234a9..000000000000
--- a/dev-python/boto3/boto3-1.14.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.23.ebuild b/dev-python/boto3/boto3-1.14.23.ebuild
new file mode 100644
index 000000000000..7c934a4a767b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.23.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit tests/functional ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.31.ebuild b/dev-python/boto3/boto3-1.14.31.ebuild
new file mode 100644
index 000000000000..74bb826bd085
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.31.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.46.ebuild b/dev-python/boto3/boto3-1.14.46.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.46.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.5.ebuild b/dev-python/boto3/boto3-1.14.5.ebuild
deleted file mode 100644
index 062b762234a9..000000000000
--- a/dev-python/boto3/boto3-1.14.5.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.14.8.ebuild b/dev-python/boto3/boto3-1.14.8.ebuild
deleted file mode 100644
index 062b762234a9..000000000000
--- a/dev-python/boto3/boto3-1.14.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit tests/functional ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.9.122.ebuild b/dev-python/boto3/boto3-1.9.122.ebuild
deleted file mode 100644
index 9febd85846fa..000000000000
--- a/dev-python/boto3/boto3-1.9.122.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/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index d996a7288df9..74bb826bd085 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -10,32 +10,33 @@ DESCRIPTION="The AWS SDK for Python"
 HOMEPAGE="https://github.com/boto/boto3"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/boto3"
 	inherit git-r3
+	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
 fi
 
 RDEPEND="
-	>=dev-python/botocore-1.15.48[${PYTHON_USEDEP}]
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	test? (	${RDEPEND}
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs \
+distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
 
 python_prepare_all() {
 	# don't lock versions to narrow ranges
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index 245721430dee..54ceb365c5f1 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -17,6 +17,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
 	</upstream>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index cc2ef58a9307..5a3b647473ce 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,34 +1,10 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa2886343a6e486710de5f962fe09ebe3ee9091830aabd17544e2112de2eaf91d63ca881ce050b6b9fa9af86337f3146a791 SHA512 6028bd13aebcbe6afe66018185d22f904c010cfd41f014b43f361c73799592d223af0a23d8fb3086f4bba9a1d106f60afc68e659dcb78d0d2a967442130b3179
-DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
-DIST botocore-1.15.16.tar.gz 6173930 BLAKE2B 70e185faa9fa3f8537e38e4db8c263f5bfb0430d827e1093d41fdae8a16d6975071d3eec0eddde41d92044eebed92396d65f70eaf21a4ea2e6a1b464498c7f15 SHA512 574f0fc8cfa34e16b9933a7c7dd9fc9a95f713f8693507eac5598e73775def6df209b2883abf5a13e68327bf1e89508fce5d37074cd3a0173ab5cd1e35372409
-DIST botocore-1.15.32.tar.gz 6261957 BLAKE2B 7825e7d6315cae3578155825e0b5cb3961e5548021d63dad1747903c8f55bede03c4fdb0a07b724e2816ef294a890e85a648bae313620ab4156fd2a28d4e517b SHA512 865612fa52aae3bf08ee74b52a3fe685d7308d0d86bd438851e0b9db639ba3f6430211a7863c1b0737c0af0afc6ba760b2ccfd0103d303e87758317f773cef6d
-DIST botocore-1.15.48.tar.gz 6336322 BLAKE2B 0d25424e82fcbf1376bb1eb9cac9eeb7a45d08698f39563f635a34b1b24bc6823c5f2b08b6a40a0fc9b54b0404b8f5dd7d07fc21e0c7e0c489fe172e7f29a936 SHA512 91d86731909be5828e38a69e32e5189fbd0357378c51a04f60efbcfbb1b6c0c01151c982fc32619e3be240f5df881e5342bbba6b290b3092d9fe11ce9e3b28d0
-DIST botocore-1.16.12.tar.gz 6422375 BLAKE2B 333cc3d42b42b93f952c6344f5196b248291d6114f3bf7e73550bfb712a8a618908acb0b08379c9caae1c8a855bd738cd5f7efeda808799510c740d604459346 SHA512 891c8c2b3b6208d3d8543c055fa48887c58c67845d46a9607ae140d3a17d5b12665cc50afa304647895c891112e35ecc1cacaf36e75d0491109bcc5150be0ec6
-DIST botocore-1.16.20.tar.gz 6442160 BLAKE2B 23ad33e53ebf810087958f003d21fe5874974e15948d26ab8c4f56ff48e7121d09d9f35dd31055bc6ceb3a2c6327a1e9fafbd6909d2d2a7222e81d9ae9a5b36c SHA512 f92cb05b7b14f3036373f5aeafc956ad776ac486343d16275075c2b29d8212859ba7f84f83865027340f7544231d4920af627e1efe194393e5aca028fddfa4c1
-DIST botocore-1.16.26.tar.gz 6458468 BLAKE2B e753f7dcb3d75a86da78536883e44cbd493fd3ff48fae86e5e1959e55d2d66fe8dcb33ee46af51b39390ce7d2227bdb193a827932b53dc5a4b56f985faeebd31 SHA512 66ba4e9bd8ae72a31fa093dc7d8eccd646a12381086f524e3bd63d6031f2d75bad5e241f08e5588a6ac6c16eac693d0410b1858641bf8e59decfb1e6ed16b360
-DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e11224addefac31b87b8ce9983350aeaaf862feaf040490fad8eb87d7dde800bd8a77156410e6a734f567e2cc1055 SHA512 1f265a0a8adb7f0172f02448d3be5aeacf11e3fb7023da8d81e6d19c39d97cac99cfe3a70997e682deb44a4fd78304e4a0c1df43787f3139bbccbe852c682a82
-DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
-DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
-DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee
-DIST botocore-1.17.15.tar.gz 6530455 BLAKE2B d402845e3c0f434e39b1c1ab80378eb2d5f113b99be83471b89cc7264a2c696cfb38b25960f8c0eb3d721147c706f43c1db02287c8ef4ae4ae33394f2fc82473 SHA512 7a8ff75e83fa8df17d79cb3ede9faf2a7eb4c2bfa338411f0186d6c30946aaa247c14ddfc91c9d7ee6d1639696ca5e808bf4131ad2182608ecd99ef0e97175c1
-DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
-DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
-DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d
-EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
-EBUILD botocore-1.15.16.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.15.32.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.15.48.ebuild 1668 BLAKE2B 2256b2477d1d263584c285e5dbfea1b3174e6493b68d0787f3a2ac8b8f4930e8cd1e9f577ac2609bd55fc91bb9f3eedac4541f2be591d1de21eb612b8e16cb67 SHA512 6b63976638b227e5fc933bca9bcaf5490c16a4d64d78d970aaf307183193c06eee6f5304fb3b3f7cf6f64bb65b978e1176e2185fd2fc8d0ab4f0202c74cd3d7b
-EBUILD botocore-1.16.12.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
-EBUILD botocore-1.16.20.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
-EBUILD botocore-1.16.26.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.16.6.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.16.7.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
-EBUILD botocore-1.17.0.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.17.11.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.17.15.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.17.2.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.17.5.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-1.17.8.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
-EBUILD botocore-9999.ebuild 1614 BLAKE2B 8a4ee3e4ae8733ab493bbf390bada866cedeaa3139b501566abc3dc8b56b6816328d885c84b2d4b2effe951d178c91641934129832260f07cd0d60024cd88635 SHA512 2a1c6901db5dee864b97e92ff15ae267f58814ade23fdf13e351dbcd7e6e3ed2faa3a189bd69872f0cc1623baf0c9b975ec616f95b4ed624d0389edef98b2437
-MISC metadata.xml 693 BLAKE2B 79fb75098be12506dd472260962bcbb2a9db5dffaa1a5237e317513f4392046b6116e3b2f9a56eda9e77f84842d2e1fb7604fe9b75808e0e36c8db02aa182597 SHA512 446695bb6e171362c741c8c5943e232acb012fa9df297637e0e41503e41b06eb3a14c0790a8a17d5b7b6f643a3e8483e04c28520cacec9ef81cf9d4344744516
+DIST botocore-1.17.23.tar.gz 6564852 BLAKE2B cc1da91f4a45964fe684b015de9db253059241f654dac93901cde5dc24f3ab3595ecd201be91bed36236bb885c7ec7aed998025f6c0ea8b050c13d17a6431238 SHA512 93af672e8d110ab4989e9abc20b3bbb1a6c9050c379bb1db8542e9027e6a4ee82083645c59211204d7110e112d393f80f87d15b77337a4d73358f43d39f6e52f
+DIST botocore-1.17.31.tar.gz 6665851 BLAKE2B dbc89d1216f9fda89c6185baccfdf2878c265d8761e4ad1349a45d334f9a4d5b79ad1ce06a19a7a706b75be1a6d7f2a7bf5bc33d8ffbe7ad8a016472edf0432f SHA512 ab1921fae887846d1c224d624e8d5dd888ab9c0c90a415ac97e5ad2f7563131b199e8870553e7f3dd6f5ff4c7901aa04bfa99160aca4e9da8ef3096cfd922ec9
+DIST botocore-1.17.46.tar.gz 6738493 BLAKE2B 2e5ee1241af91c19cef0ac575c5ad68d46277e8b2f0f1f719428f7b4026303a47e48b8a8240c1121cfe35c6310be5fde3f0cfa2aa3f3321249811eb510b47f94 SHA512 a11de252454477d478f2b5d0b5978b24961baa3942936ef5990c421709d0b8081e8dbf020b76cce5c3c43d3fe0467cedf5441918767163712e0ad178c9cba80d
+EBUILD botocore-1.17.23.ebuild 1597 BLAKE2B 7b0b186045fbb385188e87b9f81699e4392f667b870870fdff142b83e9baaddbbe6d6003466326f6652ebc9b274453b06a2d9c1a33277c852193a46170df493b SHA512 4d2900d96ab5a9eacb101f75543b47ff4069fe5d52ec5acf239ba432cd12abe53b655f7d291551a7b4485fe5022cccee93caeb5470214b5c1e20d4421a40dfc3
+EBUILD botocore-1.17.31.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
+EBUILD botocore-1.17.46.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
+MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.12.122.ebuild b/dev-python/botocore/botocore-1.12.122.ebuild
deleted file mode 100644
index 2137a90141da..000000000000
--- a/dev-python/botocore/botocore-1.12.122.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.15.16.ebuild b/dev-python/botocore/botocore-1.15.16.ebuild
deleted file mode 100644
index f9ce3c85acf8..000000000000
--- a/dev-python/botocore/botocore-1.15.16.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/botocore/botocore-1.15.32.ebuild b/dev-python/botocore/botocore-1.15.32.ebuild
deleted file mode 100644
index f9ce3c85acf8..000000000000
--- a/dev-python/botocore/botocore-1.15.32.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/botocore/botocore-1.15.48.ebuild b/dev-python/botocore/botocore-1.15.48.ebuild
deleted file mode 100644
index ec3ffeb5add6..000000000000
--- a/dev-python/botocore/botocore-1.15.48.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 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" )
-
-src_prepare() {
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-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.16.12.ebuild b/dev-python/botocore/botocore-1.16.12.ebuild
deleted file mode 100644
index be9914c2cdab..000000000000
--- a/dev-python/botocore/botocore-1.16.12.ebuild
+++ /dev/null
@@ -1,57 +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="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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	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"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-
-python_compile_all() {
-	# remove version locked deps
-	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
-		-i requirements.txt || die
-}
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.16.20.ebuild b/dev-python/botocore/botocore-1.16.20.ebuild
deleted file mode 100644
index be9914c2cdab..000000000000
--- a/dev-python/botocore/botocore-1.16.20.ebuild
+++ /dev/null
@@ -1,57 +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="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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	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"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-
-python_compile_all() {
-	# remove version locked deps
-	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
-		-i requirements.txt || die
-}
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.16.26.ebuild b/dev-python/botocore/botocore-1.16.26.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.16.26.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.16.6.ebuild b/dev-python/botocore/botocore-1.16.6.ebuild
deleted file mode 100644
index f9ce3c85acf8..000000000000
--- a/dev-python/botocore/botocore-1.16.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=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/botocore/botocore-1.16.7.ebuild b/dev-python/botocore/botocore-1.16.7.ebuild
deleted file mode 100644
index be9914c2cdab..000000000000
--- a/dev-python/botocore/botocore-1.16.7.ebuild
+++ /dev/null
@@ -1,57 +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="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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	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"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-
-python_compile_all() {
-	# remove version locked deps
-	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
-		-i requirements.txt || die
-}
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.17.0.ebuild b/dev-python/botocore/botocore-1.17.0.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.17.11.ebuild b/dev-python/botocore/botocore-1.17.11.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.11.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.17.15.ebuild b/dev-python/botocore/botocore-1.17.15.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.15.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.17.2.ebuild b/dev-python/botocore/botocore-1.17.2.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.17.23.ebuild b/dev-python/botocore/botocore-1.17.23.ebuild
new file mode 100644
index 000000000000..5c5377a0cea0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.23.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.31.ebuild b/dev-python/botocore/botocore-1.17.31.ebuild
new file mode 100644
index 000000000000..6b14dce9712f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.31.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.46.ebuild b/dev-python/botocore/botocore-1.17.46.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.46.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.5.ebuild b/dev-python/botocore/botocore-1.17.5.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.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
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.17.8.ebuild b/dev-python/botocore/botocore-1.17.8.ebuild
deleted file mode 100644
index c08c6f6ff899..000000000000
--- a/dev-python/botocore/botocore-1.17.8.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-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/six[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
-)
-
-distutils_enable_sphinx docs \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# py3.9
-	find -name '*.py' -exec \
-		sed -i -e 's:cElementTree:ElementTree:' {} + || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 54136d6d4829..6b14dce9712f 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -2,16 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
-DESCRIPTION="Low-level, data-driven core of boto 3."
+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"
@@ -22,42 +20,43 @@ else
 fi
 
 RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 	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}]
-	)
+BDEPEND="
 	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
-
-	# remove version locked deps
-	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
-		-i requirements.txt || die
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
 }
 
 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
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index 544a8e107e42..e73c2fcf1186 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -17,6 +17,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
 		<remote-id type="pypi">botocore</remote-id>
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 177c42d4fdf3..9a854801aa42 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,3 @@
-DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.2.1-r1.ebuild 718 BLAKE2B ee0e29e6501d9090f1b992fe94f4ec881e31c8a9fadd2a5113f5e66960b399917ae8a4a5ccb10dbb1671812e1a2f7e359e67189843750a83626388fab97fd135 SHA512 7ff2f8adf5fcd5297f2b3e0cf9b39308a6d6228646c758b12f1bd7b032b40ea328b9ac95642d59976e19d80523aa35873a6706991daba4e6556244554e8411c9
-EBUILD bottleneck-1.3.2.ebuild 721 BLAKE2B 84db0025d4ad6bedea964e8822f55789a5f4984a5702651134305b47a719d6f3019953f7d7524165012f5da70f498c328e1781b8b05fa333ca3b45b847fc9b4c SHA512 ffaffff979c831b638a3dad4c8a46f49effc9ac96892afce981069bf717aa6921ed2f7b46a4b44d62696787be7d526937399165af00d9a18de7183e4a3278e54
-MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
+EBUILD bottleneck-1.3.2.ebuild 736 BLAKE2B 75c0a951aeaf6f8276118490b2bc2013cda9b66454e858ff2ae159a2199cbc5e96da74fceef551a5228b860f33fd2eb2eab3da7d5f97669e53beb7b7af124b4b SHA512 ecb22f5de9764445baa561b8402a82222e20db5ceec5c9f1bcb4688fef8b354a24f828fb6e1536a125e28f175ab13650432b6e9d8e41f520b4cc17d3ca6096e1
+MISC metadata.xml 352 BLAKE2B 3ead01da9109e52e74befde776364c4d88aebb02d1d6857654d3ceb3f9c8bc6710de6d89dba16151497055e1a18bb6c6ba012242c1ce7a9f4b3d1f5f943992d0 SHA512 7bfd46f9995d2c167dd572f409900241f09beede06bfd79c4ddf8733e0e762fc2ee86379be9cb0dc57f7b56643ac6be36172dc0966cad2a6736924766bcc5415
diff --git a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
deleted file mode 100644
index 446086aaaa68..000000000000
--- a/dev-python/bottleneck/bottleneck-1.2.1-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="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )"
-
-python_test() {
-	${EPYTHON} ./tools/test-installed-bottleneck.py
-}
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 6532decb92e7..cc85db2cccfb 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.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 ~arm64 ~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/bottleneck/metadata.xml b/dev-python/bottleneck/metadata.xml
index 6a33c44cf7c8..a08cd15d519a 100644
--- a/dev-python/bottleneck/metadata.xml
+++ b/dev-python/bottleneck/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <longdescription>
-  Bottleneck is a collection of fast NumPy array functions written in
-  Cython.
-</longdescription>
   <upstream>
     <remote-id type="pypi">Bottleneck</remote-id>
   </upstream>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 8212a7a996c7..526f41a2bcb8 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
-EBUILD breathe-4.14.1.ebuild 755 BLAKE2B 37542facf6b5519e4ae6db76471ac28fc2c5f50d26ab33648dc915e9c6f9706064c3384fe3474d05f61518d50127eeb14764811890eca5e78953388365ff0570 SHA512 81ee42a2bc2189ea0737544457469735133d0c0ef2c36f86e0e3b7bbc40e327fb497690d7acbc8428967b7b397808f8fd62026009559114fe9063c1b6d01c007
+EBUILD breathe-4.14.1.ebuild 759 BLAKE2B fe884f108ee5abb70e29d32df9f397aab95c6fd2d4bb5910b4255d93d83002597ded5e0d30a3f722e8b61dcdad7d44f4ab04c4805e562ca3fa44eef75f969689 SHA512 482b059395d3bed3751af362633997abef9bf0d11a183ffa430f924d0ce445029002d5f69c506ea3fd237cf8681bb2e8ad5010fa220f9667885a612c96796d0c
 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
index 4b8274b3def1..00ffeb74ad38 100644
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ b/dev-python/breathe/breathe-4.14.1.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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 5e2b3c404d06..edad4878f17e 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-r2.ebuild 1532 BLAKE2B c45f9b8f0ec0314ff6a7375ec2b7fc296e194ca83d01c2daeffbe65e253e5382db25fdb2da62d2709b78aefac88cb65ecc754a6b3754e3ad8c56cf8d38c517af SHA512 df85e4945c06a4d73d729734234ebc52c9ec7edc2c04d93ff30139f29ac5fa10b8edc55433616ebb2007995e0ff7a835a573070da4b87c28574c772a2e222714
+EBUILD brotlipy-0.7.0-r2.ebuild 1529 BLAKE2B 6ee9a711fdc17449851ffba3f62c2dbfe0cf735e3d902a4be0dde058ce02caf70883a65adeac9ecb015c14535a9d6b1009bd80fa161c1c4bfa13f6893898b5e8 SHA512 3ae732bea20c9b65aaab02a93ef0d714e8ac0a1a95e4b40a5a5debb371217dc3cc8ac98e5712bc0cf0954e14f93287a2959480d1cbbd0b0a6a70524025552a7e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
index dbdc9d2dbc44..c5cb8d92c103 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 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"
 
 # module name collision with app-arch/brotli
 RDEPEND="
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index ffc6553cbac1..51495a9b143a 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,6 +1,4 @@
 AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
-DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
-EBUILD bsddb3-6.2.4.ebuild 1967 BLAKE2B e503da80c3ddb7e91c6e6628281a7099423773722e93bd8bd953d482635734048f17e9c4987d3fbea31ca42738b1b2188b71ad98c66a6e5bf5019e80cbd3e491 SHA512 57734e1c684ff30730c5b0d996e21d66d8283df43b03dc12b515c6aee203b133116986ec7045766a6e33e9d72287c7d1b8e7792642b7c652002beeb7fe54ac64
-EBUILD bsddb3-6.2.7.ebuild 1971 BLAKE2B fe4ebed73c2686c541e2f5dfc52c2d5e1ece020674d6ba85fd55584f3c012ed681783daad45293ff17674665bdf8d1661d28ac1109413a499aa383983485f6ef SHA512 e9b35e4d38a8a93f191dce9dde584542f412f28db9619ec2eb8908e63076d7007b170ecfc68e02025ec427dea691545d027e87aed60a253918ad5dfaf95d585f
+EBUILD bsddb3-6.2.7.ebuild 1705 BLAKE2B 74d0d738d50613e151ab2a58861c45b0441405203be6ef9495922bf2bfd7fbedcad9e9f833a88cbaa0c095a2e6e475ccef88b099043b881d73994513689fc487 SHA512 9b4e8b4f94a663023dc5dadb7ec04a2d09e231b2f5b14921315cd888a8aad9553f625f5262c08fba17e5d1d2e098be1ff28cf6b88199d6b0fe701c602db674c5
 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
deleted file mode 100644
index f03617f4fdff..000000000000
--- a/dev-python/bsddb3/bsddb3-6.2.4.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=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit db-use distutils-r1
-
-DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-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"
-
-RDEPEND="
-	<sys-libs/db-6.3:=
-	|| (
-		sys-libs/db:6.2
-		sys-libs/db:6.1
-		sys-libs/db:5.3
-		sys-libs/db:5.1
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.2 6.1 5.3 5.1 4.8 4.7; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup2.py setup3.py || die
-
-	# Adjust test.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
-		-i test2.py test3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	if python_is_python3; then
-		PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-	else
-		PYTHONPATH=Lib "${EPYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index d217d17a5f11..47c88f81dcd2 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -63,17 +63,6 @@ python_configure_all() {
 	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
 python_test() {
-	if python_is_python3; then
-		PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-	else
-		PYTHONPATH=Lib "${EPYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
-	fi
+	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index fa2e315e1e10..b9253d97814e 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,3 +1,4 @@
+AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
 DIST cached-property-1.5.1.tar.gz 12791 BLAKE2B dcc75564d3b1dbb2f34ea433f4a477b2fe0454047f1fb4825cc6350458bf09509cf970b308744d79eb3b17f96c04c606ad36327c7e24f0b13f412880d9ad2ab7 SHA512 61bbedb48336af7c0b465421eb4d3b6b48155cfe4fd6270ff49caefe0d80e40b50c4801a68a5564931d316e374b69112ad14f72687a015ce81aaeade6fcf9ce3
-EBUILD cached-property-1.5.1.ebuild 606 BLAKE2B b8449f4a1ba07484210bde520bc1c0e25c4726d9b77299df358b5f1199ee74b220aee2fa6a6c4acb3e541bac18678c89c0feaabd345f7c8810b875f02d80caed SHA512 2c95c66556fb71c1fe35334a4b22547b5b00c9091510ff6067c4ca6bbb4fa41fbda944057fe2cb9cb45b9c73fc5c9623e5c305179d539e6546c75a020000cbb8
+EBUILD cached-property-1.5.1.ebuild 727 BLAKE2B fa754a05805aee91ea5b02d1a478b03e79bcbe9a2787fc10bfd237bc6e07e0b712d20e740d3ad5aba108bde97547a275aa15d2fc3c6c8f310ddded64a8d19974 SHA512 1359667eae48f4cd9abbd8c6b09139ee6e41179c5806d0971387607f58f1ad5c66f7a2ac630050e6a75e43ff566302e949b98fb8b3a65560345bea0bf98cf112
 MISC metadata.xml 486 BLAKE2B e012a6b1d4e8ab99e6f89b18a31d548b5e26887dcf7985cf5a6c500fe4a751c7e2f4b0a055e8afa9ba09ab20af3cdd206c902521f878872e920858a3b9f649cc SHA512 8c3e98d3d89a58505c4cf4a1cb15559c43be2a184bdd4cd696b023f58001cb65064ddb938ea792c51fd29808512bbfb30580ff2ac9509aab92e0c53c4de08afc
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 01da4c80d703..04b4c9817683 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -1,8 +1,9 @@
 # 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} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,15 +15,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-DEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
+DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
-src_install() {
-	distutils-r1_src_install
+python_prepare_all() {
+	# bug 638250
+	eapply "${FILESDIR}"/${PN}-1.5.1-test-failure.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
 	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch b/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
new file mode 100644
index 000000000000..03fabd2900ca
--- /dev/null
+++ b/dev-python/cached-property/files/cached-property-1.5.1-test-failure.patch
@@ -0,0 +1,10 @@
+--- a/tests/test_cached_property.py
++++ b/tests/test_cached_property.py
+@@ -191,6 +191,7 @@
+         self.assert_cached(check, 2)
+         self.assert_cached(check, 2)
+ 
++    @unittest.skip("Gentoo Bug #638250")
+     def test_threads_ttl_expiry(self):
+         Check = CheckFactory(self.cached_property_factory(ttl=100000), threadsafe=True)
+         check = Check()
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 60c99e0291f1..ac22c49b383a 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,3 +1,3 @@
-DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
-EBUILD cachetools-3.1.1.ebuild 493 BLAKE2B 47a883829ec960b72f66b5a8ca1d13dc145d4e81f0bf4c5806145ff45e556d335717bf39e34a8ec225ea7d5f911c23c0caf164c8422b8f5c0957bee53c3ba0e8 SHA512 1d810d06f7e0dae91832161bc420d90b0d033635e1940ae510241a92121845af61a2c50cc81be2a1643a6099a8d78b5001190432d7f1be0ee23d5e6fe3418447
-MISC metadata.xml 382 BLAKE2B f140052d08961397a0f05455570a02fe09a16a332cfa85cc61aa43e3a7cd634872453e92c440bce9d80f712d9db5f0daab42182ab442618fb37fc361b53506f6 SHA512 24e532452d31effea36e8aeb24ea13a7d4eedb17538bfbabcf1427e049c7d309d67748d5360f43d6a175c2fd0868d40949199b53601f28964e3cbd23482299d2
+DIST cachetools-4.1.1.tar.gz 23574 BLAKE2B 5777d243ae87635766811fd2aea8789f9f1674ae3a7ddcc08bb3c8d4345002d65cdbd00cbaf75ba801dccffb1896a75688a6e97f984e1d498a93726854398196 SHA512 254e8821feaaf4fff656aa2beaf0b2c1c6dbe8698148be783bb18a6476f758061471906e4774f47bd8722dbbbc09745088a8f61eb5c455fbe85ef17a3816ce7d
+EBUILD cachetools-4.1.1.ebuild 419 BLAKE2B 36b2df0bbc4818f0b04d801d6c3ac97b6d30d506225f05976782985f266ad0861ffe0800b19918dfd3b3c19c7441b2f9af1b0d2ad1dade3ffee9c488a073891b SHA512 d88197d5061b53dcf8623fb69220cfc5e6b61f054e3ccf1bfc50e863f1c85176eca33aba9bb9715522a4790166f4b5f0e188311dfc515137d3c38d4539b4f884
+MISC metadata.xml 507 BLAKE2B e295e40137fa41a22fbefce74c8eb04bd0bfd920dec5e89bda3c75a524f274aeafd651187e5b86df9a16b63f3ce16e11dfce32aeefb8b7a4ee720283fc773304 SHA512 9d3503941a0c1200e22840f3886a1938c0fe4d9143eb511007e4156118878b39494b4917a68c9798e4a4e24d8f19d18eeef98fa4bbf53e61340c4505ae35bb41
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
deleted file mode 100644
index c43fb2439911..000000000000
--- a/dev-python/cachetools/cachetools-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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-4.1.1.ebuild b/dev-python/cachetools/cachetools-4.1.1.ebuild
new file mode 100644
index 000000000000..42877d594d9c
--- /dev/null
+++ b/dev-python/cachetools/cachetools-4.1.1.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..9} )
+
+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"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
index 2ba64fba1ab4..2d14ed99d847 100644
--- a/dev-python/cachetools/metadata.xml
+++ b/dev-python/cachetools/metadata.xml
@@ -5,6 +5,11 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cachetools</remote-id>
 		<remote-id type="github">tkem/cachetools</remote-id>
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index cf45feca817c..f17004982230 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,6 +1,3 @@
-AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600cb80b07ace3e8766dc865b2e43cd9860df6144de9ff864fd0c48e9528516ba86918638f527cdc6a86de5ec5a941345ac SHA512 d06d5d19914ce829ac8cf2e461bcffe404b3e639ae37b6eaa81825ece9fb0e55b8ba2b316d18c80149b34cebff75368ac62eed58dcf6345affc71d798e267ce5
-DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
-EBUILD cangjie-1.2-r1.ebuild 1028 BLAKE2B d5dc641c6637456b638ede69a88308de34e672b7306911b04a2228f82653fa92cc3e70612ff455792eb02bf55351bd530af271d17ca24202e5ece3ac57960fbf SHA512 376074f3131591a3ce7b5c2cc39b33c50db20dfdb8286e598626db7352923ee0d6b7b49726db34413435695ccb352dbcbd232f01d0dfada60bf745b69e305773
-EBUILD cangjie-1.3.ebuild 984 BLAKE2B b8ba71fb202c2dff403be8ceb934aa24e67ed380b9a7b9e272cda5d833ede9778800fd02ea264af824ecb20a7f59b245ccca747f824938205a4b187b1fd97413 SHA512 be0d41d7ff9c5fe75ade77ef9462e6187cc39e8411fc8f40963d0d628677175eae92aace8b06769fbbaca035bbc659518344bb35aca189070f98b12819ec7fd1
+EBUILD cangjie-1.3-r1.ebuild 1051 BLAKE2B 15cc1821f26edf61b15981b57e660db827e56f1fce629d7281524d89a698b4c6b16a734cebd526931801a657e36dd4333b851e7e678080e77f745c0b85fedd59 SHA512 e539a11e9bfa9d90bc2008ae68b9d259110d6c93de62749cd19bcd8df2206b1642b7681a9c87ee8c4e50fccb92d62d0411f2b21044cf2cee1f893c7699b92d54
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.2-r1.ebuild b/dev-python/cangjie/cangjie-1.2-r1.ebuild
deleted file mode 100644
index d41c713ced22..000000000000
--- a/dev-python/cangjie/cangjie-1.2-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=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Python wrapper for libcangjie"
-HOMEPAGE="http://cangjians.github.io/"
-SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/libcangjie"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-cython-0.22.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_configure() {
-		ECONF_SOURCE="${S}" econf
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/cangjie/cangjie-1.3-r1.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild
new file mode 100644
index 000000000000..646ccfa41771
--- /dev/null
+++ b/dev-python/cangjie/cangjie-1.3-r1.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=( python3_{6,7,8} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Python wrapper for libcangjie"
+HOMEPAGE="http://cangjians.github.io/"
+SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/libcangjie"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_configure() {
+		ECONF_SOURCE="${S}" econf
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_install() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir python_install
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
deleted file mode 100644
index 61b243fd4fdf..000000000000
--- a/dev-python/cangjie/cangjie-1.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="6"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Python wrapper for libcangjie"
-HOMEPAGE="http://cangjians.github.io/"
-SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/libcangjie"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_configure() {
-		ECONF_SOURCE="${S}" econf
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
deleted file mode 100644
index a681726d98ef..000000000000
--- a/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -47,19 +47,19 @@
- 
- src/cangjie/_core.c: src/cangjie/_core.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/_core.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/_core.pyx
- 
- src/cangjie/errors.c: src/cangjie/errors.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/errors.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/errors.pyx
- 
- src/cangjie/filters.c: src/cangjie/filters.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/filters.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/filters.pyx
- 
- src/cangjie/versions.c: src/cangjie/versions.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/versions.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/versions.pyx
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index f7cae6346a89..143def502e57 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,14 +1,7 @@
 AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a497ba6e45daccd453aaf0a6e17608ddabdfbc681d5d83f0bf42496425aaf4c0fbc3c3f282fb62a4639bf0a0a SHA512 2750d043373d5a7ae0761feaf5210847fad08bbef96804cf6c4931fa751918241e0517bc538b1db12ae981d6a3a89afb53cfce8b2dfd7d80b849a6de203edb13
-AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1aab4c253c83045ae6792dc5420c516c53f354d64aa45389f99c50e7ba34db6ccc7d00845444e409804f3dfa SHA512 7ef9d36aaa9fe88fc8f3ce60c233e4ad92facd04dfe9bfbfd496d96659f2e977702e6cb0ce5ec1654cfc8773b91b5e5ee83ac6634599c30b015c1c40c6564e9e
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-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
-DIST catkin_pkg-0.4.20-gh.tar.gz 64039 BLAKE2B f57de3000798c0f65f4a759f605d80161d598bf648b556b37a66d31366bb3d56805c4178badcfff5e0286e8ed07f1699a2b6eb36112a51abb4d540928a108ba8 SHA512 7b2b25186b9fefd3acd11b785562c6481e9f37f568d66a674d314318686d3e0d2e8ce0cacab126411de78c71e2b8f378439d442d3fd041b3e92a25e95cef4e19
-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-0.4.20.ebuild 1258 BLAKE2B 5c475f240eba7d2ce69aacb90a79a94144e884d0a739e5c135b9c7ccb7aaf27c36ea7c58f126e365a224be8251a255b0e876786120c9769f402995d33f6ce881 SHA512 3e682c5d3e90020a16615add8e2a4b66e43c850137ff06b98fc3dca2a7f5fe26db2d4f0cc9108fe99ee33a888981c21f796e43e6e453cd28cc643dd88a9ab0ea
-EBUILD catkin_pkg-9999.ebuild 1258 BLAKE2B 5c475f240eba7d2ce69aacb90a79a94144e884d0a739e5c135b9c7ccb7aaf27c36ea7c58f126e365a224be8251a255b0e876786120c9769f402995d33f6ce881 SHA512 3e682c5d3e90020a16615add8e2a4b66e43c850137ff06b98fc3dca2a7f5fe26db2d4f0cc9108fe99ee33a888981c21f796e43e6e453cd28cc643dd88a9ab0ea
+DIST catkin_pkg-0.4.22-gh.tar.gz 64407 BLAKE2B cbcc9b766b8fcde05a89b41d6797c02e12b65ee4518b37e31d120aa2cc43d5b7d588ca668ae0bbe2a2b10ae2883aaf8e3414449292af7ea8ba01d05e649e402e SHA512 e7119dde7fc70503d8b8cedf505d93aef719039a836186738d017500f8d53cbd73ae4f017cb8d86cc007978066e6471b971039387a07e2eb3c6894569a30946b
+EBUILD catkin_pkg-0.4.22.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
+EBUILD catkin_pkg-9999.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
 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
deleted file mode 100644
index bc3411c6ac09..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.12.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 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
deleted file mode 100644
index bc3411c6ac09..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.13.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 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
deleted file mode 100644
index d4b62f25527a..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.15.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=( python{3_6,3_7} pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.20.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.20.ebuild
deleted file mode 100644
index 622966856b37..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.20.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=( python{3_6,3_7,3_8} pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop4.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
new file mode 100644
index 000000000000..53b5bb90f674
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.22.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=( python{3_6,3_7,3_8} pypy3 )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="https://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop4.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 622966856b37..53b5bb90f674 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+HOMEPAGE="https://wiki.ros.org/catkin_pkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-python/catkin_pkg/files/infinite_loop3.patch b/dev-python/catkin_pkg/files/infinite_loop3.patch
deleted file mode 100644
index e00fb93f5135..000000000000
--- a/dev-python/catkin_pkg/files/infinite_loop3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=612860
-By Tim Rakowski
-We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
-
-Index: catkin_pkg-0.4.6/src/catkin_pkg/packages.py
-===================================================================
---- catkin_pkg-0.4.6.orig/src/catkin_pkg/packages.py
-+++ catkin_pkg-0.4.6/src/catkin_pkg/packages.py
-@@ -57,7 +57,9 @@ def find_package_paths(basepath, exclude
-     """
-     paths = []
-     real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
-+    visited = set()
-     for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
-+        visited.add(dirpath)
-         if 'AMENT_IGNORE' in filenames or \
-             'CATKIN_IGNORE' in filenames or \
-             'COLCON_IGNORE' in filenames or \
-@@ -70,7 +72,7 @@ def find_package_paths(basepath, exclude
-             del dirnames[:]
-             continue
-         # filter out hidden directories in-place
--        dirnames[:] = [d for d in dirnames if not d.startswith('.')]
-+        dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
-     return paths
- 
- 
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index fc8a52a862c6..02cc8acd9315 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -1,3 +1,6 @@
+AUX cbor-1.0.0.Fix-broken-test_sortkeys.patch 1621 BLAKE2B 37336807f72b9bef9be366d875efee4fc3b79ce233e8bd8268c39421e123f41f09601c7a41ad3e2f3b04904dc0927ace8e7ef6321d25f7de320cea9ab0af9485 SHA512 d2eb200eafec051ad9eeaba63210732a226d45e06e98c0d90f605e0171ae185f592772a6fa2bd1572d1cfca0ebeade2415a2d516a80c161ebeb0cc3376067770
+AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8b3b313321c01cf48ffb09326f38f524c45dc2cf33de497097d8276f7f4add58b981fac6a6322c8ae5e0919ba854912af3babe4906bb4a4be9 SHA512 02b8bae3c269808884d9c6f23e3ff429f6e11b6ed3d41da0f2e2c3f69569af434aacd9e6c9115c65869b499c32d7cddc20de5a721d89ea7e7ed9c669348ed276
+AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
 DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
-EBUILD cbor-1.0.0.ebuild 623 BLAKE2B c4461506737dc8bca34998962c58ef8902ef0f6178ab881ee43eace4efca306cc0ede4232733087194d8ec86b054d5fb37686384697c3f17bad6d8d556ff86a3 SHA512 eb757d70f4a00e7da34aaa76564b816fc35625416e31cd1d311c4d47fb40c8fd7e7a5b0fe403767a902b8a22c4b0bef7244ad80e6de35e2e4ab44fdd1fe1e47d
-MISC metadata.xml 1001 BLAKE2B cc7da4ab732b2479a1ecd5ddd12ab8797ea7068a0623f54a89d9370bb85102f4d5d9007f6ed2228c16fd22a40e2705cf86b8ff4a799b2a0c32b44b6bd9e3dddf SHA512 bf458f02aa9b50016d4ab24c92c8722a50ffa86543d911dfe2fce7df726b3be480bf84b6193462666e7c03d5d37836f879d330520bab7f733ab44cb6f6efb666
+EBUILD cbor-1.0.0-r1.ebuild 1444 BLAKE2B dc3e777968a65352072ac789d1e5b067fb7b6be532c58ae461dbc587959b002403498ca40fcad5ef0a6310cc9b44eb3b55775ad508aac05653e31088a42f5ec5 SHA512 58312bf09df9f6c5984970a9971f882b610dab8e40abb51bca36d8b09ab84522b3e105586688e22b415eee2901ca5c0e1d06c1d0240e22cf3cb6a010126e837d
+MISC metadata.xml 999 BLAKE2B 46bdaf98ffe5045cb76897112d80887e3b96f6f87b864cc4af8217b918351e37e87a06d36f2a8028a69f75198904228b275243bf6947947218ddcac67e4d5626 SHA512 c79ba66b6fdbfc112de321697eaacaa6c2f5ca40cdbeca4c5d606e3b0c76371bb64d0e62270a3c1315ff058f5f66b5515a214f8e1e4214b1213790262f24efb1
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..28ec5ba34fcd
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.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
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+	https://pypi.org/project/cbor/"
+SRC_URI="
+	https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+	"${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+	"${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+	"${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf2..000000000000
--- a/dev-python/cbor/cbor-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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
-	https://pypi.org/project/cbor/"
-SRC_URI="
-	https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000000000000..e7867d12cc29
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later 
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both 
+the obytes and xbytes lists.  This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
++++ b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+         xbytes = []
+         for n in _range(2, 27):
+             ob = {u'{:02x}'.format(x):x for x in _range(n)}
++            # ensure some "ob" have unsorted key:value entries
++            if n in [4, 6, 9]:
++                ob.pop('01')
++                ob["01"] = 1
+             obytes.append(self.dumps(ob, sort_keys=True))
+             xbytes.append(self.dumps(ob, sort_keys=False))
+         allOGood = True
+--- a/setup.py	2016-02-09 15:10:34.000000000 -0800
++++ b/setup.py	2020-07-19 13:46:18.586936516 -0700
+@@ -75,7 +75,7 @@
+     author='Brian Olson',
+     author_email='bolson@bolson.org',
+     url='https://bitbucket.org/bodhisnarkva/cbor',
+-    packages=['cbor'],
++    packages=['cbor', 'cbor/tests'],
+     package_dir={'cbor':'cbor'},
+     ext_modules=[
+         Extension(
+--
+libgit2 1.0.1
+
diff --git a/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch b/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch
new file mode 100644
index 000000000000..66b712b0e40d
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch
@@ -0,0 +1,98 @@
+From eea2e6c35c0962ca559a96f37ab4eada126da5de Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sun, 19 Jul 2020 17:56:19 -0700
+Subject: [PATCH] Replace deprecated logger.warn() with logger.warning()
+
+---
+ cbor/tests/test_cbor.py    |  4 ++--
+ cbor/tests/test_usage.py   | 10 +++++-----
+ cbor/tests/test_vectors.py |  2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..14ddf69 100644
+--- a/cbor/tests/test_cbor.py
++++ b/cbor/tests/test_cbor.py
+@@ -27,7 +27,7 @@ try:
+     from cbor._cbor import load as cload
+ except ImportError:
+     # still test what we can without C fast mode
+-    logger.warn('testing without C accelerated CBOR', exc_info=True)
++    logger.warning('testing without C accelerated CBOR', exc_info=True)
+     cdumps, cloads, cdump, cload = None, None, None, None
+ 
+ 
+@@ -62,7 +62,7 @@ class TestRoot(object):
+     def testable(cls):
+         ok = (cls._ld[0] is not None) and (cls._ld[1] is not None) and (cls._ld[3] is not None) and (cls._ld[4] is not None)
+         if not ok:
+-            logger.warn('non-testable case %s skipped', cls.__name__)
++            logger.warning('non-testable case %s skipped', cls.__name__)
+         return ok
+ 
+ # Can't set class level function pointers, because then they expect a
+diff --git a/cbor/tests/test_usage.py b/cbor/tests/test_usage.py
+index d72f2e8..9d7e6a1 100644
+--- a/cbor/tests/test_usage.py
++++ b/cbor/tests/test_usage.py
+@@ -22,7 +22,7 @@ try:
+     from cbor._cbor import load as cload
+ except ImportError:
+     # still test what we can without C fast mode
+-    logger.warn('testing without C accelerated CBOR', exc_info=True)
++    logger.warning('testing without C accelerated CBOR', exc_info=True)
+     cdumps, cloads, cdump, cload = None, None, None, None
+ 
+ 
+@@ -48,7 +48,7 @@ class TestUsage(unittest.TestCase):
+         repeatedly serialize, check that usage doesn't go up
+         '''
+         if cdumps is None:
+-            logger.warn('no C dumps(), skipping test_dumps_usage')
++            logger.warning('no C dumps(), skipping test_dumps_usage')
+             return
+         start_usage = resource.getrusage(resource.RUSAGE_SELF)
+         usage_history = [start_usage]
+@@ -76,7 +76,7 @@ class TestUsage(unittest.TestCase):
+         repeatedly serialize, check that usage doesn't go up
+         '''
+         if (cdumps is None) or (cloads is None):
+-            logger.warn('no C fast CBOR, skipping test_loads_usage')
++            logger.warning('no C fast CBOR, skipping test_loads_usage')
+             return
+         ## Just a string passes!
+         #ob = 'sntaoheusnatoheusnaotehuasnoetuhaosentuhaoesnth'
+@@ -113,7 +113,7 @@ class TestUsage(unittest.TestCase):
+         it, checking usage all along the way.
+         '''
+         if cdump is None:
+-            logger.warn('no C dump(), skipping test_tempfile')
++            logger.warning('no C dump(), skipping test_tempfile')
+             return
+         with tempfile.NamedTemporaryFile() as ntf:
+             # first, write a bunch to temp file
+@@ -168,7 +168,7 @@ class TestUsage(unittest.TestCase):
+     def test_stringio_usage(self):
+         '''serialize data to StringIO, read it back'''
+         if cdump is None:
+-            logger.warn('no C dump(), skipping test_tempfile')
++            logger.warning('no C dump(), skipping test_tempfile')
+             return
+ 
+         # warmup the rusage, allocate everything!
+diff --git a/cbor/tests/test_vectors.py b/cbor/tests/test_vectors.py
+index f4d8ca9..afed311 100644
+--- a/cbor/tests/test_vectors.py
++++ b/cbor/tests/test_vectors.py
+@@ -27,7 +27,7 @@ try:
+     from cbor._cbor import loads as cloads
+ except ImportError:
+     # still test what we can without C fast mode
+-    logger.warn('testing without C accelerated CBOR', exc_info=True)
++    logger.warning('testing without C accelerated CBOR', exc_info=True)
+     #cdumps, cloads = None, None
+     cloads = None
+ from cbor import Tag
+--
+libgit2 1.0.1
+
diff --git a/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch b/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch
new file mode 100644
index 000000000000..f508b86a0668
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch
@@ -0,0 +1,10 @@
+--- a/cbor/cbor.py	2020-07-19 13:24:39.497775767 -0700
++++ b/cbor/cbor.py	2020-07-19 13:24:39.497775767 -0700
+@@ -260,6 +260,8 @@
+     """
+     if data is None:
+         raise ValueError("got None for buffer to decode in loads")
++    elif data == b'':
++        raise ValueError("got zero length string loads")
+     fp = StringIO(data)
+     return _loads(fp)[0]
diff --git a/dev-python/cbor/metadata.xml b/dev-python/cbor/metadata.xml
index b680056119d4..bf5751841912 100644
--- a/dev-python/cbor/metadata.xml
+++ b/dev-python/cbor/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Brian Olson</name>
 		</maintainer>
 		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+		<remote-id type="github">brianolson/cbor_py</remote-id>
 	</upstream>
 	<longdescription>An implementation of RFC 7049 - Concise Binary Object
 		Representation (CBOR).  CBOR is comparable to JSON, has a superset of
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 01432644f8ed..54466cacac36 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,3 +1,5 @@
 DIST cbor2-5.1.0.tar.gz 72328 BLAKE2B 22737f1ce152eb356fc937199ba83e9558b68900f8183ee8acca52312fa56499812d6b26aaaa629b6e2cfacbdfbb72f65cb7fcbe93a010320aff94aec8dc3978 SHA512 0df4f0c5609ae8d73627a64ee1544af88461b2bf829538f23d912138cf47ae8d03193644c7315e2a77318e58fd2bd61c4cb103d94ed0710db0ae5c2cf4df60b7
-EBUILD cbor2-5.1.0.ebuild 797 BLAKE2B 70412aa3a3404090064f5793e65d0e47acfc7b7e25de05c59220e66102f14f7e3ba1cec522e5abf1e710f70bbb1823c37d0b2284a85ca74562afe01185f3f3d0 SHA512 6af963b51a4a03403dae1cc5d3741115f528714688da6874445ac379ce4d4ff49c607a980517f82f144a90dbfe327a28dff53976b6514e483e82613903ea3dba
+DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
+EBUILD cbor2-5.1.0.ebuild 793 BLAKE2B ba87377c387ec8f77e743d8238b00d507a2cbae2b7e268f35c0c663b51abb27eac8bf237dcca360176be001d1708ed3b323baa5d4893bd89d19f24cefba1ce23 SHA512 197843e9efb07fdd5ca872772ef0ce60303780a33bc6cb8b7f767158c32d2e1998ce695f9679205442710d07efc229ed0336adbb1e0a80e2e7aa4d68950aeeef
+EBUILD cbor2-5.1.2.ebuild 797 BLAKE2B 70412aa3a3404090064f5793e65d0e47acfc7b7e25de05c59220e66102f14f7e3ba1cec522e5abf1e710f70bbb1823c37d0b2284a85ca74562afe01185f3f3d0 SHA512 6af963b51a4a03403dae1cc5d3741115f528714688da6874445ac379ce4d4ff49c607a980517f82f144a90dbfe327a28dff53976b6514e483e82613903ea3dba
 MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
diff --git a/dev-python/cbor2/cbor2-5.1.0.ebuild b/dev-python/cbor2/cbor2-5.1.0.ebuild
index 0ab2f141e004..212a52fd6ee0 100644
--- a/dev-python/cbor2/cbor2-5.1.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.1.0.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/cbor2-5.1.2.ebuild b/dev-python/cbor2/cbor2-5.1.2.ebuild
new file mode 100644
index 000000000000..0ab2f141e004
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.1.2.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 distutils-r1
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+
+	# remove pytest-cov dep
+	sed -e "s/pytest-cov//" \
+		-e "s/--cov //" \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 5c63ae7be6e2..28ecbb506b29 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,6 +1,3 @@
-AUX certifi-2020.4.5.1-use-system-cacerts.patch 797 BLAKE2B c870e8f65f63295cc68703a1ee15bd8ee30da6e1f038e988cc359227904e8a0f6f236752399677f145ec7d4bb5767b4e97456bc65bb9b5cddd25926ff5df37d6 SHA512 c2dfb2fa730556c791efb4aa320e0164608d24adacf91f90d9398e31744d98dfb1cdba82d00eea2d75fc09c9e2d7408852b1791378e20b8e4a8b3a6342da539d
-DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
-DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
-EBUILD certifi-2020.4.5.1.ebuild 1369 BLAKE2B 231ca1e683d6da675f3a02b93b60e43a01d6790789d0a07ac34f4c608af335a84cc0b26cbe03e7dbc9727be29924e42299036b636d07cb846be81a09ed26ea67 SHA512 3d6a2876e5ab7bc4d4307b842e28db3af6f89f3e56fba244c362b254bf16ee5eb2b45ee1a4a5e65cd8641f1e9f998d88e1c23ed5708b3852ae441babe727c16b
-EBUILD certifi-9999.ebuild 896 BLAKE2B d0fff5f6befad9010e913f1e84bfd80c06c5d70e11b210ea48680f966176e1fb9bff785f5f09271be807fc2c149cc8ce4374a0f18c9c665d02e4ae648181a062 SHA512 4b3c27da78aab44abc3a63b4bd4953318e8e8c48ab4f36af46cbf92c93519deaec6a7c11e78b2d276552f09876214cd4356d7fc7a65aa7d1ea5e3d371d077c2d
+DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
+EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001.ebuild b/dev-python/certifi/certifi-10001.ebuild
new file mode 100644
index 000000000000..11944fbf8606
--- /dev/null
+++ b/dev-python/certifi/certifi-10001.ebuild
@@ -0,0 +1,32 @@
+# 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..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.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"
+
+RDEPEND="app-misc/ca-certificates"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/certifi/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild
deleted file mode 100644
index 35515f2569a1..000000000000
--- a/dev-python/certifi/certifi-2020.4.5.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=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="https://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/certifi-9999.ebuild b/dev-python/certifi/certifi-9999.ebuild
deleted file mode 100644
index d05d83f13c9a..000000000000
--- a/dev-python/certifi/certifi-9999.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..9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=certifi-shim-${PV}
-DESCRIPTION="Thin replacement for certifi using system certificate store"
-HOMEPAGE="
-	https://github.com/mgorny/certifi-shim
-	https://pypi.org/project/certifi"
-SRC_URI="
-	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="CC0-1.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"
-
-RDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
-	distutils-r1_src_prepare
-}
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
deleted file mode 100644
index 692439a10eac..000000000000
--- a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 77bf2982642c..c94770c212bc 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,6 +1,4 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-lint-0.21.6.tar.gz 2149548 BLAKE2B 36bb80d8b656eddc0e0a00e4728e46ff05f12ff93d70295a045602f09d570880bf087f25165ed21641e80f096b93e3cf4c9cf97b6498b330dc53beaba67aa492 SHA512 c263e6e5ccd03ff5b843e9d4ebd74844f1b4053fa766f5300e4cc66745c42e82771e6af73cf950c81bb66f09b4afd5d438bdcf8489a3b9d61d562a7145d04297
 DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe983b6125a6cb557ee314de0e6647c5756b0be450deec7778ac69f1cec95b594c8c74a0a2f56ea229b7dc28ffb918983e6b3 SHA512 67b72973dc174e0de4980606b7886459233fca516a0587b91319127c4df0ce2647bbdc3302d68b63916654a76f4c9405c2f27cfd5e0ad737b00724e403815477
-EBUILD cfn-python-lint-0.21.6.ebuild 918 BLAKE2B 2971e8c31d779ad659f11de9afb3a2f53358bd74ec6e7456224f90de4e1abde020ef625f852c67dde12c1a958e20b11e949725f132bf29e45ade4bd3e6010e0d SHA512 4d0743f9ab3897c506de79426d43c5c00d4933b4618a728ad8e6119319a96a5868a237ca1d61b63645de4f79c15d58b4dc621665c8bd01571fe2637417202935
-EBUILD cfn-python-lint-0.30.1.ebuild 1137 BLAKE2B 6bda3d7576a5f76accbd6740deaf014a1d52ee28a83603c18f8e79d5c1dea29be4b5211f857fc410f216bab99f2b2c58902b66e3801b1caf36c53eaa0892dd08 SHA512 7f7f2348bcc00607f7055d2c6950e7d59a1717fa9b74e3589bd1511841d9ff1142927ffff86d951ad7606107118ff921bcfef6bc086faa5ac2a735f8df011d85
+EBUILD cfn-python-lint-0.30.1.ebuild 1147 BLAKE2B 2f23485ac84f0911d2e403928924f0a96198aa863c712103c68295aa02f662d51e5c59d51883f9753159177f5b05dd47966489ce537e9cc8aca9de0cd5a75f56 SHA512 ae3c1238893d5d4d7ba86a6fb749aa407f0597f8ec2a59c8b455392105b45de8400ae133df8025d5b04a8b3a1b8edfa3ee30e2999c718107555a185e1e595077
 MISC metadata.xml 572 BLAKE2B e7e0e4631f4ec0e9b668f664607b89790edcaeea43c2da8b9cde1e9671eb5c18221d61d8981b1f23773b6d0582883d879b70d1850bfb4ab8a7bbfad60456b286 SHA512 6677b1994867314be92d0a95e2115102d8ef87f4137ac26d488957ca7d34e77cc618a308c8fb648405f28eecd872c8965dda5f042d410d5084c3dc38d54994ac
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
deleted file mode 100644
index 09b7350a97f1..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.21.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=cfn-lint
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aws-sam-translator-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pathlib2-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
index a707f4ad926a..4c8420f43ef0 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.21.0[${PYTHON_USEDEP}]
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 5e9c05ecd7af..5ee081b5c787 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,6 +1,4 @@
 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 464 BLAKE2B 2bfa9f004c62fecb64c53032bf4dfb72ad1ce49eec2dae9cd52888690a3264c959078c4059ad988279d22d2feeed0903616e2f4d0a3312761b6eca1a11cff53a SHA512 c2b7ce169f265a1aee7ba99c5e3993cc4a6cad8abab82223645fb6ef1f3a3743304957321d5bf7a6f5bb482db2edc54a6e3b0cd8fad0c7eef71417b606cb2131
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.1.ebuild b/dev-python/chai/chai-1.1.1.ebuild
deleted file mode 100644
index 4ab064a1cd46..000000000000
--- a/dev-python/chai/chai-1.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=( python{3_6,3_7} )
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v tests || die
-}
diff --git a/dev-python/chainmap/Manifest b/dev-python/chainmap/Manifest
index d6c604a14668..b3339ac1525d 100644
--- a/dev-python/chainmap/Manifest
+++ b/dev-python/chainmap/Manifest
@@ -1,3 +1,3 @@
 DIST chainmap-1.0.3.tar.gz 6325 BLAKE2B 108f4b728e5377272923e6d6c554b205429ed3534f0ed5fcbeb60746837cda64d124d415ba3da83cca23249e69795d3bec3c46fa91966d0cd2a5d220b5e1dd28 SHA512 0079f7e725d67a89402b00290bd9dfe5232c91050e68809c6fa76ce6697279ca6962a92f80a841341006d05d9a36fef639fe1e967631e21275aad03c1d871bad
-EBUILD chainmap-1.0.3.ebuild 414 BLAKE2B 410730bd983a4d06330c00eb84bd7c230e928daeaef44be3a6de1de530fc8128eeb56131c3f4823d99470a44b59ae181fa7cddc4c57d35ca41d57488ced44f62 SHA512 d1fa24e433cb500bbcd1512ed2a3d8f669a6e10b2873af55c7944fa5988ed2c341c57af0a7f71d76c5e95734e0d032164f603c3b456b36629dd748531619ac8a
+EBUILD chainmap-1.0.3.ebuild 410 BLAKE2B 0262d65ba575dd6b133dcbda97ea3d781cfa0bde9c3ea159bdf8bed7760960b40e3658277291d557aae3ef14c80f47844bdcdd0156adcabcf3a3e6e7488d957f SHA512 d65e03d6a3ffdc134cfeb4b3ac4113b2196e9d78852fee541ccf9fc0c7b30a3afa088f96a766f428977a72c6958c496281991d2674b6ac2eb0cff4d03a9d12e1
 MISC metadata.xml 420 BLAKE2B d4c81538bfccddb9ea0ed47ecd1915a18da02744d08661b5e14fb313fc6bcab6e8b3a7411406481bc1a9ec3c9d3fa7d318708c0760e85bffe4e2e4b7e1d761b9 SHA512 c4c2cd9a4cdf0c5ab4b1b2c51249288632c77d3bb461f03f57066a723e0f321a9be760a7e9b9f0a5186c1217a8b27976ad327a2faa6a7213589e96c246b4dc7e
diff --git a/dev-python/chainmap/chainmap-1.0.3.ebuild b/dev-python/chainmap/chainmap-1.0.3.ebuild
index b7190e908372..62c11f968302 100644
--- a/dev-python/chainmap/chainmap-1.0.3.ebuild
+++ b/dev-python/chainmap/chainmap-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="ChainMap implementation for older Python versions"
-HOMEPAGE="https://bitbucket.org/jeunice/chainmap"
+HOMEPAGE="https://pypi.org/project/chainmap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 0cfaba3319cf..12c2582a64e5 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,11 +1,3 @@
-DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b21948b6f252e76e5391e862850a29e9e0fe4aaa31a03da7ec1674a2b563d083ee31fb342be2dc9bf4e7b4dbccbabf8637 SHA512 9f1d2a9222b795ac139f0c06ea8169ec132c00714ec4608e58dd5781dba8380f988141f6659c47e8920ee0cd4d4bcde9070794cd0e2b5f34d0fce21d24e2dc98
-DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db110531caf28890042d0cd7a628489f03f9e2e3eed16dea2981ebb6e064a53adf95638102dfde6c8218e41e0473b32d SHA512 158b418fa6fbd13cd48d913ab34fb4f16450aa0fa3b382c6c829efed3100753814449a1d4004c9bc45d327d2a66130db0518b9c28943af300b4b310e955c426c
-DIST chameleon-3.7.2.gh.tar.gz 135311 BLAKE2B da6803bc6c064151b9d0cbe7761bbb44f73b1fd24fcf77d2e906c410768a1c99fa04225ae4aa719282bbb1f4fd0d51a6c710901016bb5c24f78ba2184f978f27 SHA512 3025fa92bdff3279fc404ad08d73d46bee82afd421f1d81982bd5cd2ea3fdffadf22efdb8b66157dbdf4d0cd793ac06b1a0daac4eb17a2a1ce9f14a65d4a6f8d
-DIST chameleon-3.7.4.gh.tar.gz 135403 BLAKE2B 5cdcfb60975283a8c4d7623e002962dea336cf4414a9a212e9f9bab10ece4627ec36c80744d91428daea187e50956be89be128f25966e7d6069ad141992cfbde SHA512 429a2ff78b27996ee9c21cbc076614accf328e880f03f084e52395987a36c1eabd679428bf8400807bb909a60a31a5c899218640be0d0230ded7309e9ba6753b
-DIST chameleon-3.8.0.gh.tar.gz 135496 BLAKE2B ee21337bb59e4d724a2b9e647af399ceef2946ec3fc4679a78ba79c10ad78c7b41f0585bb0081c02604045e08f126e5f851bdf0c091679561e3591153c49cd1b SHA512 7eaeee53a215fe93142ad57e40d161816fdcfa9a24d68a4648f09ae0a49a2439ccf8f0ace700780025e196471dc1cb8941cd77b120c84876cec77c89e883534d
-EBUILD chameleon-3.7.0.ebuild 487 BLAKE2B b4bfce3c5bbcc2bf1499a36ce44295bcdb3f138b919192fea523e353747d291ee7c030f208642b1f7df7603e892fa0592d0c7c2c94e2ce0c8f232773df9ca073 SHA512 99e480305dd8870980bac8b4ccd2cca4eddb1d0b09d33810f9406d06dad42af6e51037d732fdb8b8abf4941b7f75d2121abeeab7bd7e1aff32dfff6a5662fcf2
-EBUILD chameleon-3.7.1.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
-EBUILD chameleon-3.7.2.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
-EBUILD chameleon-3.7.4.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
-EBUILD chameleon-3.8.0.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
-MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
+DIST chameleon-3.8.1.gh.tar.gz 137012 BLAKE2B 20b0a830ae932ad0e8b28015b233049ee78a74f06f26d2652ee297f366eda6f54fa7650fa20a3c4da3802a2466c0f6a4c4cdfd9608761a20986c86673c61a242 SHA512 d4a4b3ac0b59865a7ea1d9ede7f08d991296c1d08a48c7290b9e2864afa6527237d8dee604114918f3b5035f2cc915bf6218d0758ebcd393f2103bb0751f6ea2
+EBUILD chameleon-3.8.1.ebuild 486 BLAKE2B e33b7e2215e3d23e7002c1a29097413e6cb5f1191b68f96670aadf87cb297b70111f88fca3bbdbce84dd5506683c33ca68aa9b5f2b4401e0315f1a1dbdf6a74c SHA512 e636a3e52fe294c971e7a95559b7a7002611131727b250b7983828924bae1af8050272e89dcf35979b19ab5edc7e0e3dd70d7228a6f404ab158ceb0e187fc6af
+MISC metadata.xml 336 BLAKE2B 977479a6095d95c4e347fcd892dee85a6b7212257ae16bc4f5b399ab9f640e128251a5f4c7dfb5a986d59ca055d0b8a672043fdacf977cca9657f704039eab1c SHA512 be8a4e640ca8c5dc78a76defb915e5bf2eb8f9be17cd6d7e70df390f17916c05787ece4abe97a8d0e6a4a95648c59a986b2f11f27633f39be9483df365df7074
diff --git a/dev-python/chameleon/chameleon-3.7.0.ebuild b/dev-python/chameleon/chameleon-3.7.0.ebuild
deleted file mode 100644
index 691d011358e2..000000000000
--- a/dev-python/chameleon/chameleon-3.7.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=( 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/chameleon/chameleon-3.7.1.ebuild b/dev-python/chameleon/chameleon-3.7.1.ebuild
deleted file mode 100644
index 4bee57992bd6..000000000000
--- a/dev-python/chameleon/chameleon-3.7.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,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/chameleon/chameleon-3.7.2.ebuild b/dev-python/chameleon/chameleon-3.7.2.ebuild
deleted file mode 100644
index 6f8ba1fc5c20..000000000000
--- a/dev-python/chameleon/chameleon-3.7.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=7
-
-PYTHON_COMPAT=( python3_{6..9} 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/chameleon/chameleon-3.7.4.ebuild b/dev-python/chameleon/chameleon-3.7.4.ebuild
deleted file mode 100644
index 6f8ba1fc5c20..000000000000
--- a/dev-python/chameleon/chameleon-3.7.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=7
-
-PYTHON_COMPAT=( python3_{6..9} 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/chameleon/chameleon-3.8.0.ebuild b/dev-python/chameleon/chameleon-3.8.0.ebuild
deleted file mode 100644
index 6f8ba1fc5c20..000000000000
--- a/dev-python/chameleon/chameleon-3.8.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=( python3_{6..9} 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/chameleon/chameleon-3.8.1.ebuild b/dev-python/chameleon/chameleon-3.8.1.ebuild
new file mode 100644
index 000000000000..4baf4295f0aa
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.8.1.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..9} 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/chameleon/metadata.xml b/dev-python/chameleon/metadata.xml
index dc901a1bf844..e56e490aa9a4 100644
--- a/dev-python/chameleon/metadata.xml
+++ b/dev-python/chameleon/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Chameleon</remote-id>
 	</upstream>
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 65ed26e005d6..d289cf645aca 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 669 BLAKE2B e59bdc86ce8ce52b9d5d9957a0d2e0abc25a881e5b7413604508db1305f068043ceafbcbd045ce6bbcad7b6dd84c87ac55a9466193fb75ef1b367d5c5e7c7494 SHA512 782ae8943e36d14b284fd655340409c55dc2a0b80650858c929527a9601434ac27d17ba764483a5038a53c4040ff7b894fca96ede16615984fa56120dc01f6b4
+EBUILD characteristic-14.3.0-r3.ebuild 659 BLAKE2B 654dd133c42b3aa445d672e7cadbb12166021ef2f884a940379f80e3ab27facb0dbc6e6ca00bcdc1b0a9c726b3a05a52718d8312ebee3e9ebeb53a8900d7dd8c SHA512 ece46af5d584a05a205d09898bfcf7a5a4b1162a401fca9950ec703393bad9548a302d1bfd7fbd9323cf372c280189c93f2339e9657a395a32eec085731790b5
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index 2fe3077b4082..ae5ce89e809e 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheetah-docs/Manifest b/dev-python/cheetah-docs/Manifest
index 7e17ebe8f184..b51ee9e8a10f 100644
--- a/dev-python/cheetah-docs/Manifest
+++ b/dev-python/cheetah-docs/Manifest
@@ -1,3 +1,3 @@
 DIST CheetahDocs-0.9.16a1.tgz 1031641 BLAKE2B dfd116242ac389e437e0aee9da72c9b6fa766e82adadee6881f7c32b74464244b8c802a1ed70c8c5e911dd4aa7b683b650d42c474b70af81c25d5d36489e5794 SHA512 b0628e85200c4231fefd5eb770bd797d5eef3d6d85eac9b1da6d34d9dfb755a028a50a224bf9202d43a3458e15059ed7f5d4a55c49d484eed2b4caf1c7af835d
-EBUILD cheetah-docs-0.9.16_alpha1.ebuild 726 BLAKE2B e1c2ce4a8e407eb62ca26ccea9ef22250adc5795376042c9adb2db61ac37514684f42bde1da53d9adec935d913983086ad39f2e51b3e0320c7a8006a8c76cfe9 SHA512 8b08811fc50f49ca6d7b02b1e6c1242e78eceb9adeb58e831256b50d646e0738a1b6a8d0d69751b1ec66a2ba003e16f8cc3ecc7c4b6df790410ce65a6c7960fb
+EBUILD cheetah-docs-0.9.16_alpha1.ebuild 727 BLAKE2B 085e4bdc374113a58768e5c87510d294adb68326744e84759dc92eef91574596a8d8db13bc52677b2b962ca33df35098ff9fded0246b47715083fe49849b652d SHA512 dd9b0d76d6bb6fa93a1514153f35a27959237021a49d6200e0eb7d772c9e0a330dc6b82f6b849feb23e8d74fd3b21ca8402f581abc8a02f62820d4e073910bdf
 MISC metadata.xml 325 BLAKE2B 7ddfa9ff7690f262fea51f5ada4b1aba2dfef33ef2da822a8f608021fe008737153d29b859d7018f8481f124ebe6bd00810c89aceb5abef7b13d44007bfad39a SHA512 98a1f6fbdf321900f9bd0d3357ae65cb94e70572cbb6d2919fdcc779a39020db51c8b2191e52e4258c89bf01a9db47db18d000d946c14671b2148a57856da9d0
diff --git a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
index fbb30d45f632..b9d0bf999d2c 100644
--- a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
+++ b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils vcs-clean
 
 DESCRIPTION="Documentation for Cheetah templates"
-HOMEPAGE="http://www.cheetahtemplate.org/"
+HOMEPAGE="https://www.cheetahtemplate.org/"
 SRC_URI="mirror://sourceforge/cheetahtemplate/CheetahDocs-${PV/_alpha/a}.tgz"
 
 IUSE=""
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index e0c7c55b7e24..cc1aa8854ffd 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,8 @@
 AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00be71880f2df04c928093b7e0e61c6095c854aaa1bfe0ca85e1afd480102826ea6c81766374d2886b916f98ce23e18613a5225 SHA512 0e1f04fa069917eae4267408b6f791108805ce831612cd78acf53e25ed435e38cd542b3a8d0a75cb149e55fc35daf1c24d5b6637899303861bea2e810f6e3889
-DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
-EBUILD cheroot-8.2.1-r1.ebuild 2249 BLAKE2B 75bb493262711a58088d4539c27157dd37638e521e89c7e2f2675421d38346a62332dc9b71c183d56a7560f491636f05c894d01aed0a8b10c63cd5d08e5ab006 SHA512 8ca74fe3a2a5160b228cd7009550a8d9f59dc6c85c3614167716c4d1188aeece0c774ab4d711e76615476ab5315f2b4c9133e6d4b1a2df967e120d05717a99c6
-EBUILD cheroot-8.3.0-r1.ebuild 1414 BLAKE2B 68c9dd50562bb0d7a872497e53272dbff24024859ee4a8ce25f79968ebfdf9236b3fb8a9d6be6b66d54f7c383dd62e7b87d7863482a3d1cc3a50017570a78193 SHA512 fd4d32399fa25060947a7e244d1b7b199da923a519256403a16d58113701441769f6f84eaec77d15a826102f0507fa7084d1e7f0426627adbdf8b4a133d1dfd5
-EBUILD cheroot-8.3.0.ebuild 1182 BLAKE2B 1b1582713afb603c4eab37fdfe7e7c1fdc6569f56694caaefa6629e847b71578ca8f6b256aa6347d114c5d42e09d678771cacd9a217625d416b93e573eb40cce SHA512 2ffa8686cb0fa46bdddf9277467558c8a16bae879b0a80fe6f31fe58e413f6249117068f66b7a83c2b9c4ddfd7809a9753b9eb426cae44aa63300ac9438567df
+DIST cheroot-8.4.2.tar.gz 107264 BLAKE2B d28d602ebd442ad5d85dfb2f4618b279e733cfca9d3c516ad1fbefcd318449155819549f6b929713d51d44fbaa9a7db383af81ea65271c6646a9245e521b3178 SHA512 d0b807969d491e0b3423453d27acfbe51147f6786c0b2c8a1b4774589e3e82b027277bf0ddd5ff406f31e0ac7d9dfbd6c2f02efe6911889986e72e9f16b8e62f
+DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
+EBUILD cheroot-8.3.0-r1.ebuild 1409 BLAKE2B bb5c42a3682198b4fd398d4a4bded944caa79b0e17721d49266e368297bba90a216ae10dc7653fd2cb1fb58fc61ff53623a407e55dc8600c4a8f04daa130be48 SHA512 ff73d49cb031988681ec77508c52cab9138b6a38d5eddc98c3f1e0d752a75870793391677f575ece594be53aa7b4d72f482139cd0f291ed52023e2cc743f20ef
+EBUILD cheroot-8.4.2.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.4.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
deleted file mode 100644
index 1cb11261efd9..000000000000
--- a/dev-python/cheroot/cheroot-8.2.1-r1.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,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.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index 70a6ae89fac9..5344578553de 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
deleted file mode 100644
index 0124db04df17..000000000000
--- a/dev-python/cheroot/cheroot-8.3.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..9} )
-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/cheroot/cheroot-8.4.2.ebuild b/dev-python/cheroot/cheroot-8.4.2.ebuild
new file mode 100644
index 000000000000..467ee0e31e3f
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.4.2.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=( python3_{6..9} )
+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"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cheroot/cheroot-8.4.4.ebuild b/dev-python/cheroot/cheroot-8.4.4.ebuild
new file mode 100644
index 000000000000..467ee0e31e3f
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.4.4.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=( python3_{6..9} )
+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"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 9c308e350f33..49b3442cdc06 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,11 +1,3 @@
-DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
-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-18.6.0.tar.gz 686804 BLAKE2B dae7f0ac403084acdf611e4a9e75f152355491e4383a1bd1374ae77ac68b415f41ce79f1e65a7a66c61aa0965ac94cd9bfd0d425cf7752ab54edf0bc0d8cabfb SHA512 cd33303fa9b9704ef427553091a6a6c2bbfea20e7d81acd2bcdc2855f8a36a084a0781bb19f3a084b24f0664bd7b318a667c8c79b5073381901acce4602de9d7
-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-18.1.0-r1.ebuild 1879 BLAKE2B e6ca418791d306d45ce0f9d4a189e1c4675027dc14e5ad099a139195e3dd40365daea4ffa03f59e3433e464b4ba80c9c1186c24969d50293db6e836ac9408c1a SHA512 7ba691e2b421503f881930f1a829a4335e1b85037924510afa09e0c0583f879bc92d44e080091f54a82714a61694868fbd66ac42625ddc9b8228e736e4dbae51
-EBUILD cherrypy-18.5.0.ebuild 1917 BLAKE2B fd12521b4a8effdcfb6ad89308d857fa9505c5c60d76a56d052d31cf09a8e4a8f46ee51a3026ea59b4132f43bcafcc93f354d976298bb4d18042317dd47f0596 SHA512 60eb40a5925b4d34d0bcf84e9be769554f348896e77c857aaab6dd7b33bdf4a58829d4fe60354abbe3413a6bb270fec75f7167479d677b0b27aad86a07073924
-EBUILD cherrypy-18.6.0.ebuild 1919 BLAKE2B 6dec6f120773cc5051c066354ab4f55cad213fd989e95dfeb90df15938e324c283e8f16fa5a2289b0d7df095683381af560ab26a3acb98a453741a27391e617c SHA512 9ce886bac48d1de8c4a298c2e3f26443569bb741f77962bb5de568c6652883d1e3d1f3b4d80bc8c46d2d0c28347a66ef46271231ec5f569f6a345aebaa340663
-EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
-MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
+EBUILD cherrypy-18.6.0.ebuild 1914 BLAKE2B f978fc144fbcb26358cb0722174a62b287b73104246d7814a98a9b5d3d5400ebcf880e9d751ce80b70500e8389b81c5105a3ce21a9498c271ae11c817f08e404 SHA512 743600770a3f95f1ba3aa1634ccd9f6549468537ce8108f8d7c642726c9f01f4509e720a39778fbacb73a09fd49a2aa6b9f214b3836cfe68d46823ffb1f8e65f
+MISC metadata.xml 346 BLAKE2B 96afee16daef8fd731513c0119b1a58225caac3a1a9550d53ac83fc79c286cbe7bf3025f37cf1ce9af8881a8a99d98141051c3130e8af93822fd79671016352d SHA512 4cf59edd86b71c5aee0863e5437fc0fdc5a37d1001b8ba87e3245444986884c4b804ed8686117f277bf6e90b310044d9b51bb3cf5271ab6db7b70a7e71e47518
diff --git a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
deleted file mode 100644
index 13c2d5e6fc5b..000000000000
--- a/dev-python/cherrypy/cherrypy-13.1.0-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} pypy3 )
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
-	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MY_P}"
-
-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
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "tests failed under ${EPTYHON}"
-}
diff --git a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
deleted file mode 100644
index ef09dc2c08e1..000000000000
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.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} pypy3 )
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
-IUSE="ssl"
-# IUSE="ssl test"
-# See below to see what needs to be done before testing can be enabled
-# for this release.
-RESTRICT="test"
-
-RDEPEND=">=dev-python/cheroot-6.2.4[${PYTHON_USEDEP}]
-	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-	# These will need to be checked for testing and some will need to be
-	# added to portage.
-	# test? (
-#	dev-python/coverage[${PYTHON_USEDEP}]
-#	dev-python/codecov[${PYTHON_USEDEP}]
-#	dev-python/objgraph[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/pytest-services[${PYTHON_USEDEP}]
-#		dev-python/pytest-sugar[${PYTHON_USEDEP}]
-#		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-#		dev-python/path-py[${PYTHON_USEDEP}]
-#		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-#	)"
-S="${WORKDIR}/${MY_P}"
-
-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
-	distutils-r1_python_prepare_all
-}
-
-# python_test() {
-#	py.test -v || die "tests failed under ${EPTYHON}"
-# }
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
deleted file mode 100644
index 0cdaca1585c5..000000000000
--- a/dev-python/cherrypy/cherrypy-18.5.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
-
-PYTHON_COMPAT=( python3_{6..9} )
-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 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/routes[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-services[${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
-
-	# fragile, fails with newer versions of CPython
-	sed -e 's:testCombinedTools:_&:' \
-		-i cherrypy/test/test_tools.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-18.6.0.ebuild b/dev-python/cherrypy/cherrypy-18.6.0.ebuild
index 66e4cc80ed0e..20a069c7dfd3 100644
--- a/dev-python/cherrypy/cherrypy-18.6.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
deleted file mode 100644
index 94e2448613ca..000000000000
--- a/dev-python/cherrypy/cherrypy-3.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=5
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/nose-1.3.3[${PYTHON_USEDEP}] )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-# testsuite predominantly connects to the network
-RESTRICT="test"
-
-python_prepare_all() {
-	# Prevent interactive failures (hangs) in the test suite
-	sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# suite requires current latest nose-1.3.3
-	# https://bitbucket.org/cherrypy/cherrypy/issue/1308
-	# https://bitbucket.org/cherrypy/cherrypy/issue/1306
-	local exclude=(
-		-e test_file_stream -e test_4_File_deletion -e test_3_Redirect
-		-e test_2_File_Concurrency -e test_0_Session -e testStatic
-	)
-
-	# This really doesn't sit well with multiprocessing
-	# The issue 1306 tells us some tests are subject to the deleterious effects of
-	# the 'race condition'.  Both the issues are unresolved / open
-#	if [[ "${EPYTHON}" == pypy ]]; then
-		nosetests "${exclude[@]}" -I test_logging.py || die "Testing failed with ${EPYTHON}"
-#	else
-#		nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
-#	fi
-}
diff --git a/dev-python/cherrypy/metadata.xml b/dev-python/cherrypy/metadata.xml
index b1a626fc10bf..cd8a584bb05d 100644
--- a/dev-python/cherrypy/metadata.xml
+++ b/dev-python/cherrypy/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">CherryPy</remote-id>
   </upstream>
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 326f247af734..4a000c3abb68 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 460 BLAKE2B 142cf10a41b73b4254b1a2a80fd7fc079a1f38ca1a84241c20f872812cd123e8f831a877854e589a1461fe62633312bdbcbbf0507b41dbe07af7ac644f970467 SHA512 8fa5ec31d63941979c46256db9661c31e4deea70d809e3242543a789706bba6a45443ea720945851869048bc90d7d2d73e6ae0a9880ab4b536694f083a934c06
+EBUILD cjkwrap-2.2-r1.ebuild 439 BLAKE2B 076828695bdf6a7ae3fc332836a7842b99232b5c1fa5dd86ef1de15f7dba016d16dd3012b1c42212150d465a60bdf68793e1934b93bcf6eef796233d3f36f0d7 SHA512 a7fe787edff3f128163f0b91f2248ade2d2974386e248c4dea009bdeb7495e87e831b30159fdbcc80cad0e3032c1a1dc61bf95a373f218176857f32287d673b3
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
new file mode 100644
index 000000000000..fc292b5d68ed
--- /dev/null
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r1.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
+HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
+SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/cjkwrap/cjkwrap-2.2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
deleted file mode 100644
index 69bd00ccd4a1..000000000000
--- a/dev-python/cjkwrap/cjkwrap-2.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..8} )
-inherit distutils-r1
-
-DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
-HOMEPAGE="https://f.gallai.re/cjkwrap"
-SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c8715b4a3134..4296219fa8a1 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,13 +1,13 @@
-DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-python-10.0.0.ebuild 925 BLAKE2B 568441c53509035117143a7c74f9fe2671299f9dc0771f4090efac7dfb50a16c1ec6083bc1c87cac95e6281fe9b0c7ed5eda2b0e82e51dee05dbf7e24b643104 SHA512 b74a1e9980aafcf8c253cdd0c3a6aa8e455d207f9ff7b4d3a1d3bb3e4bfa986edc2bb6f89c6ef55091deba4fe9c163fa821ed6e78b616796f141ab4903bfb0bb
-EBUILD clang-python-10.0.1.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
-EBUILD clang-python-10.0.1_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
-EBUILD clang-python-10.0.1_rc2.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
+EBUILD clang-python-10.0.1.ebuild 925 BLAKE2B ae7e34f0ed2d94bdf1aaa077339c9332ffdc8bad3f37f5fad6e27aeadf4efbc88ce14f8300c16ef81c47c2b4f7af69970c80678c9bfc8cc616d9570cfe1ae9aa SHA512 e9ed8a0721f95335bbb4cc6450eaa3146f18e5ff6f2d4d350770f1c3cfa0133ea2a7c52ca5cb95c3bab281e96f6866f26ef6296c55f2cf28f3e1e7db93f7c8a1
 EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
-EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
+EBUILD clang-python-11.0.0_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0_rc2.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
index 55385ff45617..f0886b6c9c3f 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-10.0.1.ebuild b/dev-python/clang-python/clang-python-10.0.1.ebuild
new file mode 100644
index 000000000000..06db49e44b41
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.1.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..9} )
+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.1.9999.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc1.ebuild
index 6d7cb294e651..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0_rc1.ebuild
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc2.ebuild
index 6d7cb294e651..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0_rc2.ebuild
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
index 6d7cb294e651..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
diff --git a/dev-python/clang-python/clang-python-8.0.1.ebuild b/dev-python/clang-python/clang-python-8.0.1.ebuild
deleted file mode 100644
index 853ba7aa772f..000000000000
--- a/dev-python/clang-python/clang-python-8.0.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=( python3_{6,7} )
-inherit python-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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}"
-
-S=${WORKDIR}/${MY_P}/bindings/python
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
-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 41b4c40d7984..1c12dd146eea 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,8 +1,4 @@
-DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
-DIST cli_helpers-2.0.0.tar.gz 31320 BLAKE2B dbda2c7128ac7a5f21ce9f12f866cffde1be9a4bb422c1233b32d9f346c54a73df5e5ea7734cb64ca13f3aeec7c11678c8090499cb5aa4b6d385c4fbc394f8e9 SHA512 fadee3d356d5a687d2f618801f31d0cd4b6c9a4ea1fad4d5fed087a95c3343ab90622e6c246d9a3bd878bc8324d3e9b3626ed3f1436c5d68698562ff6abec3a5
-DIST cli_helpers-2.0.1.tar.gz 32633 BLAKE2B 4bb66cd86871b18f52c737a06968a56098151273ab0a87386db62543961f3a699f37018f9e722a55635dca3136253c59a50d3ec7cb6ebb68d833abe2a320526c SHA512 e470eff51760c5e80d01a318eeb3d91510bd34ed7c094c4196342a74306ec0fe0751514d2ef2a5f77570d8434d417557cc83a8c34d0febdbc7c2cce7b1faf8a6
-EBUILD cli_helpers-1.2.1.ebuild 886 BLAKE2B 0cb3c52b0b5003ada7377bbcc43e7ab53c8c4f3adb03e2947b2c2f62d3ee6831caddbc44aea0ea183c5ff2a2ddfd4e1b37de926bce79fd39f855e6d14ed6876f SHA512 7e22d252333934ccc6c3147b47ca3f1edec559151cb12b523376175b6a46099244959c54ec446bf7c5c30ff0852f0343895cd298a54305288bcda483b4944892
-EBUILD cli_helpers-2.0.0.ebuild 886 BLAKE2B 0cb3c52b0b5003ada7377bbcc43e7ab53c8c4f3adb03e2947b2c2f62d3ee6831caddbc44aea0ea183c5ff2a2ddfd4e1b37de926bce79fd39f855e6d14ed6876f SHA512 7e22d252333934ccc6c3147b47ca3f1edec559151cb12b523376175b6a46099244959c54ec446bf7c5c30ff0852f0343895cd298a54305288bcda483b4944892
-EBUILD cli_helpers-2.0.1.ebuild 659 BLAKE2B 446caae8abe27cc40ab9d981f387df447e110c41a8a96bf9516f2c995ab90c6cfa38e5196c842f83a2e90f939f67aa694de1a3b216b5117787c6840248253f89 SHA512 63e3796831086f906e54ceb4aad5002f3f3922c600700956623a491a3e991aeb67ccb14a1c127d1498165dbd6ff5f86fb121b643b9fc81e3c94e62c515c87732
+DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
+EBUILD cli_helpers-2.1.0.ebuild 660 BLAKE2B 3edf508e2c873a63a74a8d4077c3c5e2dfc708da864b3b5c9f3309b20829c970ae10739bbac343d4c2f08486edcb24e02342efb943e3610e1f7cd11a583ab664 SHA512 d8abfc803a2d09e498f855797d415850f28fbfa83260de9f0ec9288db0d5396961a704bc4ac51f8d403de3e0bd3f68a63f9ae7acd7dd4d3c9f5bd0ea74f2a1a7
 EBUILD cli_helpers-9999.ebuild 639 BLAKE2B 09a82e0ff5f6fa88505a39407dea1fe526672b9b196b5f178c8f0d5f3a0926c9cd313a697cce09dfe52ea37b0a806c8691934282d2aef7fe438616d7df1c92cb SHA512 a1ccf4d6204fa0f4beddf5deaf2cabc669a51b73f5d61a9b43f2711209ae26c7554be26c467bbd245df2cbf62d42f73a47365c4faf5585a162134cc03d7ae454
 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
deleted file mode 100644
index 0de3c188e8b8..000000000000
--- a/dev-python/cli_helpers/cli_helpers-1.2.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,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="https://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cli_helpers/cli_helpers-2.0.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.0.0.ebuild
deleted file mode 100644
index 0de3c188e8b8..000000000000
--- a/dev-python/cli_helpers/cli_helpers-2.0.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,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="https://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cli_helpers/cli_helpers-2.0.1.ebuild b/dev-python/cli_helpers/cli_helpers-2.0.1.ebuild
deleted file mode 100644
index b4159629ae3a..000000000000
--- a/dev-python/cli_helpers/cli_helpers-2.0.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="Python helpers for common CLI tasks"
-HOMEPAGE="https://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
new file mode 100644
index 000000000000..8e70cb86e447
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-2.1.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+HOMEPAGE="https://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index f846a6d35219..32010b374dfc 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 633 BLAKE2B 24c424c7d01f29898d56be30b73cb2d3f650e265da80cd1e30a408bd9dab101550113f8cc216f785df3980e5adbf82bbd6ad0b4c4ec512219b32a86c99cfce58 SHA512 2d100365515cb45ee9f6f42eff4929db1ed628d5ea2626dfaa6ccd87cd914ef5543e15a54178bc71e791336ded19ebbfc07f77ca56f038bf552910a463636087
+EBUILD click-default-group-1.2.2.ebuild 629 BLAKE2B 6d8c225f51106b9f4f17b2955be19448ee5b2f58b421872a620d73ee182972110162afbfb38a48117919acff03f25d378ffc4b7944638b5b5bfb87fd7ecdcd45 SHA512 d6fc2d32f23ab765a11aecb34d94ef54bb6370708b7ff18d46bac289f2e0558f0c3c80a0b849c3d2591c50eaf90a7969a701850ecdade80cb08287d6326f9550
 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 edf62155eec3..57a412fec38f 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="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 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 0852af022d41..25f9bd344d50 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,5 +1,3 @@
-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.2.1.ebuild 521 BLAKE2B 4553283060729d582118421b8ea190774540e016cfbd5ecc0dc8c383ecf790da778bdb15d860a67f702a7e7db09c774045f8d9e88f2fab760c24adc240dacfaa SHA512 7e52e4a2dc0c1e332a982e1a0cd115c3b842bbe693eee181d35a5a46de870530ae073b39507b52c3de141aba0db6910d7166d4cd092fe617795aa33e09504888
 EBUILD click-log-0.3.2.ebuild 537 BLAKE2B c8369dcb1a06d2c927809dff96b0314113551a8bd38cd38c4d154890f44016ae44b3c0d1f90e375b2c3dd84b37878f1d0fb466aa45736017eadf36a671601d74 SHA512 6d752733d27a222f0e3659c75cf4458865fbe477b696c7ccab47fdeb0120acfa00d848d6bd424f0d81662abaf7ef394efae73f2f39fb37472b860b40f102abac
 MISC metadata.xml 352 BLAKE2B da4fa1487d5ee53e0f682676dae2d9dbdb581ebe4289d2673ebfe4ab09759b6d7928c24b28cb4ade9a4d55e05c6473356590190327cced4f2b87b723d15d1c2c SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4
diff --git a/dev-python/click-log/click-log-0.2.1.ebuild b/dev-python/click-log/click-log-0.2.1.ebuild
deleted file mode 100644
index ddd10f31da45..000000000000
--- a/dev-python/click-log/click-log-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=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/Manifest b/dev-python/click/Manifest
index 11d3f889101c..c78df20ae894 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,9 +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-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
-DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 EBUILD click-6.7-r1.ebuild 1429 BLAKE2B 2c45c292df5a62a6db72be4210300eb6e599aa86f6df7add0f2f855490538c077940e45ef0b5f384b75340891aa5393732804c0e2d11fc05e89cc85780663956 SHA512 4a0a8b36db424d172d8f209c24047be29a8b48d94add0127b3adfaee7f91a7c56e9546cb2711f7871bd262b7d1add94624ed4e03c98c5bbab68ad10d0cc0e012
-EBUILD click-7.0-r1.ebuild 754 BLAKE2B 676d984143a33f3817f9e58a5aee811572cd4655b85654949ca9bd10ab77e9f2ea5cd903c989c66a34a4eb3ac0062e0fe3e44f0ba29ab616f7928f9e91dbfebe SHA512 296e06a3c9ab4886629b3ed196915ed576afdb9ce441012662338f9a842e98e21c71b20bbf60e56785e72d67b64ef436c3ca220096d5226cb6f6e3802d3fbcab
-EBUILD click-7.1.2.ebuild 762 BLAKE2B f26ed2d12cf90b5f5794b628c615653d0322529e4a3edb99a8672dde2a881519c5e12806c2b5c596e1a48f0ae77075958d50dffe9a67090e8aec09e2c127caa9 SHA512 0cdef45df4250458e81e5a6b690678b35af4e65b1ccd6b9bf1511cce20d65b8fb985922815ef4f89bd942f5a2d9f418ef3802422af3862301fb31245baf76ba6
+EBUILD click-7.1.2.ebuild 754 BLAKE2B 676d984143a33f3817f9e58a5aee811572cd4655b85654949ca9bd10ab77e9f2ea5cd903c989c66a34a4eb3ac0062e0fe3e44f0ba29ab616f7928f9e91dbfebe SHA512 296e06a3c9ab4886629b3ed196915ed576afdb9ce441012662338f9a842e98e21c71b20bbf60e56785e72d67b64ef436c3ca220096d5226cb6f6e3802d3fbcab
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild
deleted file mode 100644
index 6f2551df5b41..000000000000
--- a/dev-python/click/click-7.0-r1.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{2_7,3_{6,7,8,9}} 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 ppc ppc64 ~s390 sparc x86"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-7.1.2.ebuild b/dev-python/click/click-7.1.2.ebuild
index e7dbf92c6e53..6f2551df5b41 100644
--- a/dev-python/click/click-7.1.2.ebuild
+++ b/dev-python/click/click-7.1.2.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"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 1e29db0d3b81..a302707aa11f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,9 +1,5 @@
-DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
-DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
-DIST cliff-3.2.0.tar.gz 78613 BLAKE2B 0d6a253b026142a91f70cc8af8041dbbef6854b86c36fac7fbe0929c9a13742aab7be8a26c1419947e6eea550ee3b6bb2985c92bdbfe7b76cb3fbab7fc82e56d SHA512 dfae68bb3ef66a562e9bbb0f15bed61f144d7be92eab0553d01dcf7c7349c8e41ef51f98c3a43997cda09031c08db6db1add643ecd6a9fd4d27ddd61f87233d5
 DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
-EBUILD cliff-2.18.0-r1.ebuild 1864 BLAKE2B 3d759bb8ccf4659e1699165a877c2eb596c318864576ccaa562c491061a0cfecb0445ca27bce9e38a4d41ca1d8c2e1a27fd67a6a14157aa0a43738b1f731cf17 SHA512 a4701406573674a09b2b1e95a7f03b0e3be5fa57be29edba7ac4f143c9adcfff68c73b95bc1151eea7b3537deab7cbbcbec2624e1c97743d43321cdcef66144f
-EBUILD cliff-3.1.0.ebuild 1043 BLAKE2B 1ba363c755b8c72e5edb5dd3ecb048ea4e2136c97c14e956262692d5cb05cfa31e7c62c8d52f5f380bc03ec761501b3bba6445a6aa78fbdf8d86cf0b9e169c7e SHA512 84428b3f44dc2830fac937cb5441b160dc16d730908e46a096148828a715fcf25e0fc293033aa6382a298ab1aa289b608c984bdfb2f0cd228713cc7fe1cb426b
-EBUILD cliff-3.2.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
-EBUILD cliff-3.3.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
+DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
+EBUILD cliff-3.3.0.ebuild 1031 BLAKE2B 98bfd5e1b5ee9e4e9d4eb5573b0782ca5848e196f7287cb1b12a002ee1c91d4c2aaf1f289fec36996bea3100f332a4c081aa568b87385aa23d55f85a54bc1473 SHA512 1768688ae062bbd0248a11f0728ba97808f7fac02db5703d7a6b205b77d6be2e481cebc62f2cf9be0497288aab858cb950aeb6777dc1712e32537e99363569ab
+EBUILD cliff-3.4.0.ebuild 1036 BLAKE2B 9467964b55090ae43d9c9cc040eb95cf0808af4f4b89cc8e0f56e25854da0d9355b3b451851cbf79b3a1754da1f3d032353f5ffd4e9c2500595704b3ca9861be SHA512 7b0afda286110c34bcb9017d35ee071c9fc03bbe873466fd9cb70d25161957436accd4798d12fed564ab207e9f53e58ca5df089113664cb5c9dd2df6448a3652
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-2.18.0-r1.ebuild b/dev-python/cliff/cliff-2.18.0-r1.ebuild
deleted file mode 100644
index 41dccd095b23..000000000000
--- a/dev-python/cliff/cliff-2.18.0-r1.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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via [entry_points] in setup.cfg
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-VIRTUALX_REQUIRED="test"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc 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"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	# needs outside access, so blacklist the test
-	virtx stestr run --black-regex cliff.tests.test_app.TestIO.test_writer_encoding
-}
diff --git a/dev-python/cliff/cliff-3.1.0.ebuild b/dev-python/cliff/cliff-3.1.0.ebuild
deleted file mode 100644
index 3c74f32631a1..000000000000
--- a/dev-python/cliff/cliff-3.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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	test? (
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.2.0.ebuild b/dev-python/cliff/cliff-3.2.0.ebuild
deleted file mode 100644
index a7fef18e7137..000000000000
--- a/dev-python/cliff/cliff-3.2.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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	test? (
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.3.0.ebuild b/dev-python/cliff/cliff-3.3.0.ebuild
index a7fef18e7137..4830dc11016d 100644
--- a/dev-python/cliff/cliff-3.3.0.ebuild
+++ b/dev-python/cliff/cliff-3.3.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 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
@@ -27,6 +27,7 @@ RDEPEND="
 BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
 	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
new file mode 100644
index 000000000000..c64de385c651
--- /dev/null
+++ b/dev-python/cliff/cliff-3.4.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 03655ebb72e4..da509e8e8ec6 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,3 @@
-DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
-DIST cloudpickle-1.4.1.tar.gz 47459 BLAKE2B 642cac2244060ccde18c31f0047d5d957d69d396901ea31e04d28c5d7d55cd8f58fcf199054752f1a644667a5fd73a1ccc2e33b20bdfcbc4e71450aeeb832ce3 SHA512 3232dfdf91141179be510282a1fc60fa5891fffd1f012998c6a622957eabdf9deecc7431196ae70de01b2e498c97981c83ed22ac1ed6f3db8ba68ee0a9a26bd9
 DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816
-EBUILD cloudpickle-1.3.0.ebuild 784 BLAKE2B 9a57005675a0e09d52d7d789b40ece4b0dbb809845e63ba77a0e7b3e36e4842c53a6c0fbc4b62697ef726cd5040fe100175da26cdc3252eb761e94eb189e6219 SHA512 a464a28cd1bf0be663feff4a65b46a9a753d37e4dfffbe51a896e3c9737ec17fe7069b6994ce609d9c8bd874807b284e46b45481eba36c72c7327223518d97be
-EBUILD cloudpickle-1.4.1.ebuild 739 BLAKE2B b6eaf566b05b41b8b78bf03a2ef052425942b62bc03d12b4f8e7df83cd9783aaea8d3b81422630f5143de6c7af1d811a2309611d32b18bf915341844925a4821 SHA512 8a9ed92bdb11c01799ffa475aaa0dd5742a740357fd72dc630106860a2f1f9667be24d8c037a5cf51735848e70640a24bb84b8a48cf6f66de42616a836cdba38
-EBUILD cloudpickle-1.5.0.ebuild 800 BLAKE2B ad415d4fd2ea3aea1a8a0068e25a2b5c7b41a96e71599b99892222577f7b53fa112ef3ed1f41fc8c6d17632cd6123e8614b82b69bc977213b3d7b15dfb3171b7 SHA512 e18510a08be7ceb10878810ac7d3f263f8e17f0752617e8d65b60888509483db45ca112f2d7ca8a360693c5e98a9f8c9aae45f31a9721f07f5a5131f7c8a15d7
-MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
+EBUILD cloudpickle-1.5.0.ebuild 802 BLAKE2B b542010c2ff549e6938b99289baa5a334d84147bdd43cd675553b0ca0301286a99ac1709af4705092c258009c295404a317879af2ff6beab5ac3177d29b3da3f SHA512 8c9d3160b2106cfe3bc0040110d68e7374e1b327253219b6825df8415124a2fa4645cafd00771c0c404a0714ced80312456051717aa8234b57beb30e87b6b86b
+MISC metadata.xml 349 BLAKE2B f7eeb1b4942b76c75c613e051071f3901bcd71892208d6a27121a212854f1b840914fda091f7ff7fbb085c07a38b4bfb7bc10131f82abece68d136b13199f853 SHA512 8321d76e26a00e6d3f27179f0fd158e2675c5d577861807251cb81664408b91e43d6a4e0917c2c846570a07388d6a36c51c6c3739c91a8d148aef9d6549b3623
diff --git a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
deleted file mode 100644
index 332544bb5dc4..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.3.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{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}]
-		dev-python/psutil[${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.4.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
deleted file mode 100644
index a9f5293b0924..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://pypi.org/project/cloudpickle/
-	https://github.com/cloudpipe/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-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.5.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
index 7d44be58f1b3..1fc456b6bb03 100644
--- a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cloudpickle/metadata.xml b/dev-python/cloudpickle/metadata.xml
index 82e3626e0383..cc58bd679721 100644
--- a/dev-python/cloudpickle/metadata.xml
+++ b/dev-python/cloudpickle/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">cloudpickle</remote-id>
   </upstream>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index ed4ca9e27977..7bb09a849cb4 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,5 @@
-DIST cmd2-0.10.1.tar.gz 574301 BLAKE2B f97a60cfeb6f3ba411e64f1f8bc7d51cbefbdc7821764b3a0d65e83d1ec7158f8e585f0585ec6798472b35cb3533f3a35b9113d531d657fc6abd116fe905f75b SHA512 b7cb5b6c191ead56af3b83b19400440f0313b70568a1c838ca3f7d96c9312c36660dee42ae6e59db460afef99366498931f379d75d8a5d0860aff300c0a53380
-DIST cmd2-1.0.2.tar.gz 580329 BLAKE2B 38ab275d651849a5d609bb5e9848eb5b2fd52a88ce121311889909348448809e6b23aa26ad3e170ef97029f25b24794a33976b029928a2fe65c21e6d2f3cad29 SHA512 547757724987cc310daf60595f2c07e7355c4b35007d3ce9fa52c4dc5e83e1b27a7f646ff161cf7d2aac76a396f3ecbac3a738c09f1c01804d513b40e0c0fdfd
-DIST cmd2-1.1.0.tar.gz 605311 BLAKE2B 0816c3975b45c4845f234a746037319213af8860ea8996b6d05e2412e26649be6770d21dab330387037f6284b1f440a29b727c1ac4fed969fc8dbb2f9ac389be SHA512 b8065ec217a588725eb1787d2aedac8c49b8b8196c12848038f91cba73f23e960fbfe5d4b8631b2a57eb1aeaa1a206683b8b71545c1171d6d3101f03fefc0f0b
-EBUILD cmd2-0.10.1.ebuild 1017 BLAKE2B 13f997a9f9782fd3bb1ba1290f9eb563ebea97dcf82bf68a39e333bde66c3ccd894b70c46c2a88d7bc811a0f5e6cba364b386a75db9ebf5379a772530b116d37 SHA512 bf5c6dfc2378c97f93b4f53bc6bc0db59fbd9ddd632683ccad07fc1b8ff301809ee6f2bcc01c87d2953339d064425e8aa4aafc5f81ac36c44191d83ff02d7ec3
-EBUILD cmd2-1.0.2.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
-EBUILD cmd2-1.1.0.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
+DIST cmd2-1.2.1.tar.gz 623518 BLAKE2B 69aebdb6350c453001b6101988d9b0d3d96ca7970c54cd59d3aad6e01b3e7133d62b57cb44588cec786ea21818d8c5983e5bc64510e8c6f07627505f14c28651 SHA512 5f7259111ed8f5719c230c33f6131c8464f5500ba14869d26e9f52850ea619c2b97ed950774930d9e19621e98c64b50c67eaff34277cd81463b60f8dcf6f04a3
+DIST cmd2-1.3.4.tar.gz 641801 BLAKE2B 0d85cad11613aec5d58d9130f4edb46b038abe3ba02aa84570cb5c34100d02f7b5d0fa92cbc49a71d3be19b15f5b380e42d4eac28a609fac4f1e9d0c8b85fc34 SHA512 a8fcb7448e5afde392921ad15c0848c3396b91922f10fcee925721860ee74f678fbf43d334091e201b9e6612e4d70825762a03a870f2e4aa1f82a43b37c5800c
+EBUILD cmd2-1.2.1.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
+EBUILD cmd2-1.3.4.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 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
deleted file mode 100644
index e4ce45c0ea6b..000000000000
--- a/dev-python/cmd2/cmd2-0.10.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..9} )
-
-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_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-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
deleted file mode 100644
index 0a10ae6eda41..000000000000
--- a/dev-python/cmd2/cmd2-1.0.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=( python3_{6..9} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/cmd2/cmd2-1.1.0.ebuild b/dev-python/cmd2/cmd2-1.1.0.ebuild
deleted file mode 100644
index 0a10ae6eda41..000000000000
--- a/dev-python/cmd2/cmd2-1.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/cmd2/cmd2-1.2.1.ebuild b/dev-python/cmd2/cmd2-1.2.1.ebuild
new file mode 100644
index 000000000000..cc2ca4a9c220
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.2.1.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..9} )
+
+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="~alpha amd64 arm arm64 hppa ~ia64 ~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}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/cmd2-1.3.4.ebuild b/dev-python/cmd2/cmd2-1.3.4.ebuild
new file mode 100644
index 000000000000..cdd3428887c2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.4.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..9} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index b5fb92681a4a..851672c03778 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,5 +1,3 @@
-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.4.1.ebuild 1136 BLAKE2B 274f75102c2ca35ba404ef9549f77f9f638fdfae0fe62c8017e5d7fb1f85ffde9f2a066bc3591e29db524bf83431d4852bae4b92bd21ae6f9463d88c1e6868e9 SHA512 ef0bf186f541d78029058dae399b0273ef5ebb8573a213b7d0ae6d525ecc037607f57d72462a2c9e3471b6999b3df553fd6518e61cbeb347175b6bad47c8f3ca
 EBUILD colorama-0.4.3.ebuild 1133 BLAKE2B c2bac349a26903e8602ce7ecd085923f68598eaa9a4311d31c624a6845fb6ff80ad704d0cae65118653dc4cc52fa97500c78d895c155cd7e3ecefc0d0c443975 SHA512 127a1da44f83d5d6e449507abf0027d83b175b82cacb6334ff4dd1a36d9c3bbace5274c0bdb46dbc4c88b4f2c44118e89f8503aec841b50189dbc280099d8d34
 MISC metadata.xml 525 BLAKE2B ae9c4e561fa86ce37c1bc26140f3dd4267c37591df64060b0c355a78f566b0453d6f923dc6de0e92595bc4f932bbaa58a823c2c9b62f9b8ec3f38cd1730a067a SHA512 19e73cbbef7d9ee826eb4df24a23f1d1896e294209fec9a1a854e174b83aa7a948b3128a3a70db3f406aeb577b9b500f80f41d544baf053ff4460bf2e5cc2646
diff --git a/dev-python/colorama/colorama-0.4.1.ebuild b/dev-python/colorama/colorama-0.4.1.ebuild
deleted file mode 100644
index ff35d63367da..000000000000
--- a/dev-python/colorama/colorama-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=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-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 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/colorclass/Manifest b/dev-python/colorclass/Manifest
index 96ad80a2194a..41fe88713317 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,4 +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 620 BLAKE2B 312fadfa35097176879781993631d63f52a0fad66873ff5b2516c076430d9e4d077f80dfed76a85b515442243d72e6466350978733009c5134498f3ee25e6fc6 SHA512 df66d53665b2aeb8c050ee6ac5be361b1af86eda761efff871bff7e3169c7cd650247ae5a09eb283c0acd4f66b6257c59d7b076c3e66ee40e045e5447eaba768
+EBUILD colorclass-2.2.0-r1.ebuild 568 BLAKE2B fae7e6829a67d8b802a202d0aa5a71332892e72fed82c8abd4c037a2c3f9b931eef94aea7b100d90ed285a7ee18442737676d93f9c0d45ece7d37c8ce056bb0b SHA512 4a30401ee1f29d8cad655fc3c6721a0d195523775a7e6860c9dd90068ee632a20a45e272b6f2a149816baf7415730789adbdee2cf2f2645a62b9c4c894a99198
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
index 1cb6eb341269..62eb385f20ad 100644
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
@@ -14,8 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 PATCHES=(
 	"${FILESDIR}/colorclass-2.2.0-tests.patch"
 )
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 6ca9d3ad1d3d..b5ed7022bcd9 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,5 +1,3 @@
-DIST ConfigArgParse-1.1.gh.tar.gz 27134 BLAKE2B 41e76be8932436414b4a159fe7a653594b8a1e5c3d981b2793912893924db18020489a76abbbdd71076650568e4b67b1f56e4d9161c25c5723877cc8781fbb11 SHA512 a4d02d669151087fca799bad4ed2381b7487cd749055f474f17a8b0aa4a6a643d161416510b0ee80427d59c34ce4d17710730f2d23d9b74e853dadb4d8e78260
 DIST ConfigArgParse-1.2.3.gh.tar.gz 27858 BLAKE2B f8dbb1dfc9312107abcd0c715b93736cdb86a7742270932d13b768ac7a13f805902f026d5cb34e196a8c5c659af65c13698c2cc301b522b99bb0c019b2c0e68d SHA512 bfa8f9ca8ab5c6d4cdf2a7e7c577c99fafdf7f743c81057bebbb6045c45de2cdbf5d738f7765e5dcac5a45baa92e2a8bc7ad3879776b9cf4862e3da94e78c4cc
-EBUILD configargparse-1.1.ebuild 726 BLAKE2B b9adf6005473447b7574ab8c9248337c4d82cb70e23baa26b403fbe655a606d79632a2d689477b5d03979a76a4b3c61aeb54987b0b739dc2b57254ba55c09db3 SHA512 11342c1d993534a742ac06f90d4c9ba0bf9a1c62965dea00d324a267499d8cd94224e77dcbabed588d24ed42a156553866f6a3c2cfdefc510fff78c1d06fc500
-EBUILD configargparse-1.2.3.ebuild 728 BLAKE2B 3f31291484963a231f4c9c7ee2464aeedabd565c66f295cebaed46718cae1439720ac4d33c4751a770a9a65a5add96a5f39e65ac61916d2923a2e9557d57b0b6 SHA512 6acc21a4a0ae9815e5bfac4d855a350efea9e93c60a7448da7275262da5ef3949c29eb8e40342deb9c5f74a3c2661524d84c53422cba413cb635e35fae95c1b3
+EBUILD configargparse-1.2.3.ebuild 724 BLAKE2B 133a228d1fe3385cb38da70b4e37651a90a1b3da74b595e65c34c435154c6e1760b035601a166b68e5f7d866b3a716de680c73bd470366f363b630c30224e2dc SHA512 697fc517481ffc1ee227bb7e32b1ce843fa677c20a0ab3c3d1b3aebb0b1ff8957238fc64dc27f7139e7134bee31645b460df84fe9300c567a3b3e035d0d286c5
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.1.ebuild b/dev-python/configargparse/configargparse-1.1.ebuild
deleted file mode 100644
index a71a650a5883..000000000000
--- a/dev-python/configargparse/configargparse-1.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=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.3.ebuild b/dev-python/configargparse/configargparse-1.2.3.ebuild
index be7d7f5bac5a..1ba3a66344f5 100644
--- a/dev-python/configargparse/configargparse-1.2.3.ebuild
+++ b/dev-python/configargparse/configargparse-1.2.3.ebuild
@@ -6,23 +6,23 @@ EAPI=7
 MY_PN="ConfigArgParse"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
 
 python_test() {
 	local -x COLUMNS=80
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index bcc515067ef9..a55274a1dd1c 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,5 +1,3 @@
-DIST configclass-0.1.0.gh.tar.gz 4585 BLAKE2B 39f53c1b80ed494764be0e307c452b7e8675b63e49d3640346e55461eb482e2840c85f7bfd2030129f46b5022cea21365377a794e99d6a016f35db37e14af6db SHA512 5caaa9d365e4c84a328acd853661511451d74fbe2e0fde3d96a4313131af26c4088f3a3fa6cce4bd520eb85de41e59ab512e4d99d148d26a945ee2c5fa366b6b
 DIST configclass-0.2.0.gh.tar.gz 4631 BLAKE2B 8e273e539a9f3cce70397ef0bcc420ba7d5b2b007de490bc4347412546b6af0bbea4950218e69590817f41c884044bd7d976c6a188f8665f2de0bc173f1e9c8e SHA512 7f22679d3470ede4106bdd99f1216bc49631c32452dc681fbd6a6b91735bbc82db1babed3cd94f93a0f9f2915d0866ee18704ffcfe477fd3134b6f18a094d192
-EBUILD configclass-0.1.0.ebuild 524 BLAKE2B c0cf2ae1d1b470e17fa6967a6e66254b42d60a26ec324ba1703cde4415b50003689ded0e1c4f47d9d4099a3e8cb5164c3e20278aa75a6e8fc45824d919f042bd SHA512 d74171f2645f9bcf89d39b1d82fbc3c66bb92543f2cad6c30ef432cb4416ef5ac44bd8cfa065118c693590ffbf66240549f0b9f23607dd9ee1fd306aa16e7cd7
-EBUILD configclass-0.2.0.ebuild 525 BLAKE2B 5a137f97097b574f6ca8a9249347eda7bb0890ec03e061457cfa86d3748c9c1ae41bde299494a2dcc9f08ccaf926484386a48802aaa234233587cbd7413765a1 SHA512 11e0da72ef543d552cba6e8195942c4f29b3ec9a748c54556232a799188604401ee58f82de4b07ca37e18806bdbd8bb189fb804def0f5d305acbc744580df015
-MISC metadata.xml 377 BLAKE2B ea0b67dc8ddceaa21470ba69394b82acd8b9b946992d359c2574cfa69ddc49597b971647edff13a7415251e5b05e2f43cfd1660259f864e6c5414b49c226bf24 SHA512 6307100bf5465c429ee480c4157953a4a7b24a5429197bb43ec7141b846247c13570f946dcf1795afe2d3c97039d103ad796e1626c0ad80ae7b19814cdbe44a7
+EBUILD configclass-0.2.0.ebuild 523 BLAKE2B 21c3ac2e85a10cdf0d5b91beab15f0928890b5be20505b429cb105bf349ccffac5cd2e4f53bce1abe0aa7bf4572003f5989a948600ff239362e3f9ff63e1bb06 SHA512 c209e017b32161049ef8199bf69b4161c0d4a9ef416d7d255f7809d8029abdea5ca8c998676ea613bf4ae1208a5353c12c3fc8dc0e9bc151a512237bb896c6f5
+MISC metadata.xml 401 BLAKE2B b613beaf2d6cf8f338a46e3ccaa9d35f2a725221119f37c3e076d002af317c372a1cac695edeb9a9937f68d184ab81807bc03567acefbc2c4c1446de7d3af643 SHA512 eafb2e973e5a217304de35efb417030cad5c034d7dc30ab89cb91249133130ce14f1879a9a7a67e6da9fa9c26a4f45185e0c7cf794fecd3c21b5bcd4dea1c9c8
diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild
deleted file mode 100644
index 3e35aac21e37..000000000000
--- a/dev-python/configclass/configclass-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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python to class to hold configuration values"
-HOMEPAGE="https://github.com/schettino72/configclass/"
-SRC_URI="
-	https://github.com/schettino72/configclass/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
index 46d294702fe4..2b957285b305 100644
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ b/dev-python/configclass/configclass-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/configclass/metadata.xml b/dev-python/configclass/metadata.xml
index 9ff657383f52..5938a40350f1 100644
--- a/dev-python/configclass/metadata.xml
+++ b/dev-python/configclass/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">configclass</remote-id>
 		<remote-id type="github">schettino72/configclass</remote-id>
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index c32acf9a779d..88c2af7d398d 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,3 +1,6 @@
+AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
+DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
 DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6.ebuild 965 BLAKE2B 3377a2464816f7f02c2d4eac9247dcf5d19d129682abf7ca4f4d810032b2e383fb65c0bf723e6429926df7e951c7e1e7d27e833097f68ca6d96aef49155f6c7f SHA512 8c6a8b3527360f77bc1d1039e4f497aa928f60059914c27a9f317f24f910738d49cf8c3b0ad15e412b0074e55c8ec90e954b2c43b0abba70c2ce578e8e7fae52
+EBUILD configobj-5.0.6-r1.ebuild 761 BLAKE2B 9b767d0b102973b7e2d5238932fd00eadef572878fb55bb88ca8facdbe6bac65d07aa4512726b278ab4289a106d75be47250d398243743e0ba7f6f8b9700e6e7 SHA512 469b470bfbd4a2230801a4bbf36c8f3943cba03aa14327be4deaf73d44cc3d104425a7edf9c8260e694d2605b58d316e99e85e20ceed3d5780a187b2c28d3e87
+EBUILD configobj-5.0.6.ebuild 981 BLAKE2B d6fd8c2cb300a411006b6ec0d5cb654b191d2ae0cc6076a177c748ba03f66533baf3e617524c3388d3235aa36c2fc3443dbcacbc1dfae9dfbd771b2d19abf941 SHA512 1911989a71c0235b0389acb6d2c354c2f75569c10cc99325d84f1d03ffa72292d9e099a7af11a9a59d4d9c51f92e38ffd36d7d778c7484a8f8d31c1c09cee305
 MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..0326ad38559d
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.6-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,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple config file reader and writer"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
+SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~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/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index ef9974e7a717..41c7ea7f06d3 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 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 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="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/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
new file mode 100644
index 000000000000..49576b4f43e7
--- /dev/null
+++ b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/test_validate.py b/tests/test_validate.py
+index bffb0dc..c7d57d3 100644
+--- a/tests/test_validate.py
++++ b/tests/test_validate.py
+@@ -2,7 +2,7 @@
+ 
+ from configobj import ConfigObj
+ import pytest
+-from validate import Validator, VdtValueTooSmallError
++from validate import Validator, VdtValueTooSmallError, dottedQuadToNum
+ 
+ 
+ class TestBasic(object):
+@@ -161,3 +161,26 @@ class TestBasic(object):
+                     'test3': 3,
+                     'test4': 6.0
+         }}}
++
++
++class TestDottedQuadToNum(object):
++
++    def test_stripped(self):
++        assert dottedQuadToNum('192.0.2.0') == 3221225984
++        assert dottedQuadToNum('192.0.2.1 ') == 3221225985
++        assert dottedQuadToNum(' 192.0.2.2') == 3221225986
++        assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('192. 0. 2. 4')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
++
++    def test_boundaries(self):
++        assert dottedQuadToNum('0.0.0.0') == 0
++        assert dottedQuadToNum('255.255.255.255') == 4294967295
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('255.255.255.256')
++        assert str(excinfo.value) == (
++            'Not a good dotted-quad IP: 255.255.255.256')
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('-1')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index a8d104479289..545f98048c1a 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,7 +1,3 @@
-DIST configshell-fb-1.1.25.tar.gz 56900 BLAKE2B 00f16c401a87cde0e70730ec74fe5885af3ebf22c3745851661fea7de874f5609c49e0b7c521c5d3db16eec903e0f24331816acc8e19a080043e8399c98bd18f SHA512 338eee8eb7b0fad533b739bb0c9460757cdb90103c44c37568dd86158431b67e1b0ab050afe2670abbba96c5d8c18db9b107d9f7650937a2be7f53fad26efed3
-DIST configshell-fb-1.1.27.tar.gz 57174 BLAKE2B 4f1f4dd6b641fc5843956b3d88f43456f326af16799b770b1224ba029903fb6bfb291101ae780f48fa126c9e5482b95e5e545121a11afc9d8535dd23be3445c1 SHA512 53d81b939f393f88141f2c158295a5297850e2a908b6124d085b2ae185a2093b877bffb0536a195b2743057bbd3131c75daeb90a4b83b6305baa89463e30c685
 DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8 SHA512 7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d
-EBUILD configshell-fb-1.1.25.ebuild 587 BLAKE2B a793b530cfd2fe282f8457633c5b1a671bdeecc21a0162d142258a800339fabf378f61db77e8954af4de8fbb261e4a95f41db038640912fc96c5baf37902e6c2 SHA512 bd2338d82918a47ab83326b992c71a5c9e39124536c30aecd157868670a8989e87c7abb2a7a9f584c1a94b5490b46229deb13c3b996906053d3453c127b80c7e
-EBUILD configshell-fb-1.1.27.ebuild 516 BLAKE2B 533cabf9dc78fd7b0c987a7786346243a9df3c04d6a81afb3261556e13ec9e25cf744e88d7d394f21eb69d2af24f6cd19241454a7b06b4710ecab63313d1d2af SHA512 ae9e780aefa90bc1c4437c8f13ad9c32cddb60647ead640871e24c37e37b61a4cf3ac4d0731c75ccb52be0862bea703bcbbff95b8b32843d2d2ebfed81e6d213
-EBUILD configshell-fb-1.1.28.ebuild 516 BLAKE2B 533cabf9dc78fd7b0c987a7786346243a9df3c04d6a81afb3261556e13ec9e25cf744e88d7d394f21eb69d2af24f6cd19241454a7b06b4710ecab63313d1d2af SHA512 ae9e780aefa90bc1c4437c8f13ad9c32cddb60647ead640871e24c37e37b61a4cf3ac4d0731c75ccb52be0862bea703bcbbff95b8b32843d2d2ebfed81e6d213
-MISC metadata.xml 937 BLAKE2B 2d5ded6950c4286478b6867241f974274b06fefb406117b7b1b6123d092f680e998967c0892fee40f268eb6530b62ac99f4a23859e0d208b6b1b73c730c3343b SHA512 fc2d86ea29566dc96e24e9126c28f76d83bb97e11bc336aef563595602a8342f7e1c2f9fedf6db1aea603d736e5dab3fef7e89e5b8ef4e3e5bca671019a87e73
+EBUILD configshell-fb-1.1.28.ebuild 514 BLAKE2B c01d3b3ee78dd46226ccd4870653a8a4edbf7e0fd0ac473d6b22ba8f4fe98c969762761a31f1bcd1addc3904253d726a4c5cc3ded6ef81d572639087c79f6ab0 SHA512 d80d5168c4573815b165467e584d4b2452cd5e97e9836741456ed6c8f1a7ba5d027a6718c396bde308382bda0de3079877d51f2dcd2f75b901aa4f31a6914747
+MISC metadata.xml 960 BLAKE2B f18a51e6e07f655d13446a233be2545e415c2b54c05b65e50477997a03be60043b139568101236af8c94a2b55b42d3ed1c98954e8eedcc4a6dd1ee8b660d9091 SHA512 bad17976b4d235d19c2830bb79a3caa0beaf4b09603f3b04a5fce001a65e6718ec7b629404a6daddab4100b3d2dfb9f37b5eabcac5ecff99f86f90f8c308ea6e
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
deleted file mode 100644
index 56f53848f0a3..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.25.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="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"
-
-BDEPEND="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.27.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.27.ebuild
deleted file mode 100644
index d38b29bb9987..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.27.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,8} )
-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"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
index d38b29bb9987..54877c409943 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.28.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"
 
 RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
index e9a4b7abca4c..0ade70ce933e 100644
--- a/dev-python/configshell-fb/metadata.xml
+++ b/dev-python/configshell-fb/metadata.xml
@@ -9,6 +9,7 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<stabilize-allarches/>
 <longdescription lang="en">
 	configshell-fb is a Python library that provides a framework
 	for building simple but nice CLI-based applications.
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index 0bf3edf31036..2128098b259d 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
-EBUILD consonance-0.1.3.ebuild 925 BLAKE2B 5c22a53189fef9151568e540df9b9606ca00d3538087081a601fdcb5142327f26e4e2c6f71b23e9c50d22b499f1bd07b550c0b1133b6da1831c55d881db7193f SHA512 085fc50e4d18a10a082736b686604b6ef6a9e5852293e5550c83ba16ccccc3dcca57f368bbf031beeb881eda7dcda091ba37518673805ed4f03f1e67d72d4945
+EBUILD consonance-0.1.3-r1.ebuild 904 BLAKE2B b4d8238e001ebf42ba44938cde4a7bd16d2c0acab156f51cf0cf42c0427a7f57e0b80bbebbc9dceb546cf10f5d573184b887b23439876f406a11e269025e2a48 SHA512 69f675c212caf42bc782f136067e2efa693ac2c8465858c9483505e66f72128411a3802a744943731dcae588bf3be18ecfc8d34f7909d435213b8a5ad8035e75
 MISC metadata.xml 582 BLAKE2B b36276e39edda1de4250583df9a2deb2118b0433ffe44c20960108f79857efc8b3c86950e8fe1b8cf115d40dfc767eb14908886b7e86e108582d3262ec960561 SHA512 fff3526cfea536ac2704be7a8da499b4d4a64f07f5682ed48ab84bbd1ecfdc9e2272d46eb3623a8623097544da121ad8de826ba474579e201b614ff7d61c6572
diff --git a/dev-python/consonance/consonance-0.1.3-r1.ebuild b/dev-python/consonance/consonance-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..5d58d23a99bc
--- /dev/null
+++ b/dev-python/consonance/consonance-0.1.3-r1.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="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="WhatsApp's handshake implementation using Noise Protocol"
+HOMEPAGE="https://github.com/tgalal/consonance"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+# Tests require an active internet connection
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/dissononce[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+	dev-python/transitions[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.py
+}
diff --git a/dev-python/consonance/consonance-0.1.3.ebuild b/dev-python/consonance/consonance-0.1.3.ebuild
deleted file mode 100644
index 68b4e499ab91..000000000000
--- a/dev-python/consonance/consonance-0.1.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,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="WhatsApp's handshake implementation using Noise Protocol"
-HOMEPAGE="https://github.com/tgalal/consonance"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-# Tests require an active internet connection
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/dissononce[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	dev-python/transitions[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/*.py
-}
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index e2e7008dcba4..b0c3c615ca1d 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 706 BLAKE2B 89ec5c18cd709ff564ac90f3f019ebfe45d2f33fc4e89c4e94b5c769ea6bbb9371554aa2ec4bb09cfa78b5ca7f1bb510c59454d4073000effefc6a0a3f347282 SHA512 dd002208873a9fb4674611a709ace9a79dbe521e4581c5d51ae9c98141a54c7c0c59608fb80f1dc64e0376086e63c039c7e5b9f40f7814b7a86f22af6ced3dfc
-MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
+EBUILD constantly-15.1.0-r1.ebuild 696 BLAKE2B 4671b0b6a9b9a56eee91db1157da901bbf7b5a5a5825875444fdc9e118f640132150c0317a5e2acb0d39c3bcfa5b84968817df6c5d63ce2b0aa9f39a37ad1cc3 SHA512 f11c519153d4ffa92f637e3ffd4097b66745b03354f9901b9b528fdaeaa3496f24bcb6ada1e1da888d05e755fe918f276da49c3cf6bc0cf9faab7c7004d255cf
+MISC metadata.xml 737 BLAKE2B f434d4398ccc7e8feb419980f2a71e69a74eb8e66ce506c180349bc4a3f69947e6002b3d930a3f3695f63f8acdba692c531cb9e700776e0889422e235e0ee5af SHA512 eafe24ee36b106a31703feb548b75d4eae9ba6d5a903570351bc647cff3f42ea2481602500f53abece88ac054b46629d46a5643148b514fda43f53b5d201875d
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index b0d5fedc7464..5d0b3f160999 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-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..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
index 41dc97f59633..b7bd76ba47df 100644
--- a/dev-python/constantly/metadata.xml
+++ b/dev-python/constantly/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>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index fb32839aa410..59a13694d8ac 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,3 @@
 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.6.0.ebuild 904 BLAKE2B 8892a9c9943f53514887a01fe45e7fd2eb9e96ddcbe0d112ad5c617af024b07f366eb1170b1d1d7621451b10eea4ba3f9b182557a64142edf912293437e7c7b0 SHA512 beeb3bb8c4ae1f1efca1446ab18c0fc2e3d6742de193374bfabe384cdf0a47e738c5b0e42306600f8052c0109a573f638a4ce188f8d47d8963540933d7e5943b
-EBUILD contextlib2-0.6.0_p1.ebuild 942 BLAKE2B 5e77978e3eb4393ec87245598c69bd2f8ced6641ffb38e83a8abed9b8e5b297aed43a34ab4cb14dd88a78e32b64f3fb475816dd72dcf090c66b450695e3552ad SHA512 0b5fbc79ff37a02a729444ba020e2059fe30d6ff2fd5c0b35f571aa3b86514a3ebc229602c669658d9e6c4b74c756501119dcb998bc73763797786aacd73da25
+EBUILD contextlib2-0.6.0_p1.ebuild 933 BLAKE2B e7872a8464b2370d0a56adbe6106806ee8e2267cf049e706f692050a75d058d505bd94ff15eacfa607c77b9790dcb1a145ccab2534c5b515f14b412044e0f2b8 SHA512 20913a0d043bacf83575c20bd8950b94613bdd7b0a63b6f00c232ecc0e8dd91387f8633fcc70c4cdf8468bf2cb0cfaf9c5f1dc05a62c011b07d4489ef4c129d5
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.6.0.ebuild b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
deleted file mode 100644
index fa8613af4c2f..000000000000
--- a/dev-python/contextlib2/contextlib2-0.6.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=( python{2_7,3_{6,7,8}} 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? ( $(python_gen_cond_dep '
-			dev-python/unittest2[${PYTHON_USEDEP}]
-			' python{2_7,3_{5,3,6,7}} pypy{,3}
-		)
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-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/contextlib2-0.6.0_p1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
index 341b0e956fa5..51060f9397b8 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
index 01f625a4ab3c..54efa22d834f 100644
--- a/dev-python/contextvars/Manifest
+++ b/dev-python/contextvars/Manifest
@@ -1,3 +1,3 @@
 DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
-EBUILD contextvars-2.4.ebuild 521 BLAKE2B 46861ed01caeb9d70e4e12b50b32b9817c2aa302899e343e7c5af9dc44fabfb3bde0ff5ccd8adb77898fee9e082d0b9877cfd7d85650dde765af2e4fc9222f43 SHA512 fcc3dfe1dd6b546e83a08f93f840ae956821ef4d0e7da3182373bd3f6304ee4de9d63e2e930200d6bb0a75d595ef103afc4e420828548935c3b0ec3d01d62ba8
+EBUILD contextvars-2.4.ebuild 561 BLAKE2B a2472185707896afd8c8619060133af2f2af680c406e89fb1ff439a52b6d042fe1d92a0a6fbb12fe0fa1234ad4952ba3da30615cf86e977ce3ada78da562c495 SHA512 46e92123b0e3221216c554258eb2c0e7b3d0b822fe71ee23cdb31deddb69eb9b39fee1a988da0be575adefe129486b3a85cbdb0c8d1c49fd878948d6419e5e10
 MISC metadata.xml 354 BLAKE2B f7fae56b019c0b03a1e699cd23711fa067c36549b7164f7d4f4aa1001f49d290d1dde42a5fa8c57cd77f20454181f259723ee6847ac38e97c7fd46235901b201 SHA512 79f19d5d674af1a45bfc90fe9bb2e4fe9e21d1fc195e6475b9a7c28014dba29a45fc49787b5fc9c2d7b33dc8ff6ddbc7a4710e296064d4fd097bbbc0df6a0ab1
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
index 23482225624e..d4247a17fcc9 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+# this is a backport, do not add extra impls
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6"
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index ac33f5721bab..9d6dc307626d 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +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 600 BLAKE2B 68695f37abb08ea52137b5870eda1afc3059bf15dd403069c0e7b5b409537716510af9f0395f7df39381d4e2fbac2c40b6629d272ce61e620bcbd43d5c49182f SHA512 dd1d624fa0f70c014eb908ec9fae2356e2857092d96890955bd6efd65f5672b2c59a7b6ded48df1c9f28e2b9cebe12ddf425b520552f3498ff6acbca440586db
+EBUILD cookies-2.2.1-r1.ebuild 612 BLAKE2B e039d848f775cc16dd2b2dacc25f17bb7d23efc2bc9f23a2261c427d8cd100e55bb43d32fa8ec8acadbef267b4753d927d2fe982e5911409214cec592edb2443 SHA512 78d0acf3a57630f8d341d2f77ee3294cd03ba8d0a9db0b22a78475e0f5443989129ea083d312dfa5f4ac7e32f500ecf715cf975d88e7c5e4dfa6d89c661102d9
 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 e8c760bf849c..7c8f313228b8 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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index ecc790a116b8..a7390f1aa1b3 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,4 +1,3 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
-EBUILD cov-core-1.15.0-r1.ebuild 611 BLAKE2B dbd3b63c925c96e0976d1715a71a61abc1ce560855d3b3d7fa1a91c9fe4a61469786ed25d3aebb86b6be67dc10090a7bc2424e0db527e2ba5356fca2d215b43f SHA512 5eaa617cfeedd54a6fb3482005a6bc6c8c4278659559962011ab903788a87671a9b5b046b8e405a995ab42de98b2d5ab9d64e0ca82a53c1ab36166f181b9e411
-EBUILD cov-core-1.15.0.ebuild 606 BLAKE2B 13bfb68b918bcc1a751276507c743952002362239d8219a2cfa31933db79a4b87aa4406b63b481ba821f66ec429a7b7d61130d780876f39feb1cdfe900c08f7a SHA512 dcd79b5bd768a0fb01aa3dc6025afcbb68185ae2229f44535a9cba02181c7847239cd2e8a3acd7aa1c02d3ee197f514f56351e97b1fdc69e22a3ade1c4a08294
-MISC metadata.xml 393 BLAKE2B 087b56c47500bbecddabad8a768033971f29215be751378ccc272f46dc3aa2b4cd14a6ef101989a12f3b540b792a407dab5f4e65ea5cc619f3fcdfd0b596da8b SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc
+EBUILD cov-core-1.15.0-r1.ebuild 598 BLAKE2B 6298128072a2516fd9d542c33a911776e536fbfe55462d86e34120311d595780f924d088fcb6877c66ba4f4bbf7e7d65812261462824ae64fe3b9c50674f6ff9 SHA512 6b4fab931db73086e28e57eef7d0e5d9dcd0a5e732c565ba1ed692d49b1179f0ec74672b10ba81f0dfd37c27d39ec7693554d58864378de85ba203b012502ddb
+MISC metadata.xml 389 BLAKE2B 79a7ccf0572ed3cb85715d40a9096058253405df1eced44164f6d60462c00d403c69fafda3ebd5e28e158a4e0bcf7a648f956dee39faef80f0153a260ad84a0b SHA512 62a559392798a95fd3b0e540eacd9cd3ea997a9cfcbc5492ffce378353ea737128045d46c8bf2d89d3641c575ab943ad66a97ba4e7c1efe858abf1e7d7a2aa74
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 ad84f14b247f..210e44f673db 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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,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"
+HOMEPAGE="https://github.com/schlamar/cov-core"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
deleted file mode 100644
index 539161a28a6e..000000000000
--- a/dev-python/cov-core/cov-core-1.15.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=( python2_7 python3_6 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 arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/metadata.xml b/dev-python/cov-core/metadata.xml
index 02d7c7dc74b5..0d97ceae8926 100644
--- a/dev-python/cov-core/metadata.xml
+++ b/dev-python/cov-core/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">cov-core</remote-id>
-    <remote-id type="bitbucket">memedough/cov-core</remote-id>
+    <remote-id type="github">schlamar/cov-core</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index be20e8beb853..c6540ce6d2df 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,10 +1,10 @@
 AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c505e66100962fb63cc876a3666ba3ba21f3b03fcc664661fce030e57b67e9309c379cd2e82ec3abb79abea3aee8844 SHA512 22caa44eb8e114ddf997d7cce1d762b7140422954df4155e1282a58ee9a79a69c102fd0790a80459f65d1d9313ad38a449118e7254aa1d7751e6abd2eaff9862
 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
 DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
+DIST coverage-5.2.1.tar.gz 694076 BLAKE2B 0aaf9b5668c2fac1220c377d5b841341b534bd14579b70fa3d4c5e64239df71b95c2278e041f46ae3f9d2ae55145894d51457caabdd9540b7d8ce3f32f8d409c SHA512 bda6129a4f4e2db3d26878036ceec137e4f359b8d37ce087e4007751bf0bbda7d706967a50b120378fa533f980e70142328099332374a1f303fa0083ffc078b0
 EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
-EBUILD coverage-4.5.4.ebuild 1781 BLAKE2B 55b451353694347d7b4e9e87ca5587d50e70d347f2816e0dd0b24c6c00a6fd7ec91571444b2df83b6353afd3146e6092b57cc0fc4b0c8d0112347fffcbe6d0d4 SHA512 777994ae048628535ba3abceb487e5ac19f1d08e61f0c513e5e0d11a3395bd1134e5d8905b25fa0857552bc3808e45e8c4089a1875aa815e401e9f945592d8ab
-EBUILD coverage-5.0.3.ebuild 1735 BLAKE2B 661f0c172c6d79fd64486c3e7bd41c9cf1805ee9cea6e1ab5e4243051812a6e877ff1a556fb46b4bc35e5be1bf3cf89a1e7f66ba6fabad1e072a33fdfa69c8ae SHA512 c6ab16f2a580442b73afe5140d151fda348e11a6dd293b031abffa815bcbc9222a7773c3a062ee5ba67e1da5697dc3ed2a724300e130e3b9400ec7129c6bc25a
-EBUILD coverage-5.1.ebuild 1883 BLAKE2B 6385adcfa1ec02f0ed7613119f9dbb48425ca9adf6439cb2c7928934b7a1e3144cf386f8f86c65fe0ba252210bab2b3e76b8d878459d6b2b0ab3530a4398cab0 SHA512 96a858ef2a989eace4eff4e64c18b28d0865f4cd7f8207151405bd44aa8f5e42fe92c7af53d4ce0c6a4945757429d40752125d32fc08eb282c63fc5de0b6931d
+EBUILD coverage-4.5.4.ebuild 1787 BLAKE2B b644cd4091377f15566c9bc3979410910429cede262de4d941e48c1bd68db7cdb5d7840cb71fa9454d6289db66b69772b2519b5ae2a82ce129ab2a54136d1528 SHA512 a52843da254fdf9632bb3461bcae4f58c5e7537577510aa8f4e0ca8bf7cd236376cbb707b01b3933670dc686d4a4c433115116e42e6c63f66336c2d6234a5486
+EBUILD coverage-5.1.ebuild 1882 BLAKE2B 654f744159702478c1570a0f3bad15db7dc5f377442c30e256c650da68e80bd071b06a3a96453965916254fd88747a5d023d5f4f8f83ff35d2a9644e66687e55 SHA512 cb43a7226368f4266ebe0ef1a001508c054aa3d4655a1d6f51e669e5dc49c67df1ec583664ded59e7a13191b132c510002dc5099ced9d347ecd91364703a7a5e
+EBUILD coverage-5.2.1.ebuild 1889 BLAKE2B b177a6c5b6d6e97fc959be935f1b3cdf02cccb7cfb16d20543a72c89341b6def4fac71fe66117ef42e560ab935afd5f35cee9e2594d2c14efbcb1ad4034e4675 SHA512 f11127308fce1be9833c91750bf73b231feaab3a456fc99cb0b8408e2aa4f3e1d1b2ab64495333092eb2ba2425e6ad87f49e5c187421bc73b8524f79f5e8fbf2
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index b0bb45b31246..5da1dac252e0 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 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
deleted file mode 100644
index 1598ce740058..000000000000
--- a/dev-python/coverage/coverage-5.0.3.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=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~ia64 ~mips ppc ppc64 sparc"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-	local bindir=${TEST_DIR}/scripts
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
index 6813525e24e0..279b142fc1a9 100644
--- a/dev-python/coverage/coverage-5.1.ebuild
+++ b/dev-python/coverage/coverage-5.1.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 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/coverage/coverage-5.2.1.ebuild b/dev-python/coverage/coverage-5.2.1.ebuild
new file mode 100644
index 000000000000..53b473ccf11d
--- /dev/null
+++ b/dev-python/coverage/coverage-5.2.1.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,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 410e405f7fbb..36599b9afcde 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 453 BLAKE2B 6d49d20a5facb4e5ac171fdb71677ee56486cd22c7a547dd1348befca040e6c5224d4e8488b33a72963a9a30f9636537fca779808ec43b746e4b837a54219562 SHA512 a37529f034a66d15cbb2199c32497959c401f3c1cce72e6479efdbf699d2628ce0a6557649506fb755af50bd8958e3051c8c96898c017b0f26c6f8e9b6dbffb3
+EBUILD cppy-1.1.0.ebuild 449 BLAKE2B 93e7c7425380ef940a22834c2cc6474b1e58a7c928c1e2b1ef165bd18d18969b8db6e1466fe2c3b0e5bf4ccfe37d55ff79ce3fd7c2658b02d015f2d23e8b1e84 SHA512 19483cfaeddf9f019be4b210d14852e15302563672e1367f0e54ee9f3498c1a7fccf0e2a67362717d4ca38cf7e7fe38535680b3453f9dac21f48094cb3d279e7
 MISC metadata.xml 825 BLAKE2B a57826e675f337f60df2024e4f1e719425112c70a192e3ff45e091f2c75cba7587572ebf23e84b52cc78783d67ccb6ae96a2214407485b886cba09e29ad99f92 SHA512 2c92243896cfeadd31868b9a99d4a36d7d1c88931bde44385c62f8450e116b64a19f7f7d613b81584741281697228571a3073f18267ab49341f4a6c2493e6c83
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index e441a5e5ed02..909f8d7ed343 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 4981d13cf693..005cb0784958 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,3 @@
-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.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
+EBUILD croniter-0.3.30.ebuild 722 BLAKE2B 3d7d147540e417632ab467a52a12f1a88bc103730dd6013f48f32acc01247079fb4dd619aff923a47c270bb13b32a6d370516f44fac4ee0a5381cc6cf920f932 SHA512 fad1871b047eff48a4d6a9fc2235a4651dd9375e257fe0ded37b25c791217ef699ee603bc79cc4edebdbfc8f87ad9109de2ba8262317be99d4bb59d8e1f8eac0
+MISC metadata.xml 368 BLAKE2B 597859edda3be0b8ab9a537e79d667628aa25ff2aafe37aaa63f73ad888af2ff8995b676e6c18670ea79c0293406bea8f21a24edf5fd0072bd5eb346e1a5cbb0 SHA512 86f00f0d61cbcacb19d721d5e4637d75cc10632de0da611bdb449c808fbffa7441e114f018b3caa328952dd7f97dde63d3b7728d119f87628b2e58787e0dbd1b
diff --git a/dev-python/croniter/croniter-0.3.29.ebuild b/dev-python/croniter/croniter-0.3.29.ebuild
deleted file mode 100644
index debbc4fd5e47..000000000000
--- a/dev-python/croniter/croniter-0.3.29.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="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/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
index df279163ba05..debbc4fd5e47 100644
--- a/dev-python/croniter/croniter-0.3.30.ebuild
+++ b/dev-python/croniter/croniter-0.3.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/croniter/metadata.xml b/dev-python/croniter/metadata.xml
index 991d5ec4bde5..6644d35fdbd7 100644
--- a/dev-python/croniter/metadata.xml
+++ b/dev-python/croniter/metadata.xml
@@ -5,6 +5,7 @@
 		<remote-id type="pypi">croniter</remote-id>
 		<remote-id type="github">kiorky/croniter</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 3cb4eddd2a82..7b47a0c1153f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,7 @@
-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
+DIST cryptography-3.0.tar.gz 534725 BLAKE2B f6f4d5cfcf42a9ca2288bdc7c61bd0ae2f98999868951798f358d6ec9dbbcddb31102b0954f983bb9c118df53a8483e74aa2395ce366a9a97b6b9164b0044bd2 SHA512 4fca5d0e59f02f23c7e2d5c80f86e4cf36eeeb9a128e7b3332a91aa0b9dcdd3282a882a88ea34ffba1e91687eb6d1fc1042774f1e30970e9bf56ee701c32ac15
 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 2056 BLAKE2B cd6887b9c352a11af9f7bb3bbd37416331a2c1b21441db18085b6e416a0127991d0a0ef2175f42b80a96eeae6a2209df9fdf39363cc6731c57d8f47cef080c78 SHA512 02a9bc25adc485f921ea4bbc6df2dce2720369e8316f39ce3289bf8c9ca964696e383e4cc1b073e0f49b5d7285b904e94178becae2d963b7eb4c0c8c8e472477
+DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
+EBUILD cryptography-2.9.ebuild 2048 BLAKE2B 13d5aa1de69c55a08312a302f96069f1a76e78cdd998b0255539656e425f7956788ab2c2b5e776434fff3deeabeb2d9e7c3152acfc42b78910a91bf50aae7947 SHA512 8fd34e0c4009ed7f276a5f562d9b6df1bb782c5ddd8ea73e1240e414ebc7f6fc352217b5cf4a721b87b1b390ba7695f1459c19c58cee797ab1886fd9d523d693
+EBUILD cryptography-3.0.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
deleted file mode 100644
index 1f11026f3224..000000000000
--- a/dev-python/cryptography/cryptography-2.8-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=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: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/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}]
-		!~dev-python/cffi-1.11.3[${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/hypothesis-3.79.2[${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/cryptography-2.9.ebuild b/dev-python/cryptography/cryptography-2.9.ebuild
index 8dabcca75df2..10b74ed4338e 100644
--- a/dev-python/cryptography/cryptography-2.9.ebuild
+++ b/dev-python/cryptography/cryptography-2.9.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 ~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 )"
 
diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0.ebuild
new file mode 100644
index 000000000000..c2571ae27052
--- /dev/null
+++ b/dev-python/cryptography/cryptography-3.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=( python2_7 python3_{6..9} 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.9.1:0= )
+	idna? ( >=dev-python/idna-2.1[${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*')
+	"
+BDEPEND="${RDEPEND}
+	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/css-parser/Manifest b/dev-python/css-parser/Manifest
index 7af84dec3ecc..6212f745734e 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,3 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
-EBUILD css-parser-1.0.4-r1.ebuild 574 BLAKE2B dae134436343764861943fcf526853d74a5989609a23855af2cb97a73d74a76dd3ef77f0378a39a60b0def0f79c9bd9a5fb06fbb3fbd846f95fdb5aaa46daafc SHA512 60a8fdd1b21174a75f2243a692dc787a95c3287968e76efb0aa2c3944e7e54aca534d65375ea9d19381b2f072f1c4b393244e6553043d82083375eaf7275bfd0
+EBUILD css-parser-1.0.4-r1.ebuild 526 BLAKE2B f268ac00fc5e42cceeee3251bea9eba8503bc7ea715dfa12668942153af955d8fa711eadd7f198c33c5ecbc8649aa19b4da40ddc9ff50b8b8e72c1141e33440b SHA512 dcfef816f61f72f5b4aeb8b6ed57aba8e039c3cc67124bd207d7987e060cd4103f52393b50d051adaad7ef5f35319477c7e9789536694b051b06546489e0017d
 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 97f1e05ef089..25c221d65d23 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=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 # Tests fail under network-sandbox.
 RESTRICT+=" test"
 
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 1dd745f10471..d447088d9a68 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,3 @@
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
-EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B e70787201ef9669a8d7f6c60621520ff477a9d7de1270f4bb5edc77687a16a636cb8950af29cc91312d2434173ba677b0d39fc765b4895472288e29f81b374a6 SHA512 11fcd91ad69a098b8b7394c021798fc4ec3fdfbe638bf9b41d39156b557a97bb4cfc41d9bb4c7bb7d31ee2146191ae59ceff5743b1c9ce3f167939a97033e67b
-MISC metadata.xml 556 BLAKE2B c7ecbc812459a9f52c8931f9bff561d5d21a3b8282bfa299320fcc456a33e3a87811db58ef62ccf5ee359062d3095c6cdc60574eec518516a099cd51242d8c91 SHA512 1797d4788446c3ac72abd12c722e81325f032bab8e19ab89d83883ceae354bd1e38669673c1daf3ecb522988481546884c6960d28536b55a9168bb6edf6f22a0
+EBUILD cssutils-1.0.2-r2.ebuild 1501 BLAKE2B 91fe76c52e08bf9f98a719304c95e8e4317966926b54268fbd9ad692c6ce5a4032549f25f0b22524e138a2df210550914a059aa1972178e6ec9e41f25fda0441 SHA512 ae32176acbed765c9990ee01663013273391903c483549f22e37afa47675e7e50ceab1084e66d948f7f936679b7eb63fa1a30054eb8a766ae2fa697a8f039b61
+MISC metadata.xml 440 BLAKE2B 7283924bc1bc928a890268e4022bb2570dd6bd0d79caf5065ffea919625a6cef4d11db4099b97169033dee21103795315f3b08fc5d3a2cdc833eaf394633f620 SHA512 866f25572be159eaf86d91ebb0321518e55865d5134062609105eb28cbde5f04eb141fd67f5e37f83a74b6b016334466f26ad015f544f05ac93e266825a4d54b
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
index cd0c3a9f7292..7b4f6a4808cb 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -9,7 +9,7 @@ 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 https://cthedot.de/cssutils/"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
index f9762173523d..c4870d951551 100644
--- a/dev-python/cssutils/metadata.xml
+++ b/dev-python/cssutils/metadata.xml
@@ -10,8 +10,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">cssutils</remote-id>
     <remote-id type="pypi">cssutils</remote-id>
-    <remote-id type="bitbucket">cthedot/cssutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index 02815d75acd9..e8155ab9989a 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2.ebuild 832 BLAKE2B a16a8570af0dfd392aa6d6aa2bcc98bbd2dc40b1f4eedd9c8317974335ff946dca2cea11d0f1a2aceb1f9527ea36c0835664ba7b79600d743e897f1050e2effb SHA512 e80bddd33800f9b4362bbae4dd9c2fbcd554bd4fb5559a877809278514d499afbac65a9d303530ab234a5bd8252d4cee7bade249dfe3b92b63afc74a97646396
+EBUILD csv23-0.3.2.ebuild 827 BLAKE2B ccf04535381d2157f83855d0e219b6a7712688b8fae2d155e423e51d6902abfa45b75c37a1c8ea45da73e99a98bd994139886cd9276cb3b04ff0eccea75fa11c SHA512 c7c2215faacd175b782bcda975d1dd5e7b17d4e1506eb06e59f5ee1112096e2298ef0ff6640a068d5fc872c66fa06ced112b1c727bfb3a38e57de06f4cc18046
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index dd774623cfe2..4cd89a07f42e 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index b27040f02945..cc3c9addd7ab 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,5 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
+DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
 EBUILD ctypesgen-0_p72-r1.ebuild 798 BLAKE2B 46552f34043b363b6969306405caee564b7e5cc7e19554a35cc186665341a5635727bd408a65f6794477288f1f1625dec65ab7f3f0872570825b73da98cc42e6 SHA512 d0e8d35eeea35b4cff80bbe9836611064b4cd5f43a850c21ea6c92b9e6c571ecc29d1df272dd8d9754db46c57a160a5fac887dafd48ab8b58c61581d2fd1d9a6
+EBUILD ctypesgen-1.0.2.ebuild 749 BLAKE2B 48c30bed24c64e51b96e5e898b2520f1770e5cde90df4c9d28486dfa5c3487fa1b15d0a122eb02ec4d229c1f77c542537000d5785ca6f008bfd489f25dd4200e SHA512 0f66533a2eb5fd7bbda8a4f50281b5aa13937bf88eafa631028dd22679cfe55aa0fc7d7c4abac45a58802ae80529f65dc9e2fc0bfb6b762c79898e3723622390
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
new file mode 100644
index 000000000000..a71817580b75
--- /dev/null
+++ b/dev-python/ctypesgen/ctypesgen-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
+
+# pkg compiles fine with py3_{8,9} but tests fail
+# https://github.com/davidjamesca/ctypesgen/issues/90
+PYTHON_COMPAT=( python3_7 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper generator for ctypes"
+HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
+SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" "${PN}/test/testsuite.py" || die "Test ${f} fails with ${EPYTHON}"
+}
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 62f622f2841e..88fc0b453144 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,4 +1,3 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
-EBUILD cvxopt-1.2.5-r1.ebuild 5534 BLAKE2B c2a6da2d4ed13e71233cc759d27e33306577c0c52e6b439e02d790529ad22a95b5f06e685891c7c36306dd014809868d068151d6f957d5766b7c6a889889f07e SHA512 c83625f8a004cec9068815363b1e47b2ee93a5cd1d4cbb65b1737c143a65d2061ffe50bd7c86a71394bda45f807763a645e76bc2389f772e4b8c55f7e0809238
-EBUILD cvxopt-1.2.5.ebuild 2963 BLAKE2B 449a65f303b77cb5c92e0819b49bfec7c828bcf46601a280dde0ec708c783fead5a05ee597a2579ef01660b41d51d75ab7bf34b0186e01a37042dcb98274c1eb SHA512 05433f0bffe2e55a9fb547f5a176886a10f4e8797dc292d1ad84bebf85153772df80c236f131fa3b38324760e5742c135d2e5ada4ddefcf5a53000bb4c93468d
+EBUILD cvxopt-1.2.5-r1.ebuild 5535 BLAKE2B 328b146d857bfe5e294c7c3e0baf101e2a78f70700f272d2edbbf4142285e73fa55e2022032089bf398e2ba7457e3a1150fa7a6e9ab2d9a563c37510f025bf95 SHA512 6577efae0032bc3c3abb9c7304c9baf48366e2d26c787ba1a2ceb76b53b197bd2dc1161b2f520d320248fdc2e482ff159a1c35f8df0785ad0ea4721f2678b034
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
index c4670120832c..df93cd110d8f 100644
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
+HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/cvxopt/cvxopt-1.2.5.ebuild b/dev-python/cvxopt/cvxopt-1.2.5.ebuild
deleted file mode 100644
index 4f197405a30a..000000000000
--- a/dev-python/cvxopt/cvxopt-1.2.5.ebuild
+++ /dev/null
@@ -1,105 +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 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc +dsdp examples fftw +glpk gsl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/blas
-	virtual/lapack
-	sci-libs/amd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/suitesparseconfig:0=
-	sci-libs/umfpack:0=
-	dsdp? ( sci-libs/dsdp:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	pkg_libs() {
-		$(tc-getPKG_CONFIG) --libs-only-l $* | \
-			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:;$::'
-	}
-	pkg_libdir() {
-		$(tc-getPKG_CONFIG) --libs-only-L $* | \
-			sed -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:;$::'
-	}
-	pkg_incdir() {
-		$(tc-getPKG_CONFIG) --cflags-only-I $* | \
-			sed -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-I\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:,$::'
-	}
-
-	# mandatory dependencies
-	export CVXOPT_BLAS_LIB="$(pkg_libs blas)"
-	export CVXOPT_BLAS_LIB_DIR="$(pkg_libdir blas)"
-	export CVXOPT_LAPACK_LIB="$(pkg_libs lapack)"
-	export CVXOPT_SUITESPARSE_LIB_DIR="$(pkg_libdir umfpack cholmod amd colamd suitesparseconfig)"
-	export CVXOPT_SUITESPARSE_INC_DIR="$(pkg_incdir umfpack cholmod amd colamd suitesparseconfig)"
-
-	# optional dependencies
-	use dsdp && \
-		export CVXOPT_BUILD_DSDP=1 && \
-		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
-		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
-
-	use fftw && \
-		export CVXOPT_BUILD_FFTW=1 && \
-		export CVXOPT_FFTW_LIB_DIR="$(pkg_libdir fftw3)" && \
-		export CVXOPT_FFTW_INC_DIR="$(pkg_incdir fftw3)"
-
-	use glpk && \
-		export CVXOPT_BUILD_GLPK=1 && \
-		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
-		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
-
-	use gsl && \
-		export CVXOPT_BUILD_GSL=1 && \
-		export CVXOPT_GSL_LIB_DIR="$(pkg_libdir gsl)" && \
-		export CVXOPT_GSL_INC_DIR="$(pkg_incdir gsl)"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 88be591427ab..fe6ccbbf0933 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,13 +2,9 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
 AUX cython-0.29.20-py39-classmeth.patch 1373 BLAKE2B 1b4a06125513ea727e186e217b27fe17871bacc8cf835438e16683c67f136448de75efe7336c8e7622731966f2f1b2f8d9ef02f5c2697c31e251c99f53fc36be SHA512 0a9e063586fc945bfbdf6f213540029a2864074d487d0554b11f8d3db3ea078a6675d7cb86c1f68c30c7331e832de9fd48041e628c7481d51c9b8d0f957fe5a6
 DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
-DIST cython-0.29.17.gh.tar.gz 2080768 BLAKE2B f53f8593f4ab9ef87c8fff47a031d365a748b617b7ee41872768a6a649ca3c6a6f9a338f115881117cbb4ffe1811047ac5fdcac745d6387eee29487c9da4c297 SHA512 f722e4feb0fcd0de7b882d0ba7cd78c37b6aaa4438619607665ea269b207a482fab6ca65cf12bab54d94b5929776c973a270c0748ed35b0f88a72811bf90d4df
-DIST cython-0.29.18.gh.tar.gz 2083532 BLAKE2B 7e10a32f15542ed0d7d381223f6f20ec75d7ec39979ca58192cc0f95407cece31fb053776072b49e447ffb0ab5ad1918c6b53ad8cb277df08fabe0eab8ccf958 SHA512 5a1430345fbe42235a58fd44dd4e4ce17c68485349295af6c4e9a01a06117e18ee7700c34fb5974759f012acd5cf8400ed014ef16397539272c38881e905234a
-DIST cython-0.29.19.gh.tar.gz 2083634 BLAKE2B 47ed2c8b8c4d56889f4414b974edac878a454c2cefff77bb3ac5cb51f926c19e3466949e0c9f470d896589e881afa32d8873c71d54b3999d221ae94f2b2d4588 SHA512 402f95f82099db0ae99ca2f849a9aef97558c9c6be62d3b3c66c346ecc94efbbe824ffc77f3cc6dd1d7054a2fb0332b10fe855ca1b054095f2df2ee297fd96a7
 DIST cython-0.29.20.gh.tar.gz 2087315 BLAKE2B c429dd2aec6c6dec0a3430ad8aefd17b62b65d9e2e7be0d48e0ebb808897533ac724ba69bdd639e3cdab2da2399f7dccea524dd71a48594e44c7a737026a5b5a SHA512 5bd0506abf8e0a823316e697db021e1e12296fecef2165ea4b84fa595554ebcdcf2688cb675c77e0e1567ab44ed502757b5eb4ea55b84505ae350f70e4d90ecc
+DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
-EBUILD cython-0.29.17.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
-EBUILD cython-0.29.18.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
-EBUILD cython-0.29.19.ebuild 2118 BLAKE2B 00188704dcd1fc77e02b68ad6fd1ffad35bb6240c48a07ad12f37e66fdc6b954d9b3bf6d472d1b55c2a86313422f392d38bb13925754dad2232574233e545c41 SHA512 6fb8043b8c245225e42f04f8062068ebc33f3f3eb5a67c95b014ff55e8fcd357c8d6ed0155d1b76a6a65c4e3968d59adf5d85a76106ea2bb8c1dd71a374f46c4
-EBUILD cython-0.29.20-r2.ebuild 2009 BLAKE2B a3b9cdd80aa5e054444f9098249e39904c574661b447dbd89c3042deb09573ac2640871437a5be32bae6e9f13152c934883fe2fffb3f179866f4027c8d57da04 SHA512 88f4c63a503eb70a92da9f63993a3b528fb4ccaf23ad8e6f172f7852f4a484373176ef3a2377dd5dd1d6a37bdad2420c46fa17f9131cb8c9c05fe4b3c22edfd3
+EBUILD cython-0.29.20-r2.ebuild 2007 BLAKE2B 5697ac1ac8003ed42aa63c72bca396bff005570be18f52b1a796a82dabfe0e684cd9f89c42f4268e995df24e6e25ac929c8af4543c87343ed95b62eb36f08bc0 SHA512 d40ac7f143feb16f357327be4d1d29771deb488f1dccf91d42eb1170bfe05631b83de35c74b713480c4533aa443a3c68663f595c99bbc4946bbbb54d15949b8d
+EBUILD cython-0.29.21.ebuild 1967 BLAKE2B d690a465c8f1fd3f3007c3cfb0abfa4b244b8aef3139aea0bd99776c4e23f7ee3080ecc5a30751769dd136967a336f438a14f95d52e9c53f49b94b167c871317 SHA512 d7b97d70d5c6791e991d21bce85f42570c6109f31afaaa1426b9e6f4b219613e852bb73bd27c3fdb92880b3c684c6a79c05d257e192af419bf1b1716d53cbaab
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.17.ebuild b/dev-python/cython/cython-0.29.17.ebuild
deleted file mode 100644
index 187187f52342..000000000000
--- a/dev-python/cython/cython-0.29.17.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=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-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
-}
-
-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 )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.18.ebuild b/dev-python/cython/cython-0.29.18.ebuild
deleted file mode 100644
index 187187f52342..000000000000
--- a/dev-python/cython/cython-0.29.18.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=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-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
-}
-
-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 )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.19.ebuild b/dev-python/cython/cython-0.29.19.ebuild
deleted file mode 100644
index 8b4b6e7acc61..000000000000
--- a/dev-python/cython/cython-0.29.19.ebuild
+++ /dev/null
@@ -1,86 +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,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-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
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.9 ]]; then
-		# https://github.com/cython/cython/issues/3349
-		einfo "Skipping py3.9 due to known failures"
-		return
-	fi
-
-	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 )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.20-r2.ebuild b/dev-python/cython/cython-0.29.20-r2.ebuild
index c536c20a045e..6a0df1a266a1 100644
--- a/dev-python/cython/cython-0.29.20-r2.ebuild
+++ b/dev-python/cython/cython-0.29.20-r2.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 ~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.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
new file mode 100644
index 000000000000..5216fe8a9b75
--- /dev/null
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -0,0 +1,80 @@
+# 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,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			python3_{6,7,8})
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+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
+}
+
+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 )
+	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 583a2e9c44b9..25f1aa8c276d 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1,3 +1,3 @@
 DIST cytoolz-0.10.0.tar.gz 475069 BLAKE2B aabd1bee4ee5b17640cc1e4126920c4e21893286315e3e4a5e968fb52dab371ade7a00f3082a704dbaeeb00af5ccb3cb9743fd66a3d23ad5879503f66c4f0c49 SHA512 62e90837125fae5dc6b96ac13a7fc2193604cd1250173b8e24ba3e65571e9394369cad07e39e7e6e42da0e3dab04db98193ba55195267c49447cc7ec0ff7b840
-EBUILD cytoolz-0.10.0.ebuild 1063 BLAKE2B b35764969b83827c00f0e781f0f088a2a209d726600b137e6c20055e112b2ca38612e7e9061c5b5aefe81a673706381cd6730260263e5f7ada4a33ff50ee2579 SHA512 513613f3c654f8eb6316a31b18407d30b1cc3ccd90d8ccd78f4e142fc99696a092f572292ed0dc55ec375ddd5a192769ecf65b7579ba9b1f4e305cc2e431cac9
+EBUILD cytoolz-0.10.0.ebuild 940 BLAKE2B 2cc742f7b73e8ed3cd36f8d7dc6c0367cf0bf0bb844a2429b6b8f52665557f1bfafe140c921328583a1274b4bb4bec9765d0a1751cfef083bd60098703598f92 SHA512 79e0aaac2335d3078b05bee5bdc373e144847d050b86db2d7d4c1d3447244ef5bebbf4214b27706dd8dff5e60dbef8fccf67fd6e2f9a6268f6b483cbf3863842
 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 5f4105e4b5ef..3ef3b625078e 100644
--- a/dev-python/cytoolz/cytoolz-0.10.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
@@ -25,12 +25,6 @@ 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}"
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index f2b61caa9f4f..bd51cc38ac15 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
-EBUILD daemonize-2.5.0.ebuild 450 BLAKE2B 943b33a52f5840d5d94f799d1f25b483d531ff16a4c5757e9f45bcc6e0bc36feda4072f20eee5802c8ac0b0fd43dfb2c0b4aa50feafc7db9ef037fb8f51975c0 SHA512 1fa23ab8d1391acab0ec5359cf29fa50e81639ea47ad3a0e9184d9192e80dd51a5a8184332ea3d0a374a708930d98de97e8902ce56dfff707df05878cf332628
+EBUILD daemonize-2.5.0.ebuild 405 BLAKE2B a661a2a799c0a7b3ae6bb883d3432bf154d21972d0755f2fefc6ee959920e0e8ef03f7e5aca59dac5876590df8b76285a8761167dbd2e5294aed26c78af2a461 SHA512 410350fe44c45a844b2be87d361dec0e6b1a91654694d6887ddd8e7a450bd5cc1a170f336da6d21eb875aa30b3acd20bc691b2d496f367c28effec28ab5a614e
 MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
index 1d2f4adefbf7..49dc1dab74ca 100644
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ b/dev-python/daemonize/daemonize-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,5 +14,3 @@ SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1d2a5dc94af2..fad209c4c3bc 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,4 +1,10 @@
 AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059bf14dbd7e7761e1c5e07455e067cb6ad13a83084e573be4be71fdd1218fe1fd67c6ce2f9c0984a20f4373372e8177a7519eb9 SHA512 79ccd5ccdd6709dc01dc0f6c3ee1dea9cc3dcd2c8e443cf74e9002e5658f0e72b709e0717e342040f2bbd85ee8ea331d6d6baa2c600fa498154b7137634b74e5
 DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7e4f4ff89697c254efc365091a61b298333b0f8d660cc9f760d3960a355beafde2555dfd912606dbe4a49db1 SHA512 c00886768b331f48ac9627f81c39368afbb4f1083ee9f7e3ebbe64352cc48c3c580fccef8d5466592f5bf772f873bef2ac084a972d30e7c1b4d1028e1d456059
+DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe56a786bbb00215ade5ba5fa7687176f70f12802b06bbcaf00db76f0c97eaa5b87cb65fc28bbe3e37c8b55f2a6 SHA512 90d6391a8dfc36788e819bf09f4ea65a89f37b14d0755fe4ade9179e5d3edd6dada30d5c08ad730f4ac9e08a0cc64a354933f52b92eb13fb8e60093dbcf28567
+DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318dc019573ce6deb7f3a64504608e1e27c3bd9c6766dd98a071ed075065da9beda3f2e5fef27c7bfc9918516d0a SHA512 6ce0f1471357cfa4f5c7f2e2ab31009e68d3e5de363569867d67038ae2e1a9c69552797fb232fb92deafc3b57aa040df9e60669c1856cbb53505a905c4f4b052
+DIST dask-2.24.0.tar.gz 2826106 BLAKE2B fc63bf33f8441a70412e7872c696c071c5e156137fe767007a57f6d2c6a976bd29fff4db20f42c76014bbaf8b763f0a9d974ed1fc62530a3a91633ab97a1a466 SHA512 cf9a781c64eca4be84b82d026cfa1883d54ce18c93625e28c085a7bd63ac129befeded808c817e4adab790c28aa2eeca4f79c7086be683f1a7d30c6d1961c0ae
 EBUILD dask-1.2.0.ebuild 1204 BLAKE2B 9acad86af714eaf0f95d3bb857bf2bc6ae960316a0304a6f3b1a5b47b0b0e063347732b2cfe116de9ae69b3a6413729b1c610bea08e8c8813ca14e8e352e2b2c SHA512 364829d15951d615f25fa31cfd95134d338f292fb75deaff6c50cc558d934c3c99b4ab046c3cf5d155159c1f3f54beff37361edff0172dafc811d1f62e794f0c
+EBUILD dask-2.22.0.ebuild 1342 BLAKE2B a05b2e6e44122abe9dc1c3c706a3272066e33f6683a889d8ad352d5e33f1a2f3ce64757939b673082870383059f3a71560d2b0c1476ce6a4cd46b8b1293f02a1 SHA512 3a3e11843ff169ef5a06112b00d2552df74d8dd260165d8ac33bd72adedaaa7bd6c0cc23c2907c4acf7a2c28e0cddd920272cb50927b4860150d04bbf0557628
+EBUILD dask-2.23.0.ebuild 1417 BLAKE2B fe14aa208dc839483cfea6cd4aee744cf79f02d731856c0ecfd691f7ba0c50162f258ed8a1e36cb86691e75ae2cbfa69ba223ea14ef507114e715d8ffff00d91 SHA512 411a347eceef785bf805c39841031c37b3a58c0852fc9f13cee0339b658374759e90e3fb0ab27751d9018499bffd57b1193f8c2894f04e232eb274334ab69c5f
+EBUILD dask-2.24.0.ebuild 1270 BLAKE2B 064240ed65711f6446b5fd312d3828e1f5f52d911f6fe57ae0556463c29596a5d4b7b5513b1438662117b8897383811e5230cee75150028e3f643ecc8cf06968 SHA512 b1d2f50d76b9f4d826e9cc9e3eb33f366a42540f4b44463ed4b98dbe4d5f863b3cb7b2f62fc750a937f80cc064bc01516fab73fa57f19d5768d7266655cba94a
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
new file mode 100644
index 000000000000..206edb645a45
--- /dev/null
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-2.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# flaky
+	sed -e 's:test_time_rolling_methods:_&:' \
+		-i dask/dataframe/tests/test_rolling.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv -m "not network" -n auto ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dask/dask-2.23.0.ebuild b/dev-python/dask/dask-2.23.0.ebuild
new file mode 100644
index 000000000000..1930b91f3406
--- /dev/null
+++ b/dev-python/dask/dask-2.23.0.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=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-2.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# flaky
+	sed -e 's:test_time_rolling_methods:_&:' \
+		-i dask/dataframe/tests/test_rolling.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv -m "not network" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dask/dask-2.24.0.ebuild b/dev-python/dask/dask-2.24.0.ebuild
new file mode 100644
index 000000000000..b0c47455277a
--- /dev/null
+++ b/dev-python/dask/dask-2.24.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=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-2.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 5a01087ad047..b7f3788d1a06 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,6 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
-EBUILD dbusmock-0.18.3.ebuild 1072 BLAKE2B 7eb7f14837a54cd7c2811a968f9677fd49762f4a28f7e93f2f49191d2e534d96d4627ae48c71ab579f2315df075745a505a0e72b4f1776cc94cadb63f4405d50 SHA512 8563923983c8e32bd40e7b514989e8254e43d0b763ca1ee43d456b78b504690d5c4e1ddc033f5e4d66a8b3d8b281acb6881d2757f35da0147c7ea50a21f2d3df
+DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
+EBUILD dbusmock-0.18.3.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
+EBUILD dbusmock-0.19.ebuild 1075 BLAKE2B fbd2e36f6fa61d99efd48c713e4874ec8bc44feace59e64cb73db931ce1847ab3c29b64c0874e2086a4842027837719755358b8d391cb9f92a48b5a8dc5c202a SHA512 a90c99e26fa2fe0dc79f58c6fbec2e90867342fecbdb7f07c49b10a9f63c8fc3707bdec5030601a489299ce4ff1ff27f39d56a85552d4cc0b157235435ff8663
 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 6150da8c974a..899a8a785982 100644
--- a/dev-python/dbusmock/dbusmock-0.18.3.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/dbusmock/dbusmock-0.19.ebuild b/dev-python/dbusmock/dbusmock-0.19.ebuild
new file mode 100644
index 000000000000..6bd966090cf6
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.19.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..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index e74c7cc646a2..48e40d4084d0 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,4 +1,3 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
-EBUILD defcon-0.6.0-r1.ebuild 599 BLAKE2B e7f814c5e7b728b953ae57157983b10664135b8e1e4dfce5bf7d07cb23e5596b46840b9ca1812faed5e12476e8d05effdbcbbcde9ac4f4ebc09ec4549af9593d SHA512 091fcb94416dafe70628751baae3f549ab7ece630de822267515c7109d00a23318efb64656d9cbc41acf28c636cb54fc5b5f9285452bd932483a947a87604d74
-EBUILD defcon-0.6.0.ebuild 550 BLAKE2B 8f51dddccd4986ed9c0b63cc6a5e9e5a59aa1900788710ec261eb0db1eb56c457fa64e24e8765c18bc7fac66629d48ac7d219af0d7f27b560d17f6b7e1c6ac83 SHA512 898848cd36ffcc28c34d1ebaa72e4c9383140a2a9265f6dad87a72dd5cfe38b3c682df29ca90c9644da8020e279a8df84c53928ed26873b59812f1f99f434fde
+EBUILD defcon-0.6.0-r1.ebuild 598 BLAKE2B 827a1aa370402cb942e7f845a55af91a4eacbaa929dc78f89926735789eeff9f3c445c60e41a0c07bed1c7ff99490c38175689d1c9037b6e89c93a29b2423c22 SHA512 60a10cb7be8515f8f8c310a7ceb9a8ca9bf4ff4c47c203bc4ef61f36592ac4a01f077816bfe8534a8f24c941f6cda2b142883693862ac9e165fcd2a39e7f3f24
 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
index dd848b952b92..8aa1980ecb3a 100644
--- a/dev-python/defcon/defcon-0.6.0-r1.ebuild
+++ b/dev-python/defcon/defcon-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/defcon/defcon-0.6.0.ebuild b/dev-python/defcon/defcon-0.6.0.ebuild
deleted file mode 100644
index a6e241554a79..000000000000
--- a/dev-python/defcon/defcon-0.6.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=( 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/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 85c0e9c6bcf8..890acc4644d6 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
 DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
-EBUILD defusedxml-0.6.0.ebuild 706 BLAKE2B 89b25d405f98d8cb4c9cf56be3ac607f0eb0141fe9ae7f2aa094ada4142430869e2632ab90008ad5e4651cd2a2c2745c1922fb6a4e9561227b8186de79fa59ff SHA512 80409fedf6cfe66a1422fb8595f0e51a9325db0f6279b940b7d582f9b132511bf5fa31d85257cc28b16e7cb2cc7dc5012771e213e05303dd974bdbc9f1046ea6
-EBUILD defusedxml-0.7.0_rc1.ebuild 777 BLAKE2B 23a52ec840c99171ea492b215716d654318ade7ec9ff3b7ac969462cfa931097f428bf01dda1055ce1867a2bef3b568d3a80a39ad60f555e2d2e8c12616566c3 SHA512 b4a4887383cf981b364f2982836c795e601940397a2dbaec7553486115a7ae96b014bab43a63c49436986664dc14f443c8589a6215dcee43ea2748da67c08956
+EBUILD defusedxml-0.6.0.ebuild 706 BLAKE2B 6f46fd51563b69caa3d08a9e71b581b2936f9c7db982775b91756aba0dcdd40507609fbcadf0fd57fe8e0e32cc8cb022cc29ac0cac34434eb1b7faa5660ead88 SHA512 6e765304fb3a1ea87f0c012d409b1ad7cdf7d1382420db9d965d4688be6a55adc93342b1dedf6456211eddd18315da4696721d9decdf610f8c7bec2045614105
+EBUILD defusedxml-0.7.0_rc1.ebuild 771 BLAKE2B d63911866f1f1a8c0336534e0f2cd5aa9e9cd1d83451b87903bc839d0f5072044bec76b8f55fa267a17ca6f56dcddae5d3e1d45e3066421e74ff2004ae712bab SHA512 783bd2ba24afadf94b2d58e3468196dbfd4770ece78002eb1c0c52dcbafb35887907322d9e29318d9d1089c9ff3fda67d4b2547c927762d5e0a198164df07c3e
 MISC metadata.xml 409 BLAKE2B 9a961d587d44b320c8d15a987cc6f06542f5208c013587ebbdc5f7dbf1df5cc67691ac7f9b21c7cf465dffa0e1c25e2b822a71d6f7fd00d62964f3068b21a78f SHA512 2de7bb348b7e8005bf13eb5e077c9d9ab4b5ee4cb19c7ff858cc73372ad40d0e45e7bc978da4658c379e784bddab0f9123daf3161b85c098c163a81ef128070f
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
index 441697b064e6..a243bd6895c6 100644
--- a/dev-python/defusedxml/defusedxml-0.6.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
index 3249d1629c0e..638f19676f45 100644
--- a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index d24934691767..a6c558c87aa0 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,3 @@
-DIST denonavr-0.9.2.tar.gz 92898 BLAKE2B 5e7248ac3fb3e55dd8040f70c59b082a76a25af36a378c7cca73e0f6f85de7ff2465f95e74b5523d3e5d5a02bb7833335c53739255e50b85891d3c9b92e0f13c SHA512 0748ea61635c6b76ec6987b5a4439dee1ef92b6265a29473f377867e451c055cd5a0cfbd93230d2fd0a75800ca5aab861316a78ac07acedcbe88aef281c4de30
-DIST denonavr-0.9.3.tar.gz 92910 BLAKE2B c9b93db7908b2d0375c417f3980d1df2f5b5191fee5fa1ab32ca3031c9fe190b5c0fb3afabdd42c14aa6baf6b6e451171a339e58e0716882fb19d91648802963 SHA512 80ccedeceb1df0c0d71cd6ce2f601b9a966bfac0178321528e84edd7f422489039a7867df3493f14012be383fe95aa0b4f39d6fbb7a0c292b6b2e6efc1fe8b93
-EBUILD denonavr-0.9.2.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
-EBUILD denonavr-0.9.3.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
+DIST denonavr-0.9.4.tar.gz 92936 BLAKE2B e7a38f1e967fa375bbc024fb2803ed7f4587b9bbf3540b47b2011bc30df7e907addcadf3ca26158e7a855fdb362c97c43a37d296b674c8774ff095e466a8a3d5 SHA512 32dd78f381a1c98b629e49dd90b127c023fad37b2e6f2fbd1aa4c5a308fe26a8fbca2e3f72e0ae5e26d498a421f029f5673af63353ed057213c2c3c4c77ef77f
+EBUILD denonavr-0.9.4.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.9.3.ebuild b/dev-python/denonavr/denonavr-0.9.3.ebuild
deleted file mode 100644
index d2099e429b0e..000000000000
--- a/dev-python/denonavr/denonavr-0.9.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=( pypy3 python3_{6,7,8} )
-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"
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.9.2.ebuild b/dev-python/denonavr/denonavr-0.9.4.ebuild
index d2099e429b0e..d2099e429b0e 100644
--- a/dev-python/denonavr/denonavr-0.9.2.ebuild
+++ b/dev-python/denonavr/denonavr-0.9.4.ebuild
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 9e0227e9da4c..952047330b23 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,8 +1,4 @@
 AUX deprecated-1.2.10-py39.patch 2040 BLAKE2B cd8f7c7b29c3a81bcccf907fca26864801db0440fa675581222d20d39dbfc19eeead1a708cea3b500ae15af0f3f0c64e2838a7ec8a8b57b540ced07d1641e1d5 SHA512 5cece72f18f0faab35814cd2b59bd441a0f21ebb3b2c392d9e0936df4c321d15dcefe7333615462d2fda57cf640cb8e5a95d2e2486502caec33894ddb1faf49e
 DIST deprecated-1.2.10.gh.tar.gz 2967353 BLAKE2B 941fa81dd27940be4fde1219a9fe127777354aa2054b15178cade4a859b01f8dff426e0da8161bac580ff6446b44767f3207b474bb5f555826239db039085497 SHA512 4bd53b759d04ab15c74a4c147b2c69c73aed6e40555acf0e84cf0c5b7ffe248da234bd1311c5629f9357d50bc08e55e81363340dcfdabe88933525bcc7859a70
-DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
-DIST deprecated-1.2.9.gh.tar.gz 5332765 BLAKE2B 0b88c15a0186d3adcfe3076a477e1bce3565caf39feb8e25c28865d85a168ed4cecda33fd68158571ebaed429e61b2de290f0c7e832dc87baa9cd4d439dcb093 SHA512 04a248d78021c45a1254f80966e6e4e6817ff3f8312d36fa9874c300fc106b7bed3600702a6953044f88cfa08f8ea8d6447c160554d8c1e1568051d3ce4a175b
-EBUILD deprecated-1.2.10.ebuild 543 BLAKE2B bd1778ccd27bc3884a19e9f231d50e19c91c4eda2f53d3865f7f0be555ef540346bcd18f1514f87171b50aba739d324ac143642a7a2c8da7889f039249d8bbc6 SHA512 378f3bc94b2b238a910409d4b7eeebc519fdaffa91fa8347df8d7532147cd13a5f115be418568a78c86500793ef7dedb64fda08458ea6d22c85ea269d77f11f5
-EBUILD deprecated-1.2.7.ebuild 548 BLAKE2B 662dd028bd1b654d0fe7c889c742f032ca724bf52b5065351cd730bedc7f9c0ecb0f0c9152717fac6eedc8113c87ea30cd787e7adf5b850f9d332dda675a4081 SHA512 5b9f69ac4bab6d2cc439ffd8480db90e1d826802717dda966e2f95d3c05ae98bc3afcdf0f31644ef05d8f563831b735690d56afea88dfdc1fa43c35c47ad6fb3
-EBUILD deprecated-1.2.9.ebuild 498 BLAKE2B 10d268b3bf2575854d700f280b37410253a53729224b99360271bfe68264a738689cca3fa5a34277e2da8aa2d0fe4de4f08f35a28821adae5c0b72f7f4bb75d7 SHA512 537f727f58c9ee07304b92a4d2aa0a84a4f0d842ce56cbd19fc5980d9928e2af242f40aa4bfffde6976104616b5bd28bd2d1435a63744e4a3e285e34d337e35c
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD deprecated-1.2.10.ebuild 541 BLAKE2B 5524c1b9b3b15cde003796d375aad6de29c108c63477888eb3b121379d954ef7c1cd7f56ec083fa3af6171620953c4d05302bac062724a2c9bb53d156a3638af SHA512 46df883300a946665d23e11095eb04608e53223d8dea557cdf049353d9a25a76e6e0bf2f2f16d7578463b36564d2c92d6901de25c531eb43a29a9fd54ccb1a66
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
index b2b1fcd65d1d..2a68c9e3fff4 100644
--- a/dev-python/deprecated/deprecated-1.2.10.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/deprecated/deprecated-1.2.7.ebuild b/dev-python/deprecated/deprecated-1.2.7.ebuild
deleted file mode 100644
index a6bed5059a0d..000000000000
--- a/dev-python/deprecated/deprecated-1.2.7.ebuild
+++ /dev/null
@@ -1,20 +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="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/deprecated/deprecated-1.2.9.ebuild b/dev-python/deprecated/deprecated-1.2.9.ebuild
deleted file mode 100644
index cf3f9570dd6a..000000000000
--- a/dev-python/deprecated/deprecated-1.2.9.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,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}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deprecated/metadata.xml b/dev-python/deprecated/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/deprecated/metadata.xml
+++ b/dev-python/deprecated/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 783186aa1297..872fe9995e89 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,5 @@
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
-EBUILD deprecation-2.0.7.ebuild 989 BLAKE2B f3faeb7ad9fd386081c5b05c00408ec85cce82c8cb20f54df4ec94ce86cf021a3a38cabc929a79283227e03f6fdeb537fe8db3e513a5ac64914a3d7740eb17d8 SHA512 e18c02addf3612471fae5c7492a9c7a7c3651f1d3813e746ef129b71d05fca25acb98ad76fc292a7dfe76bcf74f6985f49e35e20c0a1f70baf07524a1f1323f1
+DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
+EBUILD deprecation-2.0.7.ebuild 573 BLAKE2B 35adb3a4ad5fc675d03536e189a2f9b10d87f7fb4d93e47f9f3e45aac89012cde5279d45e716affc7666a81ba2272f6d669e0b0a20dda589d9217df12ae19311 SHA512 9b16106b78a448ad6e7135310e50a0aadb33ae4622325af5b69721381711339b16f23f5ed11349217c8793f85ed4cef76d3a5959acb414181f423c383d6e3317
+EBUILD deprecation-2.1.0.ebuild 582 BLAKE2B 3314f5d283d1fc7118a115f8f2a74b3a01fd0283ad2b0e3275289739ef6e94f173bd3ef0c86aa04f6a82651c5f9a7f934563dc23f470a72403693189a1cd22ba SHA512 452015d060fb37d99a04b230a49770944a1f8f61ba998e3d9e805febcd4d813701422058c7d80371cf062d379afba49e0d3ba130dd69fa89bb9f19f77135a539
 MISC metadata.xml 541 BLAKE2B 709794874c752bf9bfd7c4869969c7f5ae80779d2bdaaf2c49cab8abbe3c4b8b4a3f62683961edbb00ea260d933adce5d3da5f7b8be9532ab5e016fb35dc94a5 SHA512 78d8d2f01e9b6d3bc0e6c2edcc05593ce877d15fbef65a55b9302565e0a8b6f933fb12a3fe280111ddd415ba959ef816cada9c5e6c84f369bab4f0e1c8e3c74e
diff --git a/dev-python/deprecation/deprecation-2.0.7.ebuild b/dev-python/deprecation/deprecation-2.0.7.ebuild
index 112502583e07..029bb0494dad 100644
--- a/dev-python/deprecation/deprecation-2.0.7.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,32 +13,14 @@ 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 )"
+KEYWORDS="amd64 ~arm64 ~ia64 x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/unittest2[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)
 "
 
-python_prepare_all() {
-	sed -i "s/, 'sphinx.ext.intersphinx'//" 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() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
new file mode 100644
index 000000000000..6f0a706779f0
--- /dev/null
+++ b/dev-python/deprecation/deprecation-2.1.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=( pypy3 python3_{6..9} )
+
+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 ~ia64 ~sparc ~x86"
+
+RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 356c50913e8a..ae5bd698f4ed 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,4 +1,3 @@
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r1.ebuild 469 BLAKE2B 81a5bc436f897dda153e22a8671935e81d712963865c8cb665dfbd4fdbcba0572c709d7062a9f8a4517f975a6ffaf04b9caf59d27e9dd481c55e1eee1ff2277e SHA512 55fe0c86ccca18136623525f69740701829a5db5c053ee6815612a769de86bfdf6b95a7c3650ce30a7e9606663b433e8d6e8a65339cfef43028a797352315e4d
-EBUILD dicttoxml-1.7.4.ebuild 441 BLAKE2B 8717b909f3c47beb41cf55c3a9b19831ffe8d146dbe5739a3eb9bb4d6446ebc8761c7c34f78552f8a48df54877f32556918734b18c3beed398e6620c0fe1c850 SHA512 cf65855d5773a41931f58d41a10cee6c2d8d8c2cd1d3d2f793ac9185b67ba04610175e88ebd4b389e009960f29844697d61cbfd39ccda9bef1f0abf3e62d66e0
+EBUILD dicttoxml-1.7.4-r1.ebuild 479 BLAKE2B 577040e9bb8ac6270c6627da93f489181f9b1133112da13a6047004887bb38589890abc9ecc0b5e7c7fb4c10010cacfb0b2d6b1c6b0b65d14816f1a01e4b9c0e SHA512 50e5a0d5af286f7f3e7322a57d548802b56e11bd60f012b6836824b05341e0bd79f79b23bc160410a9189d5216e7bea552762ac5cae9bf93677a010050b7db16
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
index 5544ba09be89..3bc07be426de 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
deleted file mode 100644
index de6fc339e268..000000000000
--- a/dev-python/dicttoxml/dicttoxml-1.7.4.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=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 9c789ffdd72a..f0b4ac307842 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,3 @@
-DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
 DIST dill-0.3.2.gh.tar.gz 148972 BLAKE2B a807350a2d2bb84e705d20c9c60d47834b41863b862a5d347ebc32273c1b9479c568cd3018126adb1cd052bb00f50e8424f7118b37524329458150b9a3e59e3d SHA512 74a0c01dd7c0126c7de21a3b3660e51486fec17f64f23b8e7f23b70243209908573fef8851f6eda53868e89ef1a8a5e351a3ef81dd9cb3e122a2dba33a86bbe1
-EBUILD dill-0.3.1.1.ebuild 572 BLAKE2B e6567ad2af1b6b54898b81d0f0cd3bd8e82f6ac176d768252a02a9d7eb9c0069e1df24f91657aef873bb279f51e89c5853eebf428414ea9690b8b5eed9479f66 SHA512 310c104e8b0ebd763d9651f7e43879cdc7ee56bc33bea0ffae024512fb108e9ff08e26ea27e2413c12ba2331f26ed5ce10ed8baab6d4cb2f36665822a99bdbd7
-EBUILD dill-0.3.2.ebuild 633 BLAKE2B a459f682842124d3e1f78ce80b24353e71e4594779b8e86ed6f6cc8a23d00b6ae2071b15dabc078be5db8a8a528cb4006b0740193c51e7aa0cb59b4b6a45afa7 SHA512 1c325c302396875f42cb488267ce4ac3903d8d75b60d155fa99173a5d07f0a7a7a9cdde0724830a6fb4db49fc8d7d6177ab7dd1d36401d8d19a66adc2b6c54e6
-MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
+EBUILD dill-0.3.2.ebuild 630 BLAKE2B 433932c4cd4c415f331b17a024314e23a4284b95a296b9f26362e039cc1a5b6e512df4e613be195399f3c35dd09b28da49a0dcb624a0477ec7153992f1eebeb2 SHA512 62c23291eeafc72a38d0d6e90493dc0a910735a2042bc059c3a2478b3d69103139c0754f8291aeb67f8417c261eb9a9243675ffc18dddc1c22789fe9233336d7
+MISC metadata.xml 996 BLAKE2B b76f67cff65e28c22663f6291652a39fc232369ba747542d0840236971d9857989b179c80a09cd736e2cb504e1db12934a083cb7e38922430dd25844b7fa40a3 SHA512 0dada43b585791564a0351ad160f0d5c11e8821c6fc494d5ea833e48d59b84a10a2c9a99501536d00b5fc03fc55cc51839852363790e1ffe0eed9971021dba40
diff --git a/dev-python/dill/dill-0.3.1.1.ebuild b/dev-python/dill/dill-0.3.1.1.ebuild
deleted file mode 100644
index c1896db8f750..000000000000
--- a/dev-python/dill/dill-0.3.1.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=( python3_{6,7,8,9} )
-
-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"
-
-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.2.ebuild b/dev-python/dill/dill-0.3.2.ebuild
index 32554341e099..21415440540d 100644
--- a/dev-python/dill/dill-0.3.2.ebuild
+++ b/dev-python/dill/dill-0.3.2.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${PN}-${P}
 
 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/dill/metadata.xml b/dev-python/dill/metadata.xml
index b277396800f0..384c7650752e 100644
--- a/dev-python/dill/metadata.xml
+++ b/dev-python/dill/metadata.xml
@@ -15,6 +15,7 @@
     Dill can be used to store Python objects to a file, but the primary usage is to
     send Python objects across the network as a byte stream.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">dill</remote-id>
     <remote-id type="github">uqfoundation/dill</remote-id>
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index b092035aec47..87e96a24e624 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,3 +1,5 @@
 DIST diskcache-4.1.0.gh.tar.gz 658268 BLAKE2B 7712892a15e0f7b34b05c48071b4ed22f94ff4c8b6e66dff5591296d7186c686958ef3ec19994b6965319ba3e601850a1782f7ac8ed09090afda4b75ae16a12b SHA512 3871e56fa9a50942e29e200df74d7f4312d21a0f51d6be2041ce71efd3c1d0c204cc1df5ac1f92825314c742bb48bf8b0a3929cee225055903953e095701c8e3
-EBUILD diskcache-4.1.0.ebuild 1153 BLAKE2B 1399b205a806c81009319b0e23d96b35b8c823000f5c281d4374c2818309066659fd1ae12e605d7d37755063e240ba74ad0cf60b4c1729416d58683f95c3537a SHA512 e6b73bb960b41a71452bc4e4b69fb692109b298b9aefecc2a779d94163dd6babea92b5b68f1e0c5cf2a3885cf48ad021d5648835cbddea8a9fc077dfaaa808c9
+DIST diskcache-5.0.1.gh.tar.gz 656475 BLAKE2B 1926dd40564130a24f211a1962c9a9e4ecc640ecd55d2bae5057ead787df0cc64634be8a798202702a7810612bece0d45202bb12d495da1863c8b10e645cb7fa SHA512 9e06427e8ff158fa186ed161b7e90980f1a1d866164d6018a522f80a323be981f99e4297b0d90106dfb08b5d2d0babcb5a2dafebcc194e2c282c30bcf3e0f1a1
+EBUILD diskcache-4.1.0.ebuild 1165 BLAKE2B cdffc7e266f9c1b19b1dde1d6ebad0760c296c03d5a200f8d48c8eedb9d61ab781a7a5a6fe2029a43b484f420d6067b8fa24611a782d2859c229b5ea021e4227 SHA512 417b23597e292910883249505c249ff9b15324119e896eb9b5398d7b7feef385a7fde8d08b70f3759e47a265a472762d11b9b43bc915a344230416a3cd1f3e18
+EBUILD diskcache-5.0.1.ebuild 802 BLAKE2B bb75be194dff99e889efba4875121ba23b386a967f932a2f628b56a5035366d614b5dbef8e5edba4793a23e4b813c49a23323398eb96784aed100ff7f2f28c92 SHA512 f5b6ef9363372e042977aa1056f89fa9c5572914f881837734a1dd743a72cc5389a3b567c4e7a9adf7652b2aa123ef140a97dd0d206914725e6df9e2d03e5e02
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-4.1.0.ebuild b/dev-python/diskcache/diskcache-4.1.0.ebuild
index 36f1dadb1212..9f91b9ac968d 100644
--- a/dev-python/diskcache/diskcache-4.1.0.ebuild
+++ b/dev-python/diskcache/diskcache-4.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/diskcache/diskcache-5.0.1.ebuild b/dev-python/diskcache/diskcache-5.0.1.ebuild
new file mode 100644
index 000000000000..c07ed748a131
--- /dev/null
+++ b/dev-python/diskcache/diskcache-5.0.1.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..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
+	https://github.com/grantjenks/python-diskcache/"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="
+	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/python-diskcache-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove dep on pytest-xdist
+	sed -i -e '/-n auto/d' tox.ini || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
index b07b830bee1a..001edc8a6188 100644
--- a/dev-python/dissononce/Manifest
+++ b/dev-python/dissononce/Manifest
@@ -1,4 +1,4 @@
 AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
 DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
-EBUILD dissononce-0.34.3.ebuild 933 BLAKE2B ea9f487a3773a6cf1c3e6719cd39494495e3dc73f9a302ce6a027ba8ce840b503e982d0df0fb0b7b1fc3c42cff1119a92a38a02841987ff2a0a39a53c4b7826b SHA512 c60b99aaef20f603b4090174fee1fb67076769452231e49200cc46a61cd39c9cfb521e462c41bb35efa762479ed669d86ae3fe26d011bdef36dfd8c575365c36
+EBUILD dissononce-0.34.3-r1.ebuild 765 BLAKE2B f13016ae978c439457a516da1cdc5ca625285b6608672e31c4b0c99d7dbbe633e9cefb7660c98bac72e256a86743f5f8367d81c4dd1c45d00d7e94dd49850c6b SHA512 6670081013cdc516ea55ae1cdaec72ee642b517833c013eadf1212d27e1c079aa1ddd524262cf6154ef3a7179853527d6d1eff3c093d15c868f1f579f5466e9a
 MISC metadata.xml 659 BLAKE2B 9e628e24c999a14575817d45ba61f5ff0e444c222c67c3204c1c53a7c928e926ebf9e4319c3f450d30686eeb01c1b94adec2008d65e3275df09964a9b281aa16 SHA512 2bba877c4161cb766f935cbfb5b7b421cebca89116e9bee83655ded6bdcb332c719314e0c2c1cae010409e071e511bb1335f5118993b647b1c25a99076f072bd
diff --git a/dev-python/dissononce/dissononce-0.34.3-r1.ebuild b/dev-python/dissononce/dissononce-0.34.3-r1.ebuild
new file mode 100644
index 000000000000..57475f3014d1
--- /dev/null
+++ b/dev-python/dissononce/dissononce-0.34.3-r1.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="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python implementation for Noise Protocol Framework"
+HOMEPAGE="https://github.com/tgalal/dissononce"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/transitions[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-test-requirements.patch" )
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/patterns/*.py
+}
diff --git a/dev-python/dissononce/dissononce-0.34.3.ebuild b/dev-python/dissononce/dissononce-0.34.3.ebuild
deleted file mode 100644
index ba5c872c5ff7..000000000000
--- a/dev-python/dissononce/dissononce-0.34.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python implementation for Noise Protocol Framework"
-HOMEPAGE="https://github.com/tgalal/dissononce"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-# Currently no tests are available,
-# they will be added in future by upstream.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/transitions[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-test-requirements.patch" )
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/patterns/*.py
-}
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 8ced9bbba543..e1787ba40578 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,3 +1,4 @@
-DIST distlib-0.3.0.tar.bz2 848089 BLAKE2B 70f88b570229e2ab4c95bd8da0375aba189f66dec8defcf8eedf1be6924d93bd20b54c68e5fba867a6c68a31d4ef926ee2dc18ccb0391278680f30a62d0cd251 SHA512 01b0e7d59736414a241efdf883e4ee63eafe9614ce3b4147781a5750d25d6383543146c5277e3e0d3e11ce03693afd0331c6e3416776a6f84de7a4d9dadf3de4
-EBUILD distlib-0.3.0.ebuild 1574 BLAKE2B a4cc5c704c5c568d8ea95c5a9bc152474e1114843b796e7b75c57b313178895d5a6617b879608088481420a1030f52fd25142f4c057157809b3ac327ef0f471d SHA512 594ef111c28ded89a86a2c79a28a38ecc0f78ae96141c992ad0e61cc233d3197bac7e4dfea2d3c3c1665ff307f54d34179a28b481a1646c1fe2378d23d7765bb
+AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
+DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
+EBUILD distlib-0.3.1.ebuild 1325 BLAKE2B c4f5f25465a310357b30d655890caec24b4fc9490a30f30d2bf3c829deb8c0d3df4d7afc86ba89fad782c64d174cf56483c397542cbc4b259c996a6f109a9af5 SHA512 8339b311f87979382995d1669e7f5220106b6a282c20f5bc75b6a847e709d8ef9b098088b92b84ef108e6ad6cf3606362df68704717fc13f607f9ff3a18a66d2
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.0.ebuild b/dev-python/distlib/distlib-0.3.0.ebuild
deleted file mode 100644
index 10062678328e..000000000000
--- a/dev-python/distlib/distlib-0.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# this test assumes pristine venv with no system packages
-	sed -e 's:test_dependency_finder:_&:' \
-		-i tests/test_locators.py || die
-	# no clue but it looks horribly fragile
-	sed -e 's:test_sequencer_basic:_&:' \
-		-i tests/test_util.py || die
-	# progress bar test cases, very fragile
-	sed -e '/ProgressTestCase/s:unittest.TestCase:object:' \
-		-i tests/test_util.py || die
-	# TODO: investigate
-	sed -e 's:test_upload:_&:' \
-		-i tests/test_index.py || die
-	# these require Internet
-	sed -e 's:test_search:_&:' \
-		-i tests/test_index.py || die
-	sed -e 's:test_aggregation:_&:' \
-		-e 's:test_all:_&:' \
-		-e 's:test_dist_reqts:_&:' \
-		-e 's:test_json:_&:' \
-		-e 's:test_prereleases:_&:' \
-		-e 's:test_scraper:_&:' \
-		-i tests/test_locators.py || die
-	sed -e 's:test_package_data:_&:' \
-		-i tests/test_util.py || die
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/distlib/distlib-0.3.1.ebuild b/dev-python/distlib/distlib-0.3.1.ebuild
new file mode 100644
index 000000000000..f82db5aa0028
--- /dev/null
+++ b/dev-python/distlib/distlib-0.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level components of distutils2/packaging"
+HOMEPAGE="https://pypi.org/project/distlib/
+	https://bitbucket.org/pypa/distlib/"
+# pypi has zip only :-(
+SRC_URI="
+	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pypiserver is called as external executable
+# openpyxl installs invalid metadata that breaks distlib
+BDEPEND="
+	test? (
+		dev-python/pypiserver
+		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	# make sure they're not used
+	rm -r tests/unittest2 || die
+	rm tests/pypi-server-standalone.py || die
+
+	# use system pypiserver instead of broken bundled one
+	eapply "${FILESDIR}"/distlib-0.3.1-system-pypiserver.py || die
+
+	# doesn't work with our patched pip
+	sed -e '/PIP_AVAIL/s:True:False:' \
+		-i tests/test_wheel.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SKIP_ONLINE=1
+	local -x PYTHONHASHSEED=0
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
new file mode 100644
index 000000000000..beb0cd8dd925
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
@@ -0,0 +1,37 @@
+From f30a24d3dffee78cf0581218d9cca0e395b75f6a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 8 Jul 2020 09:24:42 +0200
+Subject: [PATCH] Use system pypiserver
+
+---
+ tests/test_index.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/tests/test_index.py b/tests/test_index.py
+index bc24367..4971e3f 100644
+--- a/tests/test_index.py
++++ b/tests/test_index.py
+@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase):
+     def setUpClass(cls):
+         if cls.run_test_server:
+             cls.server = None
+-            server_script = os.path.join(HERE, 'pypi-server-standalone.py')
+-            if not os.path.exists(server_script):
+-                logger.debug('test server not available - some tests '
+-                             'will be skipped.')
+-                return
+             pwdfn = os.path.join(HERE, 'passwords')
+             if not os.path.exists(pwdfn):   # pragma: no cover
+                 with open(pwdfn, 'w') as f:
+@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase):
+             if not os.path.isdir(pkgdir):   # pragma: no cover
+                 os.mkdir(pkgdir)
+             cls.sink = sink = open(os.devnull, 'w')
+-            cmd = [sys.executable, 'pypi-server-standalone.py',
++            cmd = ['pypi-server',
+                    '-P', 'passwords', 'packages']
+             cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
+                                           cwd=HERE)
+-- 
+2.27.0
+
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index af7758961490..e6a569cef054 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,7 +1,3 @@
-DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-DIST distro-1.3.0.tar.gz 48067 BLAKE2B b8dc48dc82e96c674c5fedf2f55167fcbabacde59954ce978085f0a05e5184bf8c323c76208f2ebe0a2cfb6ac41ce0351774ba6ba02dd13b22a7506ce3e5cf58 SHA512 5a3e363b7dbfb5f70967937d04b566e5c8aea10b6f3b9be7485e6f49130766ec5480ce1c1c14ec759e38b2488ffa697478246e53be72ad277cf3bebac7dde741
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
-EBUILD distro-1.0.4-r1.ebuild 580 BLAKE2B 20955997a8892260da7ae6bc2f293524de87d1afdbe1523fbe3c37253cdd8ac62dd6a1cc1835c428df8a6d3efd515641a3682bb258c3978413579dec82ef2b99 SHA512 72dd237a708854d166a549604dffc17286d79292ab6f5efb45246a6602860650a12ff0069327b0d8bc805ca35866edbd8a1da8ce1246fa3c638ecfb7837855a6
-EBUILD distro-1.3.0.ebuild 535 BLAKE2B 59c2d7b16e2a061871db85f5679ed1ffef42cade07e4028e4f4bacce59052adaaa3b2d296d9d45151ae131653d90660b1b5b1d144b9b7653ccf27e9c693aa063 SHA512 0f89047367718413042562512da81da83015e8a0969a4f025fe28ea7f58ead77787ce4388ef31658ec57f6d753f3178b7b4fa142cf6e2def2b857d25e90f4fcd
-EBUILD distro-1.5.0.ebuild 538 BLAKE2B 59d42a36541025156f4401c86b909bea0ec52c7f6d7bcc035903df7fea572d079aa4122171ae386f832d653063b923860f7b7da2368ff05b3b7798027e3611c2 SHA512 ae3c8b725531a702ee15bad2a9a646ecad5d8920d42436b2e856a6d3bba07bd724e5f7197b4020a08e44f35b4d012b3864d4029c8a7452b0f4e582bfc3566715
-MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
+EBUILD distro-1.5.0.ebuild 534 BLAKE2B 8a61e5948cf5ebcdd298d65b90dadc5bf24fe1a649dfea84964edf8f0bcf589b8b03967db2cee8976ffbe65d22d453c19df6f01062307afa554444fd289f83f3 SHA512 3f22c3a3b8baee8218f9b7022a1ca91163c49e15031bd2ace30d1b74b8ab49a57a67c46f72aae6ad21a01afe3b1d1560481b18e14428502875ad4120dd175849
+MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.0.4-r1.ebuild b/dev-python/distro/distro-1.0.4-r1.ebuild
deleted file mode 100644
index 83d02408a32b..000000000000
--- a/dev-python/distro/distro-1.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test" # incomplete test resources
-#distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.3.0.ebuild b/dev-python/distro/distro-1.3.0.ebuild
deleted file mode 100644
index 1a47e20e1ac4..000000000000
--- a/dev-python/distro/distro-1.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="https://distro.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index 24643b164d39..ed96ef70587a 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/distro/metadata.xml b/dev-python/distro/metadata.xml
index ea74de39e0f3..5a9e015bc43b 100644
--- a/dev-python/distro/metadata.xml
+++ b/dev-python/distro/metadata.xml
@@ -13,6 +13,7 @@
     function, but it also provides much more functionality which isn't
     necessarily Python bound like a command-line interface.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">distro</remote-id>
     <remote-id type="github">nir0s/distro</remote-id>
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 6fa551259f92..a0eb02476170 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,5 +1,3 @@
-DIST dj-database-url-0.4.2.gh.tar.gz 6125 BLAKE2B 1f389d20a8d38a228f10d603444fa6cb23d3b17729747e0ffb6e917494f5ad8371b64ca9b1ebb233bcd9c11929d44bca7adf5bd62637c71763413bb821db0f65 SHA512 095f22e8af3770ac2db0730c54980f957ee41456513f8e6b8da3147ec333698274a0a9e5b7d606b840d2c78906c6aef25c49df1375c2f8b5127c6270fdd4c2e7
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.4.2.ebuild 529 BLAKE2B a3aa8914b0a3abeead5f266d45e58ec5d0fa0312b5cadfa14a8f7e7c44e5ca8a12e7c9ebf21d591bfc87719f88e75f049fa69c787baf7170efccd2ce35237039 SHA512 36bb577718d56afefe5f41fa499d1525fdaabbc6473dccd0c3e6357f62c4e38aa5c5b475f0838bb6beb6c0e4b82a53f5fe5ea11902ff739e996e4ac9dba3b434
-EBUILD dj-database-url-0.5.0.ebuild 531 BLAKE2B 23d27e333ac142e1845bd71d152efeacc9736c2796676d6831352379d73b1ff85aa854efeadd81ff14613f52046bf596dc22cd029d84dc23f5b9eff0c2d405cf SHA512 dd3a4b08f6c4302ca35b16b2ead1bf660d9ef39cf5121ce759f359e74946624b273e6516bd14b6ac1b2dcd58da5f79d449975597a3b266994aa1fb98d8e56e37
-MISC metadata.xml 398 BLAKE2B 29d967c2376c10347e128d1e7cad28c9a8346b7ec4a1d616a121b676fd3d56b4c0a1b4bf890bfed47b3fb244d9fa0ae01bc28d8b4066fd9289c72a436db4f647 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af
+EBUILD dj-database-url-0.5.0.ebuild 528 BLAKE2B 07212eac1ba2ef0c46ef25bf3f5f49072f5e26a3541ddf3aa4620565bf1ad91d71610e8db29eadad1e697251b45b3c0e14a2e1a8ec67cc2c59125057e5c68ce3 SHA512 161cde866b2a66d05fd2e7b71f5cc9ab0af54909d1cc0c64f9b71b5ce254bb0127b9bc5d9c8b21859836bf1fa426bbfb4186696a8e41f72dd34039f8c0ea8b0b
+MISC metadata.xml 423 BLAKE2B 8ffeb653121355367c526ae43a04bc378066ec1606fe4a034553d0a53edeb241443fe02d28917ea46ca5c5f49a8ec56a88e951e68a7e2d98013ebd76be66dc4f SHA512 e7ce0313806e3c4ae511bc1b60bbf3f7921610c9fe889166658299dfd0cd01bf01f5a4d47b1a166569e9365b0d75e980e8bf463f63fb82c8134a20e7b1c74ff9
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
deleted file mode 100644
index 87cf652019e7..000000000000
--- a/dev-python/dj-database-url/dj-database-url-0.4.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,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://pypi.org/project/dj-database-url/
-	https://github.com/jacobian/dj-database-url"
-SRC_URI="
-	https://github.com/jacobian/dj-database-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 7242cf18e324..5c71b4444f54 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 8dd62fb8e9c7..85f9085eb45c 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">kennethreitz/dj-database-url</remote-id>
     <remote-id type="pypi">dj-database-url</remote-id>
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 45f90c04a82f..e04f9d8b2d7e 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,9 +1,3 @@
-DIST django-otp-0.9.0.gh.tar.gz 60204 BLAKE2B c71b27e007580410fea3cf8110631801c8c08f7e325c3586cb5a41a9618b371b5d65e3b030a5b483cb6cda684fe837cd40aa1c5d04f54dc82cda750b8ba8aeb9 SHA512 dd3c99e928ebf1ba5b6f6b2f34fcf8a1f86ad64ece17a9bd97c56be239f165808f6d1025e2826a12a8eadc150fe49920a0b7ef398d83542cd97a4a6f391505fe
-DIST django-otp-0.9.1.gh.tar.gz 60230 BLAKE2B 1a912e35f8245d3411fc1a9b26dd53d99df5dba5f2a5f68003bc4d535365af336d8664f81cc42f140247bb0e7150c0a60a3308d96cda1e41681dc93520f112d2 SHA512 600286653c035527a2a7978f19c3b9683805ab4562f12afcc2140adf92705239b8f9141b9979a6c30110cf7f3cc13c67019f39448d3cb8db61c4e1b0cdbcee88
-DIST django-otp-0.9.2.gh.tar.gz 61366 BLAKE2B 5016e352db2cfd60d94cd38986185fddab84bf997b72ff5ec3b59cc5944afa74ef67deca7691fd78e28f2aa75bccb9b976707ab6822a6781e541157d4810d8cb SHA512 9634ab23d006d768cec8f3a6685a77e54f8bee89854af2d431eb99560819139518738eb9f1a124190633dbd99f47388f5fa9685bd199a0918f73b263894ea051
-DIST django-otp-0.9.3.gh.tar.gz 63488 BLAKE2B 186af524cdfa3084bfc14deab1a4422a2da2a61b94d85f6c84a01ca0876b68d3f4b478ab2ed37b7d73ca273a2cce3bf4a6ad16c07cc2961bb6e5a0f26c80b1aa SHA512 23e73c1fb0af43c9ba946af5bd1a4ea2dc5abd2b6e9e543a0b7ec37296f0132e9203e3df3d8d0a70448d63453b8111921343c04fc3f073c505d6dac332fc0042
-EBUILD django-otp-0.9.0.ebuild 765 BLAKE2B ece769006ba4a4f8ead9ee89cd15224526bf8f21ece4155b84f05fea4dad1009da5225571c2b5171fbea013153c844ce8c22c36cfc738171739d2777d5d3ea6e SHA512 8b151507dc42dbc5d82be55ba8290bdede0703b49fc4d03109a4264362d04e9f3fddd9a60212fecb5906ebec9f75359e01038363db045389508e151b1b4861f5
-EBUILD django-otp-0.9.1.ebuild 802 BLAKE2B 72eb8645f292fc55bb581e512cdfb51171b1a449e2767c717bf303906bab2bb7b71c11cc86b7227c19a55f0da45b6dbd897e1cfcf74649b4713b429f0fec7dbf SHA512 7b36b987c0c6f0144458b0b9d98cababde280f6fd0f4f04483decad56a1260444fce91c20b654e9e9987e7d88e2e375ba18b6ddac3ba43b2f218883e8a1d9074
-EBUILD django-otp-0.9.2.ebuild 839 BLAKE2B 450434a0df280094bb855c2bc6109b9080a95f36e76ce1d881acabfa72c65bc261e35daba69262c33a9c4482dcd79f5c2b0a2fefe8ef2615524ac2e69f40411d SHA512 822577452adcead3039eef453c11060c679dc22063a2f51f5326dfbcd105dfb621dbf63a5fc4ba3a42f137e34b63298fe3ffb029e22a152a1e6c6ab086beb8bb
-EBUILD django-otp-0.9.3.ebuild 839 BLAKE2B 450434a0df280094bb855c2bc6109b9080a95f36e76ce1d881acabfa72c65bc261e35daba69262c33a9c4482dcd79f5c2b0a2fefe8ef2615524ac2e69f40411d SHA512 822577452adcead3039eef453c11060c679dc22063a2f51f5326dfbcd105dfb621dbf63a5fc4ba3a42f137e34b63298fe3ffb029e22a152a1e6c6ab086beb8bb
+DIST django-otp-1.0.0.gh.tar.gz 63813 BLAKE2B 17e771f11ddfe4c1667b29da7e6bdbf542796ce48d9f5898e1399603c373bee04a2b6d2d96d8b3295adf07ac245f7e5ad4baf3f6f63f6fe9ce350482a6cc06e8 SHA512 66bce779c5ce98c8b0f64bafa98d8be26a2175678b413bc5e8a80a2157d4b843c217aed7cb7b64fb423184c7dcff5967fa352dd233c404dc51082ec7e94792f7
+EBUILD django-otp-1.0.0.ebuild 879 BLAKE2B 3d659fecce95d0c804673487d8f42cd7389c03f81f8039cddbb6511a5222342a9d40232bced7f51eba111621510556c00803431e73fffe927d813040c8e39e3e SHA512 c1a2d1a36a517a2156e9966006f8a4e4360ad708d238bf6e7a7ce4c131164b042e779cfe1cae49da494caa6ff7d4ff7433a3301f080b9ea92cb6f323e9b3e244
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-0.9.0.ebuild b/dev-python/django-otp/django-otp-0.9.0.ebuild
deleted file mode 100644
index 4bbf7d96389b..000000000000
--- a/dev-python/django-otp/django-otp-0.9.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=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="test? ( ${RDEPEND} )"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-0.9.1.ebuild b/dev-python/django-otp/django-otp-0.9.1.ebuild
deleted file mode 100644
index cb3c87c6043b..000000000000
--- a/dev-python/django-otp/django-otp-0.9.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-0.9.2.ebuild b/dev-python/django-otp/django-otp-0.9.2.ebuild
deleted file mode 100644
index b14eef63539e..000000000000
--- a/dev-python/django-otp/django-otp-0.9.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-0.9.3.ebuild b/dev-python/django-otp/django-otp-0.9.3.ebuild
deleted file mode 100644
index b14eef63539e..000000000000
--- a/dev-python/django-otp/django-otp-0.9.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.0.0.ebuild b/dev-python/django-otp/django-otp-1.0.0.ebuild
new file mode 100644
index 000000000000..3c7f80d1650d
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index ae790688eb8e..ae1d23fd0cfd 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
-EBUILD django-redis-4.10.0.ebuild 488 BLAKE2B 9734925e3c6ddb09df4f6976ff7343f765614984eee1a2fec4f8945294a896cf8d887389e3d5425c85dfcb7f8a6c456730e1f74f1033630b83fd4404c202da28 SHA512 a596767f628071fe8f69cb512ccfa3101f46fb35d06838e905e2321b5935709f4275d3b5b414ba23429db39d3a16638d79c9209693fbe990a15a1af072d52883
+EBUILD django-redis-4.10.0.ebuild 493 BLAKE2B 039ea4a4634f71978a87859654e857c411332a0f28823a115536f5d578cee5e620da9d7a6ff8003ebfae6b3cf1621300abba9c21357110f11c8e33a84d5d5980 SHA512 e7da9e7f0379583323b54b4e639debf153b98abc4eb02e5d16f0ef668513b8ae96da796915d51a53c75bb9d811b4048a9f943fb7566436cda3c61758f3d5cb0f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
index 6e4c252662ed..cdd13fa9c909 100644
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@@ -1,9 +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 )
+PYTHON_COMPAT=( python3_{7,8} )
+
 inherit distutils-r1
 
 DESCRIPTION="Full featured redis cache backend for Django."
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index d68a92f4860e..61092bf2cec8 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,3 +1,5 @@
 DIST django-rq-2.3.0.tar.gz 40916 BLAKE2B cdaae3b3d1289a539306f0d8d41d034384366877bd226a5d2226fa017e7807ca2c3304fe6100d45f6cc929e591970bf707acebb1f0571d2827e22acff0468fee SHA512 2b0e0531d40ea866680aa52ac941bf0ea09d4295608c3c8b99c9b3a1c9f1efbb05527327e22ad6da3b013667a16251f190a064806c7c0e1edaf1625b5bc3a2e5
+DIST django-rq-2.3.2.tar.gz 41038 BLAKE2B 837a8f819e9a91763b2d4ec961257d429e6d686fbaaa181d7fbe41efd9e08d958c5c340e4e1a4c8f0ef4063e985d3df82d8ea2c6a7cdea872b330dd545660e31 SHA512 8cf59aae163034240bfecda5f332dcc590813445cb2fc14bee15459ec8d4c50a36ab56865b3ce9360968451695e7a6d5eca5da26ef63c29dbc9dd58af8f16b98
 EBUILD django-rq-2.3.0.ebuild 543 BLAKE2B 56db8e38544f91bffa18f28a6a4382215dd80cf85f6b09758ee5a5f2098ed04ad9810a2e0cc2b75ab165ad8bda10a0932c38a037e2a7128016db280b1c75db0b SHA512 b6cc4061d8ab9ae5e1554338117ada8a0204a01153e3e619d0768bdf12b6df248f3cfbcfe7e5502d50da501a1d4e79e6766cbaacef93354f88a76a2fc82dc84c
+EBUILD django-rq-2.3.2.ebuild 525 BLAKE2B 5c1320106a8bfe8978e224c420b3609b2fe836e8c80f28d1bab1287efcc9b46e5ffde5e7cef7f94ea905d2613e0646bb4ea24c7654e39e3e57ab3e2d4e45dc17 SHA512 08c197bfbf308ba690946bb4951175b72c7fbbe2c66b42428cbc258645a1e5159de31401aac8b2278c477bf29170269b9a7186afd02272713c17cf6e7defa063
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-2.3.2.ebuild b/dev-python/django-rq/django-rq-2.3.2.ebuild
new file mode 100644
index 000000000000..96a7c90ccc7c
--- /dev/null
+++ b/dev-python/django-rq/django-rq-2.3.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_{7,8,9} )
+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"
+
+RDEPEND="
+	>=dev-python/django-2.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index 1dcc5141d748..f0cbf9141ef7 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,3 +1,3 @@
-DIST django-sortedm2m-2.0.0.gh.tar.gz 44491 BLAKE2B f6fb1e8678a47881a52fa8dc65bd16b97871c9a711f6dd604c3293b6f77f943f3fc797c3dcebc43db7c6982d8bae8dbfbf7ae6d7904bd17309d6bd0a833083e3 SHA512 207abbe3ca9b46a26a8a6cea278c87a72990577afeaced347aa9c020a15fd8a384491f2c027d811ee96633cdafd23e2ab841b4cc90d88119415a71cf4860bb96
-EBUILD django-sortedm2m-2.0.0.ebuild 832 BLAKE2B 9926224569ab9ab13b868d05faa74e1c4e9f02fb097bf5ef1b00bcf74420ff3176c6b35c741e3c26cff1de5147b301ae7350c6fdc356da492741d3083792a4d6 SHA512 c1783d5651c6f3ac5aa0bfc3f1dddc2472e2b2b5cbb3e3ad6cb51dbd0a0017320880649430ad161607056785c77df5d9eb537f90d9559f821486982403ccaa45
+DIST django-sortedm2m-3.0.2.gh.tar.gz 44296 BLAKE2B 41dd4a7bc654fef638f7a387b1307ee32ca2d8733f4ba6b9fffc92a9ab4c6af7d64159cd5a24f4305483502609a1730fe12a3072f493251840ba840b98155877 SHA512 4e58ff37cdd798d88c47a8efee2bc783ad7109b30e023127345b6d12b176e452d6125fbcaba5392fc11660df3e8b66be4b23d5ff7ab90020f946cfedc80276a7
+EBUILD django-sortedm2m-3.0.2.ebuild 831 BLAKE2B 178b605f32974cef64e5d7ccdf55a38bfca6634837076bb64af94217920314406b78835127d08655c587244705d35859570a2aaaab63efd9eec7f896e912e23c SHA512 53ec00e85a23fe8b6c9e35057825c7c6ac71d9eb9c5c2097b607c0f0a5d97b9141b27819bb6841a0c6b59b2878fd0ccf1e9355cd61451d1dcbbb717c6ef87f88
 MISC metadata.xml 329 BLAKE2B f56302e008935e131134356469a8f76d56fe7b69f33267769dd36cd115eba90ee52d485236971cd39f93e0a3ce027948b2a93c499b205b80b8d01909ebad93af SHA512 8a6f9414b12a198d536062a2e4632a8461f9635d8fcece03bdb05fbe511f7b6683f42ea09d4eb8304a25450f2e707717f4e066498ff74a76d14609af39911aed
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-2.0.0.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-2.0.0.ebuild
deleted file mode 100644
index 7e0513e1cb52..000000000000
--- a/dev-python/django-sortedm2m/django-sortedm2m-2.0.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.org/project/django-sortedm2m/
-	https://github.com/jazzband/django-sortedm2m"
-SRC_URI="
-	https://github.com/jazzband/django-sortedm2m/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test_project:${PYTHONPATH}
-	django-admin test -v 2 --settings=settings --noinput sortedm2m_tests ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.ebuild
new file mode 100644
index 000000000000..1c4c012dae9b
--- /dev/null
+++ b/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m/
+	https://github.com/jazzband/django-sortedm2m"
+SRC_URI="
+	https://github.com/jazzband/django-sortedm2m/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test_project:${PYTHONPATH}
+	django-admin test -v 2 --settings=settings --noinput sortedm2m_tests ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a3999ebd481e..8cda7d051e22 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,17 +1,14 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
-DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
-DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
+AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
-DIST Django-2.2.14.tar.gz 9022051 BLAKE2B 397f1de35f645da9964581d494d933ce2327915315049997aaed238f27214e4fead8c50e779052eafb3d237e065ef47f2d3f151552f712b6348ed23b75d25e52 SHA512 48ad065df161300920abe0c28c3f79cebe536de00fe60c8a7633caee149e0632aa564a848172bad0f254f2a98194cb625a5c169e51a89f3cab95c1213cfe485d
-DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
-DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
+DIST Django-2.2.15.tar.gz 9023679 BLAKE2B 9619d0ac45a8256a1e605f447b89df6266d67d98969baffd41a9184165e14d57d4edfb898f64a6633cc0f4c23b24a35b16cb446c920d8baf58f771c69d8697ee SHA512 bb91e5b621be54570f8c7676f820ff93fbf0546dea79e035eebd60b70c5c872b0de65395a4606f07af7b9c77de2cf218aaef8ff489fcfabaf5c9b75d28e42dc2
 DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
-EBUILD django-2.2.11.ebuild 2344 BLAKE2B 124f5e9dd4fe7c19439ffa3f5586525499a1e02ebea738f2a515f2ee9c6a11efc909c56d556418a5a0a0f491c6c37d07c406576a69d012aea686c6d16047155f SHA512 629706bd162f4c45f80e4d37abe32d7ad99fb37ae34a25e76ea89776e7d3b76fc7ce80eaffbda2c48688d2f69f453ffef1c0a59e63ae4fb154b1f87709d8aeeb
-EBUILD django-2.2.12.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
-EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
-EBUILD django-2.2.14.ebuild 2366 BLAKE2B 8796ccc566d580e69f6c12c663a7a34311f9cb11c3d9a9045c32396523c1c33e2a5c73aedf52e177bbf09526c0435533dc7ea8b85b6c3ab2cc5d41afd65b6023 SHA512 2733ecb9d91cba09b97a223c049d9f84b6bd228da4936177abc5dc3e0a50b97074071e120ac357c4c87f7d8893cd123d164f010d7a453ca18c96f253ccd56f2f
-EBUILD django-3.0.6.ebuild 2347 BLAKE2B fe755453ac26d0338267614611745d956bbd65f0d4128152be72ba38b708fa5fe905610fd2003cf8f3c8d578a29e5bf708cd72f3d5067244ca7d70c0b67a66d6 SHA512 b272418b4f2f349d41896408a257e55805f5d0cdfe427ac5a517314bda81828e15c53f10e1eb72fba83f7b4265b26d1cc779d38b737fcc44d94fbbf5b9f6e20e
-EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
-EBUILD django-3.0.8.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
-MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
+DIST Django-3.0.9.tar.gz 9081099 BLAKE2B 502f9cf1fafff50d92c771e845319f5406722cdb8ca0570688bb96e7fbc765cee319325b0340b722afeb0a304316d30408ca92154623ad4934877cbdc8ee9259 SHA512 1244b9cff26b9e8d9a3d611e0a39981bd1a46d68fa734a58ba12fd51eeb023fb053605372d7b41b51027e4e609f1870d25f7e0584d0449ceeb8d877f674e49b4
+DIST Django-3.1.tar.gz 9382872 BLAKE2B 31f2a45cf31f87401ac1834be81cf207ca48f720bf6d6885b774fb51f42616be1346b8ab71d6c0b605d99bc7422f27b21665729b78e00c9cc0ba9cf3e4d788f3 SHA512 31f0821966f4ebc6b2a719b69f1137a32a7228414221e8938a66c9b940465c008761bd380ba9ea603e3693d38c233d6f23afe0cbe5647eb2478844ce2d0e7fd4
+EBUILD django-2.2.13.ebuild 2329 BLAKE2B 318f88cb8e0817dcefd31d0a43ce2b1067c187ecb27deb948df7c12633e76fad8f1298b3769bda49082a2887f42ca6088387bf0c9816fbed899b0207c9e452e3 SHA512 3f5f6c0e3576f74a1f0d0483e3f9640ea38d228e54f9a302ce33c2cf4805a56405c33777295cbfd6eba3ce86128a0acaca10445839b2de2918225420aa4b2b0e
+EBUILD django-2.2.15.ebuild 2338 BLAKE2B 021702600dc058b29f671f64f165985528d5fe93357d9577b9dc0c6bbf8ae69483bae62d820483ba976873ccbbac8fda0e5bf66e480369f18cc30051a6c07328 SHA512 04cddd1785450b0e02b0d838e653a616f7f76a396a769901d6100c518e94dff438dd79cc4972bf59f65c57943d1601fc5de07609e54598adc7297a17d85c62fd
+EBUILD django-3.0.8.ebuild 2317 BLAKE2B 8855c8a746876f491588b1dae108ca528f8e90be8a75acddc50559f3e9ad7e11e9b7580adddbdb391a7c2dd9f98f04f6a9696cb73da28d1c5331fac6759c114b SHA512 ed16f2d2ac738b0e404ee2c0cbc5c3877e751fd8ed160366f6b3717f48ef46a9ac4a072e56d691f73cf7d4386f25278edb49e55d825f32a462f1ffe2f763b265
+EBUILD django-3.0.9.ebuild 2319 BLAKE2B 0c243aff451ef7259ef835dc60a3d57c6d8f4a1727d29891fadc491cf45b5ef5f561e3d6b5cc9762fc16a8a107076df330492f3044c4896d69c0136144ade43b SHA512 1ce2b6f417296abf924eb75943fd5bb7eef7b0fd4bb66fc0a6e5891433958666394c44b982d9bf56218ae60fc2b70763b0cebdc4050a20f8b075ea8c778bd18c
+EBUILD django-3.1.ebuild 2317 BLAKE2B 70a8b128b5a8c21c25119559de5681402e964148185fe33bf6511e3b5b676fceb55a83e6065dc7c2e12820f6180fa0e8ba5532947c1e3dabeeb4d98874a06c1a SHA512 5bf6d53b6c4ac0cf1321071aae536fb95ca8d90366a920def8b455fa8ad256453903555b68b5acfe2bf41fd0484d87501e2604e3ce7e1ee5e1bc5b2a89065141
+MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.11.ebuild b/dev-python/django/django-2.2.11.ebuild
deleted file mode 100644
index 04943ce0049c..000000000000
--- a/dev-python/django/django-2.2.11.ebuild
+++ /dev/null
@@ -1,78 +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} )
-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/selenium[${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
deleted file mode 100644
index 5b85d6f488d8..000000000000
--- a/dev-python/django/django-2.2.12.ebuild
+++ /dev/null
@@ -1,78 +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} )
-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/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-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.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 5b85d6f488d8..734a55d6bdf3 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -31,10 +31,10 @@ 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)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-2.2.14.ebuild b/dev-python/django/django-2.2.14.ebuild
deleted file mode 100644
index f2f8b34c1441..000000000000
--- a/dev-python/django/django-2.2.14.ebuild
+++ /dev/null
@@ -1,78 +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..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-0.2.2[${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/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-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.15.ebuild b/dev-python/django/django-2.2.15.ebuild
new file mode 100644
index 000000000000..2d48305066b2
--- /dev/null
+++ b/dev-python/django/django-2.2.15.ebuild
@@ -0,0 +1,78 @@
+# 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..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-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		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/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+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-3.0.6.ebuild b/dev-python/django/django-3.0.6.ebuild
deleted file mode 100644
index 7e80304959ab..000000000000
--- a/dev-python/django/django-3.0.6.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
-
-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"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${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/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-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-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
deleted file mode 100644
index fbc688b75cbc..000000000000
--- a/dev-python/django/django-3.0.7.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-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"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${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/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-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-3.0.8.ebuild b/dev-python/django/django-3.0.8.ebuild
index fbc688b75cbc..5bc565ca8f8a 100644
--- a/dev-python/django/django-3.0.8.ebuild
+++ b/dev-python/django/django-3.0.8.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -32,10 +32,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.9.ebuild b/dev-python/django/django-3.0.9.ebuild
new file mode 100644
index 000000000000..b48404f115e9
--- /dev/null
+++ b/dev-python/django/django-3.0.9.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=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+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"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		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/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+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-3.1.ebuild b/dev-python/django/django-3.1.ebuild
new file mode 100644
index 000000000000..04d8f1897c18
--- /dev/null
+++ b/dev-python/django/django-3.1.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=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+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"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		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/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+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/files/django-3.1-bashcomp.patch b/dev-python/django/files/django-3.1-bashcomp.patch
new file mode 100644
index 000000000000..1652842aaa38
--- /dev/null
+++ b/dev-python/django/files/django-3.1-bashcomp.patch
@@ -0,0 +1,56 @@
+From e0a8c0663debeb222bf78b97678f60929313b60a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 May 2020 07:24:05 +0200
+Subject: [PATCH] Remove completions unsuitable for autoloading
+
+The override of 'python*' completions, as well as the attempt
+to './manage.py' completion are not going to work with autoloader.
+Strip them.
+---
+ extras/django_bash_completion | 33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index fa77d59aff..dfeb439a2e 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,35 +37,4 @@ _django_completion()
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+ # When the django-admin.py deprecation ends, remove django-admin.py.
+-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]##*/}
+-        if echo "$PYTHON_EXE" | grep -qE "python([3-9]\.[0-9])?"; then
+-            local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+-            if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin(\.py)?"; 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
+-- 
+2.28.0
+
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index ca9edb307f40..11e4ec4f152e 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Django</remote-id>
     <remote-id type="github">django/django</remote-id>
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 41fa67c6d988..5c4484ff5dca 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,3 +1,3 @@
-DIST django_polymorphic-2.1.2.tar.gz 103555 BLAKE2B b55764e4b2d48bd33fc9b62852c048981a80480bd5cd4603dc37cc5b8ee54a5e2558c99c11b3588910e577a1b28dd979ca82df49f788579c91129402be2abf73 SHA512 f23f3bbfd3e8a072804d374d5c7fa8f5ceb596463942795be303a2a349b1804e66adee445602ae263ec0b71894d9ad4a6712bad19c70320a6f87e07e97dbffef
-EBUILD django_polymorphic-2.1.2.ebuild 758 BLAKE2B a304c650ff55b0a4be89e97cd4b6782f985328b290505293911b289533db3ed93141fb16411ee26c11737b90f0504b8aae52c51854cd0a723accc749841671d2 SHA512 3c94e120f6743b9a699d94e7738f3dbcea10a7a0c4681508079f081d11326b3a500a37f01ea363ed9c0496db97d2182b6f95d1d64dbbad65f0c978cd511eb51b
+DIST django_polymorphic-3.0.0.tar.gz 103298 BLAKE2B f68e53de329a8b922fdf8b6daa212422cca8a0dcb31407e4423e8245fe4200c3d2986ca1c9b46013fcc3ae42cedd9fff006db64ca068f8ebff1e19dca2b45aa1 SHA512 7c7030a622d265db2a6d67c327df3044c6598d36ba9d6433f27171f9c07b34dad7a466372e0f7baefc9d2c344b96a2ff9aa28add1fa131c3869d61e4a4c46222
+EBUILD django_polymorphic-3.0.0.ebuild 755 BLAKE2B cdf481e553fd0076b7f6934151ad175e2f58fb6548620af792083259e1ed7ee6ea3f9e32b7a37baae4cb209b649dd5a7a5a75fd67639ff77bbc5affee417f048 SHA512 71376c46b79aab665e88ead4a536c1455583ec983133737473ddf0eb50b55db6d1cb9893e2d7c44bcb2757b2b0b0c130c86773ca524a4844dfb069493fa8ff53
 MISC metadata.xml 331 BLAKE2B d16890936e0e3afcf4a159edcf065a1da3a65ae1340cbd827490daed9024a8b1c50dc65e5d081162c890b2536b2e1a3bebae46fd8f5c06ed7f8d86e8e7ac875a SHA512 2a964482cf3c70f33cb01faad49664bb5345c00f21fd58dd9ee10c9df067565b3899a9be56c0d997990bc0ed492c3a9a480951af314f822e0f8dd6bc41581ea8
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.1.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.1.2.ebuild
deleted file mode 100644
index 28a0ff99f160..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-2.1.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=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="https://github.com/django-polymorphic/django-polymorphic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//_/-}"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[$PYTHON_USEDEP]
-"
-
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild b/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
new file mode 100644
index 000000000000..db4810c125f8
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-3.0.0.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
+SRC_URI="https://github.com/django-polymorphic/django-polymorphic/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//_/-}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.1[$PYTHON_USEDEP]
+"
+
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 0edd4515b6ba..6e9f3b125f46 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,5 @@
-DIST dkimpy-0.9.2.tar.gz 50263 BLAKE2B e18b1337699c1e843b4878cc84aa9988adaca475cd22b406b558c132a36761669c835dbb9718ba6c40fa5f78efe669d08c8517d6208f783399834737f4805671 SHA512 a1e7ac778f8cf0897793f296061ef67a6945b136db1a7aee18498ce33111d1a0d485b0ce32f52c22c0866be644065e000de57131301000a83a1b55b6a875bfce
 DIST dkimpy-1.0.4.tar.gz 59689 BLAKE2B ddbe24f3d98833260763eac65199dc282d4833f22adaf5495247c2198626da826d8e1b40767a7a85dd2fe62efe527d99e3c2bcbb838f1038e6ae65af1a60b686 SHA512 0c6b35f6658b11bee340cfe51eca03c301ee052ce602a326b4519bbe134cc7f7d816b8b58faf38bec53b71201bd57dcd1869dd4f3df942cbf2f49caca04cde34
-EBUILD dkimpy-0.9.2.ebuild 489 BLAKE2B 49ccf54702fb4209edde655b4d9f24970faaa97bd55fb9739953c421bf17ebf01da7d7cb2b310ea8fe9935e909ddf0ca50003f92d8bb12f7d526b471155b7c0f SHA512 937d48be3116d4abb7fe2b957fadf07b03f66d1b3a1a1c9ee607475ce045e5ca6ce123a2aeb5d9a8305c8169ee3c16ae7283f274b24e18c579bc3d9e4b9e39f2
-EBUILD dkimpy-1.0.4.ebuild 811 BLAKE2B 402c9e9dd19249c1e684ce3499a6c43b5733f8d14643831d4a1a1d4c481ae4b5d47ab9eb51c0ccad0cad0b728dd0af0813affbeeaa0984b1f278041ef7656829 SHA512 ac8741c77ed3c4a0978c8de959873cbfc53b5b44fc2474b5054e42dcdf04972cb9a4f3b0050c7e32abcea6392f1cb120b673d159a4741c2322664044cb32b585
+DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
+EBUILD dkimpy-1.0.4.ebuild 808 BLAKE2B c93bad7f707d6d186a93be2d2895b0ed2453275f862cbbfb9636f8dc02b1d490d0bd545f00bec63893184bac049c53577e51adfb324897fddae562c55fc1a315 SHA512 4632e623f3700a3b30def29cda59a12ff69e3f90cd7100f994d0f21ccf50ec7ac8f910eec98ea3c16ce1782795f480426c4f5e85ea0b35c8b60e3f4fed6d80f7
+EBUILD dkimpy-1.0.5.ebuild 803 BLAKE2B 71dc694116f64618bd4c32f333126cbf2a4ae5a1d0e6ed5206241a58cd94e9c67d2cdb425f31f8baa220b00525be2489e7183777697def50fbf8288407926e99 SHA512 a5cee2d397c16648d928861e5f47a4500566021ce440aec4d1583f90c16c73c3380e36ca46185520f9f238a2d657ba34c2f71e48b28dc5ec9b500e8ff35e768e
 MISC metadata.xml 484 BLAKE2B 14c8de62e359754a4d1dda796cd4f41a216cc3a740bbea0e127bd08f9db82acfa616159beffbd7763f345e61b32152dc66417b1dd125a500d32ddaf71655ea5b SHA512 5290aa58fb15040115413a5eaa144a5c39071a9362f86b34c969b057821267ef978b90900d4d5e52b336c00927cda6878b679cb2d4c2a7f9b4f9dfa9ad425ed6
diff --git a/dev-python/dkimpy/dkimpy-0.9.2.ebuild b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
deleted file mode 100644
index 94e3b7d12402..000000000000
--- a/dev-python/dkimpy/dkimpy-0.9.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=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-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 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
index 459673c351c6..0cdf6add25e3 100644
--- a/dev-python/dkimpy/dkimpy-1.0.4.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.4.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=""
 
 RDEPEND="
diff --git a/dev-python/dkimpy/dkimpy-1.0.5.ebuild b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
new file mode 100644
index 000000000000..92115472e0ca
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+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 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+BDEPEND+="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/dnslib/Manifest b/dev-python/dnslib/Manifest
deleted file mode 100644
index e6106d85967a..000000000000
--- a/dev-python/dnslib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dnslib-0.9.6.tar.gz 60079 BLAKE2B 203f765683cdeefb0aab50138c548c585352dd38fad3fe834dc4919584a5e8b3912451e09050d30f42ed301716dce1c2b02b15464881355ab893c601a4635790 SHA512 c733803a9b25356c82afb4ce853a681545aebdb5fbd4f8a544eea9bb61ff354acc044a43357435e02b8b787a17fec99ea7e9f01b1c1e93a2e39945657c495105
-EBUILD dnslib-0.9.6.ebuild 428 BLAKE2B 0d4bc64df0e7daae5797faad33f421f04496a63e9811da944693dcc9572c293436b03d40cc8851b3d716a3a791273b075ab8a8c10d96a4cc91e9fe680d92bfb3 SHA512 0cca9f9a6663715c57f2dd6cc48f0cb63390c7e6ee9b8102ed9a44fd449ae55a7d12e18185a8b134bb8aafdab5f70649cf97df963839b1f8f20af3d9cca8648b
-MISC metadata.xml 330 BLAKE2B 04303b87a464d7e4cf5004b89038dfaae01809763d44f1eb0fa23ec414826292c5f1b7601f2d96bf9db8ed39bd1ac0285c63fe41fb6f8f33af4f4d2d3aa487aa SHA512 a3d016fa988a8e573fb13dc86ba726c2ccae234c23dac767166064f83f49da7ccd9bc1313753efdcd02d4bf1816c98483396e21addc1c5e9846045d59d420b50
diff --git a/dev-python/dnslib/dnslib-0.9.6.ebuild b/dev-python/dnslib/dnslib-0.9.6.ebuild
deleted file mode 100644
index 1fd55ee66124..000000000000
--- a/dev-python/dnslib/dnslib-0.9.6.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 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple library to encode/decode DNS wire-format packets"
-HOMEPAGE="https://pypi.org/project/dnslib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dnslib/metadata.xml b/dev-python/dnslib/metadata.xml
deleted file mode 100644
index cbdef2ff5ef8..000000000000
--- a/dev-python/dnslib/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="person">
-    <email>klausman@gentoo.org</email>
-    <name>Tobias Klausmann</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">dnslib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 0bebf646c353..c2663b5d5f2f 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,5 @@
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-EBUILD dnspython-1.16.0-r1.ebuild 1220 BLAKE2B 46755a8947a5a498027479a747da4a044256c3a80aae4bb185b44f1c799b52756b4b0de24f98d4b48ad692914386ac90b3dfeea02486f04a2dfe3ae1ca159b12 SHA512 1e7c19fd6f5a2d0a4be0395bbb46c83f570d70e0ad932bd84e5b301f926ee22fab45f12494ae7f6f223b2b314b3515f4c98e07853596d863ce2bdae45e9ea943
+DIST dnspython-2.0.0.tar.gz 221903 BLAKE2B 540fb5fb12791dad6bae4007a77201092c8d5e64b7d82b23d5e3d16f48b49f73c90b85a6c8a83fa056a35cf7975ea2ad4a030f2b1fb1b87948bf1703adabb9d6 SHA512 3b38850fcacb0dd25ac0345201474f297c402617e8d706f3061c42172d697103075098e62ca0ac4e0e29967e00407f32f41789ac7bf070fba5aec0af9882e0fb
+EBUILD dnspython-1.16.0-r1.ebuild 1209 BLAKE2B 2ecc9ef86e9632288441bb4d99e0bcf81ffb4bd60a1ae4aac12dab886e9d59efcefe8d21b0cf1d0c16a0c75d71bc40a0ef78dfb77b2932cacd68ede7151666dd SHA512 cd23c352b897b8e3c39193a9893a5c99ec9987897087ebda8e011e37270a8c1d7cd02dabcd350c9d44080e3714bc8cb2a1ece13ae69f81f47f99b6ca2ccfa80f
+EBUILD dnspython-2.0.0.ebuild 987 BLAKE2B 85b587cffb12cf88c54a1583a4f29c2d6d5346968a8874c8f111ed17d38f93b91848d87b9501a47b78413b6f5bd799b29fba0e7212af764f0825a4a3b58b8cbb SHA512 f82b40f23543a702c7fc42d52ea33a05bcf958f3f4c9a48a567ed722f5cf96244ca735bda5cd866c365e28f1b7a35949d317c584982232e46f16dee5bf89624b
 MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index f6749205a505..e0d43deafa96 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 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"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-2.0.0.ebuild b/dev-python/dnspython/dnspython-2.0.0.ebuild
new file mode 100644
index 000000000000..22c1262a3a08
--- /dev/null
+++ b/dev-python/dnspython/dnspython-2.0.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,8,9} pypy3 )
+
+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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e '/network_avail/s:True:False:' \
+		tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+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/docker-py/Manifest b/dev-python/docker-py/Manifest
index 566cc8417e03..f302b96f56ca 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,8 +1,7 @@
-AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
-DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
-DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
 DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84 SHA512 d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1
-EBUILD docker-py-4.2.0-r1.ebuild 1228 BLAKE2B 074d94d5cb6378ca1d202286eca77dd0732a3e30cd41d667ecadd78468127ea9d78e77d1e32d09ad1825e54c3f3c3d023d09289315e20e576434600bee71dcdc SHA512 aeeee6eea4871077688298dbbd76a9fc92ada64fcb6f39eaea7de8d3b3e58526d0cc39cf5fe8c301ce31e40518f7feda618f2c70949c60b7c90dca14af4143a4
-EBUILD docker-py-4.2.1.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
-EBUILD docker-py-4.2.2.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
+DIST docker-py-4.3.0.tar.gz 236399 BLAKE2B fd9cb6426697a105f58c1199809adb009943761fc17a9b1c0a0c091d0950faf15d6e097aeddc7012b4d39770a66fcdcde73de6874a081e2a2172acd6b5c6e816 SHA512 c790563c6a3a5042f5a0d602c22b2b2838ad6f54df3bc1691e32da06336d6b651d7560ca77677ae1cb3f4d4aab721f98984e0479f7fed25deafceb1dc1c24a7c
+DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
+EBUILD docker-py-4.2.2.ebuild 1109 BLAKE2B a3e6db6747ece73ec890d8948e06c3fe58899bb9163c4ecbb383f72c080b6a6263663fea3245a2741f4589813ae1c72aa198b0533a7ab207df6107245fd69742 SHA512 593fc77f439693e8aa7619ae30d590fb584fb369a48aa05fed15bb1e2610d9e1efa600d75e9d59d7867a09e8c1b14c9db19c13c996b3db91c00ccb266562ad06
+EBUILD docker-py-4.3.0.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
+EBUILD docker-py-4.3.1.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
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
deleted file mode 100644
index b730b40c98f2..000000000000
--- a/dev-python/docker-py/docker-py-4.2.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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.1.ebuild b/dev-python/docker-py/docker-py-4.2.1.ebuild
deleted file mode 100644
index ec7b5cd81787..000000000000
--- a/dev-python/docker-py/docker-py-4.2.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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 ~ppc64 ~x86"
-
-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? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/recommonmark' \
-	'>=dev-python/sphinx-1.4.6'
-distutils_enable_tests pytest
-
-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.2.ebuild b/dev-python/docker-py/docker-py-4.2.2.ebuild
index ec7b5cd81787..956546a35843 100644
--- a/dev-python/docker-py/docker-py-4.2.2.ebuild
+++ b/dev-python/docker-py/docker-py-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-4.3.0.ebuild b/dev-python/docker-py/docker-py-4.3.0.ebuild
new file mode 100644
index 000000000000..530692235251
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.3.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..9} )
+
+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 ~arm ~arm64 ~ppc64 ~x86"
+
+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? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+distutils_enable_tests pytest
+
+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.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
new file mode 100644
index 000000000000..530692235251
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.3.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=( python3_{6..9} )
+
+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 ~arm ~arm64 ~ppc64 ~x86"
+
+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? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+distutils_enable_tests pytest
+
+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/files/docker-py-4.2.0-fix_splitnport.patch b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
deleted file mode 100644
index 6eda63459dd9..000000000000
--- a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/docopt/Manifest b/dev-python/docopt/Manifest
index d059d104ad61..c76f36a8b152 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r3.ebuild 749 BLAKE2B 1d46da13101de507ff31ae667ec7e3898cd211cdc7226bae6a048010ce69bec5029446210454f0af9c3b8fb3dee8ba10bd88b0eb386640cac41c8df2648e5779 SHA512 d7ff05f09d82df465383f7a1ea82d02db090094b3508ca9d40d9bf8f506b42f18fd407863d601d43cf855cd544e6e528e6173637a176fe4424e64875729fbd77
+EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B b45a51b71f0f30658f5fb9247d8f1b4039d77b556021ec85d5c7a6103fde0ab435f33e47f9b94b78a39ce024874b3b4fe175d475e724cdb99f603a190891673c SHA512 8eba474e2379cbe2c051cf1ae8d62e1bf3f19c9cd3a4b380d33c9b0642bdeee7e4f9ca692d0e0e00a2079150c3f1a382c532fcb5458d6aa9e7ff903c9bb363f0
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 552956138548..7e5f8e0f8005 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index d9ee1aee8f05..b2f9257ce22a 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 645 BLAKE2B c58f2142cf0ea402e2c377b06d709c5f9733cd52c03c56fc767344b23ef4b90b41d92c5dce03c6d76186212dc07687fb6666dd60e9fb038e0562e8ea72469629 SHA512 a3b68678b1b16966e8a1b6f29a87aecc92bdfbc6f65fa2b5769d7999f4ba0a20d6a94c07007cf04dab25cadb8f03cb8372c3ccd6af325c8797fd84a70169511c
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 536 BLAKE2B a1867f0622aef520d119c5dc43e116acbc962d3697c6e88f2a549dcaea3df51e5bc85aece2eb1cd5cceae09977a3753e0fa6f2dca241ca3605119b39faf1c471 SHA512 b900f45b52295bdcdc56e6dd7e51b7acc868f65c8d4bd8e545e75d9243b01129ae1f54c774c765f19f67c14a5761425625c942bff7f4c77b17d6694acbca8d39
 MISC metadata.xml 396 BLAKE2B 9d6ed08e6f963cb03406050e1ec934e9fd0484633e7989b52d5277e6668ebdc919d60f8b0898b0ccec076e9839ed07c6cf5273e14a289049f815cb119e4c13d9 SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index e34a2cba0fbb..9f94834cf6fc 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -11,15 +11,8 @@ DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
 HOMEPAGE="https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+distutils_enable_tests nose
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 033a1fc221f2..0c11630c7d8d 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,4 @@
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
-EBUILD docutils-0.16.ebuild 1871 BLAKE2B bd400bcb45b3c0c403c36af98b18a5b9e2ca199b7753f00419c286399e7f641375aa86873aa92b36fe2d72f93c6a54fe2aa3c222f12fa443f21dd862549eec8c SHA512 56b6647e9c484334a1bca6b41ea80f13d31a37295e7cf24b3b9389e2df198651b39f1fa2655f0f84ef0bf9b1c96bca4b960af2e6cded0bc469c05187ad505ae8
+EBUILD docutils-0.16-r1.ebuild 1866 BLAKE2B 3d6777a23cfb44934d371fd522b82076e26b24380f6b2f6a7ee7f4e4bab9a6e0064b65621945aab1871305b2a4831d0232e90d6a8db07b24777a6784b99cd211 SHA512 48226ff47a65f500171a0d674c4ef9e1d516b0ce933f09ecdf8499170d83e12d71e13c93b65ea63c300bcb8e4e883d0e6f76d721074c4cc5642ac38d060953ba
 MISC metadata.xml 342 BLAKE2B 18746f74840cdf8a245c4ac3233e4ffefdc8fd4768b5b995f4c9232c6ce4c47b6cb965c8077ca8d73fa6af5c4a9216e8661d2c8afe6d9f1c3153b04495549ab1 SHA512 df1b48b67e1588314ce5109bfffe84c23f5ea8036e7726b9c120f4fda220795015a02ef7ba6b4cc7da9aef579eea8f17a96aa1afa089fb01967be9ec4ef6be63
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
new file mode 100644
index 000000000000..1e418f79f501
--- /dev/null
+++ b/dev-python/docutils/docutils-0.16-r1.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=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="https://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/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
deleted file mode 100644
index 2e88fd1d63a1..000000000000
--- a/dev-python/docutils/docutils-0.16.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=( python{2_7,3_{6,7,8,9}} 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/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 82ba5d2ecdd0..a91ecb9fd6b1 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,6 @@
-DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
+AUX dogpile-cache-1.0.1-install-tests.patch 583 BLAKE2B fccbec419311e32f94bf3fd72dc55c621e53b4cd7e0401ac480da85c9ec332413d615388a480cca53dfe213f6f97e1f2b5f16827753f21272e3caf4ee3105d01 SHA512 a7e32c981f87b43750cc263a783ca22a8b1dd487adaf19e007ce104564a660968758d256cff17f39c151474cb1b3ce9283a69038e4097e08788326b9a82a7610
 DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
-EBUILD dogpile-cache-0.7.1.ebuild 914 BLAKE2B a7e57119a7510f03420d5368c4bc05c8866f14d62090d18ddf8125eef1ce9d63ffe5bef5cf216a66c495c42683d03a463e1a6f7e2f99f97a88ddf85352d8a9da SHA512 bb34950106c425e39f9177455336e07799b996e92885ad771f5d1876f03a4907da91fc4a1e02bb81e97eef77af1d8160c421ad5a029666a485fc97956e89d592
-EBUILD dogpile-cache-0.9.1.ebuild 834 BLAKE2B 2494482ebf182b657d32a6d5df9b2abef8bb73bc28b4e8ae17fad0e498b0c7e58d52684a2d29405fcdbbb6784def2d2d72b9c2df6ff5c2075218ff3cde4798b0 SHA512 88d8de4defadb2027037a75f21745def85a929640bae912b67af27837c48c91da2591fc904df95ed8161d52cf1ed120e8eb692e3a956e30ede3024ddbf602032
-MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
+DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
+EBUILD dogpile-cache-0.9.1.ebuild 684 BLAKE2B 94543a180628b1504ff9e1735ec5cede15d0f298f25b938d6de57d4c2c9453fba267c9006d45814c37e4101c282622fb04fa7626a9cdacd354f2f0c486622c33 SHA512 a302435982fc6d763d1fc33797a74240f8a50ce7cdd0350d0eaeef40af5173884c5edb5e411206fa4c19b20f6a3b2eff3a878f0069fdcb5dddd164a6b3b6d6ec
+EBUILD dogpile-cache-1.0.2.ebuild 762 BLAKE2B 7080560b50903f1343babd40e04491234620f182625f89adaa30f47e783a06a255fc8a72baffbbb1150e89d41ef883f09d4e49288e79454cd4eafd6a45428b07 SHA512 2f3ee60f8e89d39e3cd79325b29046f7eaf0ec14d9216701f8e429b2d472674d0ee9cbf8fadfd5530907bd9cd3c70d73cebbfefc08e50f6cc5e20b09aeb3a14e
+MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
deleted file mode 100644
index c5765e5413bd..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-0.7.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=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-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/dogpile-cache/dogpile-cache-0.9.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
index 2f4d32066ff1..a4f70aebb554 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
@@ -13,18 +13,15 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
new file mode 100644
index 000000000000..40848b853c59
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.2.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://github.com/sqlalchemy/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 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
new file mode 100644
index 000000000000..f00d5a15538b
--- /dev/null
+++ b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
@@ -0,0 +1,28 @@
+From 559a5c57c922741461d419b73f1aa547e3231110 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 3 Aug 2020 08:50:33 +0200
+Subject: [PATCH] Exclude installing "tests" package from setup.py
+
+---
+ setup.cfg | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/setup.cfg b/setup.cfg
+index ab4008f..2f43889 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -30,6 +30,11 @@ python_requires = >=3.6
+ package_dir =
+     =.
+ 
++[options.packages.find]
++exclude =
++    tests
++    tests.*
++
+ [options.exclude_package_data]
+ '' = tests*
+ 
+-- 
+2.28.0
+
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
index 823622b3f9e7..4d8e2abb2a28 100644
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@@ -9,13 +9,18 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		A caching API built around the concept of a "dogpile lock", which allows
 		continued access to an expiring data value while
 		a single thread generates a new value.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">dogpile.cache</remote-id>
-		<remote-id type="bitbucket">zzzeek/dogpile.cache</remote-id>
+		<remote-id type="github">sqlalchemy/dogpile.cache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index 7bfd28689914..d21342860ae7 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,5 +1,3 @@
-DIST doit-py-0.4.0.tar.gz 16534 BLAKE2B 390a7ac17efc1938176ff6aad8fd404b8a0155e82dd2f346cd416d0357cc888e1b3e84dd9ddb19260bc9ee463e013ae544032199967a6ace7d63840a178e0933 SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33
-EBUILD doit-py-0.4.0-r1.ebuild 842 BLAKE2B abe8e6e004ad8b0fe6ce2ac011cf875acc83e61a053eacba8eedcceb3cc19c2fd9b6d3c8dd154ced431833a53789b1331bfc939cb31d5963b66e60acbd575036 SHA512 75e4d2e5fbece04f7673c53bfc033ae4590f0c09d20f7cec4dbcfd5affe12db9cf7f01772eaaeaf538fe1175ec18f18e727b84194676af147da4cdc17b0b2e09
-EBUILD doit-py-0.4.0-r2.ebuild 588 BLAKE2B db1b99f10c2e666791c56d2c3afbcc85af08baa4eed0c8fc453604f04e0da09ec9a1b27e81073b638f05f23b3e001a88f6b7ae973485c9621ae1604a04bf834e SHA512 8fa04516e0a25de4cf6a5023202b295f582306958f58b398a18cba6ea3f8896fe1ddda0f28b008661feb6b7cb0ccbae61e9b619c1479722e8bc034850f1a5ea5
-EBUILD doit-py-0.4.0.ebuild 956 BLAKE2B a112037e1666a50a6d07cf4b3201d6754c58f96ca49e40798bbfa257ecf4131bb04924339744d9d3374f1090066d8247dea41b68d07f6cbea93d94abee023ca4 SHA512 0cde978075daf4c88453346d1fe42b21624605410f3072396f4722d0fb577ec990c554101b5d7ac00a44861dd813da0d1f93296b340486227df7f466ab13aa23
+DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
+EBUILD doit-py-0.5.0.ebuild 619 BLAKE2B 9c85c31ab8973f480be4655d9e47f8e6af1e3c7ebd19f1459f86d6ec6213b617744c86bed3e25aefa153e8ab7a2dbe0b67370d506c71f3af3d21f3fd8f77e5dc SHA512 3c00d45fef1839e74c34d4c16e1319c08e43863e80a494e66471d094e4f42e950b57d3ccc2a9e7d0cae647202910ce6171cb33567a831bfdac71e4970c77f307
 MISC metadata.xml 518 BLAKE2B 6051376faedfbd03dcb61444a4ee626766ce101e8c555706a3869d97c2b6ca870a1c4ad0df077cc74fa448bf61705513ed235baf228b9c32872c802f2baae9ea SHA512 8626185dc768f468e68c3cf7e731e0183762f7a07472f429e33d1576898a2cb59d3178eee5f729dfc8da06481156004c392e39ead68bc94808cb32e0f861293a
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
deleted file mode 100644
index a23ebb2f495a..000000000000
--- a/dev-python/doit-py/doit-py-0.4.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=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="https://pythonhosted.org/doit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		app-text/hunspell )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/doit[${PYTHON_USEDEP}]
-	dev-python/configclass[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-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/doit-py/doit-py-0.4.0-r2.ebuild b/dev-python/doit-py/doit-py-0.4.0-r2.ebuild
deleted file mode 100644
index 94b95b479f33..000000000000
--- a/dev-python/doit-py/doit-py-0.4.0-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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="https://pythonhosted.org/doit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	test? (
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		app-text/hunspell
-	)"
-RDEPEND="
-	dev-python/configclass[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
deleted file mode 100644
index fae2a43f880d..000000000000
--- a/dev-python/doit-py/doit-py-0.4.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=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="https://pythonhosted.org/doit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		app-text/hunspell )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/doit[${PYTHON_USEDEP}]
-	dev-python/configclass[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/doit-py/doit-py-0.5.0.ebuild b/dev-python/doit-py/doit-py-0.5.0.ebuild
new file mode 100644
index 000000000000..43900ff7e706
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.5.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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="https://pythonhosted.org/doit-py/ https://github.com/pydoit/doit-py"
+SRC_URI="https://github.com/pydoit/doit-py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	test? (
+		app-text/hunspell[l10n_en]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	dev-python/configclass[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index ddbb99ff3724..a503c6639b84 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,8 +1,6 @@
 AUX doit-0.32.0_pytest5.4.patch 2862 BLAKE2B 3a3859fc2a5a2c0f533a3c4a300744d5c4b73edc9b255f54267c6018218c393478e2feb6f43874250ba931effeaa576cfb38cec5cb7f934031071744c0d3b2f0 SHA512 2f4d251970e042adc631a9912705a0f97bd693f5cdba3e89fcb912c91f881c2c57665bd32a28630053fb1e9c2ebce022b40974a303c5e808ae0d2008f07c3e8e
 AUX doit-0.32.0_unpickable.patch 1371 BLAKE2B c03d757a99e44bbf7c7dbcac84295e7514055921d2c3a12bb3fca2fbc7e8320c8be450a5c101d39b51b8f0bb7fa1b1faa3c58a455ab5c27a68f6e03a70ea9763 SHA512 2d17f32876897a6b73ba7936eade594a0a40f38a27d08e14603f3aceb9b36426d810e0dc0b13b385c8e4cab830976637ed4462014dab7202226d3bb3f745cc8a
-DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
 DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
-EBUILD doit-0.29.0.ebuild 1861 BLAKE2B a1756f901009f5e277bcd5099fa63888b160b90d30e41425e3cae126c60af62f7ebaedb5378c2b4461c7f5a7e1057e8697d4c47e374f607fbf938da512f52453 SHA512 a0a45c33271e4dce0a7cfca52c80a2d4371fd384288249c3abfcd130d9b98256c01f1c2456be1923f592d3a10550eaaba8e578c05a5170cbe695bbbc3fc9a5fb
-EBUILD doit-0.32.0-r1.ebuild 1351 BLAKE2B db41e031fecf039f5302225c08cbe955079d77228e093ef9e771c78c91458d62a4c8cd87bd608085fff46c09629b671083fbc186fefdbb9c642135bc84dc38d9 SHA512 5909bfcd746685ca6f7c68a6aa3331c111c0dc37ffd3ee9fd9fac52d98c4a44f7ff459d28363cf319986d40e71858eb2810b1868d063f37fcf5b45e8325d775e
-EBUILD doit-0.32.0.ebuild 1846 BLAKE2B b0f30a44db4d6337bd878076c2d20c7923afa690a5f5a5af4be9f3b0c86fa77c3c9e80cfae17e5d963e372239420bd5d8ab67c91fca7163499d2db995e71635e SHA512 351036ff1b7f2a1689308e23a5506c145b98b23a0dbd13c195d19dbc571dde816e2c0e83869e981a9033a1cd2c7191c650131449ba46823b3a2a4c1150de15d7
+EBUILD doit-0.32.0-r1.ebuild 1382 BLAKE2B 35cdaa63fa8da7d22a56b437ce9fcbcb725d19e2c1160c50ec771bc5b9a3e3de1e7307fb9fbba77b82b6bce1f83db4689fee1d7d22847a6d38de048c7e45a2e8 SHA512 0d096d420e41893f03ce6faa3173342cce5842987cca597044f9a76a40095774c15636f34a151932a9768f1309878ac4b0c2797b239a8f18620de92a0b5cd854
+EBUILD doit-0.32.0-r2.ebuild 1385 BLAKE2B 75ed0c32a81356a8a80cb359350da4ac07a9e864806d76782f1f59c1810eb17dcb9e7f3c984d97200c09b8eefd9d4ead6dfb1cfe241a45e2d93418665fcc745c SHA512 50cf8363038366d276dc01a645a1cd027af6e0476c741598db25c824113ff45b796ff47748f090cbd8dc70e7035db3c4e16acb219ecabc23f502421dd9c05da5
 MISC metadata.xml 512 BLAKE2B 2d3624f36a7a3919fc3c7afbb459f811234b52f8e83c025d3211c4160c78151616bf1545ea4157dee5742a0267f23879a777b470d4c38746fa512ea3e2decf02 SHA512 52e3181b83ec7fda098ee42d3c61270a32b2170bf48d711d52d277b4448ea1d2672ff8017735cd90ca410fb6996a6547489f873ee20ca35b0246bb6a5a8b82da
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
deleted file mode 100644
index c4bf8bd37a49..000000000000
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ /dev/null
@@ -1,69 +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 eutils distutils-r1
-
-RESTRICT="test" # can't work as it imports nonexistant modules from coverage
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )
-"
-PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Disable test failing due to impact on PATH run in a sandbox
-	sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
-
-	# Test requires connection to an absent database
-	sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	local -x TMPDIR="${T}"
-	# disable tests where pypy's treatment of some tests' use of a db is incompatible
-
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
-		sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
-		sed -e 's:test_not_picklable:_&:' \
-			-e 's:test_task_not_picklabe_multiprocess:_&:' \
-			-i tests/test_runner.py || die
-	fi
-
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/doit/doit-0.32.0-r1.ebuild b/dev-python/doit/doit-0.32.0-r1.ebuild
index e73b597bd0ed..0bdfcaf80c3a 100644
--- a/dev-python/doit/doit-0.32.0-r1.ebuild
+++ b/dev-python/doit/doit-0.32.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
@@ -23,6 +23,7 @@ RDEPEND="
 DEPEND="
 	test? (
 		${RDEPEND}
+		$(python_gen_impl_dep sqlite)
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyflakes[${PYTHON_USEDEP}]
 		>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/doit/doit-0.32.0-r2.ebuild b/dev-python/doit/doit-0.32.0-r2.ebuild
new file mode 100644
index 000000000000..b59594aad9b3
--- /dev/null
+++ b/dev-python/doit/doit-0.32.0-r2.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=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+	)"
+PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+PATCHES=(
+	"${FILESDIR}/${P}_pytest5.4.patch"
+	"${FILESDIR}/${P}_unpickable.patch"
+)
+
+src_prepare() {
+	default
+	# Replace custom theme with builtin for documentation
+	sed -i -e "s:'press':'sphinx_rtd_theme':" doc/conf.py || die
+	# Disable test failing due to impact on PATH run in a sandbox
+	sed -i -e "s:test_target:_&:" tests/test_cmd_strace.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp bash_completion_doit ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/doit/doit-0.32.0.ebuild b/dev-python/doit/doit-0.32.0.ebuild
deleted file mode 100644
index 347f0c06dfe8..000000000000
--- a/dev-python/doit/doit-0.32.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )
-"
-PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Disable test failing due to impact on PATH run in a sandbox
-	sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
-
-	# Test requires connection to an absent database
-	sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	local -x TMPDIR="${T}"
-	# disable tests where pypy's treatment of some tests' use of a db is incompatible
-
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
-		sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
-		sed -e 's:test_not_picklable:_&:' \
-			-e 's:test_task_not_picklabe_multiprocess:_&:' \
-			-i tests/test_runner.py || die
-	fi
-
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index a3ece9fe99a7..5ba9e3a19613 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,7 +1,5 @@
-DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
-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.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
+DIST dominate-2.5.2.tar.gz 37704 BLAKE2B 1e55d1be457b6d1ea1f377734da3d48e7b400d6ee60093f09b42a8e094de3d303dd2285cf7883ddfbf5b47e6eaa7bd40194a945942c8afba8321f2fbdd0cb642 SHA512 d54d3b2c76e6e3d287715b2f583b3a8822a2d3556a549f728dd235bfc7c76159750cc78651d17cf8d3d5cb98929b2c54c2eae0861449882b0449235a7fbbdb55
+EBUILD dominate-2.5.1.ebuild 442 BLAKE2B 902165607b32b72af55a9a57b772a7d9b44f79d70c10263baa3128268dcc48609a46f817fbcffa902d317f4e9e5e51c8d4e7fc9f8a9f8e74cd39d3e10edf6a52 SHA512 15a8d47ebd4a8fdb66844bd0c486f6664be62af74e1e0f22ab5de5ff01d83b9d6423bbe4106df0f7afca189687a2533a63b9beb356359c0b790d5423292c0c70
+EBUILD dominate-2.5.2.ebuild 447 BLAKE2B f4689b8faa1fa5f3fefb738be1ac6cc5e49f74f94f18ee431d29ec5fcee1ba65bf301bf2d1f77197b2d1885295e0c5521c85e0f8f84f1f4d9292112f1cc69825 SHA512 d5de40f173b681ce62deec1168c26695f2d771d67330238c9e2a50b6a6dcfcf42101f1d78920b51a71c04cea6c887988577578851404c51cb92594117bac287e
+MISC metadata.xml 795 BLAKE2B 042388cbceb8a858b7191ec9284c9523aaaa348db45afd123f61e9e556c2ef35a9b220497848e9dd28b30442086956cdb12937e180ae6164716ae5d13f4beffb SHA512 2079e3bd66c401c4e5750a72fd4d4f772c96c66dbc35b8435f741f574c4c2e93e42dfb28725902a5a2796c770b1e9a6fdb2b950ad397703deb7f9a4a008e53e7
diff --git a/dev-python/dominate/dominate-2.3.1.ebuild b/dev-python/dominate/dominate-2.3.1.ebuild
deleted file mode 100644
index a9f58c5b748d..000000000000
--- a/dev-python/dominate/dominate-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=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.4.0.ebuild b/dev-python/dominate/dominate-2.4.0.ebuild
deleted file mode 100644
index adb4c2b30b00..000000000000
--- a/dev-python/dominate/dominate-2.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=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 )"
-
-BDEPEND="
-	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
index 5ad077b8e229..d848b1925956 100644
--- a/dev-python/dominate/dominate-2.5.1.ebuild
+++ b/dev-python/dominate/dominate-2.5.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dominate/dominate-2.5.2.ebuild b/dev-python/dominate/dominate-2.5.2.ebuild
new file mode 100644
index 000000000000..02d0df2734d7
--- /dev/null
+++ b/dev-python/dominate/dominate-2.5.2.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=( pypy3 python3_{6,7,8,9} )
+
+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/dominate/metadata.xml b/dev-python/dominate/metadata.xml
index 3df54468a06f..1ab70aebdbbb 100644
--- a/dev-python/dominate/metadata.xml
+++ b/dev-python/dominate/metadata.xml
@@ -13,4 +13,5 @@
 	<longdescription lang="en">
 		Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API. It allows you to write HTML pages in pure Python very concisely, which eliminate the need to learn another template language, and to take advantage of the more powerful features of Python. 
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f337cf240fc1..780858debcc1 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
-DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.19.15.ebuild 1700 BLAKE2B 006e9e58a776a8fc8ee8f191dbb4337972d298a6cb282b89c6ef6bc0e8e7cd29243c39869e56d6e2aaa2d5f419b26f0f4aaeb8949704b3524487babc01ae8e3a SHA512 fbc2a8d54f636bd049333f7bb15dd94606b08d011a9b1f450593b1f136cf7e6faecb17586d86fa916ad26446fafed6d622b3d5214246cbb602b6096edf0ff8bf
-EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
+DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
+EBUILD dulwich-0.19.15.ebuild 1701 BLAKE2B 181fac6e54d4dfa2d34bb8ced0e1eb5d037c85fdc0ffc0c51fe395e90b626dc3a98fe47e6a59ec904b6c5d8d1827a5c5000cac0de94dddf0d6f51bb50694fbaf SHA512 8cf6577504fdbcfb4045ea633c8a990a7be0af26a4b80b400435f72e668b284494ef89d74a60fb0478bad255cb3bc730b7f3958a7b9a18cd5f23d11150d00c18
+EBUILD dulwich-0.20.5.ebuild 1604 BLAKE2B 0f5eab76c7fd88680bb3782ec6ee16743caffbdaa53e266fe45045e51f0f5f2294dd6cd9dd282123f281687a9e6eb61e6b26e51f93e23dccc96229dc826345e5 SHA512 eda5203d4bba40c13c8474b64962448f3e35ee26c31aa3277105bb6e177374e2df6bf350a852af340ca42ae52e5c8aed2acfdc73523394bb5addd22740de0d28
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15.ebuild b/dev-python/dulwich/dulwich-0.19.15.ebuild
index 4b0785701595..0d01a5efa511 100644
--- a/dev-python/dulwich/dulwich-0.19.15.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~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 ~ia64 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 )"
 
diff --git a/dev-python/dulwich/dulwich-0.19.6.ebuild b/dev-python/dulwich/dulwich-0.19.6.ebuild
deleted file mode 100644
index 27d31728a85c..000000000000
--- a/dev-python/dulwich/dulwich-0.19.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=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-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/dulwich/dulwich-0.20.5.ebuild b/dev-python/dulwich/dulwich-0.20.5.ebuild
new file mode 100644
index 000000000000..bea5ab1da2bd
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ready for 3_9, but fastimport isn't yet, #733838
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| 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/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index b98104e784b8..393b20bb7ac7 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,10 +1,4 @@
 AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
-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.12.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.12.ebuild
deleted file mode 100644
index 35359a8391cb..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.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=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="http://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/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
deleted file mode 100644
index 35359a8391cb..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.13.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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="http://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/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
deleted file mode 100644
index 35359a8391cb..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.14.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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="http://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/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 868477a59110..c4a26bed0ca1 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,5 @@
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
 DIST ecdsa-0.15.tar.gz 122119 BLAKE2B ceeb0204b15d75ada1b201321caff2eb28080bbbf5f6436e6cb50203828eb318d9fe8b8343157b59370183d122e47399a3d2cd6ae569b80d81809d7c778639df SHA512 7b7491d1abdb5ca43456d943c96525fa5d722635c496bbddd04ef8e1baad9dc0aef3d1752afea7820f7796421b18295ee260657ec1e8faf7564613b316c0d603
-EBUILD ecdsa-0.14.1-r1.ebuild 860 BLAKE2B 854f49a40c07e62f375ddc14c41200f228edffb13439356fc53ff26e66c6da8e6abd113601b14aa1e732b3c2a74d8588a002c50b32515fc8ddf8d37213ec2c85 SHA512 1b540665c294de7ff7304bab7a7e563719846d5c05ae6eb3267dd7d0e3d29b2fd36b2d83140515d29898479cc0819adefa34d19841aaf20cf093a19a36afce5b
-EBUILD ecdsa-0.15.ebuild 941 BLAKE2B bc129008ac3a9ebc66783256f2e32ca4c5ea87b436b642daab5cea01d242e13218aef76299003f022f35823b357a629f9d253b041313b42201b6f0e550b28a19 SHA512 950de255b4994e8e5505a38dea95e44f19eb062db4ee502c3dcbff46a4ad45cf613fe1004b6d9445f6e45e2f67838e9e1c3f097c369af78b11c46354f891b7c4
+EBUILD ecdsa-0.14.1-r1.ebuild 859 BLAKE2B 46eca2099f4fdf9531bbbd33228b02bb04222f0ef16102eb11175652569d56f2b499c0a8ca67c186ef8f055a140f3d8ba7f782e1a5275daf8aae0da507da0622 SHA512 cb1fa9526d8347163bd098ddff6c1e61276169fa355825785be57fa7760a921c3d42223eabd5d0a7164064cb65a650ad57b45725236cd0beb437a1027378b790
+EBUILD ecdsa-0.15.ebuild 934 BLAKE2B 4e7ee1b42ece0a8cdcaae48ddda4c8f18c0e48f763c48d9f7b3ce396d43955e4ed998ea869ef75f17f50249c3d47e681bd8f3b7a1a8533a3f56121b5862e1c52 SHA512 8bf9ccf67d04902e24da59894f430e04cc72ff33c8042f72982a7defbcccb07ad9600bda0fa28e88c889d20658d5e97fa9c44a5d8f6b632258c88fd518060623
 MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
index 966456445d3a..de76da25ce9a 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 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="
diff --git a/dev-python/ecdsa/ecdsa-0.15.ebuild b/dev-python/ecdsa/ecdsa-0.15.ebuild
index b52fc50c087c..3e72b35df6a6 100644
--- a/dev-python/ecdsa/ecdsa-0.15.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.15.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 ~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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 351d9f5f3c38..e61062c51915 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,5 +1,4 @@
 DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
 EBUILD elasticsearch-curator-5.8.1-r1.ebuild 5016 BLAKE2B 5ec14b65a62887d4323c6999262a8c7fd5d378a548eb33acc5309d825183f033378fb4561f3cd2a12d4086931f8138be590ef819fb1b6c33500f9503e5d9f02f SHA512 ce1372e0b8045c464149aeaf1fa8e71db1bbf86a651d02b361819602cfe2a145bf94a55d651ca1727ce0a08d810c1fb2facfd250775b3affbdf149dabc983ae6
-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.8.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
deleted file mode 100644
index c42f8daa723e..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
+++ /dev/null
@@ -1,159 +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="curator"
-ES_VERSION="7.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-${ES_VERSION}-linux-x86_64.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"
-
-# vulnerable pyyaml
-# https://github.com/elastic/curator/issues/1415
-RDEPEND="
-	>=dev-python/elasticsearch-py-7.0.4[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	<dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.25[${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
-	~dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${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' \
-		-e '/tests_require/s/, "coverage", "nosexcover"//g' \
-		-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_all() {
-	# 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]=9200
-	ES_PORT[remote]=9201
-
-	local i transport
-	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.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
-		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
-		transport=$((${ES_PORT[$i]}+100))
-		echo "transport.port: ${transport}" >> "${ES_CONFIG_PATH[$i]}" || die
-		echo "discovery.seed_hosts: [\"localhost:${transport}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
-		echo "discovery.type: single-node" >> "${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..30}; 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
-	nosetests -v || 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 c287e4fe3dcb..c759ee7e5dfd 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,13 +1,4 @@
-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-oss-7.6.1-no-jdk-linux-x86_64.tar.gz 72567711 BLAKE2B 8fe3901cb3ce6577918f6b711f63e0ed8f10013a01ae8c197cda8e5592b2e7c99f0bb7179decc19e26ed160c21d7cfd66eedc3d6fc265e89244ce1c9a5ef27c5 SHA512 da396be8bceec32b5f4c4f9091edee51710f39f5aa1135c7c392719d9fdd0c99e92b681cf628135013a37fd881dd15540d6c660a50bb18b47991f0d723aadb64
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
-DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
-DIST elasticsearch-py-7.5.1.tar.gz 116602 BLAKE2B b9ae9cc7496e911d102118a6e2684e8942dfc0f4e92d3cd9cf6429c7c7a48521ed5b61174ddc4fbcf8001c30e74fe11649e5ef13e90ca32307290ae0bb8d0f6c SHA512 9a82715031fbe60e5d795ca31cd7ba3fa653b3100e8d1b53e0088c55ad3ed7f4c4309a07327d41d1ca1abe2fdbb9f4b6e97d6ab39ae5dcde46b7c2b1642a92b2
-DIST elasticsearch-py-7.6.0.tar.gz 120271 BLAKE2B e99e84cf952f178c5ceaaced763cda058c36797eb1bd4b09ce7996a99417adfd8c152d980e1b5be6522a4287bb37178b9b6d93968324a57fcda5637f1caee58a SHA512 f8a54cd222af94d659087d654bcbe52da5ee90570ff04dbdd6793b870b8fd7e4b5b896620424f85057f2274ed3a16ecd97f53f704c2a97931b4876d246311ea9
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
-EBUILD elasticsearch-py-7.0.5.ebuild 2689 BLAKE2B cced4decbebfa315773f41d19a85842af8883d90a782e4773e0df47fa56708ccb6c263165731822c62db524481af9da2dc83096b8de2914a28c52d222e3c1692 SHA512 c17f9a7b08fc263b530a5469e8c234d76ad78eb215ceb4e43265190f3a3eda20e6f912f7afdd725c1c40903e8d017edec805f0c09ebf14f704554dfa27845062
-EBUILD elasticsearch-py-7.5.1.ebuild 2718 BLAKE2B 14306f7a0f84989c4cad1c511032e0dd40647fa6170d516ba6a15b4d66dc16a6aef17b14d5603fc1216b8df5432ac27261016b974dd38e439a611ae5f6d400e6 SHA512 2b726c8e3fb031286937001c554d4f850acf9d471bdb613f7f163df50d0ae7765387147253dfeeb400903536998ac8092ce0874bd6b62ac23186c612ba2f2e05
-EBUILD elasticsearch-py-7.6.0.ebuild 2679 BLAKE2B d51d3c7e36adf473ed69e998e2ded217d1738b66611422956f53fb476835a547866b6c3697764345059a1de2845c9d907e7517bdbb755a6db85fe01f3272ca87 SHA512 03ab5dc5806d5c19e836a489d838c8892384845ea635962dce011a9982457f026403d5688510b9156bb883fdcd80d2dae46adf065217470b1bf7465a1f530035
 EBUILD elasticsearch-py-7.7.0.ebuild 2940 BLAKE2B dc6e4d1499b436bb9ddd738fd1cb0ad84aca5d6286d775e27751c4c264d5b3cddf418f37ca1be66c93e7095e2fe9f05136affe7934701535b04bf3c605e057a1 SHA512 adb2a6cb8b75231f945a16ba0199303af42bb91137a7036f1f8643d0d9749f91d7325a9b4c1e487d085db0f0b18dd1aa04685ebbc7655c1c99b51413e0e85144
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
deleted file mode 100644
index 4074980458a0..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.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} )
-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:1.8 )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=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() {
-	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"
-	export JAVA_HOME=$(java-config -g JAVA_HOME)
-
-	# 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.5.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.5.1.ebuild
deleted file mode 100644
index df9f5afd8707..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.5.1.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.5.2"
-
-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
deleted file mode 100644
index fe4ce148e14d..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.6.0.ebuild
+++ /dev/null
@@ -1,101 +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.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 589173a60b6f..0ef0e6f2d391 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,7 +1,5 @@
-DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833cc262cecf2f53a86fd58e542717dc26137270bde13b5bdfcd81bb768a2dd74d7ed7213ad4292c0a1a2a4771855370 SHA512 39ce9f8e8f0a75690d5ccf5faa7e28113f971015c2baeec8b8f443b568c71154589d36dc2c5a3965eeb1d3d4257f65090cf44078747c7711bc7fc8c9ad051d43
-DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
 DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
-EBUILD elementpath-1.4.4.ebuild 693 BLAKE2B a5c69a7d2c34beef1c29d2d5394c5db94ec27ff6d44712813ad0cbf363ff4eb1da1e2665842d6fc829704adadc64071447b8942e29aaa524f64d9f8faf979c24 SHA512 b55d339102ba114133a7f0157037391e50f3dc3efa50563d064b95b0fbd82f347baa0cd5c064f61d96b3bb18321932084f2fb6c45d6bf7b18fd41ccda043d04c
-EBUILD elementpath-1.4.5.ebuild 661 BLAKE2B 5ea7028595fa2aa6b1bfd271de02597bc858845f52d4ef4e5acb4795c0bf5441f7aa748c07e303b9cb661523ec4e22a8332a915abe0990aba76db8b4eb6e97c3 SHA512 48ce7673bb91dfaf3b75334daf059a6b2bb95f5ac1001b2a1937d563c9f0513ebc89ef5b1153c32203b598ec5f446bbe232877028f72ab9e761572e721276155
-EBUILD elementpath-1.4.6.ebuild 666 BLAKE2B 819a17e4093e50dadd9e6d08aae99de55dd1c9bcf16fa45b390f7a062fa311221a62dda144f013201355747854747d25cb8c14059226f5849557d623bb85931c SHA512 6d7eaf90b255fb1af831f4ad7fbc785b92d2597e45cbc16a5d408fad509c6ce876e99834c62dafe4141899e533f42a1f839079e3ac4086f26371a235975654c4
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+DIST elementpath-2.0.0.tar.gz 149239 BLAKE2B 6963429ee127ef2a293da6706e6d1bc13be4d864d7da3d7169dd81d0a430156684f0977076182ec7aff7622940dbc341b84fab3eb488bbe6470476c4d30b6d4a SHA512 bb29c9cf30e9a414f9ddc7e29d3ae09af74302ed9c0bb98332b4fe01bab2e043cd5adb59b20a0730218d79b9f2ae42e9f2ad3ed7e4d0ae8ffde1800c96ee00a9
+EBUILD elementpath-1.4.6.ebuild 664 BLAKE2B d8d91a1dacd4a0b0000700d6fb35101b969b65529903588462b26570135811e40d76692eda1f7db1b367a0acf5fdae5ab94676bc74e3b632ac3d7ea342b1b9b8 SHA512 d96ec68d52c9910d1c9320538d9347c78ded4c6a47a99d5c12cb53fcc5302dad4dcc8de53bf66fb549d0fb0a71aaace2c6e1121cd3a36c409e03b2e5e3c677f7
+EBUILD elementpath-2.0.0.ebuild 672 BLAKE2B 9c0b90acb8f616c3d019513e589f4942a5038877df436575379909eadaf3fcdc226264e97003be0d99fbb8fbc3efb3bd01d8866c25f8dced376dd67aa848e506 SHA512 852736112ce064bea6ba97c8b703175c956adfe4b3de67ecd9fd31780127ec9c44c3672bcb501cfe70d4ca66c2f3db76f0fe2bece37ad4733ccfd27f938a6a62
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/elementpath/elementpath-1.4.4.ebuild b/dev-python/elementpath/elementpath-1.4.4.ebuild
deleted file mode 100644
index fa02bf8a9d4a..000000000000
--- a/dev-python/elementpath/elementpath-1.4.4.ebuild
+++ /dev/null
@@ -1,27 +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
deleted file mode 100644
index 5cd74ecf88b4..000000000000
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ /dev/null
@@ -1,26 +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,9} 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 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-1.4.6.ebuild b/dev-python/elementpath/elementpath-1.4.6.ebuild
index 053e351ab6de..2d6e59da0dd7 100644
--- a/dev-python/elementpath/elementpath-1.4.6.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-2.0.0.ebuild b/dev-python/elementpath/elementpath-2.0.0.ebuild
new file mode 100644
index 000000000000..64b4b299f7fa
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/elementpath/metadata.xml b/dev-python/elementpath/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/elementpath/metadata.xml
+++ b/dev-python/elementpath/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/elib-intl/Manifest b/dev-python/elib-intl/Manifest
deleted file mode 100644
index a300f0521f2b..000000000000
--- a/dev-python/elib-intl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST elib-intl-0_pre20110711.tar.gz 29362 BLAKE2B b0e877085e88d8ef606019dfeb989ec4760b2b049ec4f96255b7051a526e9ea5daff4bc53b6be255c699de10220b8ebefb07486375231fbe5d4fa0adbc472e52 SHA512 f44388761bc1c371c0cba5ec8b3513b073eba1d620e1ebd696008999d748f8c2473d5100d625036436157c92283b29d700ad6672d7909ca284703e3146d02abf
-EBUILD elib-intl-0_pre20110711.ebuild 471 BLAKE2B 0d518694d2f65924019bd35be6cb1970bb14cb98c3251784ce56a89d6fdba3dfb6631e0205adb19e6f5620924cbd8e75c2aa5f709aa2f11062e3a6d2d1c2bc7e SHA512 06608a405d2dea03ae0e2db9aedf7ca7a1f2a367ee0edea150a0e588c22c1254044d5909a4f00b4275ec347f8dac10c1b00bd9d32918b9618b83070f668997ce
-MISC metadata.xml 582 BLAKE2B c435fc1cd9f76113785ba88c21b37039a390798c21abc6cb4138ea924c18450db3d0d92777a04704689adc3e9f28db4e4b9181ca2f3906091ffb8fe7eefbce2e SHA512 0bcf6cb0e2f3d9d80c9f245a28d2ee2515fc6294c4ec59fd4e5ac440118a53801f474120afc3b9df26bead73505ea07e39b85506f1c01e8d7a245a952ec72c95
diff --git a/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild b/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild
deleted file mode 100644
index b8c44da5b451..000000000000
--- a/dev-python/elib-intl/elib-intl-0_pre20110711.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="Enhanced internationalization (I18N) services for your Python modules and applications"
-HOMEPAGE="https://github.com/dieterv/elib.intl/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools
-	${RDEPEND}"
diff --git a/dev-python/elib-intl/metadata.xml b/dev-python/elib-intl/metadata.xml
deleted file mode 100644
index da93a457fa9b..000000000000
--- a/dev-python/elib-intl/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-needed-->
-	<longdescription>
-		The elib.intl module provides enhanced internationalization
-		(I18N) services for your Python modules and applications.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>dieterv@optionexplicit.be</email>
-			<name>Dieter Verfaillie</name>
-		</maintainer>
-		<bugs-to>https://github.com/dieterv/elib.intl/issues</bugs-to>
-		<remote-id type="github">dieterv/elib.intl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 9a349e489c97..91f76795a75a 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,3 +1,3 @@
-DIST emcee-2.2.1.tar.gz 24277 BLAKE2B 26572cf242caa2f9f7018e91434d7ff8b235d59349fb7b034e52bbab77098ff952e84eb96d013b66853a763c8fccc0cdd7121a5387b5081dd238df85416cda0a SHA512 8f612a135fe5fc2bc75c2bc231d9210d4a70a91f5d7b94ac2161618c082d18aa1b896604b7ece166b86d93a93902e89ee9961da2a3e65307880c0dbc63bea267
-EBUILD emcee-2.2.1.ebuild 660 BLAKE2B eaded7db7c60401e2ace4d3297699b7059843bfaa64c4d4ab3a0404f810b5a1d2d0257e79716e684518150954b66f63554d37017b5b8aa70b734d678c51d1dd5 SHA512 22953efbe028332a0aec43a609a2e08c2d75c55506e32110365ab19ec5b08e38221d1a80212ce229174fcf60239bc6cc1f46fe5ad9b7f699e220e91b4d0b66b3
+DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
+EBUILD emcee-3.0.2.ebuild 585 BLAKE2B d17f16f5f55ac17a615c803258c5e03e773cb5bfac97babca9111dce71b36f30b66160211b2f0944b26422c1bfad2a0944bc8ce1acd6ec2d893453abdd184d32 SHA512 2e6b768c7740100abfc74d888dcd78e77fffdf1eebb6de75a6bf73e03f5b19d2689f102e01e32557030d38a160e544e9f2051a75a460a374db719c4579cd89de
 MISC metadata.xml 865 BLAKE2B 5d1067b3f5aa4969bf5e50ca73aceacdf45795f0e28562b8800d1b0c84d1d0df36d50f788392b3c508aae9c7eb3bc80d8115ea2becdca370f046f543d6f66112 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102
diff --git a/dev-python/emcee/emcee-2.2.1.ebuild b/dev-python/emcee/emcee-2.2.1.ebuild
deleted file mode 100644
index 335f0980a7b5..000000000000
--- a/dev-python/emcee/emcee-2.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=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="http://danfm.ca/emcee/"
-SRC_URI="mirror://pypi/${PN:0:1}/${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}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS.rst README.rst )
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/emcee/emcee-3.0.2.ebuild b/dev-python/emcee/emcee-3.0.2.ebuild
new file mode 100644
index 000000000000..c0817373c32b
--- /dev/null
+++ b/dev-python/emcee/emcee-3.0.2.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index fcac4742165d..77855d3698c5 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,3 +1,3 @@
 DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
-EBUILD empy-3.3.3.ebuild 1012 BLAKE2B 8e02325d3e98ff0f3ffa3bc3136c0226b7182fefa5b2f8074a5c0b71be899d1c76e9cc76d1e52e66487f9a42311afa4faf9b38dbad5e17640aeaf5e5e507e40f SHA512 8b080fce64d86a948bca47fe7a9c60db04e47dcc80b634e4957cd4616b3ea6a42b9087a8069a19bf8516fa985d11dff25dcfef9891cd09a04184be69801287e7
+EBUILD empy-3.3.3.ebuild 1006 BLAKE2B a095c4d9e751095706826410b7b2c03e8249830960e84141205372a8381ab4895e3119a88a15d46349ff84d430aa57dbe124b92edc3f28488a3ed1d80788a10d SHA512 45c50f89b7b8950ceb609230c4cd702dd5c58497086b334e6e514f40f42d8dc59334d5d49c60c25dfdf6e2fb43be2733e571bfc13eb1b636d4d754d7f1d78c9b
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
index ccd4cb6ea1d5..24d0274fa10b 100644
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index a1b1a14ea833..bb66075af786 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.3-r1.ebuild 981 BLAKE2B c17ddd8fe5238dd3998375164a4e3df4f8eff3e6ed2b187432d29cd0c4ee605a2dbbfdb5200ea4dd5d34d918146dbd91f5a5ff5190041f0e55aeab35a5e56929 SHA512 81b7e534b212e4c90de6c7b8ca543346d35ad6972405e4c3eeec34c20dae16f8b6f65ba7ef9d23700c2f655f3b21666bc9b1ef7f044cd06d6c0af883fda1c4ad
+EBUILD entrypoints-0.3-r1.ebuild 987 BLAKE2B 0ef22075484cc4a5a31120cab7630b1be5b80ed36173154193f24ec17ad1ebf59a5470e7777d579ee4ee7bda4b7009c9a9156417fb9112ce0c460571baee1992 SHA512 77266ab1ee8fcdfbd9da97e486908a37f120452ec332ca6bba32f4a2f6ccb06ad5b0c801d8b419ab0f02dbf7641b0308eaefcab6bf55d2118a4a002712395328
 MISC metadata.xml 730 BLAKE2B 4036e332f77d99dc24f55da8e75cc96900cba2a343a4d372c125a5eb8102a6ee789b72a87d8339ac0352e214c0c5e2c554d6899795f3ab84df3c441b9f75f542 SHA512 7febb502fc9aad6bdec9c698275aafee404cea4cea59f554a101a8186df401d227d7d8b14cc332ee96b975ea513b5cef37de80f8e39ece138cc232718e1d5e13
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index b2cf6654d153..2fb7fce20d41 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 45415dd5be37..5886698fd32c 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,5 +1,5 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-EBUILD enzyme-0.4.1-r2.ebuild 1005 BLAKE2B e1231b88c80de54ab17391bb4770ec5ef63c523109bc6b5979cce1c1c50c46760b915a7cfb25015e3cd9086659657d84ae3f7fffc048aba8c5941a31efeef754 SHA512 7cab553c27c134baa288d2d5d406641f345d1e27f5f83c82f28bc1920a496bc3f2d1f464331bef947805f5a18f97cfb0ca62007436ed8b51e2a6f41d13c1fce6
-EBUILD enzyme-9999.ebuild 1060 BLAKE2B 64224d263bee5b11f54f3b2cc564df25706925765e6080dbdfda8d84899f992c5fab1b5c0a60a0951e699ebae013b9eecb02d7196af00c72b2e757b181d959ae SHA512 939da49f05f42f5f3ce2529547bef0b4fd394c26bc768f65e5ada301572247b11148b8963b947d8f2db8b4f53e48dae9dc6eb98ae818b9baf8397c5887ed3544
-MISC metadata.xml 342 BLAKE2B 1f5c47ca80b45dbb9476f33a22c12596c9b5c319bd278a6ae9e6910105a12aa3d6f15d4336c3fed77bfdb1501338a2514503158d3280e7163fb2b321c0e915c6 SHA512 4ed4ebc1027d54008738661d92361d44e317533fff94a03fc1c5d3e0c33f2cede8715947cf772593df0ab56d642aeb895a772250a31a946b49bad6ff07fa52e1
+EBUILD enzyme-0.4.1-r2.ebuild 946 BLAKE2B 46e7740e2a16d21aa2998b46bb407e9eba62c52415cbc8af7467ecea33d4a566afa0986156e60aba5e69f04715cae313f68b9a2b9fa79f48a666cb1c063be872 SHA512 126051b22cd6be87f792b963d882fd4c0e00933472e52cd89e2e6fb274810c45a6bcf8acc5703335ee3378bb64c53a28c65980c3c0df08a03e105306916bdfa5
+EBUILD enzyme-9999.ebuild 995 BLAKE2B 4599613c0296af7ce231a62bcf22263d09154213efe8c27874a8ed749ae81fe66b0cf2236e75a98d61316cb3f18a047a4af29ad98d64d026961bd1c0ea35096f SHA512 bfdf4ce783d655d3d7e4c22ed26aefdb45227f3dabc2ae04cefb0ed174b801677fa595b33fa212014ec2c4afbb104a59689b1f6a31dc32d3ff148d52e6fce8c8
+MISC metadata.xml 366 BLAKE2B 25e77584024733289e4a8a524e8b4f634be09e20c2ce3738d0999be66092e874c528b15b8cafb7e4ab6e7f76bf300374c0635e2fac93a0147e3e8f700bd6906b SHA512 e5685506fb707f7a9d577317908e72b46db00d09125ac5907de0f25d11b67ea94dcef2bfcfdd7754583c77796106569e1a8143d0041f45abd0233786d9965ba8
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index c4c197a51f0b..21430148dd1c 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.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,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
@@ -21,8 +21,7 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		app-arch/unzip
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -30,6 +29,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+distutils_enable_tests setup.py
+
 python_prepare_all() {
 	if use test; then
 		mkdir enzyme/tests/test_{mkv,parsers} || die
@@ -39,7 +40,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 303680658ee3..40184beaebb1 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.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,9} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
@@ -15,12 +15,10 @@ SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		app-arch/unzip
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -28,6 +26,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+distutils_enable_tests setup.py
+
 src_unpack() {
 	default_src_unpack
 	git-r3_src_unpack
@@ -42,7 +42,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index c8ba51a8482e..949fc3c7df10 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/enzyme</remote-id>
 		<remote-id type="pypi">enzyme</remote-id>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 2430311f8f2d..4584b037ddea 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 534 BLAKE2B 358a133dc417faa90ecc929e5dcee71616648ab5236cb8019c249dad114042f5e1df4d5deedbc6342e50e34f48a50daf6d09658b0bb1aa29924b64d7fad03928 SHA512 d46942e27f1bebe56d1e21ca6ad9a2445b681a6f51e723a155ef917927556883e632323acbf0140fc25422d2b5da4c1084f876568efafece46b24d73e3afd46a
-MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
+EBUILD et_xmlfile-1.0.1.ebuild 492 BLAKE2B dd0dc69871fc6b6777531d4009ba475b6d8c0eaa77b7b7d18a16ac7021746f157dfb32576d1533ecd1beec10e1e0b8d7d012da7f6b85557ce71d9d774b625449 SHA512 7c9ecbde8be3c3715d600c797ec16879c94f7a2ab37da7e7d500b7c93f78568b6005e91c08e8be0ffc9de3bc597eabcdcd077b8ae2f8482c0a6a1dd8e0a9f3a7
+MISC metadata.xml 323 BLAKE2B 4f38c09e5189542f3e9c953ca83a03472a2d8a4fefbfb045667c171d1874543f612d5e8f36e1e38783699e8129c40ead88d5f0dbb86a614147a5f74565122ae6 SHA512 2294368cf12d187380ad7f33ec620c92275cf6870d61d5949a62f9307275151cd795c1bdfe75e2b818154dac4fd63e30f595fb656d3073c37ac229b6f73bc6da
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 26d29a58cee3..fb1f2f3687bc 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="https://pypi.org/project/et_xmlfile/ https://bitbucket.org/openpyxl/et_xmlfile"
+HOMEPAGE="https://pypi.org/project/et_xmlfile/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
index cf7f0f75e00f..8a8c915f9cfe 100644
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et_xmlfile/metadata.xml
@@ -6,7 +6,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id>
     <remote-id type="pypi">et_xmlfile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
deleted file mode 100644
index f5953fa9c544..000000000000
--- a/dev-python/eunuchs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 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
deleted file mode 100644
index 99f19b650d93..000000000000
--- a/dev-python/eunuchs/eunuchs-20050320.1-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=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Missing manly parts of UNIX API for Python"
-HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.org/project/python-eunuchs/"
-SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-python-2.5.patch" )
-DOCS=( examples/ )
-
-python_test() {
-	${PYTHON} examples/test-socketpair.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
deleted file mode 100644
index dfad7a8dce79..000000000000
--- a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/eunuchs/sendmsg.c
-+++ lib/eunuchs/sendmsg.c
-@@ -101,7 +101,7 @@
- 	real_controllen += CMSG_SPACE(sizeof *info);
-       } else {
- 	char *data;
--	int len;
-+	Py_ssize_t len;
- 
- 	if (PyString_AsStringAndSize(rest, &data, &len))
- 	  return NULL; // TODO leaks
diff --git a/dev-python/eunuchs/metadata.xml b/dev-python/eunuchs/metadata.xml
deleted file mode 100644
index 6f09877002a5..000000000000
--- a/dev-python/eunuchs/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">
-		Eunuchs is a library of Python extensions that complement the
-		standard libraries in parts where full support for the UNIX API (or
-		the Linux API) is missing.
-
-		Most of the functions wrapped by Eunuchs are low-level, dirty, but
-		absolutely necessary functions for real systems programming. The aim
-		is to have the functions added to mainstream Python libraries.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a48af42ff689..1aa1304e9ae9 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,7 @@
 AUX eventlet-0.25.1-sparc.patch 4901 BLAKE2B 5c2db6c09e3123c6ec655480e5f440f094071cd2bc1de3260c8443abd736d2cc52115707f0fdcffff3019ca6788287dd8249cdad5f5dad2e449ceb4067e1dfd5 SHA512 cb3f7cd7e8f0cc1c7e040bf8eb04309e98107427ba0b2a8643a18ce13f57803eaee32045e55d2e56cad45fa1dbfb33c99bb4935f153949d08f9240384d9868a2
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.25.1-r1.ebuild 2259 BLAKE2B 05a53f452c2c0d08fdab18d43750ec6d8718896f18e837af928c6684f389f18432f7723455a44fd26ce9df872aef3a8ef173df61008e3514e7844eb5a51cfa58 SHA512 ce73b97f391118733862a2732f282acf0322f7aaaccf1c6e0183161b04615c68746a7b6e35ed44da15ade165eff9326d5f2df8b0e33c1debb8a296753c124475
+DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
+EBUILD eventlet-0.25.1-r1.ebuild 2141 BLAKE2B 7d33066c473b8794dc7775956b852a9673a56167e12afcab1a5ff7cefc1341160b8de4b56d325102d17549631bbf1336763aa8ac609c56e31df555fb87ce00d6 SHA512 d4f66e724beaae255b249d39dc492d3f50eefb80ea066071cd30e3300423bef4d1b4dafdf0d1e0060475d46b6aa467c7059b2d2a45084a097b030af2638433ea
+EBUILD eventlet-0.26.1.ebuild 1774 BLAKE2B 22a756d64b34b85adffaba54988bdf23784610cd68d8dd45bb751c78c9922fb7d02adf01e6bf19a2e3953d3dd217dd358a4ee3141bd57af0dc3c3a9a8eda46c8 SHA512 3f97f61ddb215541713a9c5f13858bbdf742d6dcf93a350635fbb518cbd1b9bc096977d685882e4b6e348c39d42a284e46c7720d02e32b60738e2b8e9924822b
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index f5ec914ba9c1..f00090d518b8 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
@@ -58,13 +58,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_prepare() {
-	if ! python_is_python3; then
-		# this is for python3 only
-		rm -r eventlet/green/http || die
-	fi
-}
-
 python_install_all() {
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
diff --git a/dev-python/eventlet/eventlet-0.26.1.ebuild b/dev-python/eventlet/eventlet-0.26.1.ebuild
new file mode 100644
index 000000000000..6fed3c8d8ce1
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.26.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${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/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+python_prepare_all() {
+	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|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	unset PYTHONPATH
+	nosetests -v || die
+}
+
+python_install_all() {
+	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/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 5e6b9d941c1e..d48f6d84255b 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,3 +1,6 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-EBUILD eyeD3-0.8.11.ebuild 593 BLAKE2B ea9b10db1e2066ec5d4ce91bc0510799d08c387ecea1ac9b77ced3ed00a8aacdbc312710d4024a5ce8708497c6afd956d29d3a778284716ac3905568bc002d37 SHA512 2dfaf91188c6ccca84526487747c95c482c1327d8d5b24a2c92d770717c032f708b31f25b8f0f997aea4273753b553f43078e4d576602f7125d493f53ceba692
+DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
+DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
+EBUILD eyeD3-0.8.11-r1.ebuild 558 BLAKE2B 38f36e5f8c769a1e228f834495b4d56d9b9ab3dffc0211551d4f65a8a7288c969119d0b690f3426c2a2221945233235a87d6d6447f966105ff518dca683b82fa SHA512 70c13459cd085dc0cfcc844733baf13c54174b514d9ac500c76f0f0ff4430943e6a433429bf27acefca420064b0df680ee8f432248d3f9992808d102e341ac61
+EBUILD eyeD3-0.9.5.ebuild 1205 BLAKE2B 1b882fcfbb96c731f8909626173b8f59597d32159012087d3dd1e1e83e8464614eaf1773803c56593ada45dbe253b5ae9e3c69b157b294f0929543f53789cb56 SHA512 39c357209b6bb1bdfce03468d339ae7bcf3db2fa2fc96559696009da1f37552a6debf9616aa09d429580bccaf2f986326d8872cf8ca62e1d002fb51e7157bd00
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
new file mode 100644
index 000000000000..6720dd35d923
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.8.11-r1.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=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="https://eyed3.nicfit.net/"
+SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE=""
+
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
deleted file mode 100644
index 214716f6647d..000000000000
--- a/dev-python/eyeD3/eyeD3-0.8.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=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
-HOMEPAGE="https://eyed3.nicfit.net/"
-SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-IUSE=""
-
-DEPEND="dev-python/paver[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
new file mode 100644
index 000000000000..48379da94fa1
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.9.5.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="https://eyed3.nicfit.net/"
+SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="~amd64 ~ia64 ~sparc"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/filetype[${PYTHON_USEDEP}]"
+# note: most of the deps are optional runtime deps / plugin deps
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pylast[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged factory-boy, doesn't seem to relevant
+	# to anything but eyeD3 usage with factory-boy
+	rm test/test_factory.py || die
+	# requires unpackaged grako
+	rm test/test_display_plugin.py || die
+
+	if use test; then
+		mv "${WORKDIR}"/eyeD3-test-data test/data || die
+	fi
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 972a60b300c6..1f337a156128 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,5 +1,3 @@
-DIST fasteners-0.14.1.tar.gz 17749 BLAKE2B a1367257b495197f974712a3444d4d7f02bff2e919ecd649aac5d0fd946c128dc7592afaed4ae5044324af5d8c63fcbca6bf56eecf04e2f521dfbaceae8bbe16 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1
 DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
-EBUILD fasteners-0.14.1-r1.ebuild 810 BLAKE2B 1ba1b170aad7567ba7fdc46318ae61452b582b3633630bb63210e75a901a60bb823ac8f3e520a6896b3a845d1577691e4a45b6e87f8bb03e662c02bcfdfb1dd0 SHA512 00182fecc8114506318d019331e5ea4237c94703185a0fe6c24af5514e7e26712d433ced7ecc7b171d0111381c458a351da9b159c2c7ea0cf5f6d6b72fd7cabd
-EBUILD fasteners-0.15.ebuild 606 BLAKE2B dbe9cd49b61479efc3a26af799d788a59eaef062ceac2283ada4c4020da6bc99733c404cb49f5b3b05c88a39f1904e492d5b86469d812de933ab6a53ad592192 SHA512 3dcf27fbdda12d4c21ca9b48ac46055ab28516cd387cdaf3ec367a35458abe361e581c3e3b2c9195bcc0a8a993a9679746aa987b856d76d5fafb075c7bad4d26
-MISC metadata.xml 485 BLAKE2B c55221455d7ed96021259cb5f3d6a5d13df207d21789484da848fb545ea719e9406e2ae61da2f5a46af82a620a6b8af7ce7f0431c55692fc7b9e6f8c8dad908a SHA512 f7c4c0751a096b3ec92a802b4a22864a542758d12e8105ac13c2758fea1952eabcb3ce9036e5aa170c865b7f89ed0b0891e9d88eab5c2812141575ad8ffe8df8
+EBUILD fasteners-0.15.ebuild 603 BLAKE2B a6ab8687f84f7309d283e85407189563e843c2539e5da1bcf675357c0a6b693f39775dc0294b80344a6f0dbe4ebfe13f153425c43777fd1f7bb84605f2ea2ae4 SHA512 7bc8f19e619e16baadc1ffadf3fb0d92d50307b8a677e452fa980d6245ffdeeeedd23098bf5da49dabec65b89534e41b0b87f71766469c16cd919ae377f9cacf
+MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
deleted file mode 100644
index 1b279280b357..000000000000
--- a/dev-python/fasteners/fasteners-0.14.1-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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners"
-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="
-	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/fasteners/fasteners-0.15.ebuild b/dev-python/fasteners/fasteners-0.15.ebuild
index b66f8cbdd58f..3237207f37fa 100644
--- a/dev-python/fasteners/fasteners-0.15.ebuild
+++ b/dev-python/fasteners/fasteners-0.15.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 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
index 80ab359f0e1d..3e8fe2e7a5fa 100644
--- a/dev-python/fasteners/metadata.xml
+++ b/dev-python/fasteners/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fasteners</remote-id>
 		<remote-id type="github">harlowja/fasteners</remote-id>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 0debe06fbc60..e93d9e62863b 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -2,6 +2,6 @@ AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d3
 AUX feedparser-6.0.0_beta1-py39.patch 2768 BLAKE2B 26966964d788891224adf67f0afe6ee20a233d2eb46c5215d643085edd8d8f15b7cff7d6a353029d1dc1e435dbc5cf7c690f157ae5d2069bf8684cd10b470365 SHA512 25f371a75e1b5b1688dccd1fc55be8a011018a4555727f87725238c28ca2ae2b0da491f45b9b48ef49ab4af19f373eed54ac2acf2e5a382dcebc91c1c60ae921
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
-EBUILD feedparser-5.2.1.ebuild 1204 BLAKE2B fe93ce75d144be7ae236d070bd720c49c698e0bc49703f93dc5eda311134251892f9136071ba664729a14d072d5a3ea5a325c769a70e864beff7ea35021bcdd6 SHA512 e2c077c873c93286e13e2014762617e8cb15d5d4920baf968c14ccd1d6ba8374d8c24a61da9646ea0aadc434e4eff0c54f9415cf99edbb3fb65cab45fd87d6c5
+EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
 EBUILD feedparser-6.0.0_beta1.ebuild 944 BLAKE2B 9bab175ae3c514e51827cb2196181ea149d3a61c3e49995217faab9fc5fe64f6d24c3d9b83dc3f72f1833c2b9b21cac372220c959dcef2f4bbf90f11a77f1ae5 SHA512 620a56526e001d096e3d5a4ae22fbcf42ad54b3e5047ad803ec0c5ba5f6fc1d91df0130283fa5661f069dde333178031335c4605ef7fae980b441e86f6a9cfa5
 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 372a7e8bf7d0..8a73635dad4b 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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 54ab8e263f34..98a8623a5c38 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 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
-EBUILD fido2-0.8.1.ebuild 1067 BLAKE2B e385742ae0c672ef0c5e0311cfe6ef61adebb58fe227d5400d4f8ebe840b5c4e0f7287e92d8f8de974a32fe3df03a48100affaf8277652f50cb78a245971d81f SHA512 2724ffed29a73c25036c0a2702090524edbaee8e7dbc2e9225586c84d6d38462d50ea6781073682ad32e210784f00f3dcaaf6af908eb07d4e3e6f018aa3002c8
-MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
+EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
+MISC metadata.xml 539 BLAKE2B 3e4288bcfbeb472b34ae14848e5dfdf24eeb8ff819efdd14a888a50d0eaa1e5efb6854a9c5cdc1c4e998b7483cfae673f83d11c98f8f97db561af50a0a908ac1 SHA512 6868804b1d3118b99dc77a1f204c05487462eee4fd1458ef9f722fc1b9038b3d4cb7a8436246b115343d53616e466e1b33fd97ca7adbca9e8cbffcfa95480354
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index 84a0ac3d31f2..d59bb437ce44 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index b0754694d806..c9ccdc3b158b 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -10,6 +10,7 @@
   device over USB as well as verifying attestation and assertion
   signatures.
 </longdescription>
+<stabilize-allarches/>
 <upstream>
   <remote-id type="github">Yubico/python-fido2</remote-id>
 </upstream>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 81d37131dd23..52c4e7247ee0 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 867 BLAKE2B 6f937bb0ab5262a5965b4578a158ac9fee2ec2e92fd589b0f41399691506b357406c062906e6517eb4f1a3fbef4d8f69fdb4ba7e0cfb77b306b6161c1e00b691 SHA512 790572cb0b49b75dd30f27910272b08f3552e93af1bd37438803b4c31e5e770328576f0f1f77700c7f330ac3ef4431c1409c71748acf969ce10f1cf16c7df740
+EBUILD fields-5.0.0-r2.ebuild 857 BLAKE2B 05bafb4a5b8a9e48308ebb97d3783bfe4361f7b38947e5105fd0d664ce57e55c0002559e6bbca94e12b2f22a174d4af736272bd4a3500531b946d4310e972f19 SHA512 76963d4735f7ad660f2068ee5b2c81f028b6a5db8abf99b5869a59c6292a4722945de0421956489eac3f7ca43a310b8b039993b787a7b08cbadc3c6ea260a78e
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 1e6194144158..af2b8086ea55 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 06bbc69d9968..84465c06cf3d 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.12.ebuild 617 BLAKE2B ee9a2f8b409db8c7c6f8dc27a0597fcee3b3b4efaf239a64854d745a83a420652906747d23edd87e42aae7df4f531c6bf82a28e85f403c67daa490245fdb9faa SHA512 f15b8a2d6fe040e94b47d8f0f384c20423eda63b5f7de47d1ff959230446ae151774d9f7d258bd0a1d123750f878820e523a408ded0f4b4a134ec727e050751e
+EBUILD filelock-3.0.12.ebuild 622 BLAKE2B c699560b5df085043c04ca549591e173e61b48101693ee18c0669f1d510b04f62bd0157f07000c70ef34aeeff8a25c2c2f989f493f71eb5f824667abab46888b SHA512 7223853c3b1dca7721daac1f58cba840f4aef7a651218d812f331db697b1e2d9e3efe7799046cdf85edfbbd26b01ac562d47b266d3aecb5895f451f072b5466d
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12.ebuild
index fdb92b5ed4da..0d4e9fcf309e 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 ~s390 sparc x86"
 IUSE=""
 
 distutils_enable_tests unittest
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index be20f2b792f5..96fe715b0bfd 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,5 @@
 AUX filetype-1.0.5-examples.patch 452 BLAKE2B b99fbb4ec4fb1ac75aa9f33bbcb509f9979ea23d47eb4d86b08a4c61dadae3aa27ab116d389d6f9c9c8787247d8e9febb15e06281de5ec82c5aa1c8d5948de75 SHA512 a2d9263958dc8a2927f9221758bba634106abdf041ae0f1c2092181e9ea0f9f3bc87d133eb107a92ff3fdef537ce3e2269fd8bc22ea4c5d3c669ccaf4003c5f5
-DIST filetype-1.0.5.tar.gz 668401 BLAKE2B c8dbb2d993a13c848b6460cbdb99da20606bbb632b388c2a0c0a28debf6119c73257f177c55cbce201ed7ac5a47f04a4a2c3137cfde887638151cb287c28333b SHA512 c90846deedfdb9c0dbb8f0f2e3943494ea2a8cbb85752b8fa8093f76a3760864e3a1854530d7a62c418a9e475e22f161ba52c9069cafe24d6f069fd300191dea
-EBUILD filetype-1.0.5.ebuild 489 BLAKE2B 32efdee8e2d8ecb766576c16607867befe7624e2ea8c51c74524ccf11869c60f261b266dd060077250dab4a2c3c50367bff42ad070a3bef71cb72693921afba9 SHA512 2c31d6e91f79c81f5b826608250c07f19b87b8ba7e2856be9b630e1ec39047d192c0bff61117ec69f4d78bc237d73c9491ad756aa935c64d51bd1fb12ac1411c
+AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
+DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
+EBUILD filetype-1.0.7.ebuild 510 BLAKE2B 5bdaaf46296e43863a6086ca1f3310333103f298ebbada217855ddfa510b56d4190e7411407aaf82380b6bec92db4e95e0f880ae8d648bf400900c7de0a46b73 SHA512 8af6c570733812df828d8393c69a0fc7f24641e81befbe8baf0739bef9ac5c77f0f26422fb459bbd237b46b594e6529e93998bd48262420ac67ade306516216a
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/files/filetype-1.0.7-examples.patch b/dev-python/filetype/files/filetype-1.0.7-examples.patch
new file mode 100644
index 000000000000..04eeb8e1ee68
--- /dev/null
+++ b/dev-python/filetype/files/filetype-1.0.7-examples.patch
@@ -0,0 +1,26 @@
+From 0aa106c03d0bc7dc872edb349b4a88edd170ca05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 9 Aug 2020 14:55:07 +0200
+Subject: [PATCH] setup.py: Exclude 'examples' from being installed as a global
+ pkg
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 45bfd49..8a69c6a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,6 +36,7 @@ setup(
+         'Topic :: System :: Filesystems',
+         'Topic :: Utilities'],
+     platforms=['any'],
+-    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests']),
++    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests',
++                                    'examples']),
+     package_data={'filetype': ['LICENSE', '*.md']},
+     zip_safe=True)
+-- 
+2.28.0
+
diff --git a/dev-python/filetype/filetype-1.0.5.ebuild b/dev-python/filetype/filetype-1.0.5.ebuild
deleted file mode 100644
index 0916c039f03a..000000000000
--- a/dev-python/filetype/filetype-1.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=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
-HOMEPAGE="https://github.com/h2non/filetype.py"
-LICENSE="BSD"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-BDEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-examples.patch" )
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
new file mode 100644
index 000000000000..92e0bc748920
--- /dev/null
+++ b/dev-python/filetype/filetype-1.0.7.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
+HOMEPAGE="https://github.com/h2non/filetype.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc"
+
+PATCHES=( "${FILESDIR}/${P}-examples.patch" )
+
+distutils_enable_tests unittest
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
new file mode 100644
index 000000000000..ee9fe2ea7240
--- /dev/null
+++ b/dev-python/findimports/Manifest
@@ -0,0 +1,3 @@
+DIST findimports-1.5.2.gh.tar.gz 32211 BLAKE2B ea3110925085d466df7f95eaa06dce9e331ecba52c1772b76b05e51c633a8adc1ff91295db441049dab39129606e3927f69834376cc5fb864f5f3b62ac68bac2 SHA512 86432d29d180d4299ba789b69601722a6a15eed9badbf2f930e8867be06c64a2f1f8123ae182d7c6b73339287d04c2cdb4a18a31662ea72e86283ee165dc4d45
+EBUILD findimports-1.5.2.ebuild 470 BLAKE2B bf11966352785963786db2fe4d0ee1e47ae7132086e2d60bf6a49a405325cd865d8f5770ce82937786266332757e7c1aba002ded7b7961b798faf824dc69ad60 SHA512 51a09981afc79bf63c6a721f912990affa2a8d3882c54ec4768f3262969d064ff59dc64187373e476cbf9aa0fc2eb86845eaf279a65f50407a5d12003efe4bd5
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-python/findimports/findimports-1.5.2.ebuild b/dev-python/findimports/findimports-1.5.2.ebuild
new file mode 100644
index 000000000000..edf248964f10
--- /dev/null
+++ b/dev-python/findimports/findimports-1.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python module import analysis tool"
+HOMEPAGE="https://github.com/mgedmin/findimports"
+SRC_URI="
+	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/findimports/metadata.xml b/dev-python/findimports/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/dev-python/findimports/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 10e21942e762..803859105d4c 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,3 @@
-DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
-EBUILD flake8-3.7.9.ebuild 1495 BLAKE2B 8fcfacec08f8e6cb746a0359afa8d2070475d0b22c4c080668c7405069c8672201a39d663d4eb5e7f9c7a8364aea956751f6eabacf56fdc6e179b038dfcd192f SHA512 3b3a06492aa3cea6f5f3fe1f4fee897f1b478d77e4480ff4c7bcae630f965098622b0f39c7507fbf5c399900fec1e0197ffad961032aca4dbcf52d6230e32ddf
-EBUILD flake8-3.8.1.ebuild 1372 BLAKE2B 5b0a2618a541ed70b9621fe31118c9ac6d62e82ac15ca006936766ac395ee05b7319aa2d547ed84ee16ee1b7bc3822e91e3966e05ae350a69f7b765dff17a97c SHA512 861119407bfe224edbbda3a153b24e60890320ff88d3130b9a05a4b6fbbe85b19519763f544babbe1ba1dd5c4edee6553e10e8641ebf2af06b08fcd51140f484
-MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
+EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
+MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
deleted file mode 100644
index 15409f7d8420..000000000000
--- a/dev-python/flake8/flake8-3.7.9.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,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ppc ppc64 sparc x86"
-IUSE="test"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/entrypoints-0.3[${PYTHON_USEDEP}]
-	<dev-python/entrypoints-0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.6.0[${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}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't treat warnings as errors when running tests
-	sed -r -i '/^[[:space:]]*error[[:space:]]*$/ d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flake8/flake8-3.8.1.ebuild b/dev-python/flake8/flake8-3.8.1.ebuild
index 806a6b8f6385..8d00e5cc8e07 100644
--- a/dev-python/flake8/flake8-3.8.1.ebuild
+++ b/dev-python/flake8/flake8-3.8.1.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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flake8/metadata.xml b/dev-python/flake8/metadata.xml
index ef6942e1e79d..86d293288a31 100644
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">flake8</remote-id>
     <remote-id type="gitlab">pycqa/flake8</remote-id>
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 1b5527f8b49e..fb8c1282f250 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,5 @@
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
+DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
 EBUILD flaky-3.6.1.ebuild 1277 BLAKE2B bd89281a3810254e08e56744046a9ef6380d8c339ca0c7e15292f157251653ceb5722354b0851e1b5c9cbe05c4c9d168fc5a396183861e969e0cc171dfe8ac0d SHA512 39005d51822b0ed1d0c9568197e4d6eee774b47e6c8ea8aec34ab7f899c7130a14d3cbb422ee2f3180b21be4280df749cc7f7c90a3be8feda7edd465a744460f
+EBUILD flaky-3.7.0.ebuild 1286 BLAKE2B cbbcd94899a975bf694ea731f73be9b74dae620f26b60c869fbe1d98ff10c42e361b1582983b92ad4b3faef4a37ca75a4e68add7c60dc7fed0beacfa21f2f4ef SHA512 b11146c9ad64f132c2ba9fa4f8d48475da2e7f885f699a2c329dba0a1356d525876e109d4a3da3c30a6cc61e052a4125e25ffdbe2e7f3aaa3d88288fc891690d
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.7.0.ebuild b/dev-python/flaky/flaky-3.7.0.ebuild
new file mode 100644
index 000000000000..98443c6754cf
--- /dev/null
+++ b/dev-python/flaky/flaky-3.7.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=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index 4bd015f5d7cd..346da0bca9d6 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,5 +1,3 @@
-DIST flask-api-1.1.tar.gz 235042 BLAKE2B b3c7e476c8ef1fa21f7e60aa1fb87ef5b40708ea96332ca0290d9355552bc5c195914da769b39ace1d34864c32989cf7f9856d070b1e6b690a6c1f60b495cabc SHA512 52bb983bf9a0f906f37b645ff907eaa6ee3bc557b51f8935817963f3d66d99689eeba6a3e17711974663ad5ede267f9c85eb1d11f27597fe63806dc9f9e7ea22
 DIST flask-api-2.0.tar.gz 235593 BLAKE2B fadd746d91cc2c797a2e40ee6b11532eb0184a1289a692f8de844501a6656eaa1e87d10811119f267344185b22ed5c12bca43198d64d50ca8055ce95d0f62f19 SHA512 631e69e5a786598e6b5ef7e02c5c4f293eadd84d86fdf0155771d04fb6e87be5686756db90ab265cc097ae3d623c31dcebf5096a62c660d6f7d6fb1c3f3d4e3f
-EBUILD flask-api-1.1.ebuild 778 BLAKE2B 07461b75c179dc6ead1586d9a3da01b20e8d3da3bff939648a51dfcd5d7f0a8f3544fb4fa28f8ccea6c9283d936eda7a9548e9a56e76a7c6bccd51ca0ed5f63f SHA512 71e7e58397742bb6fa1652b46bc3701fa29a2b6dc3ab45b904b154c8a8af6abd0a22e6d71c1c28b6bd667c2d1eaea7dae12da0281d666541aa92667f03c500b7
 EBUILD flask-api-2.0.ebuild 682 BLAKE2B a471ae91b87ec3b644dd274edb0b6fe78508dbfc7f6fd47d3aead5598abc85aefec87b1e78fc5ff082e497230689e9cdd144278493d749e7f6abda762e47eec5 SHA512 4385a2880b33bb1dd99bc36f399eb1abd4c4df4433035488d956e43e85dd8b0c85acc2cddea828d674382249ac5c136335e9eb1c2bca3268e8bb712c4869841a
 MISC metadata.xml 617 BLAKE2B 3da9d7dd713ae8f74c5ef2115935858737181082e2b86612927efcf6e47d9bce5a0d8117668155f530327180277d70ada57fc13e6a00e612440fb3321e29229a SHA512 d51812d4a625cc9f05847be119f068a574df2f9f4d51e8021b91a355faf3514c5911ebcf49c1f87f58ac64e56eb39ec4b2d0178af1680fae8c178f35d3d213a7
diff --git a/dev-python/flask-api/flask-api-1.1.ebuild b/dev-python/flask-api/flask-api-1.1.ebuild
deleted file mode 100644
index 69f4d0e2b650..000000000000
--- a/dev-python/flask-api/flask-api-1.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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}]
-	dev-python/markdown[${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 -vv || die
-}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 9ddb7fd3acc9..d8af2b1ff5d6 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Babel-0.12.2.tar.gz 44567 BLAKE2B a164dd527595412c451ee7bd772c8579f76d0202df3e1cb4c4952dab4aa4225001f5fa35938e72892a6452da1a9b70b2fd661249b2f37953fe3963046631d384 SHA512 c43bf5cf6c66e3a8a52298f52bd6300cf0b0c53a1f0fb5862b1bcf8a9800ea0e043c9f85125bb9eb5c281a3c0583c63f0f9653792204883a6f82080547b37104
 DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
-EBUILD flask-babel-0.12.2.ebuild 1219 BLAKE2B 2a79a0d93377e862f9ead3fd702f789d940bd26522e3f8155843d289b00d1d4995ce26b3fc2d1825332125ac70b85ab2beb85a0765e8f9a41aa993468c08781b SHA512 e24f0e41a70cc1e98616d2a149f3cb247f0beff65fa8dd0df5e67d2534ccfc12f2d41d39a13c5b544bf8e36073124c63d92b305c6f514312c516d117f964b16d
-EBUILD flask-babel-1.0.0.ebuild 950 BLAKE2B 4cc5104320e13c622cec76e155649f19c1a52f7cc45e6e79e1c4d12ae720e84ddab1f3ad8de4782cf58cbe8a30373d90f8087ac980073c69f4daa3beab7a0387 SHA512 2eedf1ba14d5916c6f406ba9dc6aeaa2ed93254847c5bfd68bfa1de7acc4c70a5f677f1929d8cf58d863bb853a48209f984ce661bc961cd5bba3eb14055f5592
-MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
+EBUILD flask-babel-1.0.0.ebuild 947 BLAKE2B 830deb1ecc673a4609257766ac430a048d4850ba64f67330785a8e96b405839c14b47052f8a5dfb355c95c1f0637b6a365d3cc81fca9a50e83d37bfcad07c4ce SHA512 877d3a3a50810465f059ab832916405b580c244b79e12c42e4879f9ee6f11232750cda2e251e2488e172fb8be5c1510f7d237627c000b17529770f487b6bb328
+MISC metadata.xml 474 BLAKE2B 36e79f81c6890109b98f7ab2da037e18fd85cc34f1cbf6f8ecaac683284b3385fa15848922d725feb08a063100005dc2d159066d8ff37199cfc5778474d6e442 SHA512 a1f2ada6b9ddd886fa70b3d79c6afd3c066dff22ffb7bcf8ad8b8e02353a0910b96c25c8320879e5f3c137c41bb52d7c4249cb3fe486f13336e725f98df25f2f
diff --git a/dev-python/flask-babel/flask-babel-0.12.2.ebuild b/dev-python/flask-babel/flask-babel-0.12.2.ebuild
deleted file mode 100644
index 3bbb1fde3788..000000000000
--- a/dev-python/flask-babel/flask-babel-0.12.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
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-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 ~arm arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -i -e "s/, 'sphinx.ext.intersphinx'//" 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 -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
index 59c7c7d3d1ac..3ad5aeec4a4f 100644
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-babel/metadata.xml b/dev-python/flask-babel/metadata.xml
index ee71c5b56de2..ae0c3e4cd576 100644
--- a/dev-python/flask-babel/metadata.xml
+++ b/dev-python/flask-babel/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Babel</remote-id>
 		<remote-id type="github">python-babel/flask-babel</remote-id>
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 56f028007d2e..c981d304d334 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,6 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
-DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
-EBUILD flask-babelex-0.9.3.ebuild 1153 BLAKE2B fe7bbcecc3230f07262c3b04b5e73db6081723d47f8ab9a9c21762afdbe0e31a080878e812bf2f9805362047f97b7445412e2bffa72fd3608cb02214684265d7 SHA512 1f50e8322e1e8bb680e7ae8f7825b7a29ca239575e4b9b5e9d1ae6ceef1af61a16b9062ddb1d326c3d27a4c288cecdbb3fa243fe9fe476b49ca28c8f2b0b5251
-EBUILD flask-babelex-0.9.4.ebuild 958 BLAKE2B 9384812ec3c5e2614f144d3404fabdafb5ec48838f5626f2bada47a8a440a522ab4a7d4b018201d0f776a637a0d8b6ce0141079b0a6546ad0578747ee1a45688 SHA512 b3603509ac26afaaa703bd7de646991982b8051afa48e7a2373bd37dd518ec07e4260a26e2de266135e0eb453767a0b7cdcd59e803ae3e1793b6286fd4cdcf54
-MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
+EBUILD flask-babelex-0.9.4.ebuild 956 BLAKE2B 3a1bd444f3fd40bf15908ec3344d2b566df9cf1210bfe8178bdb23cf74707e5c57e5e988b260aa582e561aae756e1268b6e906c41af8527090075d73bbaa9c92 SHA512 529c347da6f6f5086bfdbaf7424ffae4a4e2a7e0152823ea43313320b1898f74dea12024b51f37fb9b3622cdf0605bf1b50c588a22880ec4baacaf5779e6abe0
+MISC metadata.xml 413 BLAKE2B eef637e58f0b117400dc66a32777b299aaeca4d3c518660e02e71ec002e1f14ff03e2c84632aa1bb0fa8d22e7fa2f3f83dfd79be154ac1dcf9f5067c80d34280 SHA512 6a99b26c0b81ec377ddf9c0ba09479883a6e12b8141c0e2f8a20a916a7b0a80340a5e025c25e9b607df5d255f632a1c6b52fb0eee5d80024367fe0dae3d5cba8
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
deleted file mode 100644
index d456090df048..000000000000
--- a/dev-python/flask-babelex/flask-babelex-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=( python3_{6,7,8} )
-inherit distutils-r1
-
-MY_PN="Flask-BabelEx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Adds i18n/l10n support to Flask applications"
-HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-tests-fix.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index b24481782f87..d0dcd208477f 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-babelex/metadata.xml b/dev-python/flask-babelex/metadata.xml
index ad8b7279ec7a..0f8e16df446a 100644
--- a/dev-python/flask-babelex/metadata.xml
+++ b/dev-python/flask-babelex/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Flask-BabelEx</remote-id>
     <remote-id type="github">mrjoes/flask-babelex</remote-id>
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 08b69db8ea74..43dde48c6d34 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
 DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
-EBUILD flask-htmlmin-1.5.2.ebuild 618 BLAKE2B c072af5c880c4b618e6e55b6d6426b3b67a8d2511ce438a61a63049af4e02c53b208dfd0eaacc0a1c3f10c5ea471fc354c15f5c3ded39e005d16ded396071f5a SHA512 fcac3b12e5253cba9eb9fdf8324358f6e7aeba81ff655e0037a751b9b13170e08ff0a27d6575e8f8b63331c481f4352b39dbb159e92a096c26c088fe5ac74488
-EBUILD flask-htmlmin-2.0.2.ebuild 688 BLAKE2B 3aec15c31c78a377c2c98dfa2789d8edc692c6d5a7a120da03d12b94eb9d19bc490191690dc2406f5ff75da8f320ebb18de21b6605d2fe09d7c1b6c22adaaef5 SHA512 6969bcd5cb7bc7e4c88341f95fcaca2db5af0df158f807ae644b63638ed6cab5e68a93d2729773989cf405f173bec4aca16f781e784fe1038ba36c2fb0e83267
-MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
+EBUILD flask-htmlmin-2.0.2.ebuild 686 BLAKE2B df9c38bc4bf336ed71a7584d0d7f38548e18f5edeb3928c242ea9da22fcb996e7e6e4e204c3b81c7ca219a9df72b6fd9f650dfc2586bc77ebf0493fec36d4ebd SHA512 f454008f267fe67e78921a20405b3a5a9f370ea09acab3dca737446b36e707711544d583878056c7261ed8ad9f34a97cf1ca0f9cd90d192b784d76ce929e227a
+MISC metadata.xml 454 BLAKE2B 9edcbbc782ba0dfa1aaadc7ce793e1d3af60ee3ddd045a6fbbc0920f74599e4c251ea19b226de137a322d1c959af207b62c8f8886e7c533df1a0fb02bdd84e8c SHA512 775939a3cbdb3ac75c0996b25cef5cd8e8d2060eca521af4bad3d261455f0fa5566d83a6f9cf756ced03fe163df966d4ca9ba6a92e5872c8b4b6f1e29a6d59b3
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
deleted file mode 100644
index 7c60730ff5b9..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.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=7
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-text/htmlmin[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
index 4a13092ac2d1..5540c3ca0465 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-text/htmlmin[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/metadata.xml b/dev-python/flask-htmlmin/metadata.xml
index d80478200fa2..ab9923f6c014 100644
--- a/dev-python/flask-htmlmin/metadata.xml
+++ b/dev-python/flask-htmlmin/metadata.xml
@@ -9,6 +9,7 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-HTMLmin</remote-id>
 	</upstream>
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index fd5a17d0f891..297b10bfa9f4 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,5 +1,3 @@
-DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
-EBUILD flask-login-0.4.1-r1.ebuild 1352 BLAKE2B 9dc724adc0f52fa28a76f79cf8d51ea56833529ef01d4a0593a33fa4a8840a34d99d7366f0a67e5d7b2f656f62ab4595da92c4da7c03ce75d80fa7996b3179a3 SHA512 f862b535f22dba61154148c837a043309223ec5067ecf89f4f35845f7f6dda756f4854d722dea6ba5e5ceb874dc940f0d41bd63c7f81b76ca78d604ac1a5a6ae
-EBUILD flask-login-0.5.0.ebuild 929 BLAKE2B c77ea08c700741b4e4123681094ebd79cdf9af40c54e334718002443a4f09030a6c1a8d74cc07da4085ccdc382e6796587811de3d431d690f3557afc3e02bdeb SHA512 6e82f306797ceeada47eb75a3b282374a0d703d204922ca4c59ddbd69afba1d811bc706e8c4c762cc3e84c5ad4880005c15cc9d0eeed338d790c2fa599c0341f
-MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
+EBUILD flask-login-0.5.0.ebuild 927 BLAKE2B 64e0eb41ccfa89fa9e86c5b8ad601b2db03798aa151f809dfbb4469f5a4ced583aa0e22f828d608a8bfa334af1368c22ab5f81f24144b675fcc7e840ffa84cbf SHA512 2516247e39f070b034f51cfa7419a595a41618bff4ef6bd690726ade0d2e1d0602308a8189cd3088b2184b767a9a3047b3d6f0d0a14473db0b4e90c92bc2ad96
+MISC metadata.xml 403 BLAKE2B 975f428a5370ac440d4b4c6d257a91ed91fa463bf62491130010a73f87978b68468fade0b44fce56854b52fe0b64c3b77bfa676025b5ccdfd75214c3e43b5ce6 SHA512 5b702e0e8a7d848d1f09f0282c790132a8fbd3bd44596a3e9ddcf13228f93dd67e38c332fa444fc21eb4999be8fae38c64d576b5b59aaa73d650c3efc9c420f4
diff --git a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
deleted file mode 100644
index b65ef6f89e3c..000000000000
--- a/dev-python/flask-login/flask-login-0.4.1-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=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Login/"
-# Should be replaced with the PyPi URI for the next release, if possible
-# See https://github.com/maxcountryman/flask-login/pull/393
-SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i "s/'sphinx.ext.intersphinx', //" docs/conf.py || 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() {
-	# test is broken upstream with >=dev-python/werkzeug-0.15, bug 701546
-	nosetests -v -e test_unauthorized_uses_host_from_x_forwarded_for_header \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 8e7912b379c7..8f2d36b5fd56 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-login/metadata.xml b/dev-python/flask-login/metadata.xml
index 4f9b3ffa2782..43477f894bb5 100644
--- a/dev-python/flask-login/metadata.xml
+++ b/dev-python/flask-login/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Login</remote-id>
 		<remote-id type="github">maxcountryman/flask-login</remote-id>
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 5f2ba33aeb3f..3e5f10bc5160 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,5 +1,3 @@
-DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
 DIST flask-mongoengine-0.9.5.gh.tar.gz 120281 BLAKE2B 454602e7e7f26db731379b01492c6cb1adf01369fd268236407c57753aeb68f17ce62d4c2e665e493d3c7c632e4f263af02b59e6580893afcc7b8659247fb42f SHA512 3588ae25e2f3643f5e240990f424b4f3754cea2f880b7b454c98afb3ea98fd81b783d74a45cf685fe59cfa8159b1ac39e840071f364ce98fb1a25cc9a09e0d5f
-EBUILD flask-mongoengine-0.9.3-r1.ebuild 1154 BLAKE2B 9e7bd0576d65e60b10d085708193c5d75cdcebc11acc1aa9f25659e33a5ea8e9bc8f713259eb9ecd126fddbdb2b475ef32102f2cc48d97d70b0adb82152e07fd SHA512 80f0a291e4945628b5dd7085c32a32df5aa31a136bfbb887f8ce30c0b54669f42e6ee78cb4551d08e5fdfd24f8cc56a148053692913ce2991f035963ad68f8bb
-EBUILD flask-mongoengine-0.9.5.ebuild 1113 BLAKE2B f75df16c8482477e8277a55ccc3f6fb75f9c946e5f5e1ff5d229ea4cce88575cb069d722eb24ebc817e1ef93cf46d500ef8f5fdd5ca64863791993e15f58c221 SHA512 c0f3fc48259708bc675ce48528add14c8c00330d05f5e80c003e4dbdbaf005feb55ba89b4a5b2a400af7d4d36073fa8b28c2d339a89c4316c389ef5b99d19e50
-MISC metadata.xml 330 BLAKE2B 590f7ce9feffc4646a100469830bd4db174302fe419eb50ebc227fa9e7ae543b4d2a2da0d74b333ee4ea9db3c54a2ec9858f9f3cad7e6e063a4609ba11d18f00 SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66
+EBUILD flask-mongoengine-0.9.5.ebuild 1111 BLAKE2B b8bf5c3d3da4db7bcd1b275b35beac3c524086e9de95cf6e9c2169626f141979d2d87c4b87ae157e6fa74dfb11f892e889a544123ae486c3e2c8569655f822dd SHA512 862bcba2dfb6d0861309f246635972f9f982ab82e97b62f35a0a976bcbbe386bbd472b492824f70623a8cff6024ae0be68c1855bec06ac99b04a9ff7b92e190b
+MISC metadata.xml 355 BLAKE2B a5593b10b9a324da9a4240a118e6c72ded78aa7f724b5ecd4edb411e34bd6ac52bbff70c8af057b0ca2504d391eea7c79bd7c1f3bb57379e0d22fe2f6471e6ae SHA512 f8a3a52e7eea0421629f8c11b0497b9f273355419de501c5406804866b91e834fde3f7262100b18e52704cbf9fc63c224a77c0cd1ccbcb10ea08a2b353a3bacf
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
deleted file mode 100644
index 05409dd02b52..000000000000
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.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=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-RESTRICT="test" # requires running MongoDB server
-
-DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
-	dev-python/flask-wtf[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# fix distutils sandbox violation due to missing test-deps in normal build
-	sed -i '/test_requirements/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-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/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
index b135ef5e0f36..b17ac47452ff 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # TODO: make it spawn a local mongodb instance
 RESTRICT="test"
 
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
index 2ef0c031b99c..794af7239fb7 100644
--- a/dev-python/flask-mongoengine/metadata.xml
+++ b/dev-python/flask-mongoengine/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">flask-mongoengine</remote-id>
   </upstream>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 207e4d63cdeb..9fa45a3dbdb2 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,6 +1,4 @@
 AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0577554fca082418c2421eb8012be2e234699eab54f2690d237dbd490f536eae5fe0fdfd8fedad16fc60bd92351f66c93a7a4 SHA512 96db20a0850f37ebb90fad0964448783c3af8b9b8128709fc52d509f9b1edad72455330a09f81b4b766eea7b88f3b79fb01e112f1684be7776a8b3a78ab90a19
-DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
 DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
-EBUILD flask-restful-0.3.7.ebuild 1201 BLAKE2B 4c1841cd167a50a4acf19023f59b1b9a808fe18c22fda015d51bb340db9492a905a782ac954437f43ad5510df3c538d7f3e3df9f11b679001c58d6dcc5d8dbe5 SHA512 14f52af657fc042315252fced1d376b1979900d6cf07eee517fbc0165e21b1a69000ae8826fc256e837016231adb08a7851d2b3afbc4a8fee2595acf3654c1a2
-EBUILD flask-restful-0.3.8.ebuild 989 BLAKE2B 200ddfa40bae21a02d360b20f0aa851352b93d4a9227adfae3e6397a58ab44af6aaeae2c6b5e7477cc41a3e5581ea02cc3d0155197ea392862a8eacd3e35c8a8 SHA512 46c585428e84aed32e856632fdae0b94295c5d3211e4d191ed43b122023e96c340d91d11f85973c19717fefdce782370e241c4f1faffefea1658555a14e8fe28
-MISC metadata.xml 325 BLAKE2B 9c13e94c78d9f908263c1d775ca99b1425388b1fa75ab8a643c08ab1097338a6bf61d09a4a2518b896c44cb4f8b0d2ed5825f7e8b8ab70d53693a07e055f2c34 SHA512 4571c1bc5e8a1a103b024bc97538c1daab53f84fda86af428d9434365f6c3ceb43b5fd2ffa24abfb095ac1cea865f571d933472c0a6648899069b187b923e5c4
+EBUILD flask-restful-0.3.8.ebuild 987 BLAKE2B 620c70d1318b4e55da6bfaf171b51055c2d2df5d2099ee6a1fead872cfacbb9a00698a04377bea80db7bc4b92a488ace537b5536f6054394cc638543b0ffa91a SHA512 14d732daf0ce2119811b30e1dfacc0e4bb65f78759bd325eea30a692793c29932674aaccdabbf13cf4774f8474a4d7d658d539a67e3ae4675fe2c9142f6075e1
+MISC metadata.xml 349 BLAKE2B ca6c5de3fcfddca1b3e6766ffa3dc82294b24cc533842dfc31d05a64f6b3949ac928e72d9e9d53493f2fa8e0b79875196a7c37e13e82df3a965a44572854bd9f SHA512 f2fd44852255396e94d2e1c61b1f47a7e87d51cbe7d5a3f0451020daacb69cf4f5de6620d092470537f3693d9dd816d597c4ecd8fb80bfb9e7a71d9bb49c4a9f
diff --git a/dev-python/flask-restful/flask-restful-0.3.7.ebuild b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
deleted file mode 100644
index 3b9a6bd9d809..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.7.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,7} )
-
-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 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}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${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.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
index 6c63dc0f5957..f991e3e9ba38 100644
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
index 51b801a00632..ee91a7f4854b 100644
--- a/dev-python/flask-restful/metadata.xml
+++ b/dev-python/flask-restful/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">twilio/flask-restful</remote-id>
 	</upstream>
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 14932d47bc64..a15133caf48e 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,8 @@
+AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
 DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
+DIST flask-security-3.4.3.gh.tar.gz 346540 BLAKE2B ab3b037282bc5b7777ceeaaaf869996f471bc3b954f0b2cf6d17ba44d4014c8c3ac8e34618bc7347bbd1cd6b1c649b49407cb05aad9bd748191c08b7326f679a SHA512 23ad8bc91df418361a556827ff8369777f3716dfd1c97fef6237ba9cb07813eac4033eb3fed80e9ebadeab4f2d2a956b5a652bec80825f939a9fc7d817aa3d90
+DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
 EBUILD flask-security-3.0.0.ebuild 1341 BLAKE2B fda0b3ef0eb3905478e61b3dd9b0728f974e090009af723aef9d5707196a875e992c0603f459cbc6c413ddae9bf4044ab6dbdf2dffe0f3deb5a02260eb28430c SHA512 9baf9297cc339569409cf9403bf9bf986433b236499e758406ecfb56751849fa3d1a2197da8e88f1aa64751224969c32330a6284def06806154f3a378774c90e
-MISC metadata.xml 317 BLAKE2B 4889668ab37b857d0e46000d1663eb953b8f54b20e9ea16979d9db73b6d96b3fa8317bbb5cb10d9e4b4cf0268b966531e33b1bc4a9ab9758768120466999e9cd SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2
+EBUILD flask-security-3.4.3.ebuild 2137 BLAKE2B 541017d82745dd97953cdb88760b3991613aeb0c1d01e9e5c5cf7d1dfa19aa89fb001d51f439152a68bbd3a99b1c61232a2c1b246be90b8092f0f5a111cb057f SHA512 bf7cca110f94552e6836b424094687ebabf37180196fb461a9c10589f51fe225233d0196ae952b80e262a75fc8df98426f38929ccbfb834236ae3281c26ba55e
+EBUILD flask-security-3.4.4.ebuild 2144 BLAKE2B 2aaf0c0290e6121c14325c1f4d158c646028ce871051f96d6027dffa095b035b20547e46cfdd11b9ba37bd8275e782c6eb64df75724f5243753c8dabeb3c47b9 SHA512 c1767593e7d093e61f94a8e36ab995debe7ba352d420412d8eff61a942bf2aff86b9753dfcde8d9487bfb212daa578e67a4c3b31a1b5c2eb3c610e28d980db13
+MISC metadata.xml 341 BLAKE2B e33881ccf51b30de5fa6831f144035f0e895f2e1720ef7ca9360a1196b7d6c587f736d4d868afbdbd6678ea020f41164a41c0ab99069bdddd253b7e5b9d80d04 SHA512 ec87dffdadc946be52ca0a12d9265250f5a0e08e833c0cbd6deda1e8eb70354c2fea0bdfcdbe86fc16072138972881112cc5a5b08f4179b85f89695b5b22f30d
diff --git a/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch b/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
new file mode 100644
index 000000000000..484e816908f4
--- /dev/null
+++ b/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
@@ -0,0 +1,63 @@
+From 8943f49c3e6064839bd1e3c2c73a750b2b476ae3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Jul 2020 09:02:15 +0200
+Subject: [PATCH 1/2] tests: Skip tests requiring specific data backends if not
+ available
+
+Skip tests that require a specific database backend if the respective
+package is not available.  This is mostly intended to make it possible
+to test flask-security on Python 3.9 since Pony does not support this
+Python version but there is no harm in extending it to other backends.
+
+Technically, Flask-SQLAlchemy is still required due to other tests.
+---
+ tests/conftest.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 3305d92..a48f480 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -218,6 +218,7 @@ def mongoengine_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def mongoengine_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('flask_mongoengine')
+     from flask_mongoengine import MongoEngine
+     from mongoengine.fields import (
+         BooleanField,
+@@ -282,6 +283,7 @@ def sqlalchemy_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def sqlalchemy_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('flask_sqlalchemy')
+     from flask_sqlalchemy import SQLAlchemy
+     from flask_security.models import fsqla_v2 as fsqla
+ 
+@@ -326,6 +328,7 @@ def sqlalchemy_session_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def sqlalchemy_session_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('sqlalchemy')
+     from sqlalchemy import create_engine
+     from sqlalchemy.orm import scoped_session, sessionmaker, relationship, backref
+     from sqlalchemy.ext.declarative import declarative_base
+@@ -426,6 +429,7 @@ def peewee_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def peewee_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('peewee')
+     from peewee import (
+         TextField,
+         DateTimeField,
+@@ -522,6 +526,7 @@ def pony_datastore(request, app, tmpdir, realdburl):
+ 
+ def pony_setup(request, app, tmpdir, realdburl):
+ 
++    pytest.importorskip('pony')
+     from pony.orm import Database, Optional, Required, Set
+     from pony.orm.core import SetInstance
+ 
+-- 
+2.27.0
+
diff --git a/dev-python/flask-security/flask-security-3.4.3.ebuild b/dev-python/flask-security/flask-security-3.4.3.ebuild
new file mode 100644
index 000000000000..3044071d1a63
--- /dev/null
+++ b/dev-python/flask-security/flask-security-3.4.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="
+	https://github.com/Flask-Middleware/flask-security/
+	https://pypi.org/project/Flask-Security-Too/"
+SRC_URI="
+	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.0.5[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
+		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_{6,7})
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-optional-deps.patch
+)
+
+src_prepare() {
+	sed -i -e '/setup_requires/d' setup.py || die
+	sed -e 's:--cov flask_security::' \
+		-e 's:--cov-report term-missing::' \
+		-e 's:--black::' \
+		-e 's:--flake8::' \
+		-e 's:--cache-clear::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/flask-security/flask-security-3.4.4.ebuild b/dev-python/flask-security/flask-security-3.4.4.ebuild
new file mode 100644
index 000000000000..18073cabe061
--- /dev/null
+++ b/dev-python/flask-security/flask-security-3.4.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="
+	https://github.com/Flask-Middleware/flask-security/
+	https://pypi.org/project/Flask-Security-Too/"
+SRC_URI="
+	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.0.5[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
+		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_{6,7})
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-optional-deps.patch
+)
+
+src_prepare() {
+	sed -i -e '/setup_requires/d' setup.py || die
+	sed -e 's:--cov flask_security::' \
+		-e 's:--cov-report term-missing::' \
+		-e 's:--black::' \
+		-e 's:--flake8::' \
+		-e 's:--cache-clear::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/flask-security/metadata.xml b/dev-python/flask-security/metadata.xml
index 2ac97148200c..bd009040dd29 100644
--- a/dev-python/flask-security/metadata.xml
+++ b/dev-python/flask-security/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-Security</remote-id>
 	</upstream>
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index f1e4ad38fcdb..4c44233f4ea2 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2.ebuild 553 BLAKE2B 1d10671520c096c8659db788fe8a0b00f601dd30a7b18ce4b21dfad875fbdcbde48c3f87a9281c7f32b4a69b00960f012de6771781323653282f7391516bd376 SHA512 8a4b30ae5ede318cc7685bf36445b97402d1013935fb65ddfcf7d53eb2cbbe2f87ac8c7c904450ae88b98b83d5374dac26c01c7a5792ccd4c0cfb7d9fc971cc1
+EBUILD flask-sphinx-themes-1.0.2.ebuild 543 BLAKE2B 0330763b7516712125cc9ed2b7bb98e5631f54e1e985f679dc343a019546a37d2fb83c569194d1aab10442c62bf927d28748b41cc7be2b1cfdffbe144b6527d5 SHA512 42807989c50cf712e61ecf8724bfc268b45594d64afb6eb628128d781aede21084fa899361fe5212d004dfa370ecef512e7ab61bf93841507ea35f3e9a1df49c
 MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
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 15f683023120..66c669a90888 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
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 362504eee927..4fd143b5cfc8 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-SQLAlchemy-2.4.1.tar.gz 128863 BLAKE2B 5ce87601a5dbeb8505144c0970eecd0bf553ad3feccd74e7de567a4fe0702575c6f7935d4812410ced17b7b98e6b8e6fcb67a589681cd82464fa4cf0dc09ba74 SHA512 a55e6fe563583e240bb594c157424fba1a8462f953fa0bb14701954bcb52d1e7bf71eec38f4037c1752ceab90e798642274de58e0f950d83e234f4c702e0b6ee
-DIST Flask-SQLAlchemy-2.4.3.tar.gz 132134 BLAKE2B fb4df0daea347021334934ec1b22b18f9c4f97b6cf07c1c74f0d1567c6f0c3e0d16909f67adef89e8236e8a53e4126f1598fb21dc6f7fa5f5e042cbe733238fb SHA512 231593d53b02c4560eeb74dca7075495eb6fb4a75a4d25257aa281401dac39ac3ab2ef0edfd76ce762332c599b9bf2d903743142056a827a3170709516e94445
-EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 688 BLAKE2B 85af2a60151a0e132d9bfa9ae73a681cfd1c3fadd5c0485faa5ffd2aed4a6ae23080dbe66da6d99659015cee99a15bb397c0c0a11be1d852d86437175276ac85 SHA512 009fc89417d29260b36b789d72c5c2dd722dac8e7249f3ecdc84a7036bc20f26949c8ea71acbcf4b4fcc33d5e8ac7f0dff5d2e8a2cda8da1ee3665867594ab0b
-EBUILD flask-sqlalchemy-2.4.3.ebuild 690 BLAKE2B 3d526d3bb7238452433e4fbb221717cee4831d52b13bccf9b8c6921b9cd990bc6634f8028012d66da576b7fb2ef42d182121fafb89eefce0a720d77670acc650 SHA512 f748d247ab5067005c13d615329167af53404fe07267b8b9049c83bcb8da53bc67fe848b3e738088176ece75f4ca0495b56901a45d155f6cd54d73e27a9c91cc
+DIST Flask-SQLAlchemy-2.4.4.tar.gz 132193 BLAKE2B 044885af05463bfe377ef503baea6fe8b4a988e1f23aa6e8165ba76f85626d5b596226eabd7d69b984848149c8401b136806e8a68ed568d4cce97acbf402cbb4 SHA512 9d952a39f3d116306ae15c8f802780c987e54dbe519612a9b699bb77e8a45f272e90f994697f881283d1eaf5767d42eaef2ca017d22c08e48596d385d942b1ee
+EBUILD flask-sqlalchemy-2.4.4.ebuild 700 BLAKE2B 222c6abd1d622c120925e5bcd41fe92701268bc094388b850c7354b4b6166ca2e79d5ac320457089de31dd54bf2814267cb2afe63db85aad5e520c7ddb71c30e SHA512 2cc305657a834b5e28eb6cadb2f41f8e5004deeb65b18fa9d9709aaada5a3b1ff99fd0138a8408be55384efe108a4c7027f718cf0ed74579b50c6f520a287bac
 MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
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
deleted file mode 100644
index 1df802f3bd41..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-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=( pypy3 python3_{6..9} )
-
-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"
-
-RDEPEND="
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild
deleted file mode 100644
index 5733e429063d..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.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=( pypy3 python3_{6..9} )
-
-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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
new file mode 100644
index 000000000000..8778cdded3f3
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.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=( pypy3 python3_{6..9} )
+
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 6adac3a01238..ed18c3f2c425 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
 DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
-EBUILD flask-wtf-0.14.2-r1.ebuild 1375 BLAKE2B 413fd63e30135c2febc89379f662c314c7ffcce9cc3a1013ad07fd90a4088626bcc8b5717296e1b81bff0e14104ace4a6ebfb36be5c59d825b8df7230e8540d0 SHA512 ae65bf4d5f17491a29edc19f8688b26b489d2d239d4a808ce0c545f069c47294469b78ef9c8a1cab5fe5676c8c9f49df19f8190707aa50567ee1318b5f1f214d
-EBUILD flask-wtf-0.14.3.ebuild 1028 BLAKE2B 532cc5f12253ccecf24b2264af19416fd755a778e4cfa075e8160ca455fed54b5d6b5b140cfef33b51c8177a609eb8faf789be13d77de7590166dd1765a85470 SHA512 08e5d6b395079edc51a93c3b09a370576f59b5166b4e409dc5027c59e8330e9e3c41873d11300c63ea131ea329b0e38a4aa19227a76028cd10ec7af9e0f9fc65
-MISC metadata.xml 476 BLAKE2B 1f03a8124103425d2987148f9d83bdf1171b343c2025ad453504a020a3271801368aa2ef510c00f1779813336cd56955b40a0225d139bf82d74eb9fa8da8016b SHA512 5e4d7655da5bc99c41c4eab7f182ecc6d24626fad8bf74bc9baf47e6c9f6c692bc3e69f717fb4d7a149c5b097934d13064843a2846988dcb746fb8696257ac61
+EBUILD flask-wtf-0.14.3.ebuild 1030 BLAKE2B 551477d7002cd792e46c5a3624e9f3ab8d3c57256db9cc721d64603fc0005cc246d40476cc585c0330d7f40ce504ce6a2ef35c80746042c301fbb6985004c33a SHA512 b7bbdf585acb1e8cb7408d662af40559bd1a6be931a87bf3217920a92211edc0412015c898f7bb7fd8a06adfa8692b8ba75468aa23ed6d54dba87e618273a365
+MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
deleted file mode 100644
index 959ec5c33977..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.14.2-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=( python3_{6,7,8} )
-inherit distutils-r1
-
-MY_PN="Flask-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${RDEPEND}
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	# tries to access things over the network
-	rm tests/test_recaptcha.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 with ${EPYTHON}"
-}
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
index 49e218201e0f..c9b1f2fa5be6 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
@@ -16,12 +16,12 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-babel[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
index 5606288a2626..0d1a899e6b32 100644
--- a/dev-python/flask-wtf/metadata.xml
+++ b/dev-python/flask-wtf/metadata.xml
@@ -5,6 +5,7 @@
         <email>python@gentoo.org</email>
         <name>Python</name>
     </maintainer>
+    <stabilize-allarches/>
     <upstream>
         <remote-id type="pypi">Flask-WTF</remote-id>
         <remote-id type="github">lepture/flask-wtf</remote-id>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 93dfa7836478..50ce347af5cf 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
-EBUILD flask-1.1.2.ebuild 1331 BLAKE2B c9721dad0a9e94b65f4c7b3f6b1afe645c7a0a5a8821bb5a51ba605da4ce9156186fd98c1ecfe48338510461c201fb523735e5a4383926b4bbede44e93ca9f84 SHA512 9fc78e36f192338d60fcced3d749de5030a28a8a0137d2c605c4cfb7fcd9829c1d6614dc6894f5a5544f3e5d21beddfa4002785e06665f13cfa247d863da021b
+EBUILD flask-1.1.2.ebuild 1330 BLAKE2B 1bc76164ee22c6a3bbdaa06b36c6c927647760f947e117b4205e87b056f705386f11188552620d68f5d0373fa9e9f0323ca0bd721096f2892fd31369d08a6d3d SHA512 278eb7bdb8311efb258abade66683d121bfd78b4a9e411eb1549b627bda665501257f3aec3339fea740b79bf54d4b179e5d3d1d4cf3b8dd5ea4923eac072cb26
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
 MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
diff --git a/dev-python/flask/flask-1.1.2.ebuild b/dev-python/flask/flask-1.1.2.ebuild
index 2cdde4f69bd0..c76b57aee912 100644
--- a/dev-python/flask/flask-1.1.2.ebuild
+++ b/dev-python/flask/flask-1.1.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 7ec4dfd192be..1b75c5aae9ef 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.tar.gz 11286 BLAKE2B 9286d9d53bfca515ff01d329decc61201b8bc6231db8700d920530b21b8a213769f4c092ea4af901168ff31f57641f46853cd9d52a6a90398ec8b6ec67b7fb0b SHA512 d7059508908c6bc7f421d04c0f8dbc9884015009b3601822489119853d851f2bf3aab941a96d19b354edf3c9c377625d0faf7b92f7a63a6d597e6ceac4abcf2d
-EBUILD flatbuffers-1.12.ebuild 435 BLAKE2B 25cc7df522ade0a36fdb3e386324eb9e4d9574b010598a0bd3a710b854c4507f4c02d76dd5193a0889ae8316de76b940465fcc618597b97218200a32fc11ebc1 SHA512 66d6b69743a0e01d6826b5bc7e5ef1fdad93ff5302738c5b95cee76dd71be70b5c13f066f5a20812c8fcedd9aa6cbfc6dad6c814f0640a5419f62de7b33c3bf3
+EBUILD flatbuffers-1.12.ebuild 431 BLAKE2B be469b95f862114bbad4f587fbe938ff746b13f08d36775df4db6881748c3585e9ceba1829cdfcd9c679df934a34afe25bcb27572056987f261d043c1b4cc6f3 SHA512 6a5424d66e728f4589bd05670b400abe2eb93bbc34e5366d811e99b4c6f18dc806e32cbc9bdd28e6bb9e966840f59a811ac9c263603b1498eed70d2d0b15ed42
 MISC metadata.xml 341 BLAKE2B 977ad4559ebb4cc73818553b4a725b63516d5522e170726818c01800a692729394c399bff12ce4e1e9859ac577b3b47673901f76e1a8c431b59e9a2f51461a59 SHA512 bfb03828d98e2316bc1614f2491ccfcfd5f1f3a858397b40755b64c6f550391061fba3933fcf28f11f881145f90754a7d5d28396a574c8a16c2040deaf364de0
diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
index 746446bbf3b3..d51ae9856aad 100644
--- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
@@ -12,4 +12,4 @@ 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"
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index c1d399282f3f..97f50d943ba0 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,4 +1,3 @@
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-2.4.9-r1.ebuild 1378 BLAKE2B 7633a962d06dcdd51739f05510b8fbd45d5abb1a75acb3cc672be45ebcc45de86302c086fb86ad8f298ee211085d842ca11045284c75215b9cef93917531c7e6 SHA512 f548981a318b4199606204438d4b943bb372b9e05d48e4a689efd5ade1a39eaf279f5a2ccc802e5dfce08aa5685fd69f4834efc2717f88b489a8b3295322db20
-EBUILD fs-2.4.9.ebuild 1376 BLAKE2B 45b632ac7d1b5eced7f0de3f32bd14568423aa001af745fe316567c67f269383abc6869b8022cf70aeb6ec99db37520e349d69f70bbd1a74c756f8f23567e8d3 SHA512 c8123c0669b7146439444a44e1ff12f65f3b951bb4df2323873e93a22f3a8aba845a16874f154a05e3222fc31d1012733a6ffe25bb6489b552e3d197a4f01302
+EBUILD fs-2.4.9-r1.ebuild 1214 BLAKE2B ce3ef26fddbcec68143383bce719186cf298f5a283cd560d660666df6b83b523258b2c1468ebf6aab0b2952082a5c3bc46393eec57db8045e8845fbab5ec40e6 SHA512 7bb1743c9d17768b6aba41b7d1410300674fd9d7583bc6a13f4e6ae0d429ef5a48a0199a456dcad2df34b9d9fc9924b6728da70e1439d43771918849edc7863d
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r1.ebuild
index b3ef70757a86..2dc5fca3dcff 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r1.ebuild
@@ -39,11 +39,7 @@ BDEPEND="test? (
 )"
 
 python_test() {
-	# python2_7 tests require dev-python/typing which is
-	# now in stdlib so ignore tests. py2.7 is going away.
-	if python_is_python3; then
-		esetup.py test || die "tests failed"
-	fi
+	esetup.py test
 }
 
 pkg_postinst() {
diff --git a/dev-python/fs/fs-2.4.9.ebuild b/dev-python/fs/fs-2.4.9.ebuild
deleted file mode 100644
index a68ebf6c8e9f..000000000000
--- a/dev-python/fs/fs-2.4.9.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} )
-
-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 arm64 hppa ~ia64 ppc ppc64 s390 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}]"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyftpdlib[${PYTHON_USEDEP}]
-		dev-python/pysendfile[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		' -3)
-)"
-
-python_test() {
-	# python2_7 tests require dev-python/typing which is
-	# now in stdlib so ignore tests. py2.7 is going away.
-	if python_is_python3; then
-		esetup.py test || die "tests failed"
-	fi
-}
-
-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/fsspec/Manifest b/dev-python/fsspec/Manifest
index 40de290d92f3..28f50bdd0a9f 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
 DIST filesystem_spec-0.7.4.tar.gz 222128 BLAKE2B b111b8194e2c31065a26dcd952aaadf0bc39bf75e94b10f79a387dc1b66838de820bcdcd90af60533dbbd33cfcc275470ccd82b98d0c82154f0633efab355187 SHA512 086e7e7905ff4a55b7027d2b005fd875200bf40469ea4b36effb9805a3416145ba4c709c4a6c8a3ac24a033cbd2104e7ebe401e2610db6c2d8548a63587b343a
-EBUILD fsspec-0.7.4.ebuild 766 BLAKE2B cb64ccc8dbc50654c200cb836164c8478b0aecec2abba01532c8bb87b09aa5788ea5a0d239b64f2216e283afa95fc5117804d88ddf9c794f3408e417a7e1146c SHA512 49fc6b4e0b728ee781a6156e10306e32d45b2a9bc4bde4a4608624e0f78d2bee29bd2a79448bfb2eb8b482a4fae8a26dbda28c9cb0b0c262d5756d7f94c2a76c
+DIST filesystem_spec-0.8.0.tar.gz 235922 BLAKE2B 5ca1ce8fe3932ace39f3623217b0918cc7f24c07e86357fd4d3d56630010c37c33e94f0419f5fd6bb86292751ccc93efae305ad3c86c4f94a54b0ae360c9a07d SHA512 55513650f1795657ce274478d4360f2cfc3d2bbd8114df7a458fb3a20277b1594e48b5be38e26154a3af525a169f1e4b3d3c0e387bf3889b78350bacf12cc02b
+EBUILD fsspec-0.7.4.ebuild 804 BLAKE2B dc0ce270b209f58b0d59cf6f67c8c8a5715083f50788fc8297e0b27b3557ff3223be3b9e0ddf7e05e108ed55b54a48bf3121b3cdfa3a7142a611dacdf09d5e51 SHA512 ae45ef85aecbc576a849eb125c621a4f4abecc68cdf212fc62f29486340b674ea441db198d4b9552c5896ae2122dd3972ff0b2322929aa0e3ee61f6ed52f7b48
+EBUILD fsspec-0.8.0.ebuild 818 BLAKE2B bb540631aeb10dc1b3988bb0aceb3d8f9f8f9a8b7dab374e18a914ab765d1331bbc574663437fb09ef18df14849349de8c6bf5ca41122c0fdb500a4e21a08ff6 SHA512 63bcf13edfa4c637fabbb7bf013228b37a9f04468ab28e0850c2fb6d380b55d722ef33eb85538ce9bd1a4a7ea4637a625cb6cc493c145b0938357b8644d153de
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fsspec/fsspec-0.7.4.ebuild b/dev-python/fsspec/fsspec-0.7.4.ebuild
index b3b8bc1fa87c..02ac5ef5f33d 100644
--- a/dev-python/fsspec/fsspec-0.7.4.ebuild
+++ b/dev-python/fsspec/fsspec-0.7.4.ebuild
@@ -18,13 +18,16 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? ( dev-vcs/git )"
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
 
 src_test() {
 	git config --global user.email "you@example.com" || die
diff --git a/dev-python/fsspec/fsspec-0.8.0.ebuild b/dev-python/fsspec/fsspec-0.8.0.ebuild
new file mode 100644
index 000000000000..a70c1f7d5425
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 0c94309d6ff9..a446a3a901d5 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 689 BLAKE2B 9bc9232c09113dbb5b7f104f915f4a8c1e9a4e74f0164609614d96e2622acdf036620f03a7be844cfb33f4c37f8d6c8f11e0bb88324f28589eb144d3988067ed SHA512 ec30c6014deec52d2761f3228e3f73976afb7f0ab6fdc77f7f4993c608a0eebe056f9c7bc3a9f39714f50624a857fcf5f6db80801ba576cdbd7812c8ce4aafeb
+EBUILD funcparserlib-0.3.6-r1.ebuild 702 BLAKE2B c69c8e22a840bee0b3a710cfe247df7844bec0abe877766313468cf50360ff0ed025001d1cc3c68f75a948bd28f57a2abfab8eeff008a214828acd728cdb7892 SHA512 f2ad04e89d6f382a4217e9bb6b527bd71fd1f93577a83a27eecdf4dc592f45a430768b95c7de8db58f64034e877e4b4e941d6fb338b288d29e5518920c38eeae
 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 247045270b9d..5f5bac093052 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 ~ia64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 96fedd00e608..dc463bccc412 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.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
-EBUILD funcy-1.10.1.ebuild 437 BLAKE2B c28ac7940780ec84d5b530c59b87b4e42b47c264d439dcd824e088705fd119553ff0cde812165948b5f572168f9d8611462d6deb59fd6209a090aad4549f0e85 SHA512 78f7d8fd129bda101e70856a1d97f96173117d0da4c277d6a3a6e87ff89b2b4ecf87fe001272bb1888c1e3fdbe83ef81cb4b5bcfc6eb2cd12d8b4cb76cb96b6f
-EBUILD funcy-1.14.ebuild 449 BLAKE2B 5f1e1d501fb85a97bfa6636c87f55590bd80c78e04d14a3f72268a18affc16f73fa2388e3a8b724f65e08baf7d3982c39158b19d7058ac7706a575854c7da747 SHA512 2daa96571002b5c72712a534aa0d1329465d83a32517cb4b7de44fb5babd66598f35f8a1b3f61ce525a4c145838323c90731d5d52c887f2295ecb7b9f537c112
+EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 5bef5e2eedfd364e39f99b86a8da7cf57245f280e6115d47e78e054dbca41ec8f3e13b0d8194248e2af6a49babc07635005017baad4d0271b948db4022069449 SHA512 6e126cbd12f1554e34733553b50df2ee835884170d99489080cbd479e493dc969368530d5d7dafed8d7c308b498e4248f99ab16e00a73106ac142f5d6f104f9d
+EBUILD funcy-1.14.ebuild 438 BLAKE2B b0e5f67af15dffb59b2ab2f0df9f0920ca4c5a6e22ff45452c1875ea5c044bf71282ff14a2b74eec7f529570c9897bf0559f862f9e65452d7ba77dda80140595 SHA512 81357b83df479ef25e0b6865caefda24d93dd7d970a37861520c6786b837b152ef535da3b072f2c0f4f1a0f30ac2e8a4d842cdcc972c27816a9b7c6aa5558af7
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-python/funcy/funcy-1.10.1.ebuild b/dev-python/funcy/funcy-1.10.1.ebuild
index 1223e2f48a5c..10053c851502 100644
--- a/dev-python/funcy/funcy-1.10.1.ebuild
+++ b/dev-python/funcy/funcy-1.10.1.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="A collection of fancy functional tools focused on practicality"
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
index da293bb086e4..dbae274d8803 100644
--- a/dev-python/funcy/funcy-1.14.ebuild
+++ b/dev-python/funcy/funcy-1.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 58a8e2efb354..8716463ea3ea 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +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
+EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
 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
index 208e4d941208..1a3aed50379c 100644
--- a/dev-python/gast/gast-0.3.3.ebuild
+++ b/dev-python/gast/gast-0.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index d17daab621bf..e6fe5e46d142 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,4 +1,3 @@
 DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
-EBUILD genshi-0.7.3-r1.ebuild 790 BLAKE2B 33c4b4e028a67d06e3f6e74cf308467df1864a15b63672474da2501329e4567db9962677b101872c7142ea129b63e4d35b06b879434906505ecca760e2861bdf SHA512 e44b1f962c6749247042f5916111e1dec436deeeff77be2d15f38de731ab5626fcc62733d97d0d694d2124622d491e8d2d53ec584803526899441963d825b4e6
-EBUILD genshi-0.7.3.ebuild 846 BLAKE2B 3c56c5ff32a3ea4946c1464f3869237b2271bd036ee7cfb1c8eb27fe111bbeb096d6c81849e2b60f1a187789643f000be2e809126cb7d716025712b9afe1e46a SHA512 eaec154394fef0c99d6fad57350aaccd66ffb7eeeaec73806f0f6c4f3ae777b98be13c4930f1449692f7a4ee220f3f4b7ceab96a3524b61760342b4ddc69aab7
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+EBUILD genshi-0.7.3-r1.ebuild 781 BLAKE2B b47f8bee7948fca377cfde4a95ad5c696f5ab3a8edf144fab21a4d2200edf011a59c977d3be76b70e57f22ce83ed83c72d662c5dd3a9a36e02b708785dcbeb34 SHA512 0fafdbcba75cd5f08320bd3f200a807d3931ef1234158f866fff1247df334631336fe12c15b09cfd3853011292f0e2b6eeaf30ced4955c7e19b8ef3894c6c29c
+MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
diff --git a/dev-python/genshi/genshi-0.7.3-r1.ebuild b/dev-python/genshi/genshi-0.7.3-r1.ebuild
index 7c06bf78d983..e1b71c283652 100644
--- a/dev-python/genshi/genshi-0.7.3-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -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"
 
 S="${WORKDIR}/${P^}"
diff --git a/dev-python/genshi/genshi-0.7.3.ebuild b/dev-python/genshi/genshi-0.7.3.ebuild
deleted file mode 100644
index ccd41be9299b..000000000000
--- a/dev-python/genshi/genshi-0.7.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=( python{2_7,3_{6,7}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-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"
-IUSE="doc examples"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${BDEPEND}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P^}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	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/genshi/metadata.xml b/dev-python/genshi/metadata.xml
index e24dd86faa2a..ec3c387df89f 100644
--- a/dev-python/genshi/metadata.xml
+++ b/dev-python/genshi/metadata.xml
@@ -5,4 +5,5 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 0c90ced64790..5fe39416e1a9 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,3 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
-EBUILD geoip-python-1.3.2-r1.ebuild 921 BLAKE2B 2dff77f0d21dfb9aad4972124f6d15aa0d29ea2cddd4b8f6e9badb2f5780b7ddcacf5e172f5a21dda13d248ad3b88aab38fa6becb870e9c4da49d5b8ed466738 SHA512 4c9d6b570766161d723bdbf12793d6cfb7c20d6b96866720e7d0848db211cce45d95acda276083d4f7a115445aca410e2528a0b41ff92275b4d47fd1d6bbb358
+EBUILD geoip-python-1.3.2-r1.ebuild 911 BLAKE2B d2f2b5ec02c73642a2cc44c32a30665f6ad11f23a78fe1df5aa60daf4d41f0597f697b9076e4387e83fd4f63170d79211b94852beeec2bf34c35285a35546e70 SHA512 16401a0ed57326e9c8d3a4b794039b0e22a14e519ca27da8bf3cf61dff0a53c437e1c1adbae5f4b6f508884e02cd71b55a5b0142045aed99dbbc10e2874c3550
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index f89ae7f8f23e..2f9e9c7cfd98 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 9ed1688277e6..d7de9023ba23 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
-EBUILD gevent-websocket-0.10.1.ebuild 531 BLAKE2B d393f86d507f9a7daf7810ff2de64ca58bf635ce136ce53dad6af8e1993198af37531cfe50c9f372766679ac4f7de6d302316b9374a1305908a22f28a3c6985b SHA512 5c9ed8fa6ca1775be58277e9945c5bd01767e6fc3318b66e65963df0036f51d8afbea2f08293a4c34ca565c5ed513a07a507c17f4a1ce5c04945a9d0840ceb23
-MISC metadata.xml 417 BLAKE2B 9fa2975161a6b01016fdaa704195d8845603b8eb0de45a0ed0d31d7892fe482c750aca59f9f5fda43a63c1e6dd17907b598a970505a0d04a881ff3ad1b9a5889 SHA512 ee229de187c372e975abd1ae71313da572ecdf5f9c2d3bc9601b5e3554f477a4d74160f043dc1725c8fb193da348844d7f7549af8eb505e4d0fb46abefc7d7fd
+EBUILD gevent-websocket-0.10.1.ebuild 521 BLAKE2B 236046bb6e800798d9b612c925a9f93dde1b32282591a6feb5b122e0e4728086174b7315a5dead5046a10ce6e869578f9fb0b0d90c97a9add8f3b6e420d3d77e SHA512 85cb9a3fbd1b34ddaa0295aba05742f0d162cf8c306daa30f33ef6c60d6c514aa2c3920edc9b7ad5ea67bcd7319d8feb74b70b274a0089734c22a061c4629983
+MISC metadata.xml 315 BLAKE2B ea8a3869c0cd8379a6e7efc8520697bd4b8a500a25d5611947f54ca895116a6caafe3ba61aeeca6725a79d039acfbf32059a805e164d70f3bdf8d80f849df369 SHA512 0ff9f5357eec2e03d6d5909e09fc66c306e7972124348dd4b61018b83dcdef6342e74aa25806f93e56ef3e2ba84ba88c5d776170842cecb89800c68fee42edc8
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index 8723a4a8b4b7..70fe16344d32 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.1.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/gevent-websocket/metadata.xml b/dev-python/gevent-websocket/metadata.xml
index 8a536611e71e..edbc3754d12d 100644
--- a/dev-python/gevent-websocket/metadata.xml
+++ b/dev-python/gevent-websocket/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 1b772f141e1f..b861be38f3fa 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,11 +1,5 @@
-DIST gevent-1.4.0.tar.gz 5169595 BLAKE2B 0c78f67bc94d15419b8eadf8825d9657c6a7a82756308216e1ca94d5465c25836cb736b8b370a12d1003eb8614effd4110d8ed47ee2b0d7febc2bda4038adc0a SHA512 6771f4f2932055270e4f5a79ae815e93fd0f471defa7f437dc84907ea8b44672e05ae5eb6958f8d90580b2471785dce4044d9d1bbea0dd0c34c1381d88af0344
-DIST gevent-20.5.1.tar.gz 5566653 BLAKE2B 1d9a474681573ec2e9d3c0d40fbae8a91b8cfb80c3ff8b3cf0e119b0484458941224302afb59f16c3272e1d770b1c1e92a3f648754a81d2e894e35ed8a335c31 SHA512 c6f9360efa86e598b7b240cd15e24ee0711dc314bb14f8bcaee7b0768b34a0f090d66296819f4c2eb95fe1565fe1c0f3472fb47444c31cfebc348b420811aed5
-DIST gevent-20.5.2.tar.gz 5567755 BLAKE2B 9cac45f92c7c1841cca4eb52a54f71406beb3e83136170610bba326a32722de3c5ebd3b777a45b73ab5e1012eb0dc49d861b042bab0c6194e61f44e6011ede2e SHA512 24f00a599f26d673947f0ed5582f8b55d1b214677578d7c5c2f8d8c106f89a98951db523597c470bcd788de9f6b7abcd3f25f7aff27788227f6d8c7ca7c183c1
 DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
-DIST gevent-20.6.1.tar.gz 5806150 BLAKE2B fb75e440f31ad2952d1395780a66ee673c55e62b635a2c6757efe9706c404d126c38a613ac08cd088900c0b10913fe9ce9d57cec8a7cb252ae87912142cfafce SHA512 b7ceb5251b01972a11e3d51e1ebcaaca7c08d36b6ba7b138bee57f0d5da4553539a0ad538e8a433321bdac396788acbfb0ac294191e829df3f066d00816310bb
-EBUILD gevent-1.4.0.ebuild 1719 BLAKE2B f933f4b4d229f0b8db7a02babee639ce18b9a44f9390b2ded21b0ba6ec13ba1c13baa2a412ea50ec10bff84822a839ad711dea20bca3fd9e821e7d6a057d6569 SHA512 b28a51f9be4ae39bcd8b41e30adc5b5cfdb959758f6437c5dfa017588730bc50fbb8205552edd5de7b90792da021a55b92d3ed027ed7181f5467e3dc62f257eb
-EBUILD gevent-20.5.1.ebuild 2282 BLAKE2B f52fc8d73a974b29cab3b1d356ab9f90c8f00179fbbe14b4837fc93310ca8a5f62cc6c2d999c506fc1f1ce8a6e0e285a519f5cbc0ae59c8c34bf9a01c2450695 SHA512 aad4f67e2f49b2f887328f74f0d6d12e8d0fa79e3f2c934c1cd721aa706e903ada017f2352297b0259ecee9ee6564d3e1337053d9a942e47b84233d1d54e3110
-EBUILD gevent-20.5.2.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
-EBUILD gevent-20.6.0.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
-EBUILD gevent-20.6.1.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+DIST gevent-20.6.2.tar.gz 5806612 BLAKE2B 8b1fbd991cb169292d33001bb0df06702d36eb3849c9251e4fac9e2fb5826eda3435971e39e209f1f537536081ce2730e561e91c398ee66a9b1d55c9d0e5a81a SHA512 65caa9caf8a2913b4c3bcc9a303169ce5837a0d7ccf4fb6b7583bf4ec3a0b288d65fc7e28399f0715e61aed128ffc6e67fc9b455474e47263236136a492021f4
+EBUILD gevent-20.6.0.ebuild 2297 BLAKE2B f0d2a4367a77c22341cbdce9345f0208c9ba01bfe0062532dc4696d49de5f5c01d23b220991d88deb92cd706fa8fcc6e5812579b4468ee532de5973fba3cff13 SHA512 51aa1c880970f350206d762c9ba1fd33d63424342f961e1ae7d2ed26ea7bda278df3a72c41b6f8e955c9af658d83fd482a343a280bb2322360193160780c1501
+EBUILD gevent-20.6.2.ebuild 2298 BLAKE2B 43803f5074c3b748fb16644f22ee632c8157f57c935a501933a324fb8ebbe8f90920d2b3c3060073430013308af0eb02066f1a40a1d1430d2009450246b6c576 SHA512 a7c177cc29b56bb4b22f5d5b042ec1fd98d0ab7cc718583079a58e04d23c9e5884f6201e71fd0bb0870d4906956bd5f0dfb09a327ee6c3842b651b7917d68e5b
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.4.0.ebuild b/dev-python/gevent/gevent-1.4.0.ebuild
deleted file mode 100644
index 3f87f8d3fe59..000000000000
--- a/dev-python/gevent/gevent-1.4.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc 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.14
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	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"
-
-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-20.5.1.ebuild b/dev-python/gevent/gevent-20.5.1.ebuild
deleted file mode 100644
index 9c22b6bec13b..000000000000
--- a/dev-python/gevent/gevent-20.5.1.ebuild
+++ /dev/null
@@ -1,89 +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,9} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.23
-	>=net-dns/c-ares-1.12
-	>=dev-python/greenlet-0.4.14
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-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_test() {
-	cd src/gevent/tests || die
-	# TODO: figure out how to make them work and not hang
-#	GEVENT_RESOLVER=ares \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=dnspython \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=thread \
-#		"${EPYTHON}" -m gevent.tests \
-#		--verbose \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-20.5.2.ebuild b/dev-python/gevent/gevent-20.5.2.ebuild
deleted file mode 100644
index 1448d3df4c13..000000000000
--- a/dev-python/gevent/gevent-20.5.2.ebuild
+++ /dev/null
@@ -1,90 +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,9} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.23:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.14
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-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_test() {
-	cd src/gevent/tests || die
-	# TODO: figure out how to make them work and not hang
-#	GEVENT_RESOLVER=ares \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=dnspython \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=thread \
-#		"${EPYTHON}" -m gevent.tests \
-#		--verbose \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-20.6.0.ebuild b/dev-python/gevent/gevent-20.6.0.ebuild
index 1448d3df4c13..2cad389df36a 100644
--- a/dev-python/gevent/gevent-20.6.0.ebuild
+++ b/dev-python/gevent/gevent-20.6.0.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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gevent/gevent-20.6.1.ebuild b/dev-python/gevent/gevent-20.6.1.ebuild
deleted file mode 100644
index 1448d3df4c13..000000000000
--- a/dev-python/gevent/gevent-20.6.1.ebuild
+++ /dev/null
@@ -1,90 +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,9} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.23:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.14
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-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_test() {
-	cd src/gevent/tests || die
-	# TODO: figure out how to make them work and not hang
-#	GEVENT_RESOLVER=ares \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=dnspython \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=thread \
-#		"${EPYTHON}" -m gevent.tests \
-#		--verbose \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-20.6.2.ebuild b/dev-python/gevent/gevent-20.6.2.ebuild
new file mode 100644
index 000000000000..9f3895b0cea0
--- /dev/null
+++ b/dev-python/gevent/gevent-20.6.2.ebuild
@@ -0,0 +1,90 @@
+# 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,9} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.23:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.14
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+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_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index c0a91bd6dd25..401ef51b45a6 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,7 +1,5 @@
-DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
-DIST geventhttpclient-1.4.3.tar.gz 57541 BLAKE2B 6b28cba862eb01bb1a298c2e228eac4f4bfbf91cd138d0e77f54a91184672f089d3233b7287940b3892fd7e732c924612044abba0704054112f8c0563d9ed741 SHA512 1360a95d367b3bbf03294be916f70f8c2e655b77180a7ff44e67a40508584500e4a0017416639c0a90a974fe53cc7895dc9c3f7bf43d3a34fc4484f804793c21
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
-EBUILD geventhttpclient-1.4.2.ebuild 1531 BLAKE2B dfa676277ca7a529ae91c206f8de6438c6f9729a3e65086122adeb980f0e266d488659628e00a931f7e02b2a70b9a9141e5414a3def5a7ca426fd4af4933ad1e SHA512 c82c31c24b40299e3a4e2c395480e87fef085f6f8f317ca85ae2a5bbca8b255fc69cfddb53105fbac653383d4c75d10fc310bced6448a1dfd2fc9aa3e89e4e2a
-EBUILD geventhttpclient-1.4.3.ebuild 1533 BLAKE2B 821b0e96daf6a106197d6a75409c2766c15d7c0110fcef7aae35a4a0bf9c043a96eaa6802514190858b98f7f8009e860b2f479e5b0f0c6ae301e79c8676c1667 SHA512 a67326b5ea5ac6cc4d1e31dfa616c6e4b092d536c21fa147d76fd36b8ca9e3c121a1d6f12d9dca0b349f5cce5cc083c0d7b64435283c34b2a4d972c258d7aa16
-MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
+DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
+EBUILD geventhttpclient-1.4.2.ebuild 1527 BLAKE2B 6e6a17d12cebcc4e355bd35e7030df325ce028da315f76274d8ca95015488bb650a33f8ee64a0e0b7298a250e018a9778020bc511ed500bc1f1a12cfc0018afd SHA512 33a0eb1d558e10a841a09511f0c3ab48453c2ed66c38304f981f0f4027a9eaa77550b44384245377dde4fd61c4a260510577b0b7b68e5dbf41b4506b47483869
+EBUILD geventhttpclient-1.4.4.ebuild 1537 BLAKE2B 8467945c669e1f480c5f167bb0245f7fca2f984b1033e211b53a5903e2963adb18cef4a6f19e44bf70685903f981561a4787e81244317fb56c5f748c938ad7b5 SHA512 f36b9bb59778cb75e28155ad92b74ef9a680c2d8b6c0a1fb37302173740a5c687119e801b39d4d834962bda8c78037869480af84eb29ec839168b2e798dd401c
+MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
deleted file mode 100644
index 58b14db4d77d..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.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=( python{2_7,3_{6,7,8}} )
-
-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[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# https://github.com/gwik/geventhttpclient/pull/82
-	rm -r src/geventhttpclient/tests/__pycache__ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Ignore tests which require network access
-	# Append to sys.path to avoid ImportError
-	# https://bugs.gentoo.org/667758
-	# Skip a test that fails with Python > 3.7
-	# https://github.com/gwik/geventhttpclient/issues/119
-	pytest --import-mode=append -vv src/geventhttpclient/tests --ignore \
-		src/geventhttpclient/tests/test_client.py --deselect \
-		src/geventhttpclient/tests/test_headers.py::test_cookielib_compatibility \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
index f1ad8d5daaad..248eb286dece 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha 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.4.3.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild
deleted file mode 100644
index 4d3f4094b52b..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.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=( python{2_7,3_{6,7,8,9}} )
-
-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="~alpha ~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}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Skip SNI tests which require dpkt
-	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require dpkt
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	# Append to sys.path to avoid ImportError
-	# https://bugs.gentoo.org/667758
-	# Skip tests which require internet access
-	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
-		-m "not online" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
new file mode 100644
index 000000000000..c92490bd271b
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.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=( python{2_7,3_{6,7,8,9}} )
+
+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="~alpha ~amd64 ~arm 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}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Skip SNI tests which require dpkt
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		# Require dpkt
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	# Append to sys.path to avoid ImportError
+	# https://bugs.gentoo.org/667758
+	# Skip tests which require internet access
+	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+		-m "not online" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/geventhttpclient/metadata.xml b/dev-python/geventhttpclient/metadata.xml
index b9473054d6f4..712535d49ace 100644
--- a/dev-python/geventhttpclient/metadata.xml
+++ b/dev-python/geventhttpclient/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">geventhttpclient</remote-id>
 		<remote-id type="github">gwik/geventhttpclient</remote-id>
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 9b12628ac254..75a70f240862 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,3 @@
-DIST gitdb-4.0.4.tar.gz 392964 BLAKE2B ffbf9d78efc1a12e63ce639018a9c5fde366ae14a85b0ec7ba2866678dbeba2c31ff18cac9b5c4caa2b7e150d3aa5d55434352c38a5155477e053c5ab5eae707 SHA512 a0b2aef8b8b3487c22faeba5d6a60ff2b1a97e3ef075f28bc27140c973242b096463839516ec233065710b7450cb4d885904a7a253e2b518379283edd40cc489
 DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
-EBUILD gitdb-4.0.4.ebuild 1153 BLAKE2B 2349d55dfd87dd61aa440ff413c45e7618bb48a651c274ff8daefdf90f5cedd00ee35e609de92e43a061867f430c52ac2da925859ede5c9c9ecb3198ddb63fb8 SHA512 41e1be5ccdcaa0952f4d08f450d17c35d730f1dc1917a7755a7424857f9984b90ae56fc41c9d11df4d931b6a7c6f4df57e29408a3980e8dad499fe17fe05cbc7
-EBUILD gitdb-4.0.5.ebuild 1155 BLAKE2B 30c6a9fab6c97381e1d54e654c7c53113cc1801fa5e767a24b091017cddc339e874b82abfa87339e4d6c08ccdfaff6fcac51b60f985cf5b1775ddcbefca89b26 SHA512 4a050c42a3dcd29cb12f86e413f59ffba4e80c3ead9cf28b75913111fa165c688cee308d5eda985ecfaf1b85d049591523b53c1b69cfe86acd0ebf4176ea5487
-MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
+EBUILD gitdb-4.0.5.ebuild 1152 BLAKE2B 469dd2a2cbf6a5ab0982a4aae6fc413a660bfa62c20a6c433850b75ba33559d9fc36f5261a7089a63ca0d1f7e0c7abbc7cf1cd9814f202fd8ce7dd489ba64fd0 SHA512 15fde3d0921a93abda3e88fec07c75a55bc942a4809c6c200335ee92f29c1c7e5c8ff2fd6096d15e1c8c7180244307631e838c7c3de7ae25bde6cf4b2fda0f66
+MISC metadata.xml 411 BLAKE2B 270925cade7731451404999603981322c15224b7a6a2580c957af06cf8dbc940adeb40a63452ae6ce11f725a01af58ff56e85c4ba63a92e2027f4c13c81e1689 SHA512 361528c0a12026a9bef55a22d172ca8fbb0f82389ad2e867a2d8bcf65913cff9a2d510121f6b54be00a1d8ccb2bca471e2c3579054d3746fcedae910d4f3b361
diff --git a/dev-python/gitdb/gitdb-4.0.4.ebuild b/dev-python/gitdb/gitdb-4.0.4.ebuild
deleted file mode 100644
index 7bf8943e92ef..000000000000
--- a/dev-python/gitdb/gitdb-4.0.4.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,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/gitdb/gitdb-4.0.5.ebuild b/dev-python/gitdb/gitdb-4.0.5.ebuild
index 109ef5fb25be..0ce35c56033d 100644
--- a/dev-python/gitdb/gitdb-4.0.5.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.5.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"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/gitdb/metadata.xml b/dev-python/gitdb/metadata.xml
index 95de8c8c4ea2..44cf024f6e33 100644
--- a/dev-python/gitdb/metadata.xml
+++ b/dev-python/gitdb/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">gitdb</remote-id>
     <remote-id type="github">gitpython-developers/gitdb</remote-id>
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
index 33b2101e7ffb..e348b419283a 100644
--- a/dev-python/gntp/Manifest
+++ b/dev-python/gntp/Manifest
@@ -1,3 +1,3 @@
 DIST gntp-1.0.3.tar.gz 10839 BLAKE2B f427096ff1e0b81da7f3a6c4f4a477bdedd7c69f632d8ff7bb7780a0b31726341d78852f3819e5ae8764b96513b27c5e3a261e0885645b60b5146d3d36628a14 SHA512 77f4f3801e183eeacceedd2c0588e571e3ffb1d81fc13f222fc593035ed767af487c2242b8cece697b430e04a6dce589c3e91fd5784f29f477964307197053c1
-EBUILD gntp-1.0.3.ebuild 453 BLAKE2B 8b3b3de7aee603e45e4b7d0014f7c8130d6239337a425ac9b2799c6656e9e44462a70d870ac446e2ac07c691620bfec6d88b25cd620d10891d73e72d50d90f22 SHA512 0b13ab3d011cd1231b94512fba2fbcd5895a5ecc1e107053d5e007d0cdf0de2684183f98fcfc3265b98bf9c5d2180e18a0eaec7671ce02bfc0c40f82266359d3
+EBUILD gntp-1.0.3.ebuild 447 BLAKE2B a8f2f99b8ebecf59d47ddef8658a5f6a69994cc0bfa05dbd31456a57b9a6955d7a41c7f714778017173212cf556b4d016913f034ef1240c7fc9cd7597f2a7545 SHA512 d19096b62970536baed59b931e464eadefa125aa76351f86a600fbb56744510333d0dbec97ed9df9ca1022029cf3bdfb33bc4e5bd09aba34611c91d7406d441a
 MISC metadata.xml 372 BLAKE2B 355ee3bad65b04dc623309bd6b14ce8e25b0b16356b4ef6d08cfebb5f2e3b7a9959967e69fb66faee38eca60a6004e03e205400814cc136911bd46b9cc0b9a71 SHA512 c247337a79257cb729b1439a90f977f650169abe6d685edd8f74bf2841f3274579df2b2a3c32ff4a8c2c9771220e6f115295671407829ce145daecf652f43621
diff --git a/dev-python/gntp/gntp-1.0.3.ebuild b/dev-python/gntp/gntp-1.0.3.ebuild
index 200b45fbc221..0334779bffeb 100644
--- a/dev-python/gntp/gntp-1.0.3.ebuild
+++ b/dev-python/gntp/gntp-1.0.3.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/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index a5045310d38d..e99132602683 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
-EBUILD google-api-core-1.17.0.ebuild 1192 BLAKE2B e6e10fd8323f5fc863a0c59fbca2622f9bec67e1d837468a078763a08e51ad085b2bc9ea8888c9f6147ec5a51f94f4a0c51c3f4a854ca0205a11a309b9ffea78 SHA512 325c203214bb127259f374a8fb8351196f4221be9b839e21c8be66b376e67d1947319b964ad47c9f591f5e8fec559af6b2bc349cefde6374a202004b48489c9e
+EBUILD google-api-core-1.17.0.ebuild 1191 BLAKE2B 19bcdb5575b237a35c3ac0ada18e8bc24e840fa501fdd41d0efd6c490ddd55202bd12d21c8cc9606e34f713c8fb6865a18c2ac2ee7f5012d67bf18ab74c814e0 SHA512 ae5014c5bc75efa358cff7143edfb6e4b1b75b7416a6b48b485f74acc0b786192bfb093cb84e97ea739de4a1838cc75eb0dd68efff7512430f67d903e92619d5
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
index 256b57cb60f8..b0eee1f185aa 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Core Library for Google Client Libraries"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 30eff390941c..f5d1d7a44043 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,8 +1,6 @@
 AUX google-api-python-client-1.8.3-tests.patch 1118 BLAKE2B 41900d0b3358128626090b94f8e2a1f767a31dce97efb3c7c5750704a27f9c962cde240caafcc883497b71209c7c8b6733464d1dfee00ad13d2707cb2beee397 SHA512 a14830727ab93bece5c65d303276b6ba85c5fbe8335d97be2f0478a7ab1d37d9be688c859b4ff4ecaf966a9d95f245276c81dd4d7d4e9bb31164a33ecabf32ac
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
-DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105e4842ac415473949064576241453ba5aefcc9c53e3a070167d4210f49509a5f63d4b9e79fa5377119ccd53acafe24eaad4a39e5f8c7 SHA512 1e4410c5e639a6bd3cf12b3e648a63e0098182bb52196085dc92597a38e98984fd349adc282d688aa58ec263502d984f54c7827b7ce53128811e7137234358b6
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
 EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
-EBUILD google-api-python-client-1.7.9.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
-EBUILD google-api-python-client-1.8.3-r1.ebuild 1356 BLAKE2B 44310be2b1e65afd36ef1a3bbf8d2b04abd1771ab2e5cf4cf6fa1a4a4462b50d8781d30ae83c54cd6aaad69d6fb69307603c120f6ac0a1732deb944b6c81a894 SHA512 db78bc80d99fa77ae11fdb868e38a1d36e5198fb2d71dce5ebeff7a69e697dda312187af7d7932b13d8a41c39c604aaf0fd430d8e384729fe23be141b4409ee2
+EBUILD google-api-python-client-1.8.3-r1.ebuild 1355 BLAKE2B 10c56f73d832a6fba703e62a2f5a994bec366499dac39fcedef4d1c04b297e7269ebaa8e495185f06c6357353fe4a313a6656957f3353c5d94c20dc6e0c51ac8 SHA512 e879486e21b41db2c6691c2ea1d720dfeba5bf99a82a6830287aacf8d48b6bbc89a33364789166a69ea6d0d78b0b2a6874b20351b081c3edfa3e130b277c06e3
 MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
deleted file mode 100644
index 140bfc9d35cc..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.9.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/google-api-python-client-1.8.3-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
index fe3d45109573..eef43c9585f7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 1cc612a277d4..1ce783d652de 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,6 +1,4 @@
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
-EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
 EBUILD google-apitools-0.5.31.ebuild 1033 BLAKE2B 318f21685f90478db2d0df945873a847a2ddd2c60a5ba6e585bc3afec45a9781a5f7c09ff60e5390b4c1c90337815e456570980237bf6071c15f42747a1e430a SHA512 ee9b30356982fd08f1e4f098762d4a6749c91f7969608f52e7b5ad498b1e4fa3a6a1d8d539c72f66c1db4db74e80fc6c1159b7a0f448f82efbfca2aefb7f2903
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/google-apitools-0.5.30_p20200507.ebuild b/dev-python/google-apitools/google-apitools-0.5.30_p20200507.ebuild
deleted file mode 100644
index c81be54c3e20..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.30_p20200507.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,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-COMMIT_HASH="02db277e2bbc5906c8787f64dc9a743fe3327f90"
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN#google-}-${COMMIT_HASH}"
-
-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/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	test? (	>=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index 357cce3d29b1..50de9bc2a4d8 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,5 +1,5 @@
-DIST google-auth-httplib2-0.0.2.tar.gz 10830 BLAKE2B 7f2092d83c318510b9140791681a58bd3e436f3b5966c8dc53aa5b041e50fdc4f93c276810a0e6ca20b14a919eb37588ae1d027b5eba74f79f44a6809909dd4f SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0
 DIST google-auth-httplib2-0.0.3.tar.gz 10914 BLAKE2B 20473182a5bd4633d1ae16101d81520ddf182706d478c066e533a2eac3e28fccf2bbaf733eeb4f7ea14d658fe29b9b0c656307bb555aabd2d1a21585e3e3d3ba SHA512 dc39626961dfc67ee56d1c74b4e37e6c6a81ec3c8ddcc24007535acc6a973f2cba5e65a9ece323f53d4dcb4f7bca948d65bde4ab55b2c002432d020cba9d914e
-EBUILD google-auth-httplib2-0.0.2.ebuild 1166 BLAKE2B aa9b6d9da543b3af2b071f4bb0fb52a2530aa5e641e521a6017295263e1a0702ad26bd24691317997b9eee86e2caa90732f7f5f5f3f272368e4729034e03e666 SHA512 89111fbca4a7728590f2f7630951b8397bc1fa49ca1e70f38e63282fd3ec44a3ec31d59db4fc41f6e4231a63d8b949880c87677f031e22fc0c536b7d72336a8f
-EBUILD google-auth-httplib2-0.0.3.ebuild 1174 BLAKE2B f7cb89d6a041b17b68d39074bfe5545a060c899cd03ceeb4836cb4a1141c4b3621b66d5d91126e096aded05529fe781e66d1ada980f4b001d57f977a3bd9d6e6 SHA512 63160aa6a87df8c4783667a74ac350aa5b1d338cadbb71eabe66cb535c1d5bc4f8a9768b68d688c400cf53078f082d6e6f7342f2aa4ade8bafc99a0a9991811a
-MISC metadata.xml 422 BLAKE2B 4aa4a1542a90ed8ebc399dff1824e77e9f695104e4e59317af95e21719d993ceea8c5ed512d15cc2d9d4085bdd1afcc70a58e2f0d7ce673508e2cb6f52d3664b SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2
+DIST google-auth-httplib2-0.0.4.tar.gz 11218 BLAKE2B a6f4b4cf29ba6db81d70dda16eef7c2d378cf1c38d1f3f2f27a38a7d293809a23a4ae38ef0515b8b1ce278bdfc4a15daa291cac0a70f7a84cf7c8f40e36e01c5 SHA512 a33e54d07c610dcb1e01118808792c3a259b7f1a579acbe3f92825ad5100b96a844168bb37327e71f078b870f1594b021d59d0c86c15868384f19ddb569b42cb
+EBUILD google-auth-httplib2-0.0.3.ebuild 1171 BLAKE2B 48dd52add4fe989c830bbccafdd5d294e3246cbd646b7e7134a082f902ecd044a1d57a37ca7fef8556191506f59156daa87095fc8f7209896b53a5f0eeb0867f SHA512 3a2eebd719febf97ad80e20913c1de3c5f2dfdac8fc26f380c94dd76d50cddd88306631774e0ce9ade00a6377384eee18dad82e53f5ba9e295f4e80eaa6a795a
+EBUILD google-auth-httplib2-0.0.4.ebuild 1101 BLAKE2B f1e66f78e7e6b0bfe58e1610e7e904799ae6527db8fa8e2770a24b392a9546f6df24654c71baa6776fe9f127c597cad96e8cc3b282cdb7286318c0681d0c6321 SHA512 f0392cd7633367e3b7cd67bdeed15ddc62f37b24b77235cc4245ccab7c1a4fdd5e03715510c144c65917f82bd3082e8cec58618ed677e81c0c5da9f408c7009c
+MISC metadata.xml 446 BLAKE2B 5f1f5cecb1d2313f60aec2264a869d2138965894c64a79a311da512bee4c50f21a5d0ab8976598b42e6560489ac40e3da656ddb4d0dd729384b9f7e940672df6 SHA512 1f0be263133f99a92f2557d69a21c861ad0d5a2146635dccedbcf00b40d162810deb2edc4c888f5b69ef0bb4d293463c1484282ba37d92a04329f3ebc67cd561
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
deleted file mode 100644
index 8b760f60138e..000000000000
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="607e86011141e8885b1f52826d57c8b5ff588ffc"
-MY_PN=google-auth-library-python-httplib2
-DESCRIPTION="httplib2 Transport for Google Auth"
-HOMEPAGE="https://pypi.org/project/google-auth-httplib2/ https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
-# PyPi tarball is missing unit tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/google-auth[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_PN}-${EGIT_COMMIT}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
index e75d2111fc23..327435feb3a7 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httpl
 
 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/google-auth-httplib2/google-auth-httplib2-0.0.4.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.4.ebuild
new file mode 100644
index 000000000000..24f6b0bda716
--- /dev/null
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.4.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..9} )
+
+inherit distutils-r1
+
+MY_PN="google-auth-library-python-httplib2"
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="https://pypi.org/project/google-auth-httplib2/ https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
+# PyPi tarball is missing unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/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[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-auth-httplib2/metadata.xml b/dev-python/google-auth-httplib2/metadata.xml
index aaafa4650042..0c84d2bfe5f8 100644
--- a/dev-python/google-auth-httplib2/metadata.xml
+++ b/dev-python/google-auth-httplib2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth-httplib2</remote-id>
 		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python-httplib2</remote-id>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4e9e6a53cac0..97714d9d66a5 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,8 +1,5 @@
-DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12aac0eec8e08d06f0b17aba9c4f5ed44f19ca41c737a249611ce02b98e03474d1e995909c5755222605e004d11fb1d SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4
 DIST google-auth-1.14.3.tar.gz 101964 BLAKE2B 096768066d02248a4b614e5ea1f1035c81714ef09f6fb43fdb3ecc308d7cadaf7ad821f1dca505389fd1c73eec5e0b2d233f71f54469c43a2616f64a15661f21 SHA512 e3b76907e50b4927aaa1d450a6133943ad736427a180023ea2c4639545449769136b9db89eae54456338f1cf5bbaaa5840a8cf3db92d54f9e96407ae8935a607
-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.14.3-r1.ebuild 1477 BLAKE2B 5b8d5e861d452e868405f476835ea530c816e76506ca26b87cf0fda9d02aa448f10cffecb256ce776a3c59ec58f417c72162ffa2c2e414d67eb0d1cd5aa42d54 SHA512 d496baf4377203c1908d483fab5e6acebd82558ca509f0e60845afcb979ccb4048397808f69ab162b249727d2910bf5ea29005a17cacc993f7846dc8f834bf9e
-EBUILD google-auth-1.14.3.ebuild 1284 BLAKE2B 9c7fbc8767884a2ebf840b34e828ccb88dafb7d5fd2c1dbc90ea8da23668cf8b9ed53822de989eca62c9190431f37b67ee2427d8115218d7329039a2a8a2b36f SHA512 4824dcf339a3987b910a260a71320fb618339c0fc9c630f7970b7f7e41dad147093361e1be546ebf8710ce181030877dd5992cb9029a3add76447d23db70ebbd
-EBUILD google-auth-1.6.3.ebuild 1280 BLAKE2B ec8a8c550643d8f25de5a51dd1b3d502c8156c86ff863b619af5b3c5041df20891f3606fa0bcca53dc555dc6b987bec1192db979088af41dd062bd3ac3450a9f SHA512 0136a2964f1210a729e1f2a9364ecec4f5e07672cb3a1824f8b60b98dcec7a824ed9ab67db46a3926ccdc3d5dfe263f137d78c083eee9edb7e292a4460d920f8
-MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
+DIST google-auth-1.20.1.tar.gz 107375 BLAKE2B 2f57cd9752c46891c59ed13e2ec8c6f98e5b3cd07d329769a78872877a17580c1ff5bb9da0381ef9bd4b6b9f72f04125ef71102543cfe1dc7bc3b09a5d5d9039 SHA512 6aad44b58c71f96c686606d6e8b6f273c64ce1559737920ccc31ad761442cad7f5fab19a59daee9408b284405a00c2de769c00221ac91bcfdd48851dba6f680f
+EBUILD google-auth-1.14.3-r2.ebuild 1549 BLAKE2B 30225ede6a4d3f97a845b7c1320652613e27eccf0903c25435f3e7137fed8c3a00d94e3eb6575d3fcd226cc9d23ce2a2b341409e0a79f4fd06245f5cbabab76a SHA512 33f41d3d3faaa158806096c0fa35d8c05f015b2329feea2bbce810bb060c6ae79ee007e3bfdbf302895003a472724cb9b4377c689ce0c2c5e793a6dec5762926
+EBUILD google-auth-1.20.1.ebuild 1488 BLAKE2B 0ad01e6584cf9e73c18990d87c239bb95902905fc0b16b2d6bf889ba795db7de78422f5a21d5e34119f5dfaa2781c973727300f7eba31f888449b04a76ece350 SHA512 a1626e1bee025a92bd37e9b29b3f78677de33df7f71b95a6bbda83578b28ddae6e3d3bc5c10522011c0d1b4862b6b6363307a2557772bd0eb6f2663c54c73110
+MISC metadata.xml 428 BLAKE2B 130f36eeb8949f23ff7658277485387897cc1688205de4f5ac7acd4e8e897a5212c07fbe36b4884f4b6d4c4755cbe1e99d0f9d37529a605d0f4df01445e7045a SHA512 82c278bcbbd1329e5b002b7382f11a5bcd8419080137ad09c51db944941669cf072401210d9990d1bb2adf98fd3e60f0f77415d9f2294e1cc2c68023040b9535
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
deleted file mode 100644
index 553ccb457d1c..000000000000
--- a/dev-python/google-auth/google-auth-1.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=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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:' -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.14.3-r1.ebuild b/dev-python/google-auth/google-auth-1.14.3-r1.ebuild
deleted file mode 100644
index 91fe626a7fff..000000000000
--- a/dev-python/google-auth/google-auth-1.14.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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 ~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/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.14.3-r2.ebuild b/dev-python/google-auth/google-auth-1.14.3-r2.ebuild
new file mode 100644
index 000000000000..a61736d01286
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.14.3-r2.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=( python3_{6..9} )
+
+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/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# delete stray files included in the tarball
+	find "${S}"/tests -name '*.pyc' -delete || die
+	sed -e 's|"rsa>=3.1.4,<4.1"|"rsa>=3.1.4"|' -i setup.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/google-auth/google-auth-1.14.3.ebuild b/dev-python/google-auth/google-auth-1.14.3.ebuild
deleted file mode 100644
index 2776bf9f4da6..000000000000
--- a/dev-python/google-auth/google-auth-1.14.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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"
-# Test deps need keywords. See #723554 and #723912.
-RESTRICT="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}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.20.1.ebuild b/dev-python/google-auth/google-auth-1.20.1.ebuild
new file mode 100644
index 000000000000..1fe0712b1c91
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.20.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# delete stray files included in the tarball
+	find "${S}"/tests -name '*.pyc' -delete || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/google-auth-1.6.3.ebuild b/dev-python/google-auth/google-auth-1.6.3.ebuild
deleted file mode 100644
index 8ab4aa30d8ee..000000000000
--- a/dev-python/google-auth/google-auth-1.6.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=7
-
-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}]
-	)"
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || 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/metadata.xml b/dev-python/google-auth/metadata.xml
index 9ee4c6540b0e..c773411434f1 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth</remote-id>
 		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python</remote-id>
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index 9906c96b812b..1d0fa1e836aa 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,7 +1,5 @@
 DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
-DIST google-pasta-0.1.7.tar.gz 37090 BLAKE2B 55d1846a733d3d593e0df16f360a55879b7d5c88a1df410b2f86e97dbcdb01493a7abaebfa57f0f39cbe0dbd081847bce41d8862dea30cdef65d745870ffd89c SHA512 dd374fd039b7b6bd5ca9821dc8342854277cdd7b58738532cf0a39458c3021a1d5011f147c5a3fd1936023da7890636a65d4026af7da65194bde0004ec0caa35
 DIST google-pasta-0.2.0.tar.gz 40430 BLAKE2B b3f068c0530149d6e8057a2e7edeb76b1912516a8227a837913783060e30f418159b38c77480248dc7a1586b46c9b5914e93c77a9430d963b3538e2197661922 SHA512 1d75d994a5120109677a58472459a632b31568e6ce79b205688913dc2a94e132fad818c73510b2f7d7adca3c757077543abd8b7f15be035a63fa15d38874c753
 EBUILD google-pasta-0.1.1.ebuild 481 BLAKE2B 97b6c1d3acc931792958e574186d793723d991449bfe3e1df5aa39ec72315a5bdb05da5450e73e05fee350392b609884ab2daf98346e2b009d38c13b8a762985 SHA512 144f0b6784b456fd26797dd432f57021a9ce92910585dbf013d9942413d8f7061699027a280c81c87505c8555e8c0c9e24f7a4a804c9442d3d6bc15f9e11259f
-EBUILD google-pasta-0.1.7.ebuild 483 BLAKE2B 0db2e7c7ca4f1007dce20ebfd1954a4091563a5cf6224393080fcc70d8a6aee04aa05ef29c821eb1ba636ecb23786334cb1aa9bd447660b809a04ef1ad820d6d SHA512 5a16313b53545658cfa15f9582bfb89519630301d55972f6eaf1fd168445091357d859f1ee1a533059de7508c0cd370195d92b3516fd38fd9572e970cd52b647
-EBUILD google-pasta-0.2.0.ebuild 487 BLAKE2B 5f0b00691a139b83220e43c8b42c09fe099cef8d1e98fb2970b4c32edfb48ac887496b4e7831062a76e05a74c6cc23c4fad7275b3b1c7d214634cb365b16293f SHA512 b7a2af6dd0243e3e42ab78071d3f20e8e75b9a8227c580a8ed3d3c881a3799351090539827fc52de07a1f262c046b919e03ad304d3755929f025ba049862c52d
-MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
+EBUILD google-pasta-0.2.0.ebuild 486 BLAKE2B 47df33c482d490dc5c9a7e7c3f86929173d791b0c8ec765fbeb3164b2109734934633d2f7e94d5f924420ba8c5e86bc41b2d0a061a622f089c2931a44c9a44bb SHA512 826e2518d2820b6f08f1944e05eff31b3485c65399efcfe625f692452dcce304971950750d9610eb43d77d6e1eec9d38efffa1ea217db061dcb367c436b0a08f
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-python/google-pasta/google-pasta-0.1.7.ebuild b/dev-python/google-pasta/google-pasta-0.1.7.ebuild
deleted file mode 100644
index bec75ab9f0fc..000000000000
--- a/dev-python/google-pasta/google-pasta-0.1.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=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pypi.org/project/google-pasta/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-pasta/google-pasta-0.2.0.ebuild b/dev-python/google-pasta/google-pasta-0.2.0.ebuild
index 110caa8549be..1adaf35c12f8 100644
--- a/dev-python/google-pasta/google-pasta-0.2.0.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-pasta/metadata.xml b/dev-python/google-pasta/metadata.xml
index 7e9a09758906..76f45cdee0f4 100644
--- a/dev-python/google-pasta/metadata.xml
+++ b/dev-python/google-pasta/metadata.xml
@@ -5,7 +5,4 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<longdescription lang="en">
-		pasta is an AST-based Python refactoring library
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index ae69f928fdee..a20e18481296 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,4 +1,3 @@
 DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
 EBUILD google-reauth-python-0.1.0-r1.ebuild 1074 BLAKE2B 51bd0bc227a5eb1a10671c97cbe779418125baee8030c9ca9219fe14668037c8eb12a5f8cba15794d4ffe68a5d50565b11b60dd7cd0a3d53212c326e5a9253c7 SHA512 e1e946ef98931376211e0a5cc674cca112548ee01111d86e300858c6d931c8bf43ac291de42047da9c444b1dc188b432f136c6fb6fa2fefe0ee8747ff2d950ea
-EBUILD google-reauth-python-0.1.0.ebuild 1119 BLAKE2B a8dd833fbacccb46e5697078c58823f80c52b30ebb1b60dd93fbb786cea0b1e36fede555e24e067919139031871fd93eed2e671f9a2fde3740f68637bba4147a SHA512 f3a713385df277ed0bc7cca819dc94f4e2b2f325e7fbb61a5e43cd7d211db20b2439220dee8989975f1b99817dd81e33d5c1a5bdaf19b337d6b9c31956d4ebc6
 MISC metadata.xml 387 BLAKE2B 3c273fa005cf2d68f977f8556723ae4577d05998471f3cd845f7335c84c610d4d4af9c971b6ee2edcf51b621e24eaf2083c20dabad714111b2d21cc99116d376 SHA512 7fcd5ff43d0f70d110f62c197f5e8f4ed6bf3192c457402c0d4bfdda66f32ba5144008d07e87d1661289ffaf1f2b637f7467dc1a50b65cf6606c17caf283b96a
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
deleted file mode 100644
index e3130158a0dd..000000000000
--- a/dev-python/google-reauth-python/google-reauth-python-0.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="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/google-reauth-python"
-SRC_URI="https://github.com/google/google-reauth-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/oauth2client[${PYTHON_USEDEP}]
-	dev-python/pyu2f[${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}]
-	)
-"
-
-DOCS=( CHANGELOG.rst CONTRIBUTING.rst README.rst )
-
-python_prepare_all() {
-	sed -e "s:'some_origin'.encode('ascii'):'some_origin':" \
-		-e "s:SignResponse('key_handle', 'resp',:SignResponse('key_handle'.encode(), 'resp'.encode(),:" \
-		-i tests/test_reauth.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 39003d96e215..db4ac89654b0 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
-EBUILD googleapis-common-protos-1.51.0.ebuild 684 BLAKE2B 1eacd54a0f323788ae887ec6e5478ed7c6bf2adf5ee5b2a8d63468f1ad3bb016e74b138e92df788916e770add4f5bfe534bdc2ae4d29b3db97a310c3b896c07d SHA512 fb9bb65b32443264d90b667a3fabab7a999ebfb409d044f2e75e4f364d408e958c3deb7365068f3979228640dd35a651f9c061506150f422a37bc53cc95185e3
+EBUILD googleapis-common-protos-1.51.0.ebuild 683 BLAKE2B db2489f6aa8fc6bd05ea341922ba20e97f373fabb0925bb4c4ef9ef890239d6a11e5eb394f6e90515f0be91a94764b3a8afc39220fe7c271a965df579d73ee6c SHA512 34268347a52c9183f130f39d4ec426bca50290a042d44860a1c48352be1bcb0e8c079dad87a1bd723c9309ed970dc796671af2340c65e06823d09c86b689a5e3
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
index 16183872ed26..1c0536a357ba 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="python classes generated from the common protos in the googleapis repository"
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 40b93d9f5637..d34344b108b3 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,3 +1,5 @@
 DIST graphviz-0.13.zip 181039 BLAKE2B 6484706c706941891500350c933cad537e63b8f6bd602c46d493ac211842bd9762ff25d7b97c8eda9b8f345e20712971e79afbc099087a8db2fcb3e734591b71 SHA512 3401aeebd6b19f487998aeb4cffcf9598ed31a861b6d335fc76295474512068692371b061a83fb001098010813c0ab61a06c3f2c410c9c9d108000a6b2ab6631
-EBUILD graphviz-0.13.ebuild 769 BLAKE2B 55c3b80c90e4d46c4e336bdac80a32a5600a86cc6c2b8d6d65fa131e03f651ab24ad506ab15ad386fc8111b9fa070ab16293decca6bd6117f664165c83dae9f5 SHA512 3a7142eb06d7e41ddfccb5b81d49dcfa53f95091b91abdbbd6e74814e33cdbc8737a7ab3be9bb18daa791b5ab1b3486f8a33867945c507c065ddd00012fb5419
+DIST graphviz-0.14.1.zip 183737 BLAKE2B f4dd100d6fcdfcfc266a7dc77f89b8647ac16d4d56629555ec94b54347b0d91b531ec25ac7ed9c13b0470f6bc49c68a9101791e5fe8b815ab0cd18a9c6f93e7d SHA512 ce2731acecee823afaf086955b316aba956a666b5d528c1ecdee388bf26ee02f502d48d650ed3a8aebcb75ecbff750049c1ca50e27644f74f57fb34b65e42c9a
+EBUILD graphviz-0.13.ebuild 712 BLAKE2B c109d4ff4e571328c7b88cf59727a82b22c14a0ffe499fa04be225a1f3f5b5714956831d297e775f049c324ca02464c4cb9d04171c5440a160f10620432cfc7a SHA512 baead7390ecb362bb8c6c488d4e1d895104fb893134b99b3a1df3fb5a58d3367e70476c26385ef09149bbaaf8a9f3fee380ec1742c12a7fe3488edefcc9741c5
+EBUILD graphviz-0.14.1.ebuild 714 BLAKE2B b729944979869343730ea20ce1fcc9536a714c0f7deca2b75bc5a156ac865972e2dc656e220f6eb339e4aec4942c4e4f9df5b7fcadf555e0c031d47dac83b288 SHA512 d8a4b832aea3751e214b82aed64c9fd6a185123f4e2a519d57b3baf6a7f57abbba11898a0c86e3a7c728afab0b0a58b1b3728d05a907d8115b02256c8183978e
 MISC metadata.xml 527 BLAKE2B b9c6fc9921bfbde8dcde78435394cb97b88d65cd6691bffe94d03f5b22127753333a93496b206d7efa7aef31ffce26d7dd212e3f244f9d111bfc006baf4fff42 SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82
diff --git a/dev-python/graphviz/graphviz-0.13.ebuild b/dev-python/graphviz/graphviz-0.13.ebuild
index fb28c85097c4..92f9f2c7bf0c 100644
--- a/dev-python/graphviz/graphviz-0.13.ebuild
+++ b/dev-python/graphviz/graphviz-0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,21 +14,20 @@ 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="
+BDEPEND="
 	app-arch/unzip
 	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}]
 	)
 "
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test -v || die
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/graphviz/graphviz-0.14.1.ebuild b/dev-python/graphviz/graphviz-0.14.1.ebuild
new file mode 100644
index 000000000000..3700d1003cf8
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.14.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..9} )
+
+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"
+
+RDEPEND="media-gfx/graphviz"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 78825709ff25..85952ec726b4 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,8 +1,3 @@
-AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8
-AUX greenlet-0.4.15-py39.patch 1760 BLAKE2B bb2c8602c838c2187b3f7090eb49571548962700947c89a00f7e1ac742f5a19ada33a0311b84830895acee88162014b7a3dca3aaf6b4e974dcb73f3d4d07bc63 SHA512 76d205c0e00e1c08976a84093f49c478483cea8dabd05c69dfb138e25879a5eced3d4ff00f1f7c0d34f251804f14d8a73658d2119cdaebbcf1922203014882d1
-DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
 DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
-EBUILD greenlet-0.4.15-r1.ebuild 944 BLAKE2B 53a91152659fb65a833b02d73f57630ca771f0811b856f103f2919feff0ff37a856d9bdab11de3fc67bfc93e68b512606eec1ee9af8682ca1046615663398b27 SHA512 9662bcd90557b345246db170ac256efd988092cea2b80f26168c2e2cabfb661154659bc76bf231c547bb3e887aa66ad16c2420b4cd0c265d044e8fddd95a2809
-EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
-EBUILD greenlet-0.4.16.ebuild 844 BLAKE2B 84e8c4c15029350de8722740dac80a9bcbca88e0bc7e4289e2ab85c8d2fabc27d8b97f43d595c4f1a3e5f62e1e9d159412440216394b49ba83fa65ce78a7d53b SHA512 532c0b427004e77cc5a0c82636363d95d8106b7c05d52253fa4e6337ead9c736dfe3c47c86f2478c72b7ee0f1f4db391465a9d520cfc74689ab82c7952a7fe1c
+EBUILD greenlet-0.4.16.ebuild 837 BLAKE2B 40883c0cd53c7ad52c6282d682e214ce4e1b0fc04388ead4c734f4bb1ec45b475ecb2a4f6469b985e3a46218631a91045885ab347895f2fdb777f77e56dd40be SHA512 65023c2536a3ba02b47bd4d119b0610a4fee03f5f176d8ce105b7c657383abeb584cdfe933e10d538f332577d28bd1ef1d0a7a5c0a306b2aad6de84dd0eb6c9f
 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
deleted file mode 100644
index 6a5b37b0e944..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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/files/greenlet-0.4.15-py39.patch b/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
deleted file mode 100644
index 15cf75d32e55..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Wed, 18 Mar 2020 15:09:33 +0100
-Subject: [PATCH] Port to Python 3.9
-
-On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
-https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
-
-Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
-since PyEval_CallObjectWithKeywords() has been deprecated in
-Python 3.9 and PyObject_Call() has the same behavior. The only
-difference is that PyEval_CallObjectWithKeywords() can be called with
-args=NULL, but g_initialstub() ensures that args is not NULL.
----
- greenlet.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/greenlet.c b/greenlet.c
-index ec738b9..d37fc97 100644
---- a/greenlet.c
-+++ b/greenlet.c
-@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
- #define GREENLET_USE_TRACING 1
- #endif
- 
-+#ifndef _Py_DEC_REFTOTAL
-+  /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
-+    https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
-+#  ifdef Py_REF_DEBUG
-+#    define _Py_DEC_REFTOTAL _Py_RefTotal--
-+#  else
-+#    define _Py_DEC_REFTOTAL
-+#  endif
-+#endif
-+
- /* Weak reference to the switching-to greenlet during the slp switch */
- static PyGreenlet* volatile ts_target = NULL;
- /* Strong reference to the switching from greenlet after the switch */
-@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
- 			result = NULL;
- 		} else {
- 			/* call g.run(*args, **kwargs) */
--			result = PyEval_CallObjectWithKeywords(
--				run, args, kwargs);
-+			result = PyObject_Call(run, args, kwargs);
- 			Py_DECREF(args);
- 			Py_XDECREF(kwargs);
- 		}
diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
deleted file mode 100644
index 86dbb7a7c895..000000000000
--- a/dev-python/greenlet/greenlet-0.4.15-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=7
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Add-support-for-DEC-Alpha.patch
-	"${FILESDIR}"/greenlet-0.4.15-py39.patch
-)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
deleted file mode 100644
index 0fbfb93370d8..000000000000
--- a/dev-python/greenlet/greenlet-0.4.15.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.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
index 95b8ec7c7e4f..6372f318b5e7 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16.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 ~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_IN_SOURCE_BUILD=1
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 34766626e819..a60090adb050 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,5 +1,3 @@
-DIST grpcio-testing-1.26.0.tar.gz 17018 BLAKE2B 5747cef7d45ebd5deb0f86537fde2994ec7d4b0eb94cfbbfd3f9ad869e43a549d7a289477f76fc87d0c72a3a232bb643aa64c97e2ce3cc80ccb18368b276befb SHA512 7fae8c2e5dce79562005ae0c5e779e8ff157e245d849b573376aa36cc98fc6efa126f2aeed9431d2c41535ffbbac017ce69d83b5fffaf7f75b5493e778e8caf9
 DIST grpcio-testing-1.28.1.tar.gz 17127 BLAKE2B 494e232d4a4cf098cefa0948868f0610732d1aeb7c788d1481ad2693394767d73a74bfda49cb8c892f6f246f47b18c016318b5eefe3509fdc87be5649c253a17 SHA512 89c3aa5528e1f243a435997266a210ba6e287bca1401931689eb51f258a51768eb25a34c095d383dfcac7d446865535c48aefa0e37b4844bbb92214c7f431068
-EBUILD grpcio-testing-1.26.0.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
 EBUILD grpcio-testing-1.28.1.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.26.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.26.0.ebuild
deleted file mode 100644
index 4ac3f66d4e6d..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.26.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="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 ~ppc64 ~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 d7e9222708e4..27eec011d39b 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,6 +1,4 @@
 AUX setup.py-respect-cc.patch 636 BLAKE2B 8bbba520f02c83be4322e6ad2e65f95f23dc475f55b8acea15be341b131f9262c6595d7cc79dcfd0ede7ee3be61139a4c0d74586ffa845ce21dc253fc8e88bff SHA512 22aff2ae63dfeff93dd1bcb23d3f95f0e54908819b6fb7b54fad54b38cd86e62c2f4af8f1248c81516700377971c0da9dea027df99df9fa7d168f720dbac4d23
-DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
 DIST grpcio-tools-1.28.1.tar.gz 1986547 BLAKE2B 9f6eeb1e12dbf088a38bbff4daec95327cf86d6b9ac72dfdd826507d6b19d635bb263ccb4aca7577df7f585acaf02a45feebcfe0879c32a1190cac179d8cafba SHA512 b385fc567e8bb5965082164f87c1fafca5f0ec236feef343df92f82862b12ca33ddf9c94a366cd56437dc691ec5a37b82fd0f4fd547e389c6e9bcc7fe912d12e
-EBUILD grpcio-tools-1.26.0.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
 EBUILD grpcio-tools-1.28.1.ebuild 762 BLAKE2B 8448040333dc9089d864949fb1abb1675688c43fce7b06f974261dd02405d5274388456b322b70d82893d935cc8802154566714a2a3aaed4e9b00dfe8e430a55 SHA512 a2f33ff11d7a524707471282d5b2757949d3888eb3755084ad2e5e1e18656021a65f34ebc86b2555fe4843852d018eb576e4346c9fe5b09c358383429f2e6d74
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild
deleted file mode 100644
index 5f5084a83cac..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.26.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,7,8} )
-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}]
-"
-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 c379f7e30143..3b1eac653b21 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,7 +1,4 @@
-AUX grpc-1.26-fix-odr-violation.patch 20139 BLAKE2B 0a7e8043a40c2d6edb6ea4620b3cf908f3d7a24f88aa864581ad6b77ebdcb12dc77930510523aa4a3ed21d86ef931749afd723c08f472489546c6cb6d47dcad8 SHA512 de5be7bb5d4923c9d4b14e93c7652b79efbe58c9059e91bbc52367d04eb69113724c659ab1cfab5dc1f437c790242d17008fd7d6eaf38325370d33f01fb2db1f
 AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
-DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
-EBUILD grpcio-1.26.0-r1.ebuild 1065 BLAKE2B 18379d743fcb58e3088dd492f5afa5b89cfe438df1af9fd9656a883d34879b0e8cd01d7df720031cb9a6c75b79b24ebe9fb4382bf2c4825c2e43e70eeb510a3e SHA512 3ef09d22052efc55aafaadd6c37643944a3e6371a9b7a77fbdda311d1a322c111c380c420e6d9da66a89675e70961189dc4b6d9da25056a2c880566127a28ccb
-EBUILD grpcio-1.28.1.ebuild 1030 BLAKE2B 5bf692f5572afe4db5e878d9c3de46e461e6039a728e40909898dfcde6d2078cf067e361c2b19ed9a81ffc39575d3f312767ed3d31f34bd7daa5e7cd34d03396 SHA512 c32fbf6a8abbb1a131c66520bb1cf92159f3ce9cbbc1a9f10a6872fda11f3262128746cd937d919e241df228668397743ec67866fc6a8782941e9cefd0ecfe28
+EBUILD grpcio-1.28.1.ebuild 1029 BLAKE2B 0b24a24b52b21b5b2eed959c899627ec63f15f05de12f66ab42811b7273753ba2941dc65e79ef2cde848b120532e3393c42942c108da744c35a16469f77fd04b SHA512 b5a2d4a82ca3cb34866f07b54c7801e97fcd072e3d48be9a0fd97d04509ad67c8b5a39c22c4bf5a76c05b54504c69b01963194068b92cb5a913b813e196ca970
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch b/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch
deleted file mode 100644
index 695ec4efe165..000000000000
--- a/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-From 72351f63fd650cc7acfcd2d0307e8e8e8f777283 Mon Sep 17 00:00:00 2001
-From: Esun Kim <veblush@google.com>
-Date: Tue, 14 Jan 2020 16:35:23 -0800
-Subject: [PATCH] Remove grpc sources from grpc++
-
-diff --git a/Makefile b/Makefile
-index f8bd36f62f6..b25c748d3a9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5695,205 +5695,7 @@ LIBGRPC++_SRC = \
-     src/cpp/util/status.cc \
-     src/cpp/util/string_ref.cc \
-     src/cpp/util/time_cc.cc \
--    src/core/ext/filters/client_channel/backend_metric.cc \
--    src/core/ext/filters/client_channel/backup_poller.cc \
--    src/core/ext/filters/client_channel/channel_connectivity.cc \
--    src/core/ext/filters/client_channel/client_channel.cc \
--    src/core/ext/filters/client_channel/client_channel_channelz.cc \
--    src/core/ext/filters/client_channel/client_channel_factory.cc \
--    src/core/ext/filters/client_channel/client_channel_plugin.cc \
--    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/health/health_check_client.cc \
--    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
--    src/core/ext/filters/client_channel/http_proxy.cc \
--    src/core/ext/filters/client_channel/lb_policy.cc \
--    src/core/ext/filters/client_channel/lb_policy_registry.cc \
--    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/parse_address.cc \
--    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
--    src/core/ext/filters/client_channel/resolver.cc \
--    src/core/ext/filters/client_channel/resolver_registry.cc \
--    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
--    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
--    src/core/ext/filters/client_channel/retry_throttle.cc \
--    src/core/ext/filters/client_channel/server_address.cc \
--    src/core/ext/filters/client_channel/service_config.cc \
--    src/core/ext/filters/client_channel/subchannel.cc \
--    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
--    src/core/lib/avl/avl.cc \
--    src/core/lib/backoff/backoff.cc \
--    src/core/lib/channel/channel_args.cc \
--    src/core/lib/channel/channel_stack.cc \
--    src/core/lib/channel/channel_stack_builder.cc \
--    src/core/lib/channel/channel_trace.cc \
--    src/core/lib/channel/channelz.cc \
--    src/core/lib/channel/channelz_registry.cc \
--    src/core/lib/channel/connected_channel.cc \
--    src/core/lib/channel/handshaker.cc \
--    src/core/lib/channel/handshaker_registry.cc \
--    src/core/lib/channel/status_util.cc \
--    src/core/lib/compression/compression.cc \
--    src/core/lib/compression/compression_args.cc \
--    src/core/lib/compression/compression_internal.cc \
--    src/core/lib/compression/message_compress.cc \
--    src/core/lib/compression/stream_compression.cc \
--    src/core/lib/compression/stream_compression_gzip.cc \
--    src/core/lib/compression/stream_compression_identity.cc \
--    src/core/lib/debug/stats.cc \
--    src/core/lib/debug/stats_data.cc \
--    src/core/lib/http/format_request.cc \
--    src/core/lib/http/httpcli.cc \
--    src/core/lib/http/parser.cc \
--    src/core/lib/iomgr/buffer_list.cc \
--    src/core/lib/iomgr/call_combiner.cc \
--    src/core/lib/iomgr/cfstream_handle.cc \
--    src/core/lib/iomgr/combiner.cc \
--    src/core/lib/iomgr/endpoint.cc \
--    src/core/lib/iomgr/endpoint_cfstream.cc \
--    src/core/lib/iomgr/endpoint_pair_posix.cc \
--    src/core/lib/iomgr/endpoint_pair_uv.cc \
--    src/core/lib/iomgr/endpoint_pair_windows.cc \
--    src/core/lib/iomgr/error.cc \
--    src/core/lib/iomgr/error_cfstream.cc \
--    src/core/lib/iomgr/ev_epoll1_linux.cc \
--    src/core/lib/iomgr/ev_epollex_linux.cc \
--    src/core/lib/iomgr/ev_poll_posix.cc \
--    src/core/lib/iomgr/ev_posix.cc \
--    src/core/lib/iomgr/ev_windows.cc \
--    src/core/lib/iomgr/exec_ctx.cc \
--    src/core/lib/iomgr/executor.cc \
--    src/core/lib/iomgr/executor/mpmcqueue.cc \
--    src/core/lib/iomgr/executor/threadpool.cc \
--    src/core/lib/iomgr/fork_posix.cc \
--    src/core/lib/iomgr/fork_windows.cc \
--    src/core/lib/iomgr/gethostname_fallback.cc \
--    src/core/lib/iomgr/gethostname_host_name_max.cc \
--    src/core/lib/iomgr/gethostname_sysconf.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
--    src/core/lib/iomgr/internal_errqueue.cc \
--    src/core/lib/iomgr/iocp_windows.cc \
--    src/core/lib/iomgr/iomgr.cc \
--    src/core/lib/iomgr/iomgr_custom.cc \
--    src/core/lib/iomgr/iomgr_internal.cc \
--    src/core/lib/iomgr/iomgr_posix.cc \
--    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
--    src/core/lib/iomgr/iomgr_uv.cc \
--    src/core/lib/iomgr/iomgr_windows.cc \
--    src/core/lib/iomgr/is_epollexclusive_available.cc \
--    src/core/lib/iomgr/load_file.cc \
--    src/core/lib/iomgr/lockfree_event.cc \
--    src/core/lib/iomgr/logical_thread.cc \
--    src/core/lib/iomgr/polling_entity.cc \
--    src/core/lib/iomgr/pollset.cc \
--    src/core/lib/iomgr/pollset_custom.cc \
--    src/core/lib/iomgr/pollset_set.cc \
--    src/core/lib/iomgr/pollset_set_custom.cc \
--    src/core/lib/iomgr/pollset_set_windows.cc \
--    src/core/lib/iomgr/pollset_uv.cc \
--    src/core/lib/iomgr/pollset_windows.cc \
--    src/core/lib/iomgr/resolve_address.cc \
--    src/core/lib/iomgr/resolve_address_custom.cc \
--    src/core/lib/iomgr/resolve_address_posix.cc \
--    src/core/lib/iomgr/resolve_address_windows.cc \
--    src/core/lib/iomgr/resource_quota.cc \
--    src/core/lib/iomgr/sockaddr_utils.cc \
--    src/core/lib/iomgr/socket_factory_posix.cc \
--    src/core/lib/iomgr/socket_mutator.cc \
--    src/core/lib/iomgr/socket_utils_common_posix.cc \
--    src/core/lib/iomgr/socket_utils_linux.cc \
--    src/core/lib/iomgr/socket_utils_posix.cc \
--    src/core/lib/iomgr/socket_utils_uv.cc \
--    src/core/lib/iomgr/socket_utils_windows.cc \
--    src/core/lib/iomgr/socket_windows.cc \
--    src/core/lib/iomgr/tcp_client.cc \
--    src/core/lib/iomgr/tcp_client_cfstream.cc \
--    src/core/lib/iomgr/tcp_client_custom.cc \
--    src/core/lib/iomgr/tcp_client_posix.cc \
--    src/core/lib/iomgr/tcp_client_windows.cc \
--    src/core/lib/iomgr/tcp_custom.cc \
--    src/core/lib/iomgr/tcp_posix.cc \
--    src/core/lib/iomgr/tcp_server.cc \
--    src/core/lib/iomgr/tcp_server_custom.cc \
--    src/core/lib/iomgr/tcp_server_posix.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_windows.cc \
--    src/core/lib/iomgr/tcp_uv.cc \
--    src/core/lib/iomgr/tcp_windows.cc \
--    src/core/lib/iomgr/time_averaged_stats.cc \
--    src/core/lib/iomgr/timer.cc \
--    src/core/lib/iomgr/timer_custom.cc \
--    src/core/lib/iomgr/timer_generic.cc \
--    src/core/lib/iomgr/timer_heap.cc \
--    src/core/lib/iomgr/timer_manager.cc \
--    src/core/lib/iomgr/timer_uv.cc \
--    src/core/lib/iomgr/udp_server.cc \
--    src/core/lib/iomgr/unix_sockets_posix.cc \
--    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
--    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
--    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
--    src/core/lib/iomgr/wakeup_fd_pipe.cc \
--    src/core/lib/iomgr/wakeup_fd_posix.cc \
--    src/core/lib/json/json.cc \
--    src/core/lib/json/json_reader.cc \
--    src/core/lib/json/json_string.cc \
--    src/core/lib/json/json_writer.cc \
--    src/core/lib/slice/b64.cc \
--    src/core/lib/slice/percent_encoding.cc \
--    src/core/lib/slice/slice.cc \
--    src/core/lib/slice/slice_buffer.cc \
--    src/core/lib/slice/slice_intern.cc \
--    src/core/lib/slice/slice_string_helpers.cc \
--    src/core/lib/surface/api_trace.cc \
--    src/core/lib/surface/byte_buffer.cc \
--    src/core/lib/surface/byte_buffer_reader.cc \
--    src/core/lib/surface/call.cc \
--    src/core/lib/surface/call_details.cc \
--    src/core/lib/surface/call_log_batch.cc \
--    src/core/lib/surface/channel.cc \
--    src/core/lib/surface/channel_init.cc \
--    src/core/lib/surface/channel_ping.cc \
--    src/core/lib/surface/channel_stack_type.cc \
--    src/core/lib/surface/completion_queue.cc \
--    src/core/lib/surface/completion_queue_factory.cc \
--    src/core/lib/surface/event_string.cc \
--    src/core/lib/surface/lame_client.cc \
--    src/core/lib/surface/metadata_array.cc \
--    src/core/lib/surface/server.cc \
--    src/core/lib/surface/validate_metadata.cc \
--    src/core/lib/surface/version.cc \
--    src/core/lib/transport/bdp_estimator.cc \
--    src/core/lib/transport/byte_stream.cc \
--    src/core/lib/transport/connectivity_state.cc \
--    src/core/lib/transport/error_utils.cc \
--    src/core/lib/transport/metadata.cc \
--    src/core/lib/transport/metadata_batch.cc \
--    src/core/lib/transport/pid_controller.cc \
--    src/core/lib/transport/static_metadata.cc \
--    src/core/lib/transport/status_conversion.cc \
--    src/core/lib/transport/status_metadata.cc \
--    src/core/lib/transport/timeout_encoding.cc \
--    src/core/lib/transport/transport.cc \
--    src/core/lib/transport/transport_op_string.cc \
--    src/core/lib/uri/uri_parser.cc \
--    src/core/lib/debug/trace.cc \
--    src/core/ext/filters/deadline/deadline_filter.cc \
-     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
--    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
--    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
--    src/core/ext/upb-generated/validate/validate.upb.c \
--    src/core/ext/upb-generated/google/api/annotations.upb.c \
--    src/core/ext/upb-generated/google/api/http.upb.c \
--    src/core/ext/upb-generated/google/protobuf/any.upb.c \
--    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
--    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
--    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
--    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
--    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
--    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
--    src/core/ext/upb-generated/google/rpc/status.upb.c \
-     src/cpp/codegen/codegen_init.cc \
- 
- PUBLIC_HEADERS_CXX += \
-@@ -6926,205 +6728,7 @@ LIBGRPC++_UNSECURE_SRC = \
-     src/cpp/util/status.cc \
-     src/cpp/util/string_ref.cc \
-     src/cpp/util/time_cc.cc \
--    src/core/ext/filters/client_channel/backend_metric.cc \
--    src/core/ext/filters/client_channel/backup_poller.cc \
--    src/core/ext/filters/client_channel/channel_connectivity.cc \
--    src/core/ext/filters/client_channel/client_channel.cc \
--    src/core/ext/filters/client_channel/client_channel_channelz.cc \
--    src/core/ext/filters/client_channel/client_channel_factory.cc \
--    src/core/ext/filters/client_channel/client_channel_plugin.cc \
--    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/health/health_check_client.cc \
--    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
--    src/core/ext/filters/client_channel/http_proxy.cc \
--    src/core/ext/filters/client_channel/lb_policy.cc \
--    src/core/ext/filters/client_channel/lb_policy_registry.cc \
--    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/parse_address.cc \
--    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
--    src/core/ext/filters/client_channel/resolver.cc \
--    src/core/ext/filters/client_channel/resolver_registry.cc \
--    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
--    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
--    src/core/ext/filters/client_channel/retry_throttle.cc \
--    src/core/ext/filters/client_channel/server_address.cc \
--    src/core/ext/filters/client_channel/service_config.cc \
--    src/core/ext/filters/client_channel/subchannel.cc \
--    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
--    src/core/lib/avl/avl.cc \
--    src/core/lib/backoff/backoff.cc \
--    src/core/lib/channel/channel_args.cc \
--    src/core/lib/channel/channel_stack.cc \
--    src/core/lib/channel/channel_stack_builder.cc \
--    src/core/lib/channel/channel_trace.cc \
--    src/core/lib/channel/channelz.cc \
--    src/core/lib/channel/channelz_registry.cc \
--    src/core/lib/channel/connected_channel.cc \
--    src/core/lib/channel/handshaker.cc \
--    src/core/lib/channel/handshaker_registry.cc \
--    src/core/lib/channel/status_util.cc \
--    src/core/lib/compression/compression.cc \
--    src/core/lib/compression/compression_args.cc \
--    src/core/lib/compression/compression_internal.cc \
--    src/core/lib/compression/message_compress.cc \
--    src/core/lib/compression/stream_compression.cc \
--    src/core/lib/compression/stream_compression_gzip.cc \
--    src/core/lib/compression/stream_compression_identity.cc \
--    src/core/lib/debug/stats.cc \
--    src/core/lib/debug/stats_data.cc \
--    src/core/lib/http/format_request.cc \
--    src/core/lib/http/httpcli.cc \
--    src/core/lib/http/parser.cc \
--    src/core/lib/iomgr/buffer_list.cc \
--    src/core/lib/iomgr/call_combiner.cc \
--    src/core/lib/iomgr/cfstream_handle.cc \
--    src/core/lib/iomgr/combiner.cc \
--    src/core/lib/iomgr/endpoint.cc \
--    src/core/lib/iomgr/endpoint_cfstream.cc \
--    src/core/lib/iomgr/endpoint_pair_posix.cc \
--    src/core/lib/iomgr/endpoint_pair_uv.cc \
--    src/core/lib/iomgr/endpoint_pair_windows.cc \
--    src/core/lib/iomgr/error.cc \
--    src/core/lib/iomgr/error_cfstream.cc \
--    src/core/lib/iomgr/ev_epoll1_linux.cc \
--    src/core/lib/iomgr/ev_epollex_linux.cc \
--    src/core/lib/iomgr/ev_poll_posix.cc \
--    src/core/lib/iomgr/ev_posix.cc \
--    src/core/lib/iomgr/ev_windows.cc \
--    src/core/lib/iomgr/exec_ctx.cc \
--    src/core/lib/iomgr/executor.cc \
--    src/core/lib/iomgr/executor/mpmcqueue.cc \
--    src/core/lib/iomgr/executor/threadpool.cc \
--    src/core/lib/iomgr/fork_posix.cc \
--    src/core/lib/iomgr/fork_windows.cc \
--    src/core/lib/iomgr/gethostname_fallback.cc \
--    src/core/lib/iomgr/gethostname_host_name_max.cc \
--    src/core/lib/iomgr/gethostname_sysconf.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
--    src/core/lib/iomgr/internal_errqueue.cc \
--    src/core/lib/iomgr/iocp_windows.cc \
--    src/core/lib/iomgr/iomgr.cc \
--    src/core/lib/iomgr/iomgr_custom.cc \
--    src/core/lib/iomgr/iomgr_internal.cc \
--    src/core/lib/iomgr/iomgr_posix.cc \
--    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
--    src/core/lib/iomgr/iomgr_uv.cc \
--    src/core/lib/iomgr/iomgr_windows.cc \
--    src/core/lib/iomgr/is_epollexclusive_available.cc \
--    src/core/lib/iomgr/load_file.cc \
--    src/core/lib/iomgr/lockfree_event.cc \
--    src/core/lib/iomgr/logical_thread.cc \
--    src/core/lib/iomgr/polling_entity.cc \
--    src/core/lib/iomgr/pollset.cc \
--    src/core/lib/iomgr/pollset_custom.cc \
--    src/core/lib/iomgr/pollset_set.cc \
--    src/core/lib/iomgr/pollset_set_custom.cc \
--    src/core/lib/iomgr/pollset_set_windows.cc \
--    src/core/lib/iomgr/pollset_uv.cc \
--    src/core/lib/iomgr/pollset_windows.cc \
--    src/core/lib/iomgr/resolve_address.cc \
--    src/core/lib/iomgr/resolve_address_custom.cc \
--    src/core/lib/iomgr/resolve_address_posix.cc \
--    src/core/lib/iomgr/resolve_address_windows.cc \
--    src/core/lib/iomgr/resource_quota.cc \
--    src/core/lib/iomgr/sockaddr_utils.cc \
--    src/core/lib/iomgr/socket_factory_posix.cc \
--    src/core/lib/iomgr/socket_mutator.cc \
--    src/core/lib/iomgr/socket_utils_common_posix.cc \
--    src/core/lib/iomgr/socket_utils_linux.cc \
--    src/core/lib/iomgr/socket_utils_posix.cc \
--    src/core/lib/iomgr/socket_utils_uv.cc \
--    src/core/lib/iomgr/socket_utils_windows.cc \
--    src/core/lib/iomgr/socket_windows.cc \
--    src/core/lib/iomgr/tcp_client.cc \
--    src/core/lib/iomgr/tcp_client_cfstream.cc \
--    src/core/lib/iomgr/tcp_client_custom.cc \
--    src/core/lib/iomgr/tcp_client_posix.cc \
--    src/core/lib/iomgr/tcp_client_windows.cc \
--    src/core/lib/iomgr/tcp_custom.cc \
--    src/core/lib/iomgr/tcp_posix.cc \
--    src/core/lib/iomgr/tcp_server.cc \
--    src/core/lib/iomgr/tcp_server_custom.cc \
--    src/core/lib/iomgr/tcp_server_posix.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_windows.cc \
--    src/core/lib/iomgr/tcp_uv.cc \
--    src/core/lib/iomgr/tcp_windows.cc \
--    src/core/lib/iomgr/time_averaged_stats.cc \
--    src/core/lib/iomgr/timer.cc \
--    src/core/lib/iomgr/timer_custom.cc \
--    src/core/lib/iomgr/timer_generic.cc \
--    src/core/lib/iomgr/timer_heap.cc \
--    src/core/lib/iomgr/timer_manager.cc \
--    src/core/lib/iomgr/timer_uv.cc \
--    src/core/lib/iomgr/udp_server.cc \
--    src/core/lib/iomgr/unix_sockets_posix.cc \
--    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
--    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
--    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
--    src/core/lib/iomgr/wakeup_fd_pipe.cc \
--    src/core/lib/iomgr/wakeup_fd_posix.cc \
--    src/core/lib/json/json.cc \
--    src/core/lib/json/json_reader.cc \
--    src/core/lib/json/json_string.cc \
--    src/core/lib/json/json_writer.cc \
--    src/core/lib/slice/b64.cc \
--    src/core/lib/slice/percent_encoding.cc \
--    src/core/lib/slice/slice.cc \
--    src/core/lib/slice/slice_buffer.cc \
--    src/core/lib/slice/slice_intern.cc \
--    src/core/lib/slice/slice_string_helpers.cc \
--    src/core/lib/surface/api_trace.cc \
--    src/core/lib/surface/byte_buffer.cc \
--    src/core/lib/surface/byte_buffer_reader.cc \
--    src/core/lib/surface/call.cc \
--    src/core/lib/surface/call_details.cc \
--    src/core/lib/surface/call_log_batch.cc \
--    src/core/lib/surface/channel.cc \
--    src/core/lib/surface/channel_init.cc \
--    src/core/lib/surface/channel_ping.cc \
--    src/core/lib/surface/channel_stack_type.cc \
--    src/core/lib/surface/completion_queue.cc \
--    src/core/lib/surface/completion_queue_factory.cc \
--    src/core/lib/surface/event_string.cc \
--    src/core/lib/surface/lame_client.cc \
--    src/core/lib/surface/metadata_array.cc \
--    src/core/lib/surface/server.cc \
--    src/core/lib/surface/validate_metadata.cc \
--    src/core/lib/surface/version.cc \
--    src/core/lib/transport/bdp_estimator.cc \
--    src/core/lib/transport/byte_stream.cc \
--    src/core/lib/transport/connectivity_state.cc \
--    src/core/lib/transport/error_utils.cc \
--    src/core/lib/transport/metadata.cc \
--    src/core/lib/transport/metadata_batch.cc \
--    src/core/lib/transport/pid_controller.cc \
--    src/core/lib/transport/static_metadata.cc \
--    src/core/lib/transport/status_conversion.cc \
--    src/core/lib/transport/status_metadata.cc \
--    src/core/lib/transport/timeout_encoding.cc \
--    src/core/lib/transport/transport.cc \
--    src/core/lib/transport/transport_op_string.cc \
--    src/core/lib/uri/uri_parser.cc \
--    src/core/lib/debug/trace.cc \
--    src/core/ext/filters/deadline/deadline_filter.cc \
-     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
--    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
--    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
--    src/core/ext/upb-generated/validate/validate.upb.c \
--    src/core/ext/upb-generated/google/api/annotations.upb.c \
--    src/core/ext/upb-generated/google/api/http.upb.c \
--    src/core/ext/upb-generated/google/protobuf/any.upb.c \
--    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
--    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
--    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
--    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
--    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
--    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
--    src/core/ext/upb-generated/google/rpc/status.upb.c \
-     src/cpp/codegen/codegen_init.cc \
- 
- PUBLIC_HEADERS_CXX += \
diff --git a/dev-python/grpcio/grpcio-1.26.0-r1.ebuild b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
deleted file mode 100644
index 268c02d3437e..000000000000
--- a/dev-python/grpcio/grpcio-1.26.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,7,8} )
-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:=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/grpc-1.26-fix-odr-violation.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.28.1.ebuild b/dev-python/grpcio/grpcio-1.28.1.ebuild
index 52d65ba9345c..0ed253b4d80e 100644
--- a/dev-python/grpcio/grpcio-1.28.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index ab0618a4c7d6..326db15f6e18 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,6 +1,6 @@
 AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
-EBUILD gst-python-1.14.1-r1.ebuild 1747 BLAKE2B 3c562186e3f902f20a05fb3e3dba066481ba7dbca29c727544188a4b478edc7e0a5f24de9b5e1ecdad1d886eaecf58b408985d85c272effce77b7bae1ea7d201 SHA512 ff68669724389d6e7ba1f93b44f5ab7487950b1ae26fd1bef6c9f923dbeed1de4902458112e80827c56d66d7522aed5da1f8ed2acb34a7d9898e7f52ea5686d3
-EBUILD gst-python-1.16.2.ebuild 1614 BLAKE2B 0e1e37893bed984116855d85a2d4b3f6d2550b49603f1afc25218f85b77ccbc0d68086a56a6119f932efdccba3c81f11c99218f28bc29ccdf453b14b837f99fd SHA512 2cb8ac7c357b5966a6970902cea3fcc9f2bb4bf1ac8327ca39a480e4a7356ec44aa2b482aa3c7d1204933c981c6a4743591fac3ed4dbf44ae2ae4d39e324963c
+EBUILD gst-python-1.14.1-r1.ebuild 1743 BLAKE2B 0b44d77f6b04dc63ca3775a096b4080d4e9936f8d1cfd14704cfbe5986af45b03156c8f1fc5015a79ef40f28ba67413bddb9edb2cace5ed94a600e14de2443bd SHA512 d5edfadd026636f2f549fdb9ddabb75853b7b98d26b553b166f65f5bb256ad42f7e83ce1c5e871490a6fb75f5a655bf7e646e10c7aa16db7dd5f4fa5b455aed5
+EBUILD gst-python-1.16.2.ebuild 1613 BLAKE2B 5a5c391957ffcd5e04047692ff87245e68be81b5626d1a2b7238ba354f1feed339bca830ba036f022a1fcf24428ecc0cbd6bafab2e47f57d423097acf6bf4cce SHA512 84046969bcbcc4182962b3babff68393f4e31b083e13cb9d74ec29883ab6971b7e150d86b80806dc28d5ad65d06be72b59770b54abf5d3320058ffe1246a1cb5
 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 81c1c472fe53..c29ae445db24 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
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit ltprune python-r1 xdg-utils
 
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index f0bc9e15d221..7b496ec8e5ca 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit meson python-r1 xdg-utils
 
@@ -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/guessit/Manifest b/dev-python/guessit/Manifest
index e17f6bb0bdb5..d8d09840219f 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,3 @@
-DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
 DIST guessit-3.1.1.tar.gz 147605 BLAKE2B 3b11747b652e922aada12ce771c1e91e8842c78c221ac39c068488ae6cae95ebc6d9f6d8849aaef11d522e2c7d6e6f8e34981179e48d9db649e811c5fa2e52ef SHA512 6a02c4024d286cf49c62e072bcb616a052cec1ce51d364b17cea1768504c4ecebba914a3bf5beda9a61dca0e7764c8642cb5b918a20fb25cdd7120ad1667825f
-EBUILD guessit-3.0.0.ebuild 1049 BLAKE2B 16208c2bb58b26e4914448600db0d5dcc2e94250775f3e1582618b4a86960d1223ca0a8a22e0d54e89fe119837086264306f8ad0b2e1e808aad3654d7197db2f SHA512 28c82180f9ab9a3353be0c078068a1559000b85d196e41e9536c3a2eeb810a3de533e4431c6d32ca6352dd9b61e197a20faa1b06a2d16f7c559158dbd8b5a1e9
-EBUILD guessit-3.1.1.ebuild 1056 BLAKE2B c840803bff97921a512961d515648c95ff20fc5aa0ac63758112b207e2be8d3c57886adb2b9c7e31b7f5f9af9f967f44b39a156d66d347484a407e8703d1d406 SHA512 e07d0ceb8fe44e0c308df0a0e48f18e116735d8f840dc5e5bd9dd1dbbdba94bd85fb22b473cd03e4de6172b3a00d8d39d39fb6ab93f31bbb6d1c5671f6b20cbd
-MISC metadata.xml 368 BLAKE2B 4436422efbe713e768540e695777319afdcbb0e986843ddfd1b78495c66af5effd96bf671850131336e2a3159cd741ab6179c4323527724a5483e0d4ec04727d SHA512 be4bec94b4ab2a711dbcc1ba79a5284187d5e83c8db648e4d374e533de9bc9e84fa16c590a41d2dbee7b63fc6a0910ba71366d974b22c35f53bc020fb4498683
+EBUILD guessit-3.1.1.ebuild 1058 BLAKE2B 25fc51da158ae9373aaf757f00535acab37daadbfc84f8e8a09ee45f13d8aa9bfc2518f7b2c4d3995e4da01896429c0b83d223a1887d581e7badbee7d4996dd2 SHA512 946583e305e96940fcf959025a094d1bf022a74f2a6ceb87802ad4159a7463da815edf9ed40ed1b2c4e26af4944166bf2a4cdfc16f289a81c9adb8c195baab71
+MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
deleted file mode 100644
index a1fbba8fd954..000000000000
--- a/dev-python/guessit/guessit-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=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-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/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.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
-}
diff --git a/dev-python/guessit/guessit-3.1.1.ebuild b/dev-python/guessit/guessit-3.1.1.ebuild
index 7f1d13fc3968..8fad04058c3e 100644
--- a/dev-python/guessit/guessit-3.1.1.ebuild
+++ b/dev-python/guessit/guessit-3.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guessit/metadata.xml b/dev-python/guessit/metadata.xml
index f09daab85f07..b7679a22e451 100644
--- a/dev-python/guessit/metadata.xml
+++ b/dev-python/guessit/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">guessit-io/guessit</remote-id>
 		<remote-id type="pypi">guessit</remote-id>
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 52567ce9cfbe..07a7ba66ebf2 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,3 +1,3 @@
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 510 BLAKE2B 4275d2f45c9679f194f7216042ccf72cf0be85315d180dc0298cff2912f27e0af99ada7aa60e9eb2948f2ef6aa350c9860e7f08d7497554270b11828f0f25b13 SHA512 d56bdf20c0420017e599ab6c5643fe78fc01379d12aa60e27b27595163f95f3a88a5030c68778d4e7bd4b554252239bfd770373fe9e9521324b85e7dce036cff
-MISC metadata.xml 423 BLAKE2B af845fa73d257d2ead2fd41a6ffd50b1e0c29140c3484c7199ff041b9025e9e297a1cc849e136733e3271187fb44c09a36d9fb705fceb82b6771bc29deaef52f SHA512 fb05cc6b19cdf522010d886649146cb02ac259c53e54111dcbb0eb16109d8bd1832b80e2e763d57fa425b05cf232a8b36710c9cc0cc20e38bfa548bb51abaa3b
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 515 BLAKE2B ac3369ba1f98a261895403bdf39d0df25ba306ac379f21deee48b4e13ed937221bdfd54542675684f83f2606b07f364c042f892bdb4fd5a7125bd230214cc745 SHA512 c7f113bb7565ad2d4d3de838bed34d9c1f41734299319db2b5a2c1f6ad5f14c9ee75850e7d943f52c6420f770b533de0cec1a1d19f7800f2bb52a6ac9f0556b2
+MISC metadata.xml 339 BLAKE2B b05bc0183201fb2155f2ac06a76f77a1bb0cad3bcfaf0a6419f5de867d710b9ed7a336acb825ff25e685806128f733bdcd0d70825cbf995ca6d17eb57ed1c8c1 SHA512 2a0348e805f633535dc358cac761f51867b0e6dc13724e11d3671523ee13cfe67eceffd811989eb9cf71c697fc3b3f254844746468c5f4e0fff7f5e77346ee52
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 6304d0f12ae4..db52c8ee0cc9 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -12,7 +12,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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/guzzle_sphinx_theme/metadata.xml b/dev-python/guzzle_sphinx_theme/metadata.xml
index 19bc64eb6929..572599ea3f48 100644
--- a/dev-python/guzzle_sphinx_theme/metadata.xml
+++ b/dev-python/guzzle_sphinx_theme/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">guzzle_sphinx_theme</remote-id>
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 18e08ff38c91..caddd7f704aa 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,3 @@
-DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
-DIST h11-0.9.0.tar.gz 93331 BLAKE2B 46bc596f110d78ad162daaec68b9fa1e3a5ec828b45d66b6067bbdf27a5e81f110a7c1e1d394a4a11d797b9a6ba69d7c9fb182edbf753c5ea1a66f2cd8c01ed7 SHA512 fb323ebf0cc95d89bb7e73cf1f393d2588961ed6dd95630ad692e36f15141ae1de7a0bfe3ef2855f0e9b7c8cf2abba5cf808547bb4bb4d10ebb525122ac63d4a
-EBUILD h11-0.8.1.ebuild 620 BLAKE2B 0a2e602241411755dd74eca548833f0287f9eed5aab223fcca68d0a79851ff8f6771d7041165423f8bab74b41d01698445e9debfd7cdb73264562f424193ba36 SHA512 a4bf5cb5a832b30001ffe99c336d09d1e5e0f65b4f899d2e894651a17bcec697be42d11cfdf8f4e8af4ef95ef2ada0f6dbff6e3f9272eb55b0bd50532d7dac38
-EBUILD h11-0.9.0.ebuild 456 BLAKE2B c77dd764075be0e17056f1f01fa95e515fe253aa64f4cfc550554510ac398db177159b3c931e1b978105dedabbbd1d060bb881728577411d2ed7c853dc0f9778 SHA512 c436b7b669f11ba6d736fb397f8f01465fe573fdc69ba1ae08da2446e02be5e55e8b8d4789502eaad4f66c090dd631eaaa9760fc6e8918783e316ab8f791e598
+DIST h11-0.10.0.tar.gz 96120 BLAKE2B d998de143fae86217b47f4e7f535780244bef84233cdb957799ce0540d6315bdffc4c6909d36c74e5d11d83b816f23dce27ac7424c5a235e94aeb70289577add SHA512 c5f6271002d3c9423d6587a1050279d4cb25c6f1a0fee87f8f01c5dbd02b4c4817f1a6b7ea0b92c49a45a1f05a7073c6f4953c9d61d29e341fdd8b0a5f40a0b4
+EBUILD h11-0.10.0.ebuild 458 BLAKE2B 18432d980245cebadc1cf51f3d26370578a30d503e3ee7a326cfd7b5d75ef1968f2dae0d861ac4ced093744179d5b388d69d6d8f7baea87d13f23d97f44c0d41 SHA512 dfd178dd8da7d0d1955b24468a9d505e650188881463bd34d39de3b507b39144d77e6bfb2bcad198cdd51ebdda8c2ce167ec82efce35ee95e796ca1cd28baf00
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/h11/h11-0.10.0.ebuild b/dev-python/h11/h11-0.10.0.ebuild
new file mode 100644
index 000000000000..f61bd104ce99
--- /dev/null
+++ b/dev-python/h11/h11-0.10.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,9} )
+
+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}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/h11/h11-0.8.1.ebuild b/dev-python/h11/h11-0.8.1.ebuild
deleted file mode 100644
index 5ecef28bce40..000000000000
--- a/dev-python/h11/h11-0.8.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,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}.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() {
-	py.test -v || die "Testing failed"
-}
diff --git a/dev-python/h11/h11-0.9.0.ebuild b/dev-python/h11/h11-0.9.0.ebuild
deleted file mode 100644
index 42d541a4f8ba..000000000000
--- a/dev-python/h11/h11-0.9.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,7,8} )
-
-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}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 3f258fcf6809..111aea829e9c 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,4 @@
 AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-EBUILD h5py-2.10.0-r1.ebuild 1583 BLAKE2B 0c84f503b30233f78e7a5f4534909153ede1c0d60bd8a93de346573d2e0413168dffe16e2bd98e9a8538c40891c56aa616c91c2446faf021275e46400a36d93c SHA512 911cb64690c4a61fe30f1ed8df23f979e359d7854dcaf35967760021bf83d2b7a70fde945f119ccb2938b22a39d8cdc37e05f285f6355712944c2c8d362ebdf4
-EBUILD h5py-2.10.0.ebuild 1444 BLAKE2B 33f6fe1ec2965ba813db74d215049135b8bed3f02aedf9d3958ed4a1b3e53a738ee4f68c0ba7bc23e982c595d1e4d18b88623e0884c96d70af3f0edb2fb8e4b5 SHA512 0f74c2ce5ea0736339039c751026530cd61d96eb4c45c0d69aa2fd583a0dc9db08068041ed3dfd656811dd5d614396b3f7b73ec4610529016c4a1b29a1da149d
+EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B 6a2266faa0997f41b39f92dbba0d41c6b9fea246e4aec005af71ae3f473d73f7cc170e1dcde749898e645ff21425106c46de067f8be0491e1b6fd520d0652dd8 SHA512 4b7d31cb0fccca70a65d1dd474d5991a1f694a2344e39ddbcbc91b23044ddb43ca815d4d0efdfb959910cdf9747030bece832e80e37927aef3ca0333a61331a4
 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
index 4196ed179b15..5ed817404c4d 100644
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild
+++ b/dev-python/h5py/h5py-2.10.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -11,30 +11,33 @@ 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"
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
 
 #RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-RDEPEND="sci-libs/hdf5:=[hl(+)]
+RDEPEND="
+	sci-libs/hdf5:=[hl(+)]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 
 BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]"
 #	mpi? ( virtual/mpi )
 
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
 	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${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"
-
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 DOCS=( README.rst AUTHORS ANN.rst )
 
 distutils_enable_tests setup.py
diff --git a/dev-python/h5py/h5py-2.10.0.ebuild b/dev-python/h5py/h5py-2.10.0.ebuild
deleted file mode 100644
index d524e809356c..000000000000
--- a/dev-python/h5py/h5py-2.10.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
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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"
-
-IUSE="examples mpi"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="dev-python/pkgconfig
-	mpi? ( virtual/mpi )"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${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 '')
-}
-
-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/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 0845c43c4d10..f7f3eef21e95 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,7 +1,7 @@
-DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
-DIST hcloud-python-1.7.0.tar.gz 71683 BLAKE2B 43dfda161505d9aa486487a028dff9406e77f3c33efe935c13faf19503d1cd98a136703939408b0faf50633c1a40bbd5c43d90a6373acb38e8a0d61bf715a02a SHA512 d8fac8b74862d5f59f50ddac4f675c409f0bb5b51b16c6db094acae2323214c623bdb459c7fe0e74bb21fc88aa61e551b951cfa6c7de4504a4bf31c7f9481f2e
-EBUILD hcloud-python-1.6.3-r1.ebuild 1222 BLAKE2B a5e15e7099d0a6a664be879f843bb028d4a5cbebf8b93a03e58c8ae6e5c40bdb7bc2eafd44ed7459437f3967a84f63fe08a58cc24d78fd0db9c085c28e95f4ba SHA512 831bfbd3736832e7a2d438aea92be8b9ada98f282665089c2d0f2998b184b4709b6a38a4248bbda16d11dbdb0997299f1a97dbafb1eecb200eec6ec04063c345
-EBUILD hcloud-python-1.6.3-r2.ebuild 1268 BLAKE2B 849aeebb548c084de979afac89a1e4d73ca99e82edca878db75c1148426cd977ec0ce85c15204299f6465cfd9c9920a215b82df3ecf0e42db56acdfee38c7419 SHA512 48ff49f5db26fd81ce7c6a566b4dc24804b528653a42c361c5640e8e792318f0424e0ba27077a14c4bc6aae3994447f55878156c09403abd7f6eb1060a956ff9
-EBUILD hcloud-python-1.6.3.ebuild 1028 BLAKE2B 6568a2dbd9928e71d4d92a1c15072b15fd77686b142aa0cc921755b604936c4f378d3feef37e0c2e6df7ea5ac196c7881cef73b3000d538fa236a474d98e699e SHA512 cb7879547643d1532988135b2c58f80bb99e6515c440ef6c8ff009d5505878890aaff48678c4bbc59c6b2226ddce0b474ebf2ac576c4cdcc37f63c41c1973e21
-EBUILD hcloud-python-1.7.0.ebuild 1414 BLAKE2B f869f16f112dc57f616728842e07abfc9f04bc64ae1c357dbc72632439eccfa1f5218ae2f6a2a35624b36cd52d519609479862aa4e443c8fb6cdc15bc8ec67c0 SHA512 20cf507235650b7a906c4084618a6b298820191fb3562663897cf121d0894a8197f77a9fa91837780303b1e4c135fe1768abf05845dde746b1fa939f621065a7
-MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
+DIST hcloud-python-1.8.1.tar.gz 87532 BLAKE2B d5e2b5d2aef96508042189d650ef0c6793ca8747a99f20c591c63dbeed497576ef6cf268f75cdc5551b9b3469f1087d5d2ad167af77a93ab321cc9c70d1bb65b SHA512 e26976abe77149db53ea8a35e53de85e0acc3b2021ecbfb1a3a634230d2324e2fb212f54cfcb7a96993b4776d305a247b29aa883053958db881a794f431858bd
+DIST hcloud-python-1.8.2.tar.gz 87560 BLAKE2B 836b0422364e50567cfa31e1a77e0b4a28da4419a0991f1635d6d0366368315ae914d238fab974fb1ba2c5e09172e3edfc625d40c6c099d757fa1c7913dba68b SHA512 8436b57e9a0e5b8fb44f9242c9862835a5e027ee2d774e3dd1b55834f5a574c4f21a543ac9c7d0a105048bd184e7278a3bb4f94a7ee5e18bfb419f0ca59183eb
+DIST hcloud-python-1.9.0.tar.gz 88885 BLAKE2B 455f955caddd8e72d02df57da2e08f395b9845f9658b73dd9f96b1fd73d7793fa13319d8365903599c000a803c9374dee7b50c5ad2a9ba449027d3dc602601fe SHA512 6da2a3eb7e4a4d7f13137167199f01f370210e6c139f0cd8a8e447ea3f14101d4b37b104ed387b1713ad62351ae72c8add7970e878571caa4242e6e347ef8833
+EBUILD hcloud-python-1.8.1.ebuild 1415 BLAKE2B 4d231adb4f5376550b49f3524e20a8350e7788be6b6d69b74b6266a14d420cc9523cf4aac0143d9f7d73739741e22885820f3a33525cb488ec4e61eb09c98e01 SHA512 a47369fd44bb71af435dd8de1c7a8731f051900a5d2038ca153b913690efdf5c13bebbc21c6d480cae44dcdb466406cf89cefa54157bdcf5232c7bb57f32bf85
+EBUILD hcloud-python-1.8.2.ebuild 1276 BLAKE2B 2088306a31ee63ceb9786443410cc49be7e78ac31aaa7dcba875da04071ff1718830276b8cd6e4e2ba9a301543d803329de75da1da2614d1b4fc32112442470d SHA512 00d995349df255a60a1263b3476a2bd23846cdfa00989baa71c7af5697748bcf504580f43f0c5ab255537e8ae8f77ee7a4f26978720b3d8a67e510369592fd52
+EBUILD hcloud-python-1.9.0.ebuild 1277 BLAKE2B ce85723c4555916561b612095e998e4c40f831fd4638041238cd436fab1c7e629ff14ec103262a8e969feeb043ca53689f08b8ad1d1a07ae85f284a5164b2f29 SHA512 b46383ba8af2d2a7741c8575f50620405bdaa4a2a5b40b7c73f96a74da067922cb0edc831f28de641500e2ebf3dde10227af1922d6469045e837f9d5dc366532
+MISC metadata.xml 347 BLAKE2B 4e9c42da7ff606982fb56c60b2eeb1315e862fbd2e55b28a46f8f86ff348fed8fd5a14843e8c41713267d16b378c2e317c672bd561056544dacdad8f09f54eff SHA512 f7a5d3297b23b097ca65415ca87441f9b14dee1f7be980b6bc7d747388fd511aadd12161f5785bbf3c97c3301487e0144fe11c40143ee8b25183c7f68a6d3c9b
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild
deleted file mode 100644
index 7d014ff7705f..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.3-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=( 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-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${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-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${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
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3-r2.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3-r2.ebuild
deleted file mode 100644
index b07faa5569e4..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.3-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=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-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-BDEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${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
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
deleted file mode 100644
index 4ecd707cef68..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.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
-
-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-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${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-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${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/hcloud-python/hcloud-python-1.7.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild
deleted file mode 100644
index 2f3b9f4100c1..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.7.0.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
-
-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-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-BDEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme
-	)
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${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
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	rm -fr tests/integration
-	default
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.8.1.ebuild
new file mode 100644
index 000000000000..8febbd5247be
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.8.1.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} )
+
+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-2.7.5[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	<dev-python/requests-2.24[${PYTHON_USEDEP}]"
+
+BDEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme
+	)
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	<dev-python/future-0.19[${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
+}
+
+distutils_enable_tests pytest
+
+src_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	rm -fr tests/integration
+	default
+}
diff --git a/dev-python/hcloud-python/hcloud-python-1.8.2.ebuild b/dev-python/hcloud-python/hcloud-python-1.8.2.ebuild
new file mode 100644
index 000000000000..90f5fbfd78bd
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.8.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="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-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+
+BDEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme
+	)
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/future-0.17.1[${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
+}
+
+distutils_enable_tests pytest
+
+src_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	rm -fr tests/integration
+	default
+}
diff --git a/dev-python/hcloud-python/hcloud-python-1.9.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.9.0.ebuild
new file mode 100644
index 000000000000..38732655eab6
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.9.0.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="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-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+
+BDEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme
+	)
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/future-0.17.1[${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
+}
+
+distutils_enable_tests pytest
+
+src_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	rm -fr tests/integration
+	default
+}
diff --git a/dev-python/hcloud-python/metadata.xml b/dev-python/hcloud-python/metadata.xml
index 4eceb317f22e..7520bcc3afb8 100644
--- a/dev-python/hcloud-python/metadata.xml
+++ b/dev-python/hcloud-python/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ago@gentoo.org</email>
-		<name>Agostino Sarubbo</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>ago@gentoo.org</email>
+    <name>Agostino Sarubbo</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hetznercloud/hcloud-python</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 4d83f82bc272..6ce69b871dc8 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
-DIST helpdev-0.6.10.tar.gz 12864 BLAKE2B f022e4a76b8f416e806bc11c11c27e4ee1c2a92cdc2a19561d2e8c0de60027eb03ae6696d968f7dcd803d2a9935c4ee9b3a0f8248f4cb8ca2afb13ff58d8be46 SHA512 6bdd51e573ec656de12e5b4c17e0de7c2cbfc26e696bb6f62eacd148fecde1c8c239879a9d44f8a30b12d744ab40e225799fe6176805d676cecabcbee6c1e4ff
-EBUILD helpdev-0.6.10.ebuild 498 BLAKE2B 8c06dc2fe8adc2f71e397a985ae4857fb150e8403804fa188d254b69da4eb5738260fc314c9415492e00af506ac48b33a6d7920fa617892e6897c9f6748f8472 SHA512 bf0c1b0ba45282181e6d2e26536d31e4588856d72f40b590a43e941877adde2d423a945a04dca948ef877f26f0a3bfe42683c22b9617480d16ad27e599c52a03
+DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
+EBUILD helpdev-0.7.1.ebuild 718 BLAKE2B 83abfb3e45fc6507a3de18071799bc9c7c9778559a74b62c17188eecd64b2a83e558c616cf220a7964b81f5d3a4b18c4fb6be5e5f9f0195dc5cda95c63ee4841 SHA512 c680222511815ba1dc384de73db5693c2a7e2855417ca09af566d67d527c8b0bc3eec5188945e135bebeea5147b1985b10d2e813c5405294b8d20eee90c76015
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/helpdev/helpdev-0.6.10.ebuild b/dev-python/helpdev/helpdev-0.6.10.ebuild
deleted file mode 100644
index b2e84f080a18..000000000000
--- a/dev-python/helpdev/helpdev-0.6.10.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,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helping users and developers to get information about the environment"
-HOMEPAGE="https://gitlab.com/dpizetta/helpdev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
new file mode 100644
index 000000000000..52bb4cf4873e
--- /dev/null
+++ b/dev-python/helpdev/helpdev-0.7.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,9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Helping users and developers to get information about the environment"
+HOMEPAGE="https://gitlab.com/dpizetta/helpdev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7,8} )
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/pip[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 6c9910119b61..c4c8a9cef967 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 791 BLAKE2B 163b7865b5d579fc13285436f77bdf10a3eb6cee35cf5e228d5898c690e2998e6cc76aa92f552a555eaecfa00484639f5acdceebdf3d667557682ca080a510ee SHA512 d530785223ed11b740a6ae4206f2c19d1e838797414cd1088b581297eb6fcb0e61b490d2d7d6f223fe59bf0736d049ed078305105553e5d2bf3e6877336d7f3a
+EBUILD hgdistver-0.25.ebuild 781 BLAKE2B fc00822bd5975f2ea7586909f6579b3b5770406ef26e22c2c0ad0a00fb6ff28ff8b7849bf13b418bbe768d732d2b9b2072a27e8ab85b63f8b85e015f77da07fc SHA512 361656aa8faaa968363eb4cb0ba367577442aa906fd409fa2c24b02b3e88e3ab7389f34ba056f479f033ce8ca5154317b6442cc81b581aa2b1aa3dde213cea06
 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 eebff5382012..0d7d367e807f 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hglib/Manifest b/dev-python/hglib/Manifest
deleted file mode 100644
index c174c6ba329a..000000000000
--- a/dev-python/hglib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-hglib-2.1.tar.gz 29030 BLAKE2B 3603e4030baf1f542c7c4b2123a78e3567141af8e84709eca38495ecea264f85c870005b39f8fc1bb2afc611c9a2c428971c8d783bc2595e25d83b9fcb5a2af6 SHA512 82cd00e4184a8a002ea0bcc2dec4de06a705f5f6cecd1ddbddef08ead2817f673590884aee5187fbc3496ced3f27ca8c8d78e0436fb97205ef654cd28d912e68
-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
deleted file mode 100644
index 9a0b6110cc0d..000000000000
--- a/dev-python/hglib/hglib-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=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-MY_P=python-${P}
-MY_PN=python-${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Library for using the Mercurial Command Server from Python"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-vcs/mercurial-2.4.2"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	if ! ${PYTHON} test.py; then
-		die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	docinto examples
-	dodoc -r examples/stats.py
-	docompress -x /usr/share/doc/${PF}/examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hglib/metadata.xml b/dev-python/hglib/metadata.xml
deleted file mode 100644
index 5d827767bef9..000000000000
--- a/dev-python/hglib/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>arne_bab@web.de</email>
-		<name>Arne Babenhauserheide</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">python-hglib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 3a1aed101169..3805a978080c 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,4 @@
 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 1057 BLAKE2B 63ea72588bf2808508439d03d8796b3156de41d5716297c00573e765849111f264ab91833f6881973558b124cac3cba3c935f9c65ee8e9bd92af5868bb6b6d2d SHA512 dae03fc39bb37a279f33f1dcad2b05ab59dca8726e1b1c7fad67f8a94a2a27cc75967143f704ad6a800726640d930d6a5ecc6f4cab5a905cb0e8bf7af81571f2
-EBUILD hpack-3.0.0.ebuild 1144 BLAKE2B c65cb0666b676355623d19c4985d9f8dd9c20f1712a493b9b8cd1a0668ebba480161c10c03521f564ba13128b5376168b5f0e892a2475e72ec25811a5b55bf8b SHA512 c1f59638cc93565b3f42be3f6576609583dd66bb79e544e29bb1620091ae4019e2902cc119bbf5ae2351dc71a09f12f5869d4ce96aa86731e6d2364fa9d498e1
+EBUILD hpack-3.0.0.ebuild 1134 BLAKE2B bc24b1c99733ec94dcfa3c9377dcec18d66524991ae54fc3f6cd72807cc5459edf85ff5331bc15db7ebac20a6e30803ea1e817f48ca69b7474883756bfacfd34 SHA512 ecbb4218d5fb8bcf481ce982d732622efdd72f70967625e2fe1de26595fdd424735287531b6ff10000ecc2854adb39e1574d92ab14d38afb54714ad166d8c848
 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
deleted file mode 100644
index 89ccb2e23d62..000000000000
--- a/dev-python/hpack/hpack-2.3.0-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)
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Remove a test that is not part of the mainstream tests
-	# Also, it's data directory is not included in the release
-	rm test/test_hpack_integration.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		py.test -v hpack test/|| die
-	cd test
-}
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 3a62a22097ce..e19f0adffbc8 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.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,8,9})
+PYTHON_COMPAT=( python3_{6,7,8,9})
 
 inherit distutils-r1
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 557054fec7ec..afda5f89c44b 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -2,6 +2,6 @@ AUX html5lib-1.0.1-collections-abc.patch 1336 BLAKE2B 2b626d56830ff818168ca5b0fa
 AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f2008978378c54a889cdd3cc28f33993d16654dff6ad7dbff69a42dcdef7c3cbd57677c88bec9650fdccdd754b488c956146168290661090a4702c9e SHA512 51435c4094fa0e0c423e21c15709e5ebe10546cbea3ac97635c3d1ebef9287d6c42a479075cc790ccf233c67924a518638d6618f073df2b0871da3fb2838e10e
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
-EBUILD html5lib-1.0.1-r2.ebuild 1006 BLAKE2B 7eeaa358a6864e61b9e9f99749d9ce0672fbce54142c36b24e8168fab3eb930f83ef9e763a225a0cf5a3707b5547d7b873c7ae4f21a9ddc4ab9f74f73e4c62fd SHA512 abe0b8cd95828e7e7e7308da3dfc512e4f25a01b19f4b48116f2c261b18a837411d8f9f9011b52f5ac55609c17e8a03704c0d7ef0dbaa1ac8fbec5a311cc2de4
-EBUILD html5lib-1.1.ebuild 810 BLAKE2B eb172bdbf08f5b9fa1e47cf62d8f8c95bb97280fcb300ed018582d8874e344bce06ad3b088be1a9407cd61c2a907e4adb42cdcfba6bd1ae38b9d72564ebcf786 SHA512 b952e9042a8ae86fa3c36423b373a7a4f8c95770f7e884f0df1878178b8676d05a1860ac515dbb2040d6469112093d440d70d38814f5a3f025fa9986e7a45284
+EBUILD html5lib-1.0.1-r2.ebuild 1000 BLAKE2B f9d18a3bc62939db608535664b81d2d81e10cac020b08ac940798a036145f9e1f0156a98d3d17dbc56ad25785b9078df99be8a213b0beff3a2d03b0af8878f36 SHA512 0812c6c817aff122c8edd70d85ba51dcc8d1a751ce1ad08cdd28ef5954cfb79135a477e2a046a08dcab99ff0ecf06860d79a381ee3706af6170cdb19c9313d36
+EBUILD html5lib-1.1.ebuild 800 BLAKE2B 053638a656bbda3f7578bd4a7d5ea7d2ae78e0cf633615664fb9f03041cb697afa2ba30c5790dfe3559ed645e39d79c1fca437a95717b8fbf83f3bac36a78204 SHA512 e6d840540e9548a270d5c794cc57d311f5f5cdac18bae47c39d4b8085513954393b5a0cdc654a25f9b3ccb7bbefa07c50f6ef89d79857677291c18176f1b45a4
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
index b2553ca1f8c2..cb7387aff2c9 100644
--- a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index 16f72f8d42f7..939abadef410 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 9d91527a282b..9160b8229bce 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,5 +1,3 @@
-DIST http-parser-0.8.3.tar.gz 83040 BLAKE2B 8ccfd15154e34756229159576340536e447a1b76375df7c3f56b96c79957a3b28569fd4a4e77303fd1d254aa5652478f7e319e7556150de563f5b12c58482de4 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
-EBUILD http-parser-0.8.3.ebuild 926 BLAKE2B 46bffc6a2319555ea102393d3529a6a11ee81371a120b60d4255bd518254ce62179b62a5ab791b4ac4a64cf46955864508fb208fa01acbfc1dca8e4574acb15d SHA512 4d7389cef4c82d51dae23765dd30511a695ea84d05e9b87034af6622a2f0f5ebcd27265d916be7720d2fcc23dde65eee6252d1d576c1defd85c46959cb17881e
-EBUILD http-parser-0.9.0.ebuild 888 BLAKE2B 49b7b1bd729c6c7103761e200b4dd45a69c70394661b9ce02597a6d2432e669aecdf594d26d8e3480bf3abd48a723d4577c1c2cbafd8133cc368fa65dbecd9b6 SHA512 5bc12cf93fcd27e63ed1e3d6b959701d3ca635e389681af3a75f795c6596406b8a13ac5aee5102c7b92674ecd30d1a3fadb436a7c83cbcdd00768bcf43b12af1
+EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B ecfa101214d94aa99f1ce3c56b2dc5694b0b0f3014115997abb30932b32dcaf14e808f7a266f37abc07ef25ae17ae04f3023aca880f723e3ae5bfa62d2da4126 SHA512 1a185dac83873c37d53872ed1a420db1d16f677367cffca5dd6cd24f6b58968aff0306bcb92e71577f86640e7237226852e50b208cbf74ddd8c402bcd850ffea
 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
deleted file mode 100644
index 896c88cd6aa9..000000000000
--- a/dev-python/http-parser/http-parser-0.8.3.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 flag-o-matic
-
-DESCRIPTION="HTTP request/response parser for python in C"
-HOMEPAGE="https://github.com/benoitc/http-parser"
-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"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python*')"
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	local DOCS=( README.rst )
-	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/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
index 775ab3cd8575..7230c49ba818 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 559de5a0c232..6167372705bb 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +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.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0.ebuild 1077 BLAKE2B 5521b7cf47756a48821787bfd28e5d2d2319e6e2ff72516aa0c85303c3789f64b9de3e0d7f0c4e11b541c2b9f74cbf46fe78b90f9f3861ff7c1b79ad25a0440b SHA512 da24e194598d34329c208012c275292494132d831ac14ec3329a4543a8a790b17f1e63d053312fa0b3af7aa0373bba97f686bf83dcce2a7333e852406aa1e270
+EBUILD httpbin-0.7.0.ebuild 1074 BLAKE2B 0f6e17a8cc92088f0e5702c89146d50494de98bfb03b7899641da929a799d9aa55cd68415a1cc841118a55bb64699df28703f39d04e5834e54d6200abd9f29c9 SHA512 b5ba2bcf91797cac502f3aef49b0485c39cc8d6d0f2114b4bde72c45f6e0e4dcbb9bcada85e665e78f8c8b41d7bda6644fad5833eb3acb284bc50eeff1b432aa
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index 0c6a3d727d4e..4d57e0c59304 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="~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"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index f8059bb90537..d4a629de4096 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
-EBUILD httplib2-0.18.1.ebuild 1389 BLAKE2B 0ce0d890c9ead002e91d39fc14c4706a5f933b3025fc775d32033655b537dcb66a6d5f408609dd59797ee2eefbdbbc5d57004c12af85978bec65463ec54d4240 SHA512 74cf81885d8993291cc403d56b3ae36ad0e44907dabbb2541aa9605cf96f5d78cc60ac5bcc40206ca073b1af987a21899fdbdd2bb79c772f6d960845683cd165
+EBUILD httplib2-0.18.1.ebuild 1388 BLAKE2B 89ba39a3a5fa3a3fda83b1a5ee187b24489e5a8662cc1e82924008c32f2445736264189edd66a429cf56c5ecbd069fac72f6ef811681d401cdeae7250ab3694f SHA512 33f1ba8f543137ddc29a5fbc4e689ee329d80fe0a7cc65c2d46730c9e71e142af71b0b0ef51d4fcc3d4d8683dc569a26393821b923269a7f5e2d44a6a25eac1a
 MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1.ebuild
index 6e298a0e0b21..7b48fb23c40a 100644
--- a/dev-python/httplib2/httplib2-0.18.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="app-misc/ca-certificates"
 BDEPEND="
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 82dfbc5695ac..0487aae1cd65 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,6 +1,5 @@
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 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-1.0.2-r1.ebuild 1323 BLAKE2B 4457955bf7783af2b20fbeccf263a1b5c9d8a25e402a278da5210f1b3339663ae5684ef43daaf4e4fd16ba412aaa517d09baf7e53346f0fd8f26fd8e95fe2c01 SHA512 d0c5d09bc3c16fdcf32ad1920c14ac4314f2594efb34dca4c82822a4a186019cd1c0837fc71395a19f103473c88d894777093a6827573b094217d3e74aeb962f
-EBUILD httpretty-1.0.2.ebuild 1038 BLAKE2B 52b1f2faf18a03fdf9769c138c2de275b8bef2774e668df5b2a0fce36ecc83aec18a6f19146320b05b43420783a239c4267cd322cec83af4409c3a693b20e221 SHA512 7081a41e72ebaa0dfa96795250ab6c814857c8d7d237181ff9c3197ec71be6923ef02614d2d068cbcf122b5ad53278c32f4f2a599c7a274fb708ab01d2e2546c
+EBUILD httpretty-1.0.2-r1.ebuild 1338 BLAKE2B 663bdcf6c3ddb239cfcd02fb41fcb09e0c5a18c711494e8904492482ad35ba4c684d4dd0520a463aed6db2b6f776a43fc4ab8a5e669a70b099ed4ac0ae38f394 SHA512 1ecf0485842babce7e52cc91245fea4ccdd4e47e5628fee0a5416b87886846de11e7210da770129bd420f195a2999ec3d003e411cef821fe2a6dc296e0ff997e
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
index 363537a5c97a..1851a2c02fe0 100644
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -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 arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpretty/httpretty-1.0.2.ebuild b/dev-python/httpretty/httpretty-1.0.2.ebuild
deleted file mode 100644
index 448717cb08c7..000000000000
--- a/dev-python/httpretty/httpretty-1.0.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=( 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/humanize/Manifest b/dev-python/humanize/Manifest
index 37309094fce4..562fc69d5e34 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,7 +1,5 @@
-DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-DIST humanize-2.4.0.tar.gz 46489 BLAKE2B bb2cfeebd25f4aa073539bb616a5d05db2827dd2aaa6f093d46b51415ef3b954918a45f2434b9ce41845389be986200e23b1cb752e8a0bd03649377ea46fbec6 SHA512 20707a59f2f0bbc52e1e5d906e733561f53c3bc429ce24662ea9014d7f73f87a8f3ae9aa62f2564fafbe9de0d6b250e8fecec4a3cb81968c5b24d61ad9627d1b
 DIST humanize-2.4.1.tar.gz 46827 BLAKE2B e9b37283c5a4db1c5b2a9ef61919fe02a4e5720711129910e51b0b3481290c9bfa4e29225db75c37d83884c00065fa71b599ed42fac41414f481167d33091a98 SHA512 5d8534d2e97f375c7ec065dd239334a2a5da9d058f7c0312cb2683c3e42f5b8f99e117782e0888a6e5348f43958523df6609c294f5af7c971d81bd29679a0500
-EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
-EBUILD humanize-2.4.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
-EBUILD humanize-2.4.1.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
-MISC metadata.xml 537 BLAKE2B 7b1184cce1bc82ce4a25986a86b6652a4504f3655f7d5eeba66f861230670988055c30523b64d1bcd889976f4b18299fd90e326f49eafd24c0e53b13e33bc59d SHA512 d72a8d89642dae3925593e9692108fef34a177937fa48823cecac9ecd1869a6dafdad73e1397a6a337b3517185c049ddc287eebaf0dde992b31f700ee9512fa6
+DIST humanize-2.6.0.tar.gz 53753 BLAKE2B 7908100cde103846554264df887ddb54223900cdbf1e52b2a19f029084b2997ab7a02e275f437d0cc04c3c42d6f8c371fbdab23468cdeb8f98a8cd6a64c1c288 SHA512 d1e57672c80ccabc48dadb2bafe65ac0b5b23de13907d7d51a06b6a1f2f01ef254e36afa203c9393420ad3bb5aaa22616a0d5c4c71cc53cf47727436be0b1599
+EBUILD humanize-2.4.1.ebuild 891 BLAKE2B 207f7258b693d02a5ef90ec6c97964ff951197460f78f5a4a8cb98d45d01e3924eaf1686380366f43cda91f9df04722246786d55c93729a5fbb8c50a5a45a54b SHA512 ba5f4da1f605ded23d73cc040d0f35fe8a6938bf6e92c0efc8048b69127ae5f3784efffba5587b9d13e741945a706028ab6ed3300bcfbd9daadad32c022db6e9
+EBUILD humanize-2.6.0.ebuild 895 BLAKE2B 5771f5170ddd5b562eb7d0419dce949175f167bd91212f2de97e2d60a335257753502e402db8cb68a12ccea07d98454c2ec8d1fed12d5fe4d98e9c0d56bead75 SHA512 490a9c2ad0efd33bd52dd8250c3ac1bfa5774dc351d7045cb79bf4d7707f1bd59f6a219bb09204f5226bc1a766203e0ac6123639967af25f47c14e70a3d86ea8
+MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
deleted file mode 100644
index 9fb7249b70dd..000000000000
--- a/dev-python/humanize/humanize-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=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-# Tests are not included in PyPI tarballs
-# https://github.com/jmoiron/humanize/issues/33
-SRC_URI="https://github.com/jmoiron/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/humanize/humanize-2.4.0.ebuild b/dev-python/humanize/humanize-2.4.0.ebuild
deleted file mode 100644
index 4785489816a4..000000000000
--- a/dev-python/humanize/humanize-2.4.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=( 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.4.1.ebuild b/dev-python/humanize/humanize-2.4.1.ebuild
index 4785489816a4..fe65045a9ba3 100644
--- a/dev-python/humanize/humanize-2.4.1.ebuild
+++ b/dev-python/humanize/humanize-2.4.1.ebuild
@@ -15,7 +15,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/humanize/humanize-2.6.0.ebuild b/dev-python/humanize/humanize-2.6.0.ebuild
new file mode 100644
index 000000000000..6225e90488c1
--- /dev/null
+++ b/dev-python/humanize/humanize-2.6.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,9} )
+# 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/metadata.xml b/dev-python/humanize/metadata.xml
index e401be0146a1..27cd9b203a6f 100644
--- a/dev-python/humanize/metadata.xml
+++ b/dev-python/humanize/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">humanize</remote-id>
 		<remote-id type="github">jmoiron/humanize</remote-id>
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 9cebf7bc07ba..2db23cac6a35 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,3 @@
-DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
-EBUILD hyper-h2-2.5.1.ebuild 957 BLAKE2B 888cec5e7d877d63b2c0b5499d1638a0d0494908091612a5dd0c5ae0ec28e211544dd92382eb7270de0cc17cc6c4744e284a8c283fa7535ea4b6fa94efb0e93b SHA512 06c5c5a40cf9db89417431b7b97a65fc86a06620cccebde8e1012f7b75c30c5a88c12e37fcaa37358700628e57572589b541f39be34fd440df029926241bc9ea
-EBUILD hyper-h2-3.2.0.ebuild 1082 BLAKE2B 5a2718f6bd99210a6f037d96e9dc451cfe705e8c3ccfcde90396df66732cf275078fe3822e643ad002ead27285c80ad0a049d6bca5ddba3eece122e905c58da1 SHA512 0d72a55910770a0533d7a397ab06197c1cfb7fc637efb5237c08c7cc2786692f794599a1e2035e1352b6308557854eab35f16896b4c81306558a396cf76ee28f
+EBUILD hyper-h2-3.2.0.ebuild 951 BLAKE2B 6824009d985a868be4acd09c0f51c8a0774d3e0c390d68220c6555a946bffe60320a67d24f7dc19aeeeee4611b0f726d065364f99fcbba1d859a0478d65e32c9 SHA512 87d7d194bad7305bc3a405759ddf297d67515644b0bc40a3926ad4ae457ca8a23543fd0070b3233fe4507878bd51c4a55f8c23f9624479563ea180d203189108
 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
deleted file mode 100644
index 8b0f3b21078f..000000000000
--- a/dev-python/hyper-h2/hyper-h2-2.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=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-MY_PN="h2"
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable
-	https://github.com/python-hyper/hyper-h2
-	https://pypi.org/project/h2/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
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 cb7769975da4..114276642909 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.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,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -21,9 +21,6 @@ RDEPEND="
 	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
 	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]
-		<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' -2)
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 7a2dde30a8b6..7c45dca79b9f 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,3 @@
-DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-EBUILD hyperframe-4.0.1.ebuild 486 BLAKE2B f7ea74e2b99715c39f73abcde4fd026744df92876ea37dafe54bfea7623101f57d18538c3ea4216e74c4c3444fb6cc2bb39fa4de6243802d2952b5eb7554a0b2 SHA512 1e8ce163e9083e37cd7d550a672e366e2046bb858221aaf9649a8d04fc9f640c649b347514978edc4ca19d3a43051fb16d9147341723c9dc7a8875fce67ffb6f
-EBUILD hyperframe-5.2.0.ebuild 538 BLAKE2B 959c562c759063eefdc85fb631645a94212664eca4c9e0f3e81dc540d00415fc909c4220f9bb5f2657b4534e9e767df72fe92da733765833c8695ae1f1367e2f SHA512 e5ab7aeba5eeaf73bedd5a3551be1618fe28ca6f1ca2807e8dd44cfa7e62e1836e257e1de1caf3aa3f9469c15daed26b9b176726bcba2e8bb65a139431636941
+EBUILD hyperframe-5.2.0.ebuild 528 BLAKE2B 5f23553a52f35a5f9e2a9bd98a93660b5aa1fc8be93f7cefc165b8e4fae622befd16ec7f0301cecf9d657ae7435738482d04fc90529882de4962f9ba27528144 SHA512 3428a4b717278ed9b4d30845c295371bb00529e89172b3667e32a0ca8876baa06a802ec8d744bd76f3fb9304a78c00f020a57c29eb1630b33ec3a185c9b80c22
 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
deleted file mode 100644
index 89a3844e3674..000000000000
--- a/dev-python/hyperframe/hyperframe-4.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=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe/"
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 737863453dfa..5d9af85aecb9 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.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,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index a468b9407d65..9af8ec22524f 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,5 @@
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
-EBUILD hyperlink-19.0.0.ebuild 578 BLAKE2B 07923943659db3f4b9d2b1f32d4d2fb1d84ad82c7409a660f62007d97093d2e0864bed9ddbd355a71a37d57f3adb687f9e166f7c1b6a0ddb0b8eb9fe7f4fcd79 SHA512 09d4cdda6b666d8013f66bf14e8f0dba506bd3ca9cac28a7613771ad3cd4c698454abfd40e5a561be7fef76e8aaa125655597b804d0e4fd5725c7953109e0e19
+DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
+EBUILD hyperlink-19.0.0.ebuild 568 BLAKE2B 50b5ab528343078e69ae3dbf0135f34b74a660618090fe7cb215535f32a4f348bd98c57baf63f972a0469318cceddce108361314e6a767cf7645a7afda564f44 SHA512 122381a0f3253cfc5e0e6511d71114e8552767d39b6b5d09ccdcedb1f56337948ea0af20f7b74b7681f415e5e68670b17c712e10e936746207c0ef165866d710
+EBUILD hyperlink-20.0.1.ebuild 670 BLAKE2B 83e8672955c293c7e6bdb3bb7378e36ca3d3d7c06015785d96cfa82d4d050372d029c5d5d258e61cea5d48a47278f6f901578c44c059c01c6b0ed4150e53ac29 SHA512 cdb48e07b8a670f2068b9210d6d831d93f3549bf77ac5795982462852635b411a8a6ff651ae3d2adc4f616ddc9619b26bc812682a161d53cfa092a1b517fb702
 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 4457f97f42f9..3d1b449904b3 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.0.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,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/hyperlink-20.0.1.ebuild b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
new file mode 100644
index 000000000000..d1adb23821d0
--- /dev/null
+++ b/dev-python/hyperlink/hyperlink-20.0.1.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,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A featureful, correct URL for Python"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# suppresses hypothesis health checks
+	local -x CI=1
+	distutils-r1_src_test
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d95e9bedbe07..65dc07c432bb 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,29 +1,13 @@
-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.11.0.tar.gz 9007902 BLAKE2B c9a924ae6496d2ff8babd688b36d36963bf169c309c26af95cba73567a3c2d76def08f511d7eb62e254b8b6c9db6e13b2e91a940148013ea0fe6ecbcba07e467 SHA512 64a39eb18b435c18fed3bb595d73d6929b090fdacac11445e7e0c07b80616b46bc1e1c7fc3b4c7137ff4cadd6da467c2b0ba02aadf8dc18f6900268c4e33d677
-DIST hypothesis-python-5.13.1.tar.gz 9010460 BLAKE2B 55e3266eb0a48e60963a3a97e185a887461d301996f92f3ccf87721ecff9d7fbc8112ac7b03fba49269affd74ce412b4230152ffe8dfe2317fe02a7ca7be0301 SHA512 2674865842d8610b61ed2b7ad1baf9e787d816e8e1a26886227b42803b882f6395d81fafac3e6ce9592e378ad3370139a1c206220c990d5fe5276adb0b1b9fe7
-DIST hypothesis-python-5.15.0.tar.gz 9010730 BLAKE2B 926433af6c57ee5206bc50ba96275b43c75534a31ab680042e42b4c4b01cb3d55efe76ce5355ed5407c83237c748929e04fbab570f04ad3cd6d41446b90387a5 SHA512 333547ec8433e9190508038f4263c4e65399db3cedf2f5e0af6bcd398ebcdb8614899499c3c6f0395333933b5b7e1d88dd4606243ae3aa8d763afc84bc1831e7
-DIST hypothesis-python-5.15.1.tar.gz 9010924 BLAKE2B a00ebf581781e47fd85fa9d5044894d3f81e1195bbe4269e2bb2262dc70586936df33c4871b4186ff45ec49235b81a4070fc89daa67d2bcd31c98291c12be730 SHA512 d3fdc2ec2d66353da2ee790eae8ecef0bf168320a90556b5877844af975765c1da37a104765a3ca07e3143621be5cb01acfa7d19cc3222a52a0cd6eb63f6c0be
-DIST hypothesis-python-5.16.0.tar.gz 9011031 BLAKE2B 65659f72094ac7fcc82c7e5a8b88c0156345530742412f13398dc72ce50d2466fa9b04b5cf4a79e87916aae770f2a89aa880d1d238890c7f8c8483c4c5068bcb SHA512 66366c172aaed84f1fb5fe0cef4e0fccfa4f65c31a94d52cf3a49b44b535f8366e71974f2aaa7b39d1d1b4171fd92cbfe4bbbac8ec4b9c4ccd2b0e5d15976d26
-DIST hypothesis-python-5.16.1.tar.gz 9011388 BLAKE2B 9d80cd296475846404ded5c466ee50f11957959f08a94a715f80e732da83bc31b66a2bbff2bb4ac1402dbeddda219eada772267f34705b8891137b8d910e5229 SHA512 ea1416c041c857fc184fcce10862d93fce1de888396527d120b2d5f3cd041084d85f8ab4b36693d52786c7162bf41d61c9700ebc4509902c6fcd1c2e87130dfb
-DIST hypothesis-python-5.16.2.tar.gz 9011495 BLAKE2B ecac1ddd0c214a06e8822fc04f9fd9378933b1c3721c1a3aabfa605d45df21b22b76a497f5fa1bef3009ceba52d582c9f69a0918fdcaf7df7b3c03405f8eb7a9 SHA512 91feb7b81c4c36468b05318c0db7ce3b607374b55bf2609bb587d316448f087fab44b99cde1cb5fc440df8d31ef2dd6c154281f13dd7bc6d1de4e463cdabf66a
-DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866 SHA512 912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
-DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
-DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
-DIST hypothesis-python-5.18.3.tar.gz 9017453 BLAKE2B 85356e723fca66853e388a4a3e791dd4b1cfb80b7a4b62363a4f0d0aeffc44c051eeabd516eebd5737a96050edef978a87788c1141f87aa2e310eda9bf64a0a7 SHA512 baeb4644a90fd8694d88819a46ba1ea6c60ad13e00f07cb923a3d0f43cd4b4d61bd07bf25e45e6d1203f9db44fbe8ec7eca7e029c804659025df89a80520e550
-DIST hypothesis-python-5.19.0.tar.gz 9022213 BLAKE2B d8996cfd18d24722cd4faaf8335ce2b1c67757e3ffe973a33bd8ad087fcde513442d9fdf01f486ee07b33504e4088aa9e4c104782c3b03aa4f0d77a99ba6f672 SHA512 c26b0c9c5c7e1941c7f491e8e8165fda86a6e985204b9098c214080e508167f77f7dffe65192a4418f4958c3c6df44a20d75131895517c40c1113995ace3b604
-EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
-EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
-EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
-EBUILD hypothesis-5.13.1.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
-EBUILD hypothesis-5.15.0.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
-EBUILD hypothesis-5.15.1.ebuild 1595 BLAKE2B 6fbaf4b3a84adbfc6eb1251ba1df555904e0bed0013df52891d3d2d9f99e97d01e3f6352ea931d30aa6f5cf340ff82a338fda1e12fd94dca22263559ac077c29 SHA512 b603470e4d701a878bf316e6678a93d32ada16ca5fa39860f3a3f3a7cb5b12e9862580a80cf30380933d03ff9a2df7711013c9a4831f5d2572df5423b6beeb72
-EBUILD hypothesis-5.16.0.ebuild 1606 BLAKE2B cf440bbe2db950770ce947a6c1dd0f6a9a3c7f304ded9c20041b8de6b5406eedd410aaaf26c91b7b2cadee11b6ed48bcda8bb213bad7483be4d00ca7f72cebac SHA512 c485e6b28f49613448a328cb2815b295070eb91761ce5ca7f49c3dc4fcf8bd1a337626c7a6f1c24268cdb01a92a7235eab29432a3bd9f6a08130e3738f97e202
-EBUILD hypothesis-5.16.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.16.2.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.16.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.18.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.18.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.18.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-EBUILD hypothesis-5.19.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
-MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
+DIST hypothesis-python-5.21.0.tar.gz 9025422 BLAKE2B acd6f3b0f945ae65656af2a718add06fe440e221fda7793e3557ab194ccee4c6327e7946a58ce51e9efe3c08274888a648d9021c49fdcf663a04c28b99a0f636 SHA512 1921e5ea8d0f2a6e55d80611004d35671f7a7a02cb8a8f101b45e64e4ef23f9c2c8a9c467fb6c9f33ae440622020e1ad504f51a7d725a6449ca715ad1f373e40
+DIST hypothesis-python-5.24.3.tar.gz 9050345 BLAKE2B bfb47794edb3c1c6aee22e808a6d27af52f8176d307f9a585efa0f1e0d68adf9a902ed6f67405e77c6804f18e17a76486ab42f610807f6ee97535f950318a055 SHA512 7647d14ba805ad3ff6465e1d2c6d9104560c7ea31517777ab45e07da39efefa7109215d2f4074082620554ae4aa5ce5060bca5c923d11c14718f1efdae829986
+DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
+DIST hypothesis-python-5.27.0.tar.gz 9067945 BLAKE2B 29cd1fd1b7cd4a2258a84d4dc122284c1cc8f21da2604e3b6c800a3bb43687eed7a3eb5b33373000c7c1359a3ff08326107d878910a0d92817c0c29c743dd1fa SHA512 973ab33c69d2db58ca3550335be3cc4196ccf532ccc2c0aeb0b54459201904c06f289a9f6faa3bfa77f6704a6f43e253e34453110cda750a2a1a19a851038dda
+DIST hypothesis-python-5.28.0.tar.gz 9069739 BLAKE2B c7b404b815053441a7446c947a03a50eaf3030cb2b0387dda697e677af94b1b90e7570603ef3b4f8b26b9afbcdfc1b3708f713202c4a3617c73494f9e13781aa SHA512 7d3f7a88d70d48465a5bb6b995a73dafc4273f4a0cc3d3f2ee0ae125e1b2f52b9a840268acebf80f4dd1e86b5b5998996f2506a665f24044643a299aded0ced1
+EBUILD hypothesis-4.57.1.ebuild 1836 BLAKE2B bdb5dce13df4313f88387dcbde4209f31a7f23ddf9a6a5a3f886bf050b35f3b45e27ec349cd8baa1d3ba88e5e9200283df5b6f11c0d10fe4383d33575a682317 SHA512 b642bec77a742a13acfc480f02eec505fe0908071c55b58264e066e6ed3187ed0ed4b6d5a330db304ea45a1726f8c67a000e5ac179b63f72a79aaeda616ca2bb
+EBUILD hypothesis-5.21.0.ebuild 1604 BLAKE2B eca08db7b4e0937dbd5de78cdb420e2a5557105590415994db1b7f43b33dd006d64327c750414d076c42d609338309de94b831adeacb05c9d5c0402887bc4789 SHA512 d95ef55b76a3317fded4c9af28a4e75987263eec99063c25e926602a62a0016c09a8d7a877e43f715eb7fc4d4874388e02f01e139ca4e582ba0f658def9696aa
+EBUILD hypothesis-5.24.3.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
+EBUILD hypothesis-5.24.4.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
+EBUILD hypothesis-5.27.0.ebuild 1844 BLAKE2B 7a25a5c1b07603bad7984ae2baf757d2ec0ff8c9f5142db0ebc94efdc0fc2000a17a3ec99680ea5a18b4f373749df79bec73b4825359dd39b8349132cbbf1349 SHA512 45da50147532aa3d2b427146e4379ccade85900069f210d515b48fb5774d3e8505966417238edfce8d026889c522ce2a93e6f2146fd49fc421da34f86e0db5a3
+EBUILD hypothesis-5.28.0.ebuild 1844 BLAKE2B 7a25a5c1b07603bad7984ae2baf757d2ec0ff8c9f5142db0ebc94efdc0fc2000a17a3ec99680ea5a18b4f373749df79bec73b4825359dd39b8349132cbbf1349 SHA512 45da50147532aa3d2b427146e4379ccade85900069f210d515b48fb5774d3e8505966417238edfce8d026889c522ce2a93e6f2146fd49fc421da34f86e0db5a3
+MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-4.50.8.ebuild b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
deleted file mode 100644
index e780d7c770ea..000000000000
--- a/dev-python/hypothesis/hypothesis-4.50.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=7
-
-PYTHON_COMPAT=( python2_7 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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	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
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		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-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index d917ac98cf90..dbb3ff9d7f15 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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.11.0.ebuild b/dev-python/hypothesis/hypothesis-5.11.0.ebuild
deleted file mode 100644
index 161feb37e789..000000000000
--- a/dev-python/hypothesis/hypothesis-5.11.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.13.1.ebuild b/dev-python/hypothesis/hypothesis-5.13.1.ebuild
deleted file mode 100644
index db5d42767265..000000000000
--- a/dev-python/hypothesis/hypothesis-5.13.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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.15.0.ebuild b/dev-python/hypothesis/hypothesis-5.15.0.ebuild
deleted file mode 100644
index db5d42767265..000000000000
--- a/dev-python/hypothesis/hypothesis-5.15.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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.15.1.ebuild b/dev-python/hypothesis/hypothesis-5.15.1.ebuild
deleted file mode 100644
index 1671594bdb5a..000000000000
--- a/dev-python/hypothesis/hypothesis-5.15.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,9} 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 ~ia64 ~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-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.16.0.ebuild b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
deleted file mode 100644
index 2455d57012e6..000000000000
--- a/dev-python/hypothesis/hypothesis-5.16.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,9} 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 ~ia64 ~ppc ~ppc64 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-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.16.1.ebuild b/dev-python/hypothesis/hypothesis-5.16.1.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.16.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,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.16.2.ebuild b/dev-python/hypothesis/hypothesis-5.16.2.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.16.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,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.16.3.ebuild b/dev-python/hypothesis/hypothesis-5.16.3.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.16.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.18.0.ebuild b/dev-python/hypothesis/hypothesis-5.18.0.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.18.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,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.18.1.ebuild b/dev-python/hypothesis/hypothesis-5.18.1.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.18.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,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.18.3.ebuild b/dev-python/hypothesis/hypothesis-5.18.3.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.18.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.19.0.ebuild b/dev-python/hypothesis/hypothesis-5.19.0.ebuild
deleted file mode 100644
index 494668bd6a8e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.19.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,9} 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 ~ia64 ~ppc ~ppc64 ~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-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.21.0.ebuild b/dev-python/hypothesis/hypothesis-5.21.0.ebuild
new file mode 100644
index 000000000000..b36d0b119e67
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.21.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,9} 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 ~ia64 ppc ppc64 s390 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-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.24.3.ebuild b/dev-python/hypothesis/hypothesis-5.24.3.ebuild
new file mode 100644
index 000000000000..54efc2972e96
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.24.3.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,9} 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 ~ia64 ~ppc ~ppc64 ~s390 ~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-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.24.4.ebuild b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
new file mode 100644
index 000000000000..54efc2972e96
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.24.4.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,9} 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 ~ia64 ~ppc ~ppc64 ~s390 ~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-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.27.0.ebuild b/dev-python/hypothesis/hypothesis-5.27.0.ebuild
new file mode 100644
index 000000000000..fcf6b2610385
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.27.0.ebuild
@@ -0,0 +1,68 @@
+# 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,9} 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 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..8})
+	)
+"
+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_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+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.28.0.ebuild b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
new file mode 100644
index 000000000000..fcf6b2610385
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
@@ -0,0 +1,68 @@
+# 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,9} 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 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..8})
+	)
+"
+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_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+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/metadata.xml b/dev-python/hypothesis/metadata.xml
index 51edf873f002..7c5b75670d16 100644
--- a/dev-python/hypothesis/metadata.xml
+++ b/dev-python/hypothesis/metadata.xml
@@ -14,8 +14,14 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">hypothesis</remote-id>
 		<remote-id type="github">HypothesisWorks/hypothesis</remote-id>
 	</upstream>
+	<use>
+		<flag name="cli">
+			Install a CLI tool used to write tests.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 500f40bb8b18..884990e730cc 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,5 +1,3 @@
-DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
 DIST icalendar-4.0.6.tar.gz 78418 BLAKE2B 4941262cca63cae4df249b6ec01b73b640caa002d011ed19aead89fdfc6fe9a7e37258d95668142137faf635403986a2ea4d3e39dd565d1205dfb238fd13e98f SHA512 e8f7ee878cc14b75636268d7b8c79569ce1875142fb907b1eb74bc6b9cf96f218e4be63828190aa2a27978c431437c1d454febe9a2da58c5f2785e283ae725b2
-EBUILD icalendar-4.0.3.ebuild 1128 BLAKE2B d03477b5ff950c8e4269d1b2afc4ff6deb3bda4ec97446f9c6c1240f3b37f16a94f94c4f0b7ea5b14b517b18a6bb1381713865125e3043b3b7b4d8c0223858ab SHA512 9fc3ee32ec7521e15b2fa0481cef0eb45b54088c3ef18a50f1f3de005fd9f61b09f358fa6062c284b37eb1557bbb3171efb59887c15950f8d1393cfd9da00ed5
-EBUILD icalendar-4.0.6.ebuild 818 BLAKE2B a309fa950247ca9095e91d24a28fd5778b8b6c2e4790a2b5fcc732ed1b64c372a7a5d3a0287e37c2c9a561628d0baaddb9ea8348c40c053e2d8d1b4f2e5d158a SHA512 c5abca0b72f30895f044b56930c91a15504c8e1ff9558d1916432658dc39ea8436a246e668e902b5f0ddb33553bde2488accadce6d6ec4e2ba29f6d43d026a4d
-MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
+EBUILD icalendar-4.0.6.ebuild 816 BLAKE2B 89c131e1e5d9d00b84211762e9972502d531342bc33af5a606171d53d92675764a8a5b17d8c1eb6f1829bde4082e93f89385cdf31db7b6021b6e41a12535b0dc SHA512 c2f8f909dd23f0b47be19bf3281c8026d0fcd930ea0da2fef069a5596cffc40e1ac4bdfd753a42773120a399ab678ab75cf046831065a79aac59db72a5c0471f
+MISC metadata.xml 502 BLAKE2B f370ac279a7af56233a313f68da17d2c2f03fa6028fa05b1bef93cfd52fc3fc2808409b86df3c3597939c7e0778513067ce643c456ae74f8a6cfff5d4fb83efd SHA512 e345c6c50e5c496bf50e2d0a5c4134ad57a85a7b43867359fb152962d75a0ff2ab69beed9bd9522bab68f8e98125b37c812ac00394d55a0bc4297c21c9af90a2
diff --git a/dev-python/icalendar/icalendar-4.0.3.ebuild b/dev-python/icalendar/icalendar-4.0.3.ebuild
deleted file mode 100644
index 99fff99f2dc0..000000000000
--- a/dev-python/icalendar/icalendar-4.0.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-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 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( "README.rst" )
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${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:'${PV}':" \
-		-i docs/conf.py || 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() {
-	pytest -vv src/icalendar || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/icalendar/icalendar-4.0.6.ebuild b/dev-python/icalendar/icalendar-4.0.6.ebuild
index 4b472fff1bc1..68481ec5e2bf 100644
--- a/dev-python/icalendar/icalendar-4.0.6.ebuild
+++ b/dev-python/icalendar/icalendar-4.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/icalendar/metadata.xml b/dev-python/icalendar/metadata.xml
index 43e4acf159a3..22fd082e7ad7 100644
--- a/dev-python/icalendar/metadata.xml
+++ b/dev-python/icalendar/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="doc">Generate examples and other extra documentation</flag>
   </use>
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index a848bc01d38f..82539f45d9f2 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0.ebuild 825 BLAKE2B 631e604f1064966205e4e25cc7341ec1ceb776fb2773d581536408b58c9654afa3e33d1ed3eff28e67471795a949958d38d47e45ea5e2aa72249c3e086a1f271 SHA512 cca61d4b7124cb2fcc0614e15d74215c7142f3f751e8c2ee45c8e956040edb17cd55a327d99e62f5aa09b2c7fe4191816330bf2fc275bfdcdf945e5c0108fa92
+EBUILD idna-ssl-1.1.0.ebuild 831 BLAKE2B 7c287e80c26dc5ebe2360f7d52daeac2abf2864e4008e0ddd2e8983b4c46dbdc0af769d999b13282b84658fcc6bff62769b10cb2497591e81929fe24db681709 SHA512 a8fd138f852495e1c02194276e6200d5ef9402dfab6d468b959b48446ed09c3f38e3788b7cec1f72f0bcf22c7d64144e3a644d0247902256f47c42a4d55fffd8
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index c80202c1db5f..62405f0a1d14 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 69525748682d..af0665ba6221 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,7 +1,5 @@
 DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
-DIST idna-2.9.tar.gz 175042 BLAKE2B d111bec6c5682321967818aa3fb828d1f7bc5c056e8c7418589a7b1f9e125aadfd21c6c3329a93b894977c41ad258c4bd38db166b85c1f85c52ca2f0b5acb242 SHA512 2bd3fdae46fe7045640912872b0a3955de3abce62fd222b16ea2c997a04755acc834eeb645e5610d621c176d4b963e1d4a71228fba14efad54999cdf3c02eaf4
-EBUILD idna-2.10.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
+EBUILD idna-2.10.ebuild 641 BLAKE2B 47e15fc27ce9257455364799ef3f7ab2947559257866e404a2e9e4e28c16032cbb54ae47d0c9cf15f5338d98b402444695205fc4410ee9b3320ad1013741cf30 SHA512 0f09ff321413c13a831e04ff54bca648c008a0f08c79b1a82a451f7d4e6f1f9f23126082ba1ebff299c0a4b911a3ab728e550ed398c649f5db0137ffb9e30382
 EBUILD idna-2.8.ebuild 691 BLAKE2B af17b44ed061c888ebcd1af6693d658403ba1c6eea0bea1e7e76036f9f4c013c8f2fb32f7fddba1f5ed049d5c9e04aab58fbf93aed74a34278fc905770aaf381 SHA512 7d32611ae1725f8eb2443aadaa9c23f5ed8e72fce06db75baf20098ec4f485104cba4e726748321d6f2b909cbd5b4bc6e10b8c08ad8bdb4931eafaaaf1d540b2
-EBUILD idna-2.9.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
-MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
+MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-2.10.ebuild b/dev-python/idna/idna-2.10.ebuild
index 4a4a7f4a56eb..12c884cff34c 100644
--- a/dev-python/idna/idna-2.10.ebuild
+++ b/dev-python/idna/idna-2.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 ~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=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/idna/idna-2.9.ebuild b/dev-python/idna/idna-2.9.ebuild
deleted file mode 100644
index 4a4a7f4a56eb..000000000000
--- a/dev-python/idna/idna-2.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-distutils_enable_tests setup.py
diff --git a/dev-python/idna/metadata.xml b/dev-python/idna/metadata.xml
index 6ce490eacf0b..e46bff495f75 100644
--- a/dev-python/idna/metadata.xml
+++ b/dev-python/idna/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">idna</remote-id>
     <remote-id type="github">kjd/idna</remote-id>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index 9c81c5264f75..aba8b38cf587 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,3 +1,5 @@
 DIST ijson-2.5.1.tar.gz 23258 BLAKE2B e41cb4d903399384a1a1d18941a2ecf36e80c762e5d4e3e854e9337f3a72cab3a61576d9d5170b11e1513bd82ca0e2158b8a88d4c30855674366fbc9172c5042 SHA512 f8d2cf0496357d3385e2744a4604cef1fd6fcd92cbd52c8803d7e831c091c18b718ad0c1dc8735c3f10df04e25fe69ef73d6935b2df6f67845493935e2ca529e
+DIST ijson-3.1_p0.tar.gz 123536 BLAKE2B d8ed0da77e219aee8ca287a2ede4eccd8e965a5778ff95485376bcfdcca07b48ae5c0e22b271fad0a489342403b11716971663158f340c97b80031bb2cc8c060 SHA512 af2db5b3c9f2cc93aa2d15462b6476a970e5c394a8f5bd9740ebbe134e8a2fa973c95057447bd02d3c4262ddf22fc7d231840d3a91b919a1411bae07d38cfd93
 EBUILD ijson-2.5.1.ebuild 573 BLAKE2B 0e03a71c06e4d071c81448415c03d42a4a35b4eeacb5a659fb5d44a4cf44c8718e921ab05a514a81873c2458bee0d0a981f4b28f70b5f549da6028b7578cc1fb SHA512 28bd571f432ea47009bde0107728162612156252c7dec85dd4e92ac14d366ac913af89ef6f77f3aa9a1f8a33b8a26c67b1547f8ba176d0c107661818be881569
+EBUILD ijson-3.1_p0.ebuild 569 BLAKE2B 1f0ffe19d38ad7c52efc2db2e6eea3e013c0334fafa7cddb0c1d700d9a82aa1ae6f55e3063240113d3ee695a6d7849c17943b5f170863f3ce9603e92fa02e241 SHA512 f2c41fb864bdbdec11258438f9be923f24bb447be6659bf16653f0e3918c8efdbca361ba2c967bd3360addda297529a206ec56bc5594f4c564644ae9529274ff
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-3.1_p0.ebuild b/dev-python/ijson/ijson-3.1_p0.ebuild
new file mode 100644
index 000000000000..a8112d927075
--- /dev/null
+++ b/dev-python/ijson/ijson-3.1_p0.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..9} )
+
+inherit distutils-r1
+
+MY_PV="${PV//_p/.post}"
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="
+	https://github.com/ICRAR/ijson
+	https://pypi.org/project/ijson/
+"
+SRC_URI="https://github.com/ICRAR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 5225b0c0c457..567c879ca225 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 519 BLAKE2B 2027568477fd5bf5cfc3c3239642584e69f17a959b07d3985dcdc93742e849fb13b1ee4132eb728460015d634c205194f34adf13323b4b164633c6d9ecca6bd0 SHA512 5c15e60e5579dd7a1506ee25ce03281fdbf1e5682b2bcdb6be92c31bafe0f20148bfb1826762a9e31ee2e5d48164887a3f46bb4ebede9ec19e10d8a40a07c750
+EBUILD imagesize-1.1.0.ebuild 513 BLAKE2B 70d88342c73168874d3463339a0590ee393312a0c79b9c559c0bf6a89ac5533e62940838e6b6d7f6a90a3df8b0cc451fd278e95be0a8dc20f15bb75246502449 SHA512 bea68b0285ccdfd710cf3e0bedcadac49492a8be342aaa8822c634dc46c0f637fcfadeb23975e88fd649386838a39cee73dfd83ae1da56b96e26d11d23c13005
 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 949c9fdc6f5e..74dfd6ea9b98 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 54472f17492b..23bf14e21a6c 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,5 @@
 DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
 DIST immutables-0.14.tar.gz 79451 BLAKE2B b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217 SHA512 244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea
 EBUILD immutables-0.11.ebuild 467 BLAKE2B cf218d188b5c9d1e76dad9daa9bf759c6c9921d760887f55ec93a2856c10d48373b658b92e8689d36c10bd8541f87429bdceaa682b08dd3b61a3a03374b6127a SHA512 ca127c9316d6a453a0c1af6d8105e3ab5b809430d45b54d8e2f609f4940484d9d97e520583bb1799b7ba5431d8cf97d5bc31f60d417c5b4c2715eb440b5c7627
-EBUILD immutables-0.14.ebuild 469 BLAKE2B 90480cdabcbd810147a2a237fe65c1a89888a6b5bc184dd7c144f198427b4dc5d02fca6353fddf00ea12c7d722f9784f0dec56c286074357aa0ae8cb852fbb4b SHA512 be0dd6a91063da1a0a8d2b0e4c9d505b802cac39d2f5a30753581e51526082f26630467a7a1be6248060bec8541892c8ba1aacbd8f3b6c1da23b56e2aed8e009
+EBUILD immutables-0.14.ebuild 468 BLAKE2B ba453e05cdf0455393b75188ab4e879035a4db27d47e8ec2a9d25df7d27d27346a7e7867c49621c22f3c47ddfd8fc7d486daf8750d2c15df3249d4985dbefe7b SHA512 66e6c85cc7e67f94f883deb186390233e9c8242d1a7c7f2a019b13288a55ca0103c9f8db6dbe3a0dfa6195aa4355e66f7de84fae16185f862f92b5d39ede06ce
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.14.ebuild b/dev-python/immutables/immutables-0.14.ebuild
index ce13a1de3ff4..456316f1258e 100644
--- a/dev-python/immutables/immutables-0.14.ebuild
+++ b/dev-python/immutables/immutables-0.14.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 93caac08c10e..7680f54c617d 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,11 +1,3 @@
-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
-DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
-DIST importlib_metadata-1.6.1.tar.gz 29039 BLAKE2B b193afecae1458b0d82fad0fe00878c17f8fa279d8eb43ec80d189d3f33b217fb376023c92be70027579484bbbc9ef949ca75f19660a40275d96ef88e1f2aaf9 SHA512 f5537d80bb72cfd97269e2d83b059fe1085e41ce9cc7eaac30abc819dae4b118bdfd2d17989b693c05f0084b2bb86f73837788087915c94724e8e5344752b626
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
-EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
-EBUILD importlib_metadata-1.5.0.ebuild 1108 BLAKE2B 2bfdc004450287617f23b183ac7bb52b46463b1894ad761294b2200d0de8244e00481372b7c5ba1fd3ea0472dcb1304bb29390f43b9d02ef07a44901f05dfd62 SHA512 267ad2f36025556162b81e3465b7eaf3baf383a06928b4799e044a309698c5e4196c0cd2483245fc45ee6d16fa930a1607789077fc1213b05826463a6363e828
-EBUILD importlib_metadata-1.6.0-r1.ebuild 1229 BLAKE2B 3672433212a43e40b6d7021586e6f6a09954a6a38b785463ab39fb56612faf05952100afd7b9c79e991f303c505b6deee6bf0013a9e2861e53c7bae36e575df1 SHA512 55abc3d9561efcbce67f47cca55458b268faa147c468ff788a84d263bd5e3f20eef3ea607577418b382c3dc0ac596d16871283617d327d5bc67f9b0a2126506d
-EBUILD importlib_metadata-1.6.1.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
-EBUILD importlib_metadata-1.7.0-r1.ebuild 1271 BLAKE2B bfbb0b7ca477f4d1734e0015646ee86b1e059ed36189de1d96689f3ac5a3b3c451f4fe1f6b5188a2cbdc81fe5c581eef5ace9a6afb88fd407698a8f8123266bb SHA512 8859ffe2661945376ef0d2e844f669e8849bfd3f5acc5fb5a807ca2ed533ad14ff8200316de0b5e76531d36574b418b61128d6f380a4b6fbfafab69546053ee8
-MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
+EBUILD importlib_metadata-1.7.0-r1.ebuild 1269 BLAKE2B c22d7cb2d57f9a40d8fe287f83b57e0f998afe5cd0b2a1fdce71e17b08e8237328b901817d178956e16967bd57ca4dbf4287f98eff958056651c691fe5671eca SHA512 e0e648b0842c76d0379d6db752fe322b361eb19698c32908ff3ef263c2533f7d4660c2e2411f3fc0b601d7ca5c4326ab6d0b2cab75086b200eb0d78a2cd5544e
+MISC metadata.xml 599 BLAKE2B ce02ca578d2030d74c64bc05e83c8453dc4bc9efe83ae89860ef66e8f13da35961dfb73ba5aec3da5f12f91be9d15a4168bf93f45c7b942071b9418cb12aeb5b SHA512 f1c15874958ff4744838e06e2dd6f20349febc7d6f1939eaed3d698ea7ab552de18956f8dc3f57777ff0c82e26be1cb6bac325a9fde1b51b796fdabb2e7ae0e5
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
deleted file mode 100644
index 12625909d107..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.4.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=( 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"
-
-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}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
deleted file mode 100644
index d2091357760e..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.5.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=( 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 ~ppc ~ppc64 ~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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	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
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
deleted file mode 100644
index 02bf0a0c0981..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.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=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 ~ia64 ~ppc ~ppc64 ~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_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
deleted file mode 100644
index 0982cef9a7c3..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.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=( 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 ~ppc ~ppc64 ~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-1.3.0[${PYTHON_USEDEP}]
-		' pypy3 python{2_7,3_{6,7,8}})
-		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
-	sed -e 's:test_find_local:_&:' \
-		-i importlib_metadata/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
index 9fd91e215bf8..04f1b0fda7d3 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0-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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/metadata.xml b/dev-python/importlib_metadata/metadata.xml
index 232d18f4ff02..94e019a67253 100644
--- a/dev-python/importlib_metadata/metadata.xml
+++ b/dev-python/importlib_metadata/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">importlib-metadata</remote-id>
 		<remote-id type="gitlab">python-devs/importlib_metadata</remote-id>
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 296fd31751b5..72b1ec927dd6 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,7 +1,5 @@
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
-DIST importlib_resources-2.0.1.tar.gz 26060 BLAKE2B 739cd7fd90cc12b5b586eb1bf3386b85cde2399e80cfe05cae5173ba5177fb1d15f7e44e7f78473ef03e37d563861f57b7c470782d1aab161eae4c40d530ca29 SHA512 7f62c5bb5650dd2689a41ddef2e9131f01d5edc99b284a7a4257fce18190f2e78c38a2c260d6fe5e6db122666435e079c417bd9011e68e35724932854c90a1bd
 DIST importlib_resources-3.0.0.tar.gz 26725 BLAKE2B e2517b0d1e576ce949ac05230892acbad59c09fa4b84401b3c957e83f40b50d12bc02360b135fe949d12c43f8f557006824e4e4a3e9ff2ce879c03362569a00c SHA512 cd29e268cacef3729024af6cae8394ce5aa8c1d8a28397fd8f009c7eaa908ed3775508bde86c26b0d233c25261b8509abb1e16c378c7c8a9bb0906224f3fdd54
 EBUILD importlib_resources-1.5.0-r1.ebuild 1280 BLAKE2B 16db4dff815fc1e5dd034965e42a9d22f0f7413281856c80aa7652003799c2cdb928a8a6143a5d1d3d31b7f1dddb7ae933afe3bcf30a6d838ddaa290593b5cac SHA512 3c4c2aead9af6c6f44acde1b976bd8a853993ef1813cadff7986d41f4b627f697817e65d0ec2bdee8d6fcf3b618c3b320a3b179d8df9c4445dcc1c31d21aa837
-EBUILD importlib_resources-2.0.1.ebuild 1289 BLAKE2B 199f43187b4b4dcbe438fd6d1d59dbef10712cfa389cccb3285e1589c82bfab2acc1ab2f48e0436c6e2b577a55a55287cbc6d1f0141ae166c9594756c0ce2f53 SHA512 c917897a69f256365a8ff767b810c5383ed023853d1ca914483c301729a403071efeac1e3918af71fd927ac58caf8426f7ea443cb4fd9912cef5dbc9bfd44d22
-EBUILD importlib_resources-3.0.0.ebuild 1234 BLAKE2B d325377754849aab1bd76d110ac0f86732f4c4f26096177d4c316132059353b7265b786da544a36749997d467bcb8d6a38d3f2132b3ce673998b13a615e88dd8 SHA512 7a65cc6900998459b7024c9644552043b6bf8e6644bce0919740281e632fb47be2f7822a4b5f5bf20dac2e2a72cffd7b464edf713fc3c743c47b545aa4a85662
+EBUILD importlib_resources-3.0.0-r1.ebuild 1242 BLAKE2B 5482c5f4f81653d5bf63e12cacd329412beb80b7de02a6b6cfb095e5d0e5a4273b28e055b9803ba52ec00d8d09700844f616ec36aa3eb610bae414213a7521ab SHA512 da82eff49d66eb8fc0a76648a232f03dcd4ac30b5c693926a6cf86a5b103b571fa571649f9bc147c1ad44d6b05410e590b20fffe15be44a6a6593a4d2d71f668
 MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
diff --git a/dev-python/importlib_resources/importlib_resources-2.0.1.ebuild b/dev-python/importlib_resources/importlib_resources-2.0.1.ebuild
deleted file mode 100644
index e86acf448e78..000000000000
--- a/dev-python/importlib_resources/importlib_resources-2.0.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-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/importlib_resources/importlib_resources-3.0.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..8de5a9670ffd
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# 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.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+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/zipp[${PYTHON_USEDEP}]
+	' -2 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/importlib_resources/importlib_resources-3.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0.ebuild
deleted file mode 100644
index 39499d3eb2f2..000000000000
--- a/dev-python/importlib_resources/importlib_resources-3.0.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-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/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 e6ddf632c453..f859515f5152 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 583 BLAKE2B 2dfd26c17e442b2dc686cda4c96e702c58031c57a5f05c146bd48135f39da8546d8576429b694a2b89736d94f84e1be9c37f809d08d90e85be4ee4448a6b9b7a SHA512 ea13df56a24309d386f87b83c890e836651473bb50da7a3e074dff43dca3dfbac7e5ff54a79750d343f022b595ce51fff3719fafe1a1940cc1c66f5b8c59cad7
+EBUILD incremental-17.5.0.ebuild 573 BLAKE2B e8e5f7444072d765b3e0016bd28d91ecce67fca9dc61e26a44a093b5eb8d434ab7353adb87fd5c0467a7ac3a023d8e502941a73fa3a224fec2d249d66d05246c SHA512 e444206dfda069ee7e14c87b25a48bd5f48b83ec1d3576e38de79d952792189468dc8aa75ff01801d5c30fbdb163e03696387afed5763132c7bc08abb6b749ed
 MISC metadata.xml 476 BLAKE2B 854207bdc5352a730881f6f6a820bed4648e839e64601274f0c249e805bd8c1aad5066ee970f2f45e8c8cf532fd4f07ab0956ac8656da5e8947246fcdb618337 SHA512 603906b5876ed9cc69aadcaee6d9443d20a2d134939ac79a41ca23f8ef010563ba3f56c012219cabb812eab0eb7e6bdc19cbe7763cb406e948713e49f1bb13c2
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 3ede4a78f6f1..2cd598812816 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.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..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index 97f6f4617886..22b4a688fa8d 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,5 +1,5 @@
-DIST inflection-0.4.0.tar.gz 14536 BLAKE2B 18e76db58d36cc1e3b9cf60870f4ea5759d050e7f0a5bc80206e712a51cba32fd1381b602b33bcd2b9763b899681d4d868ed930d5133d029d91161118ad68198 SHA512 1fb4321701aa0d36152044e732de679629c0b72052d1ab14d3f27356701f48a51589283d6ee821d8c0afec5ce01389a67d2f6a435075120e80b2da96e49e9159
 DIST inflection-0.5.0.tar.gz 14830 BLAKE2B 0e3cbac92b823de37ce99837c82d3319a61d0106eced561d2607ed0481db023059401a313478465e25fe16057df956554f01faa4d77f574040ffbe46f4b53afe SHA512 6d05447eb65feda1830b22b6409dfc7f7e472b5a50f2fc92008393bb06dd148471db4d460b683cb78358e755a86266b4db039bd10fc21d1cee26632d76cc0c70
-EBUILD inflection-0.4.0.ebuild 443 BLAKE2B fa5b067237041a7b03b7f567f983f14ace74d2bd53d3ea60bf18c6abef7aa28a0f71346f1d832699f273fb2251654f2750617fd4f438cad6e9c5928ade8bf971 SHA512 7a210776cacce08526a7967d771053540b92e0e2ebe3c2f830d937015c9616a060a37e0fca24cf564e7f18300468e709ea3061e4626feddf6912642f326da444
+DIST inflection-0.5.1.tar.gz 15091 BLAKE2B f3db09d1010ce22b67dcd519f59f25f240f463872932fd6218209768b4c5e064776ef5300a8d7f9a6b9cb94392b05b46963f00b94c6de29fb325947df7b243cf SHA512 82f70e2b81fb166260191a464383f6674e3b21504a35ee605ac6ce4bb163c8f3bbe6d06379575178d7196701459506dd541f32e48f24b32f42d5cfb717158d50
 EBUILD inflection-0.5.0.ebuild 445 BLAKE2B 46af3212c59aae45b52b3a54fb67d6647813b736d930e8deda8004b963927d570039727bc4fa4ec45cd72a5e381a7bc261c0d290597e7acf62327c20bd5ecbd9 SHA512 db7513619489bded9703bf4c58ef4befe5f894945aa1368a7471373ccce43a63bde7260d828c0c1db964e97ad971fc9a9c86d4cae906fe3fe9d1eb4a2ddd3b37
+EBUILD inflection-0.5.1.ebuild 446 BLAKE2B 2d6180fba7796eabb73d60c3eb228ef1eda1a453a479b6a6258f8aa6d9530f4193938018414cc3b1239e5dec6257a9314af5585f013fe87d914a634c09a899bf SHA512 63ea275fdf5b9ee3dac0264aa5834e0ba32945f2bc03f8fa53eccc80d7b1851cbd286f71d4b5014f6c997da5c226d585caa9f74e8d3751b670c95606d6377fcc
 MISC metadata.xml 444 BLAKE2B 8127165e52bc2ba190021733ea594cf8da0bf3f2d878fdc191cda3354d2093c239cd5bd7fffc0c2bfe3055eff103da4bcafefc215576a28cb83e852aeb43cd57 SHA512 2175dadc52b8a381bfcbcd3a390d99f8582aba44870c29f5addf25880df9336d9bd16bd2120ad283359693fef2b0e65b7cae315fe17f042c17a512ea0352c352
diff --git a/dev-python/inflection/inflection-0.4.0.ebuild b/dev-python/inflection/inflection-0.4.0.ebuild
deleted file mode 100644
index 95b8c51742b4..000000000000
--- a/dev-python/inflection/inflection-0.4.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=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of Ruby on Rails' inflector to Python"
-HOMEPAGE="https://github.com/jpvanhal/inflection"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/inflection/inflection-0.5.1.ebuild b/dev-python/inflection/inflection-0.5.1.ebuild
new file mode 100644
index 000000000000..2198c8bc6729
--- /dev/null
+++ b/dev-python/inflection/inflection-0.5.1.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 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of Ruby on Rails' inflector to Python"
+HOMEPAGE="https://github.com/jpvanhal/inflection"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
new file mode 100644
index 000000000000..c22942186333
--- /dev/null
+++ b/dev-python/iniconfig/Manifest
@@ -0,0 +1,4 @@
+AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
+DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
+EBUILD iniconfig-1.0.0.ebuild 539 BLAKE2B f7675d976ce7f92c271ba38ad4ed670f3f22f68ce7d3eb13ca89681d7af0c72cc41ed56c499364e5af71a7180a5df5c9618c899583468ddf04c1c6dd1b2e200a SHA512 1c2841c5cb15658e29c7545a21ae4ee7357bc3700702a15f2c4031333f1d09a0ccc60bae649782fe0fe9553d6b175e16dfad67c821ed05a6431e12bf50cc99de
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
new file mode 100644
index 000000000000..f8fca367b342
--- /dev/null
+++ b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
@@ -0,0 +1,57 @@
+From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
+From: Stanislav Levin <slev@altlinux.org>
+Date: Thu, 8 Aug 2019 19:43:12 +0300
+Subject: [PATCH] Fix Pytest 5 errors
+
+This fixes
+"""
+pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
+is deprecated, use the context manager form or use `exec()` directly.
+"""
+
+Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
+Signed-off-by: Stanislav Levin <slev@altlinux.org>
+---
+ test_iniconfig.py | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/test_iniconfig.py b/test_iniconfig.py
+index 27fd53f..fe12421 100644
+--- a/test_iniconfig.py
++++ b/test_iniconfig.py
+@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
+     assert list(config.sections) == ['metadata']
+     config = IniConfig(path, "[diff]")
+     assert list(config.sections) == ['diff']
+-    py.test.raises(TypeError, "IniConfig(data=path.read())")
++    with pytest.raises(TypeError):
++        IniConfig(data=path.read())
+ 
+ 
+ def test_iniconfig_section_first(tmpdir):
+-    excinfo = py.test.raises(ParseError, """
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='name=1')
+-    """)
+     assert excinfo.value.msg == "no section header defined"
+ 
+ 
+ def test_iniconig_section_duplicate_fails():
+-    excinfo = py.test.raises(ParseError, r"""
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='[section]\n[section]')
+-    """)
+     assert 'duplicate section' in str(excinfo.value)
+ 
+ 
+ def test_iniconfig_duplicate_key_fails():
+-    excinfo = py.test.raises(ParseError, r"""
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='[section]\nname = Alice\nname = bob')
+-    """)
+ 
+     assert 'duplicate name' in str(excinfo.value)
+ 
+-- 
+2.28.0
+
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
new file mode 100644
index 000000000000..d38a1313161a
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Brain-dead simple config-ini parsing"
+HOMEPAGE="
+	https://github.com/RonnyPfannschmidt/iniconfig
+	"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-5.patch
+)
diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/iniconfig/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 11e141b4c16b..f98e1858827e 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,6 +1,4 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
-DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
 DIST ioflo-2.0.0.tar.gz 838200 BLAKE2B 876a38df5e6fb953eef6e65bb793fa975a4fed8d4f698029e26747a4887a449bcf5cc5c9fcce081f9b93faeb34d0f783b2f81e17ec619d7ca95810762eae810d SHA512 b4b70aef65cffe067d7563682a2cbeac0a07cd4722aa2de8fb56fd127c99df771dc5d3d22be24aadd628a26fd1b7407db684ea7257b45eba8f8376f4ad226a87
-EBUILD ioflo-1.7.5.ebuild 591 BLAKE2B 66c9cb51ca143e4523ab28135f4955229aa973539ff4344df2f44a7ae322d12ada44d39920f6344beacca06e03449054ab397906f89ad9feb48b50281124b6ca SHA512 5ed720bf859961c1a6492a67f08f4556dadf2ed5dd7bdb4fb9aa24493deefbf26d944370ffd4be63b394bd5bab3abb3e4141df920ce23cf81adc44b4f79a9494
 EBUILD ioflo-2.0.0.ebuild 715 BLAKE2B b72173e3f103bf4511392924bbae46d594799e73454c4f997c74a6bbaf33d1fa86a254d7d4d5f512a92d4e8a521e761faabf1e07359920e1d692b3f7a29a09a4 SHA512 b50ab250cddf468e81f5dbd62d78a8a23c36e4fd863ad813a027084b7bbc4871fce17382f0b3cd0268d09e9fa918cbd59e84612aedf1efe8dd62f4ddc3103942
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.7.5.ebuild b/dev-python/ioflo/ioflo-1.7.5.ebuild
deleted file mode 100644
index 3c00c369a1a1..000000000000
--- a/dev-python/ioflo/ioflo-1.7.5.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})
-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/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index e23fcf8970f8..f1003122367b 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
-DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
-DIST ipykernel-5.3.0.tar.gz 110977 BLAKE2B 4ca23618e25cc4ab4d6e1b0725136594d995eda91bd804611d1707c81437bfa0eef2b0995eb2697f28b119696d7493f6ec8e0c21e0cafb6e791a35438e8dd464 SHA512 c36a6dd4d9dfd52d31a8a37e10aea3c67a7a523ab32db8fb8904f4d90741056d946c265c57354be016d0fa1e4a34f4722c26798a3a7d6b6992884bdba8101190
-EBUILD ipykernel-5.1.4.ebuild 831 BLAKE2B 6e86274287543c6645ab4ad83175e6561bc6053ac54b6cf31ee397744c6eb8f74e03e897021ec1ba90cd5f2dc19a1ad643eaa06151bb41057b2664a24d0d7809 SHA512 b9d762eb0bfd0bdc0bb077cb234962f4b572c0e7e0e8befca4a3f0e0a99c6ed9c812028b0c15d4e178aafb0358090ea8be96f61b815ec53d4cc1c7f457442b8a
-EBUILD ipykernel-5.3.0.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
-MISC metadata.xml 501 BLAKE2B 86da6845e84d32dc9571aef5828ed06703c942882a34b2392cf83d3cd2f59a01fd0d353445e67cbd45a9479ae1a8600a0c4dabf72f68eca0985d1f3423a146ee SHA512 2f8e8ee7fade5fb1c4b1065a1176cba942556bebb417824a900fca11e467ba6dc54a6ad4e49c0c0575bed769abf01fe52a9b6c0c090c7a530e8806226fa089a7
+DIST ipykernel-5.3.3.tar.gz 111718 BLAKE2B 4295eab97c971dfaef797ad3314b9077f740ae102282553ae7265352b83c3d44a51e1cb696cdf161c612ccc1ccdbed39bde1ffe17d83aeb3f61c1cdf73154d3e SHA512 4c33e6db572e002c2ecda479a427a46707f0e162bac5701a5a079d6d5c1df2680b20bed2cd5b2aa7927e8efee0b0993dc78ba4090e7e053389e278f6116be1d3
+DIST ipykernel-5.3.4.tar.gz 108656 BLAKE2B ee2ff12e0a3fae853dfb16235bd14bbfe16b670ac93c572ff4e3867d5d2c451ed4f4800f3e501caf857405d0efb73a671c2966ea0fe53aa41f1e59ff68424cb9 SHA512 6865cb4cb1979e79ed532fabd59e55bd860df996f557e4c05b69fe7baf60301d70dc0657248bf75102285c68be6212787180b548d5125029991605f05d0d812f
+EBUILD ipykernel-5.3.3.ebuild 831 BLAKE2B 4d305566dc109c47e4ea3133b6cf2f357436fb5a85a629b1f1abf4ea8dd2f75d41dda911b793b81b2b68fd5478bd722383352b6113c86b019e9749adcdd894c1 SHA512 9a8875796301e1fec9be0e048e0b695fd7ae4da5e32032f25268c85fe568ca8b80673d510ec5d9199dd40a1c3afc5373b138e4d350edd37015d803b48a13cc9e
+EBUILD ipykernel-5.3.4.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
+MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.1.4.ebuild b/dev-python/ipykernel/ipykernel-5.1.4.ebuild
deleted file mode 100644
index abd296dab6c7..000000000000
--- a/dev-python/ipykernel/ipykernel-5.1.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=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/ipykernel-5.3.3.ebuild b/dev-python/ipykernel/ipykernel-5.3.3.ebuild
new file mode 100644
index 000000000000..80bd239e6f7b
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.3.3.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..9} )
+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/ipykernel-5.3.0.ebuild b/dev-python/ipykernel/ipykernel-5.3.4.ebuild
index 5504b53c5963..5504b53c5963 100644
--- a/dev-python/ipykernel/ipykernel-5.3.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.3.4.ebuild
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 25e389950c4d..b28a765e696b 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <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 37ecb888118c..42975162e585 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,6 +1,3 @@
-AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
-DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
-EBUILD ipyparallel-6.2.3.ebuild 1969 BLAKE2B dc93cc19091299c4b07e55a7068226e3239a5b3d4d32e2ddb15c1ff4a9cb6c6d6b572a5ca172cad3c59043e5c214e0c6f15dafb3d4303d8be70eb43047669028 SHA512 ef6dbefe4d827f5bd399d90a4b75a2be0b77d000c4973453dce17e26f59d45cb2a3afdae5964f2652e807079f23e6410aead5719fe54d218c6fd1b4d9ee277c4
-EBUILD ipyparallel-6.3.0.ebuild 1721 BLAKE2B bbfc1fa1db531de92835c5400ba27d150cb47e1d02a7eddaff11ed65bc5cffd8d055f9486d7ac68dc12e5c953e68fdf59ab709498feb6a70dae03fde6bc7a5f1 SHA512 778ed1bedc5a2a207dac83f5b08f3a66d9589f28cdda769a621e838b7afe74ba3d20faa1df770f59bbf452f71805b688bc641d6e2ba48cacc378ea5026729df3
+EBUILD ipyparallel-6.3.0.ebuild 1718 BLAKE2B e67a1bf4043f42fe6e60611ee1c6bd1bbfbd56074f5328992ee01e7649b9d415dd173b15779af2fd331cb9368c4fb5c1130efbda2060edbcea303818b1d90d95 SHA512 bc731e2069ea2533eacc3967eaf705148ccd809d8c0d8746296c11097184361ee72c2d351a7b08b13077c2155037a169cde49cc70e7316a868881077556292a8
 MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch b/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
deleted file mode 100644
index b578cd7f73e1..000000000000
--- a/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ipyparallel/tests/test_util.py b/ipyparallel/tests/test_util.py
-index 06fde46..e685a88 100644
---- a/ipyparallel/tests/test_util.py
-+++ b/ipyparallel/tests/test_util.py
-@@ -3,7 +3,8 @@ from ipyparallel import util
- from jupyter_client.localinterfaces import localhost, public_ips
- 
- 
--def test_disambiguate_ip():
-+# This test is broken in gentoo's testing environment
-+def xtest_disambiguate_ip():
-     # garbage in, garbage out
-     public_ip = public_ips()[0]
-     assert util.disambiguate_ip_address('garbage') == 'garbage'
-diff --git a/ipyparallel/tests/test_view.py b/ipyparallel/tests/test_view.py
-index 45cb669..dd335b1 100644
---- a/ipyparallel/tests/test_view.py
-+++ b/ipyparallel/tests/test_view.py
-@@ -823,7 +823,8 @@ class TestView(ClusterTestCase):
-         assert view.apply_sync(find_ipython)
- 
-     @skip_without('cloudpickle')
--    def test_use_cloudpickle(self):
-+    # Broken on Gentoo
-+    def xtest_use_cloudpickle(self):
-         view = self.client[:]
-         view['_a'] = 'engine'
-         sys.modules['__main__']._a = 'client'
diff --git a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
deleted file mode 100644
index 074fd315ca02..000000000000
--- a/dev-python/ipyparallel/ipyparallel-6.2.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=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils
-
-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 )"
-
-# About tests and tornado
-# Upstreams claims to work fine with tornado 5, and it's indeed possible to
-# launch a cluster with tornado 5 installed, but tests definitely don't run with
-# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
-# ourselves to <tornado-5 when running tests.
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/ipython[test]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		<www-servers/tornado-5
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.3-disable-broken-test.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() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vs ipyparallel/tests || die
-}
-
-pkg_postinst() {
-	optfeature "Jupyter Notebook integration" dev-python/notebook
-}
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
index e567a97df1c1..d89e468faf15 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -15,7 +15,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 )"
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index dd5bf20959c8..77cd6c0c6a1d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.15.0.tar.gz 5245923 BLAKE2B 36c9712c72a38e918403cdc91fc098904282a48faed3e7faf03a1791356d09b9953c080b1b6f73b958713984748ee8af6d586956ccdad3ddadc60292cefd6d83 SHA512 46b09a8b6e5611d7b11b26aac475e7b823b00653ea6a3bf1a66d294cef22762b38e63c79f1e4e9bea0fe3e6423b058a2a692dc544c082dca37b9bb91c816cd22
 DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
-DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
-EBUILD ipython-7.15.0.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
-EBUILD ipython-7.16.1.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
-EBUILD ipython-7.5.0.ebuild 3571 BLAKE2B cc3f3e60012b2f432d94b12d46e51723e31905d7536467efc031ec130afe1460ff17eafa6ae8c601338714ca0a5862437dcc95919c85b54c2cb0892a6cac4dae SHA512 044290fe2202ed785ee10f8809475ab25c4dda5ab3d5de43d345860a809d5a7dc4a90bdd335d2d1ffbc7fb482179cca55d0981d3a63a8e6a567d342f3f151836
+DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
+EBUILD ipython-7.16.1.ebuild 3648 BLAKE2B d6a6667ec56db5adb9176038bf8e9abb3f9a2ddb69f181b73188b6e9afacffadcaba88a4f06631e5f2828a7dfe9a507068d16dcc5ebacf10e28a43137d6779d9 SHA512 99bd76b6778bd5b3a2a86be2217e9d1720d2bf565ef201a1acfdf39c9b450697c385b53844904f3c04788ddfa26df8e707221e03a22d284a02dc93fe9696854d
+EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B 65972fa0122548fa440337d4584af6967a7fa51ccf09aea9027898e4c42c4b78add1bc88e1e59cb978be4a5d50b1e2228dd62005ddb2a5f18f7122c1a06ad284 SHA512 a1a5c4134cccdb45113f7267af59ac116f4e1de2d7d2a0964e80ea84701f0abb4cc123ae69b64b7297ee78aaabc82ebe8950f75e9cd3c31c595d8a0f09e7cc4c
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.15.0.ebuild b/dev-python/ipython/ipython-7.15.0.ebuild
deleted file mode 100644
index 72cb41ac0a13..000000000000
--- a/dev-python/ipython/ipython-7.15.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-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/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${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.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
index 72cb41ac0a13..8a96fc541cbe 100644
--- a/dev-python/ipython/ipython-7.16.1.ebuild
+++ b/dev-python/ipython/ipython-7.16.1.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 )"
 
@@ -37,6 +37,7 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		app-text/dvipng[truetype]
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		dev-python/nbformat[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
new file mode 100644
index 000000000000..3ba94560a010
--- /dev/null
+++ b/dev-python/ipython/ipython-7.17.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+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/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${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
deleted file mode 100644
index 202f47a34fd9..000000000000
--- a/dev-python/ipython/ipython-7.5.0.ebuild
+++ /dev/null
@@ -1,133 +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='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-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/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${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_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index a898abee9762..4d0f581c4ad2 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,4 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r1.ebuild 423 BLAKE2B d1ba402f93c7cd54c8366bcdfc8da82914c93ec85716045a52ec8cf9c53e4521a4ef30b8b80ab59cf818dc4af841f8789ee65c7f228f7241e21336512c1eaf2e SHA512 8856839ec7522824452d315767e5c34754a81c704078a16e24da8893289d1506bdc25581d8e6e0d044b235ff7737fa0cbda27262b918af469db9ebf4f1a28ca5
-EBUILD ipython_genutils-0.2.0.ebuild 633 BLAKE2B 487a65dd1025cb6e3672257b7d03d9606f8fe42aaf2366f3262e9db8f95092e0ea1c632a7a51a9a7ee6d7e3f455c197a8d68f9046ba0b5246813b423bc245e93 SHA512 2c1cf901f04ec51b506a942c2c85075f1c0bc352e87d7317a0af3abb294e54971fddfc49d171fdcb916a1a5b1c2d90e6ead17d22d00f7de8c09414fb1480b05c
+EBUILD ipython_genutils-0.2.0-r1.ebuild 419 BLAKE2B 33e6b47457a500f991df4b38cdafc48acbb1cb1e54d7ef6b52e9067a97d75e4a1f88d845939998f97f64095d7d966fc58b7b0a375f856ebd9e0f37e2689cdf9c SHA512 00be27ed36d382cb54e126aa40616da17221c0ab60bc6bc7d4ad01d2b19a732cd746b538fa9348976c828fa49797cd6458de0162800ae431a8f55a80e4fb4453
 MISC metadata.xml 836 BLAKE2B 4dea2105ba7319f4068c670e25ff874be86c94dd128997eb53e3909a4c20b741ad145b823bc6f5d543554fa69d386717d90dce7c5a5c4644daefb99cc615d95f SHA512 1508f1c25aedcd8128cb5caeca6aa1b344084fa635a3f1634a73eb7bddeb900ee6d6462650d954510f5d0ce23128b1473932fd487791cb68c33504b507dd78c1
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
index bdcb7286b82d..6a14099f89eb 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
@@ -13,6 +13,6 @@ 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"
 
 distutils_enable_tests nose
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
deleted file mode 100644
index 3fbbb3d68c8a..000000000000
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.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="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 9c2542254591..2e9dfa5c0d54 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,7 +1,3 @@
-DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
-DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
-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.5.1.ebuild 664 BLAKE2B 7af4580bb1b1d9ac9e850f514ca1a92cebc730cca6218e229d2342c4f1df81a6e9196bcf0a90a450048e904bb1a99d0c6bd08a40899a7cdccd758db3eb446e73 SHA512 1566a01de8959635ca069717af459715c29933d7d97fd586f85f5aa72050c7ce6081382ca1665471eaa522707b3efd05abceda1cba74476c2e2c37bb733f72a5
+EBUILD ipywidgets-7.5.1.ebuild 662 BLAKE2B bca9b4a4d217793b05b1eef3ff58b8a5c0958ae98ecb1acaa7f8cc6417755c9a00d04d98775860ab752ff79545b62814cd9ba994dc20be7816cef2f351a0afdc SHA512 b956f20f561e0d3a835d658adfe8454305a2b6193d0e0bfa5ed2b91b8bd43a8fbece646ccae88e2e9593a5d3b989262b952c7b648723017bce335fe33341e939
 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
deleted file mode 100644
index 25bf0838eb43..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.0.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
-}
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild
deleted file mode 100644
index 273266670df8..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.4.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests ipywidgets || die
-}
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
index 392387529694..5f89f0e8c244 100644
--- a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.5.1.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"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 15db6f5bb878..131df01cace7 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,3 @@
-DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
 DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
-EBUILD irc-16.3.ebuild 1694 BLAKE2B d4812f3b09369a3d6ee89e034f9433b59f87f2bf87f415c7b5f1e2389a7097a48f36f659c811a939ed8059cd825c45c0702503b07740def9e0603967c36d5dfc SHA512 6f6d8f23e945703ab76ec23f1f6958113deab9f3a0575b73b8aa6dafc3fb51fe181d76ec05e711b8015ef00b2eea9b89ca6dbdc411938e7b5bf4f6724bb0285f
-EBUILD irc-18.0.0-r1.ebuild 1686 BLAKE2B ba7de13db747de4ac4c6b590831859eb2b51240895cdcf03ea3a6028ea8a38ab64562cf401816b372cfd338b935c497191292af26b303b96d589308b5cf37057 SHA512 3768540afb7e2f5b72376d93bb3511e72d48f8bb6813508f4bbd8d302e3691a12ab318990dd41ed2666ab47116a1277c6bffee2f34e306b8a56da90851c3b327
+EBUILD irc-18.0.0-r1.ebuild 1684 BLAKE2B 9d23782042a6211b0a920a4643e97cf571ebd8bb8c543310e28691b2b6c421965eb535d38650949cea82421a37d2bd06b3f1ee93eb6002413b0bf0a6f5287822 SHA512 050b5c92d0e265fb630d44f2c5e9675997ab79a51dcda216eaa0a35e9f84e43896ec02bad0a4b4f238c02ba4de3e4430b20fe98dbbaade0418afc82420b5c4a9
 MISC metadata.xml 815 BLAKE2B 0431114b3a5e9f0ba4d316502ce7612a7b987d9189789c0e156f6cf970c06fea9353c8b8fbbca828f3b89b2b43e42453ee6073b90097fedf92ce0e6a6061ea8c SHA512 a6b414ff2bac0bb47c4330707b9e09236a7ef2ca13d4e5ed19aa1bc514998ba0139643fd3014ca451c19b446452a829c074b5d2015e761a914373d1b5561c482
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
deleted file mode 100644
index f917dce5e7c4..000000000000
--- a/dev-python/irc/irc-16.3.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	dev-python/jaraco-stream[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	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/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-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_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/irc/irc-18.0.0-r1.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
index bc2ceafe82d0..a0838bdf12cd 100644
--- a/dev-python/irc/irc-18.0.0-r1.ebuild
+++ b/dev-python/irc/irc-18.0.0-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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 7c55adfe26cd..a2ab1c96acab 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,5 +2,5 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
 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.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
-EBUILD isort-4.3.21_p2-r1.ebuild 823 BLAKE2B b1dc630eadfdff875d062528563c85ea44a07835b7ff6a82b9cb55b87c91b41f7c42f38d0569dfa1b4f1f24dddc8912b99269fa169aae61ff65e59af419a1c9a SHA512 0412f312bab6a0bf93ad766668bb5b9d5298308f88728b5449d064f5bbb60bc98d73ef10a2c1063af223c1f09ab9340b867378486474bfcf300984c917183b96
+EBUILD isort-4.3.21_p2-r1.ebuild 821 BLAKE2B 3f3940ebddddf4e2febd47167f375ae4329eb4d90f2a1c61db733ed29fffafb5679208061b4234cb33c42f1539dbbc4e9e9c193e325cbb0186c6fc7ada67dd25 SHA512 1617de098a568c58eaadd072ac859b9dccf770261fe912d1765c8a0b8e716ac609e7aabcc80b9c9b2506b49504ed0e214ee49c679fc35fa0b43fab236bcff713
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index a6450aede40b..6086f5b770a6 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 1d500c26a453..6087dae51ef4 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,3 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-1.1.0.ebuild 678 BLAKE2B 72aa44ddb9c77c801c74e2385201bfcecb9ba9187e92060b9451e12b875d04ea137f4af34135145da629efdb2127dccfe8249ad9d58fde2af8f10e157d0ad8bb SHA512 2ea538f4770762052a4eb681c6b22055c5f4237f391bdfa7dbd5a1df7921aa65b61fdd255fa763da804a4f246fc669293a4b95de5314a129457eb1d5ac0f65f3
+EBUILD itsdangerous-1.1.0.ebuild 677 BLAKE2B ff9355ca4ffeb4382a63cb49f3245318fe3dd106ba76ff4312478495ab9dfa0bf55faf96320a6e711d514482d4cb503c63f46176653a9be25d31723c110192ac SHA512 2687a0de211ae6506f11c1826efcf2b6f934090c3e2fa1eab6d2f8a251ccdff2b36345320b94284262eb2e6f69337cfc6d4825bce856cc060aeb503b9beda6e9
 MISC metadata.xml 325 BLAKE2B 77ff2333a1e15eb410f0c320bf5b62c19568bea653b4cda79294debf6dad02b774f914ecfb3cecbe0adb1630e36bc82727ae77ab09f2b8314fe2ccc101df6737 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
index 86d4b9783eed..f605c2dc5797 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 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 b7881a7b3bed..5eaf8b0b3d3c 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 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
-EBUILD jaraco-classes-3.1.0.ebuild 1651 BLAKE2B 7909748684a7783d400ce90224baeabfe53fa5233ce00580b265ea689f99b24456da780a9895296a434414425f26c04968e2fa14cb0b4996d39e5f15dfe227e9 SHA512 6a1105a372012106c58ad128647d35220e4c014a1703afba519241153842979ae7ed32492757921e922a892c3ad2307e875bcba87de737e744d04081edbf8f01
+EBUILD jaraco-classes-3.1.0.ebuild 1646 BLAKE2B dabf68fb1b8f8901945196e75dc60fe8ac2f99eca622a9b225d3d4509760a35538b582e412e72f26164572496bd0a8653c0934d477b56bb1c957f6069badefed SHA512 9c7d83eb8977e07684d956cab98c77f861fda3a54483b021b7b4ef5d781bf6f7442a8d9c4c3ceb786e9aa6063fa621dbe3e20d3d3d0a791e518177aa69ec7302
 MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
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 72a6f7164ec9..1e6374b3d94b 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="~alpha ~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 b20e79efa891..18f21c186e83 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,8 +1,4 @@
 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 1619 BLAKE2B 874e17d4dcc31b2182d75fa0581210b349b7fe879f302b66fcc401b2df1210bb1f16d9429bf93a568daf75dc15df533217c12d98368d5f17fd5367b7e1b23e2e SHA512 1d296504d54b64d29f561b63e06860d238b19286ce41d48da8813e7b43aaf492325ab01823531e489cf8f80cf0e3fdb845e02de7f99bbc3c9fa8f7a7a38eff13
+EBUILD jaraco-collections-3.0.0.ebuild 1616 BLAKE2B eacb71474299b34d2cd780edcaee3e0ef409b8c6be6ad552d1708ee507a373e138ad3c811896e28923d8acebe5035e327a042cf79b62535ef597946d22fce436 SHA512 5c0d98b43d17cdb9844963e35ad1a6559a7bc0740eed43d1a86f91d9f153d659ce7060cf7bd8438d985942c180761a4d0acb822447c8830d41e15af08f3be8e8
 MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
deleted file mode 100644
index 16373fd2e8e8..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-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 )"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${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[${PYTHON_USEDEP}]
-	)
-	test? (
-		${PDEPEND}
-		${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=. pytest -vv --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-collections/jaraco-collections-2.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
deleted file mode 100644
index e91d3ae0e642..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-2.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-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/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${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[${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=. pytest -vv --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-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 680c710ccb08..430a3e4d86e5 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
new file mode 100644
index 000000000000..3065c52ce449
--- /dev/null
+++ b/dev-python/jaraco-context/Manifest
@@ -0,0 +1,4 @@
+AUX jaraco-context-3.0.0-useless-deps.patch 2133 BLAKE2B 8db1fea20763661a3d6786536de6ed956a1e3f2952a96f7242b5735f2ed782496dcc662259921e4eb2967655da4f94ad7262f282caf3bf15428c704f4a38890c SHA512 16608605a401fbd002714043da0a7a28fc770f8972a808d71da19733fe1992f7f1f27f1d87462900c980bd14ba4c493349e5802f735e795a2e2c3d7012d2773f
+DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
+EBUILD jaraco-context-3.0.0.ebuild 1122 BLAKE2B 7c52d1532ccff0b303988f86c61e22cc194851eb4d96cdf0e81a30a5a3faf166ceeccd7555368c43bd443781918b98cb41a92df91907ce84ad776e010ae20cc6 SHA512 e9dabf3036916d9ec75b5e51e149be77e4da09bfa82f270d420611137cee1e0a2d971ab79006b5c7efe676f01fb30b8998ab613e1d3e1bc8e1a5b61d0f5b20e2
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch b/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
new file mode 100644
index 000000000000..3b69581ab2b5
--- /dev/null
+++ b/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
@@ -0,0 +1,62 @@
+From e3a1f344c296f9d6193f4bf2ac1e0cdafcddce0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 20 Jul 2020 18:11:31 +0200
+Subject: [PATCH] Make jaraco.apt & yg.lockfile imports optional
+
+Handle missing jaraco.apt & yg.lockfile modules more gracefully,
+delaying the error until dependency_context is actually used.  These
+two modules are only used by the dependency_context, and this context
+can only work on apt-based systems, so there is no point in forcing
+the extraneous dependencies on systems that do not use apt where
+jaraco.context is being installed for other context managers.
+---
+ jaraco/context.py | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/jaraco/context.py b/jaraco/context.py
+index 0b5b1bc..13dfdf6 100644
+--- a/jaraco/context.py
++++ b/jaraco/context.py
+@@ -13,8 +13,15 @@ try:
+ except Exception:
+     import contextlib as contextlib2
+ 
+-import jaraco.apt
+-import yg.lockfile
++try:
++    import jaraco.apt as apt
++except ImportError:
++    apt = None
++
++try:
++    import yg.lockfile
++except ImportError:
++    yg = None
+ 
+ 
+ __metaclass__ = type
+@@ -131,6 +138,12 @@ def dependency_context(package_names, aggressively_remove=False):
+     """
+     installed_packages = []
+     log = logging.getLogger(__name__)
++    if apt is None:
++        log.error("jaraco.apt not found installed")
++        raise ImportError("jaraco.apt not found installed")
++    if yg is None:
++        log.error("yg.lockfile not found installed")
++        raise ImportError("yg.lockfile not found installed")
+     try:
+         if not package_names:
+             logging.debug('No packages requested')
+@@ -144,7 +157,7 @@ def dependency_context(package_names, aggressively_remove=False):
+                 stderr=subprocess.STDOUT,
+             )
+             log.debug('Aptitude output:\n%s', output)
+-            installed_packages = jaraco.apt.parse_new_packages(
++            installed_packages = apt.parse_new_packages(
+                 output, include_automatic=aggressively_remove
+             )
+             if not installed_packages:
+-- 
+2.27.0
+
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
new file mode 100644
index 000000000000..e452794c4180
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# upstream uses bad template
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.context"
+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 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-useless-deps.patch
+)
+
+python_prepare_all() {
+	# used only for apt support that's irrelevant to Gentoo
+	sed -i -e '/jaraco\.apt/d' -e '/yg\.lockfile/d' setup.cfg || die
+	# pytest plugins
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/jaraco-context/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/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index abfad83b7e30..71a167e416c5 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-1.0.1.ebuild 1226 BLAKE2B aa448531f05a3d5c6da92657403e47d36d3419eb78abf6e96c81ad46ebfd02eb59da86f48865888fa2fcd9cd9ac89957a8fe4d017ed65138c23953d384c553ee SHA512 8e23179efa415d71c77c746b597bb3cf6fb52a1fcd0b9cdcc53183c60313befa3713ff745cc12179604b05c9ce6e89c04dd1af0c8430b7688a64182a517c0396
-EBUILD jaraco-envs-2.0.0.ebuild 1038 BLAKE2B 57402728d5175ab58140341521a7a37a0003129295bcca9a108f8b6d6bfc7d4a90a6fc884f1cd31036bcdbbab9a93c0c49b72deab799b7f90fa43d4cdc0f462a SHA512 c93fbd8a2aa0b1443df2b4937b65aa4e03fd72d590d84d08a83a86d519a98d592a62167706bbc492bba7e8ba9f5d213b3e13ce5d4c20a8c8d3c1536bcc4889d4
-MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
+EBUILD jaraco-envs-2.0.0.ebuild 1031 BLAKE2B 52e2efe76c6328d90b7ebb50db9f3c0ff95b2e8d0fca861340524dce717a9d2dbd6ef0c7c89aab5fab7d4d1f25b82a63b40c65d4c177246c5f40e9ada01a3ae9 SHA512 5b6216b8b4db90a528b9269015220e1e44d22fb9617dae78d646d0cf74b6ebf0094f5af45898c330cb5d63d5208b1dc86b80dcf8f38143e310ac10ffdc189261
+MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
deleted file mode 100644
index d93173d1b677..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.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=7
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Classes for orchestrating Python (virtual) environments."
-HOMEPAGE="https://github.com/jaraco/jaraco.envs"
-SRC_URI="https://github.com/jaraco/jaraco.envs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
-
-RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index 9ae4de05313d..9f373e18842e 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/metadata.xml b/dev-python/jaraco-envs/metadata.xml
index c1264bf8cadf..ea0f511c6578 100644
--- a/dev-python/jaraco-envs/metadata.xml
+++ b/dev-python/jaraco-envs/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.envs</remote-id>
 		<remote-id type="github">jaraco/jaraco.envs</remote-id>
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 7112ab904fc0..8ccb766dae4c 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
-EBUILD jaraco-functools-3.0.0.ebuild 1747 BLAKE2B 5bc3c6ec8723e01dff7b9953ce1653a77603e5bf10a913cf526cbe2546f09d05c85809e37254c7a504855c0d85d708b168b58f82710e4f1ce2e219f74ad11883 SHA512 ce4135a8607d136b7866d8c47401ed4c8d2d1c2412b8b3c3ed480963ab03f061a846ddf6bc1f54225c618e0a2594fa17f65e03cecc24eb638a59359db3437a6f
-EBUILD jaraco-functools-3.0.1.ebuild 1567 BLAKE2B f02f864715762c84c70aa95cb3abc3819184cdd505dcda9ffdc03490a198c0b0f611e7b0c82cd2695453d49a8efe0027c4c7fd651e0c3c770195ef5c8b7f0791 SHA512 b327f3cae832a6c20b296085867adbbe5c4ea643e6f6c1f6672f228b892c3a0417c080a8b09745a2df7dd48ced3fc58a6f317c87097e4f6f9c9a047d36289fc6
+EBUILD jaraco-functools-3.0.1.ebuild 1562 BLAKE2B 4696832f693603770559aa3c57822cfaec47682d2f9f298c2a4db277bb2acf8c1025c2deaf817a61520e1198ee977039feec5e89bf150a945526d4ca4fdf6fc5 SHA512 145584d185a0ff801e2a1eac747c36537486de5971b747c3ec25f093e4036fa65e33a4972af8de1acad84a4f6e2f33c05e1fd7fdb22b94515bd996ad3f3811a2
 MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
deleted file mode 100644
index 6600c4a4631d..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.0.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 python3_{6,7,8} )
-
-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"
-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/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-# TODO: remove six
-# https://github.com/jaraco/jaraco.functools/pull/14
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/six[${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
-	PYTHONPATH=. pytest -vv --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-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index 21d365d3af3d..2a5017a2f033 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 56c864f82ccd..3bd30abb9593 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,7 +1,3 @@
-DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
-DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
-EBUILD jaraco-logging-1.5.2-r1.ebuild 1378 BLAKE2B eb082aee28fa0499f6a418e99607cefc5c338af94f5994c138b33aff45ab4c5e2e2b52a31f5c8bdfee749e73a9435c1c44d3c4fa895d8cd8ba991e6072e6020f SHA512 67a46b663703faefe375633aad6239c41d077c547d836109f73e474b54d2acad545b4e744fb02b5ff716a716f6bc7b62bd00a160349ed586a2b21b5c1804cd07
-EBUILD jaraco-logging-2.0.ebuild 1563 BLAKE2B fad4ccf40161120aacf0a4b7c5197014b2b178cdc3371fbb2758476b7963162f8a4875e2c1d8db4151e7039b84943ddc42f388542ee8d3c30c392e802f44fa30 SHA512 0ef10790bc63eecc56c64ebd882c79e40a73486c34e4f4e9967b755ff056340b21056c248961b5d156ac5937f207768194ff0e4f65b35b712b2bb38bf66428e7
-EBUILD jaraco-logging-3.0.0-r1.ebuild 1402 BLAKE2B 54955bfa8cfc01e8d04e561e3db5ca8479801745b3eaea6906a0668d058d92727a66d742577b00fab483cacd8b8ca207611cab7af759b4e1f090dfc1dc3838e9 SHA512 057685a710de19477fcdfefd2be91bd71004985d060305a1365ce315adde539ba5fbda053aa9e8c9eb0bbb43b6420375fe8b9bf796a92be58e8ecb4235dcacbd
+EBUILD jaraco-logging-3.0.0-r1.ebuild 1400 BLAKE2B 29a93b2ab8cfa6ec2d34252f6ead5319fc5d555649c88b373d15ec11189f4d369a3c82704356612e6508b753d58a13f1f0dbd7b3ca5e12001687b8bac64e5e44 SHA512 1727c121fcda6460ee26679616d7cf3541028283fe83763342102e13f30f985d3de7e9f390634fd272f0e6f663ef328ca2297dd9c5acc81817e5d692cd660479
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
deleted file mode 100644
index ff7b68814c35..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2-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
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-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/tempora[${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[${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
-	PYTHONPATH=. pytest -v --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-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
deleted file mode 100644
index f2d70dae4632..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-2.0.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 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-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/tempora[${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[${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
-	PYTHONPATH=. pytest -vv --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-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
index f2dc6af3ffac..2470aa63d5e8 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-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=7
@@ -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 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index d49ebe689d6a..507fc18822ef 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,3 @@
-DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
-DIST jaraco.stream-2.0.tar.gz 11061 BLAKE2B 86cc9958e11421fe839551e029f839c16a12b80d329466b44224d145be6c2a15a63d03f426a9b8d1510249ea6c129e892dcfec41a32dd5c3c3a3b66acc21030f SHA512 d379d07772d739abb275cfc8ed7809583c728af695294b9d12ae1276add360b9559de64104cd20d05d82a3250237ae1f6eb23420970a95e9fdf6346ef9312331
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
-EBUILD jaraco-stream-1.2-r1.ebuild 1429 BLAKE2B 9f7b53269d8cad1240acca7226e18ed742f803b9c0c4f1aa2c39f86245f84f39c1665c0e95849d8f3d02e3a3c9c2076e95639bdac1c35a08d09fcc75cdb4e794 SHA512 daa807726fcb22377a10e90bf44c0c7d987e4f3fcd16e10c5a095e9b1dabb47e129b5dd21dc816552abc08c82d2d6c57a23f3c44ca704b5110f535d70f3a5d59
-EBUILD jaraco-stream-2.0-r1.ebuild 1618 BLAKE2B d1711b1886bf2de2fb2ab0362212b882d14b5d2f0ef1dbb23033fb38149aaa67b73b899058bc3dbe58c159bcfde3f473b6ac0c9309d73a5d200e76b3f3969f8f SHA512 af728cc4ecb30b24e63d1d197eedd6aa1b77715813a07faaea6b6c592e8ee609654222e898896d2333b5a0c4ca9d29f548a8d6cde446fd881ee31640d7bbc5fe
-EBUILD jaraco-stream-3.0.0.ebuild 1404 BLAKE2B 0394e1c75242e107a6d92e0a5ab35f48ce50a631542f9621794d4fbd40b372b7da3421ae517d1edf91777f5e59879f7f13e7fa646900118081204142af3bedb6 SHA512 66b5ddf6f945d3480cc7db8ffbced27444cfb75fd3492caf673d57cbd936fa118fe25c0836d96021bb2ce7230d9be35c369a3b7f531b76ffca0e17a3df1e0410
+EBUILD jaraco-stream-3.0.0.ebuild 1402 BLAKE2B 5134ec16b580ba72299daf485aa56c744b2d4714faa0dc49d30e774485b343bb44872c86e7b6245842a6b461f1218b7fbe9811222331386282f6371f2c554826 SHA512 f220b21aa50eb5aedd28e27b2f7261903a855a84e0379e99bf1228d377c38c9a3912f3fbe1b96e442c6e6fdff484337b2ddf1e908efaddd32cb05d2784cca926
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
deleted file mode 100644
index 7febc3f3bba1..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-1.2-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
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-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}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${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() {
-	# Skip one test which requires network access
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
-		--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-stream/jaraco-stream-2.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
deleted file mode 100644
index 408604edd5c4..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.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,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-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}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${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() {
-	# Skip one test which requires network access
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
-		--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-stream/jaraco-stream-3.0.0.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
index 48dec9742af4..a8ead7c507d7 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-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
@@ -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 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index b9e107e25171..cbbb27bd20bd 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,3 @@
-DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
-DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
 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 1496 BLAKE2B 3942a6de4f71f7b2b1c782c0b290a26afb4bb597d06004d04aa549c72d7363aebc223b05513a06a0d7851d708dcde26db5579d5fe7286db17e085d9ed2a28070 SHA512 8738b16d54585d59bd70f9353709d3c703e0b255c2cce9393c0831096bea8480ab69f26794c5168fb17be61103fdb91e4aca3b7b1333ceb2ba03652dbfa47e1f
+EBUILD jaraco-text-3.2.0.ebuild 1483 BLAKE2B ee1a49037beaa9d71d1a000cbed914ba9974991c61485a82789e83212cbd6d689b17d8fb79b00326fb2f0e91e71579e96dae64286c56d9bea6d122c83fb70f39 SHA512 41a91dac99a61b19c01ac2bb075822099ad87e937c971073655a8561982421e508f057c5201560f02c64dfd0cc897f615deaa4d333fe3762a11666876a13c552
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
deleted file mode 100644
index 5609a83b3be8..000000000000
--- a/dev-python/jaraco-text/jaraco-text-1.10.1-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
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-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 )"
-
-PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	<dev-python/namespace-jaraco-2[${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[${PYTHON_USEDEP}]
-	)
-	test? (
-		${PDEPEND}
-		${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=. pytest -vv --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-text/jaraco-text-3.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
deleted file mode 100644
index 728ffc4387a0..000000000000
--- a/dev-python/jaraco-text/jaraco-text-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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-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/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' -2 pypy3 python3_6)
-"
-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}]
-	)
-"
-
-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=. pytest -vv --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/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 9a3c00ccc7dd..1084d2d49d18 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python{2_7,3_{5,6}})
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 8a468a4c6973..9a469de2ab24 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,5 +1,3 @@
 DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
-DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
-EBUILD jdcal-1.4.1.ebuild 447 BLAKE2B a2e092ffa46b207fec6c8db9d443a9909fea1f09b4495eec0f47f1bae29af8624c9e1033875e6195ab1b57426db649a67e760541b0b6bcff4097332e3425d627 SHA512 d9bd440bb45496e2556c083edf24395d469562594278dcba3f1804c0a61e1da08e1fec3954a53c2b012d1f48bc43530fcaa38084dfdb8da34ae7da2c85481ca4
-EBUILD jdcal-1.4.ebuild 445 BLAKE2B 5e45bc8a0e31edd65a846f09311c2a4b31b7e18a5bb7adb41f53a01f0910847bc0e9efe5432ab392d790e35f73316dd882cacf6930ee13fa4780ad87f4310ad5 SHA512 adc621b03122f6fc7d0e755e0653b9f2c11bbc95cfa6fd25fbb114bf6bce55e8f0dd3bc2c1f8f287df7bd9cf68d11cd759e308e9546ee91b41aa61ac2f2832d0
-MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
+EBUILD jdcal-1.4.1.ebuild 445 BLAKE2B 5e45bc8a0e31edd65a846f09311c2a4b31b7e18a5bb7adb41f53a01f0910847bc0e9efe5432ab392d790e35f73316dd882cacf6930ee13fa4780ad87f4310ad5 SHA512 adc621b03122f6fc7d0e755e0653b9f2c11bbc95cfa6fd25fbb114bf6bce55e8f0dd3bc2c1f8f287df7bd9cf68d11cd759e308e9546ee91b41aa61ac2f2832d0
+MISC metadata.xml 394 BLAKE2B 9c35062d139a232a70be4bbf6daa238737a318061879c48e32b287e8269d5020f1698f0968e75c4077d8a92bd0048218dc6a5cc8c505aff393430b41f275b962 SHA512 d2de830b52671780250d301ad183337bf0020141abae9931183158f1222d0e46691054138ec283ea16ad31b3403b07d0d8313013067d4e6c51e54c4ae08b5688
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
index e11a2e8e0fcf..60b57f24139b 100644
--- a/dev-python/jdcal/jdcal-1.4.1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
deleted file mode 100644
index 60b57f24139b..000000000000
--- a/dev-python/jdcal/jdcal-1.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=7
-
-PYTHON_COMPAT=( python3_{6..9} 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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jdcal/metadata.xml b/dev-python/jdcal/metadata.xml
index 520a5de8ab37..2871122805a5 100644
--- a/dev-python/jdcal/metadata.xml
+++ b/dev-python/jdcal/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jdcal</remote-id>
     <remote-id type="github">phn/jdcal</remote-id>
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index d36d7576f01c..796c562b9fe3 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,13 +1,7 @@
-AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
-DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
-DIST jedi-0.17.0.tar.gz 462810 BLAKE2B 71eeb3e3fa23786c577fbcb3727a49111d6188c2a5d9e13538123c7c6817b67d457f3bb88423dc9dac6ee09dec89d7281c86166bc771fa0215cd327a4432ebd7 SHA512 562ae25f0c4709cfe36fe4e737d383190d8ad435b3ff580b9fbe966544c8d035cfa29815459ceecfafd704547560a8dc397f841989043e6e18c8f9d639f75399
 DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
-DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
+DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
-EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
-EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
-EBUILD jedi-0.17.1.ebuild 2128 BLAKE2B 60c917667bc22722fceef83013626559f4d82ae11e47b5617195b68fd7fc693769a2d340c79ec9bbf24885c6e530091aeb5ac39238a6652e898277f602b1de3f SHA512 b3e17e5a1d984bee6aad5bc1727b71d03011cfaf82f5fb6e6974d512a7d399ef266b14791d6b0b0bb71e5e1c2df127a0d3f50b498325b2bab0148e3050f7ce18
+EBUILD jedi-0.17.1-r1.ebuild 2126 BLAKE2B 7408c92262a1ae88537be1e29c464a78755b2e72f922db863acf4424b0009fe3ca1da19f9953bec21d73018724064088352994ebf09d5d340b6ca7e21c7acea9 SHA512 3c42bf871e9336b4948d716efde466f683d3ff932d955dbe3fcbdd7a8d925dc6f34f3d75d054e5f5bfbf0073d80a717a22898d4ace2cf5503e59ff6439d4be42
+EBUILD jedi-0.17.2-r1.ebuild 2122 BLAKE2B 024075a30fd86c3299a0e3a53f67fb2a2b1d86ed66b16105b9d4d50ab2896b39f8b1b48e738ea0827d7dac994579ef79de9e61808b520c33051361c10b11491f SHA512 8be3d7c4985a1ac7e71ccade2f3b74cab705ee70cab85c8e1e2e3455731c430c8949ced57c90d40f2275f2ce992ea641d9346fdc0d2056e643bdfc3f6f8c1f6e
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/files/jedi-0.17.0-tests.patch b/dev-python/jedi/files/jedi-0.17.0-tests.patch
deleted file mode 100644
index d045340d0930..000000000000
--- a/dev-python/jedi/files/jedi-0.17.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 57f2a731d2e5c4fe5794d823154983e44e8df003 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Apr 2020 07:54:01 +0200
-Subject: [PATCH] Sort test_project::test_search results to fix failures
-
-Fixes #1542
----
- test/test_api/test_project.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_api/test_project.py b/test/test_api/test_project.py
-index a7d4846e..c21579a5 100644
---- a/test/test_api/test_project.py
-+++ b/test/test_api/test_project.py
-@@ -135,7 +135,7 @@ def test_search(string, full_names, kwargs, skip_pre_python36):
-         defs = project.complete_search(string, **kwargs)
-     else:
-         defs = project.search(string, **kwargs)
--    assert [('stub:' if d.is_stub() else '') + d.full_name for d in defs] == full_names
-+    assert sorted([('stub:' if d.is_stub() else '') + d.full_name for d in defs]) == full_names
- 
- 
- @pytest.mark.parametrize(
--- 
-2.26.0
-
diff --git a/dev-python/jedi/jedi-0.14.1.ebuild b/dev-python/jedi/jedi-0.14.1.ebuild
deleted file mode 100644
index 6f023f45fc8a..000000000000
--- a/dev-python/jedi/jedi-0.14.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=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="dev-python/parso[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-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 's:test_get_modules_containing_name:_&:' \
-		test/test_evaluate/test_imports.py || die
-	sed -i -e 's:test_os_issues:_&:' \
-		test/test_evaluate/test_imports.py || die
-	sed -i -e 's:test_os_issues:_&:' \
-		test/test_api/test_full_name.py || die
-	sed -i -e 's:test_os_nowait:_&:' \
-		test/test_api/test_full_name.py || die
-	sed -i -e 's:test_os_nowait:_&:' \
-		test/test_api/test_completion.py || die
-	sed -i -e 's:test_import:_&:' \
-		test/test_utils.py || 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
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} = python3.6 ]]; then
-		# our very useful patching changes libdir for no good reason
-		sed -i -e 's:test_venv_and_pths:_&:' \
-			test/test_evaluate/test_sys_path.py || die
-	fi
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jedi/jedi-0.15.2.ebuild b/dev-python/jedi/jedi-0.15.2.ebuild
deleted file mode 100644
index 3cd8bc1d3369..000000000000
--- a/dev-python/jedi/jedi-0.15.2.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,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/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild
deleted file mode 100644
index e8e830ee68ec..000000000000
--- a/dev-python/jedi/jedi-0.17.0.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..9} )
-
-inherit distutils-r1
-
-TYPESHED_PV="0.16.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 \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/jedi-0.17.0-tests.patch
-	)
-
-	# 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_complete_expanduser relies on $HOME not being empty
-	touch "${HOME}"/somefile || die
-
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-
-	# really silly assumptions, not fit for py3.8/3.9
-	sed -e '/len(difference)/s:20:27:' \
-		-i test/test_utils.py || die
-	# py3.9
-	sed -e 's:test_infer_on_generator:_&:' \
-		-i test/test_api/test_api.py || die
-
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jedi/jedi-0.17.1-r1.ebuild b/dev-python/jedi/jedi-0.17.1-r1.ebuild
new file mode 100644
index 000000000000..60aa2d557a20
--- /dev/null
+++ b/dev-python/jedi/jedi-0.17.1-r1.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..9} )
+
+inherit distutils-r1
+
+TYPESHED_P="typeshed-jedi_v0.16.0"
+DJANGO_STUBS_P="django-stubs-v1.5.0"
+
+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
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz"
+
+LICENSE="MIT
+	test? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || 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_complete_expanduser relies on $HOME not being empty
+	touch "${HOME}"/somefile || die
+
+	# TODO: investigate
+	sed -e 's:test_local_import:_&:' \
+		-i test/test_utils.py || die
+	sed -e '/with sqlite3\.connect/,+2d' \
+		-i test/completion/stdlib.py || die
+	rm test/completion/django.py || die
+
+	# tests relying on pristine virtualenv
+	# this relies on test* not matching anything else
+	sed -e "/#\? \['test'\]/,+1d" \
+		-i test/completion/on_import.py || die
+	# this one's broken by 'path' module (dev-python/path-py)
+	sed -e 's:test_os_issues:_&:' \
+		-i test/test_inference/test_imports.py || die
+	sed -e 's:test_venv_and_pths:_&:' \
+		-i test/test_inference/test_sys_path.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jedi/jedi-0.17.1.ebuild b/dev-python/jedi/jedi-0.17.1.ebuild
deleted file mode 100644
index 00e52e0a5408..000000000000
--- a/dev-python/jedi/jedi-0.17.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=( python3_{6..9} )
-
-inherit distutils-r1
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-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
-	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.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 \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes these as submodules ...
-	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
-	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
-		"${S}/jedi/third_party/django-stubs" || 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_complete_expanduser relies on $HOME not being empty
-	touch "${HOME}"/somefile || die
-
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
-
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
new file mode 100644
index 000000000000..f0eb683638b9
--- /dev/null
+++ b/dev-python/jedi/jedi-0.17.2-r1.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..9} )
+
+inherit distutils-r1
+
+TYPESHED_P="typeshed-jedi_v0.16.0"
+DJANGO_STUBS_P="django-stubs-v1.5.0"
+
+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
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz"
+
+LICENSE="MIT
+	test? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+
+RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || 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_complete_expanduser relies on $HOME not being empty
+	touch "${HOME}"/somefile || die
+
+	# TODO: investigate
+	sed -e 's:test_local_import:_&:' \
+		-i test/test_utils.py || die
+	sed -e '/with sqlite3\.connect/,+2d' \
+		-i test/completion/stdlib.py || die
+	rm test/completion/django.py || die
+
+	# tests relying on pristine virtualenv
+	# this relies on test* not matching anything else
+	sed -e "/#\? \['test'\]/,+1d" \
+		-i test/completion/on_import.py || die
+	# this one's broken by 'path' module (dev-python/path-py)
+	sed -e 's:test_os_issues:_&:' \
+		-i test/test_inference/test_imports.py || die
+	sed -e 's:test_venv_and_pths:_&:' \
+		-i test/test_inference/test_sys_path.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 420ef53568fc..df8653c7ecbe 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 808 BLAKE2B da107263e69eb97bccc2bdbd59e08d453ef30618beff9a6c0c57820c1980bfb36adc50be6840e3241f30f4934a74947ec4b8ac689b638cd7834808df84a84be2 SHA512 5dea8ffc3ef6ef42824a65b8cccb9d872f9aa1358205272b6388e9acd9ff969af6ad3d0e3d5eda0a9cc06ee6005c95f5df63fee21305a12b1f4a6acac63669dc
+EBUILD jeepney-0.4.3.ebuild 803 BLAKE2B 887f8aab1dec5a23a616f9ca984cfd046d8ac3330e27f0f572c66112d7bf841c6455febbe26fee2094f40c906fc59e24579825ad505dfb79a7223e92565a8c6c SHA512 1d443e321346c6e8eec366dbf079dd718774bfb5deb95c5f286730de6acbcaae030b9e538dfaa9676ed6f9187f4e0690d709aef676f377dfa7fb10591c7ff2fc
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index 48253ebcd3af..9717da697eaa 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index a00cffd279f2..6659fc193661 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,5 +1,3 @@
-DIST jellyfish-0.7.2.tar.gz 133320 BLAKE2B 094610c79e8c7f1caa94ff6c8f6936c3ff26c8d8ab8a7605c145e8293d1ebc28f5d057a603f7d8392811aea5d31a87ecb3e3d9eb682e2fd8a3222f23fbc7c3f7 SHA512 5fa19826a3adb16dea26855d733bd3e8ccce0c68652249f7bcc06f9b5d5ac36919152301c9afafdfca9877cef6614dccbe8e46a51ab41c1fed493374929c3367
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
-EBUILD jellyfish-0.7.2.ebuild 935 BLAKE2B 9fa8cc992e2a9af8932ef653dc60dd5e3ff24106a2200f4d91e9b473a2b4c81e75669c02c0ae3c3e9ba5642f7ac7ea4b40d96fa1706405d4a58c01791bf4c4c4 SHA512 175fc3a58aa147c5e6435597213e4703569eed7aebec7a5960c6170c5384fde75e0259e87f394e984fdebc9d9ce564d0f1c744cba5934e59dbaf97b24bcf7148
 EBUILD jellyfish-0.8.2.ebuild 937 BLAKE2B a1a32e4008169905a14e137f8d5d5d1a88cce01b12b1661ad24159930a1a334de1957573637ff39b4a5b15a5fb1c75f319a9c6fbe21671debc4e1b776eb640a9 SHA512 a4750cde3dee2451bb7205804eaf9317c6cfb718cf9eb9c001428c01b0d2f3cdc79f5c752df3350c135c394ef67eab09c3e8d5dcb8410e8bcdf4c4412ccdb419
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.7.2.ebuild b/dev-python/jellyfish/jellyfish-0.7.2.ebuild
deleted file mode 100644
index 53caf0c99ab8..000000000000
--- a/dev-python/jellyfish/jellyfish-0.7.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( build/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	cp -r testdata "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	pytest -vv lib/jellyfish/test.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index d59d4ad73636..75cdfbc748f5 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,3 +1,3 @@
-DIST jikanpy-3.4.2.tar.gz 14132 BLAKE2B 4a06cd0ac37968c26cf062c7aa7b42a23795f372a814641d373097e67c0958ea2e640b9945883552c6997285fb3d19991482ed4872c5c74097940121edddca4d SHA512 cff23a20a331da55036875c2ea34e3bcf7c28592b625bb9c3fc453969db2f232cd30841757ec8d75807f323a2caa0f591f91e71547b29d07694560462c561d30
-EBUILD jikanpy-3.4.2.ebuild 459 BLAKE2B e8e00cadc1404dfe5f5878efae1e5b97cdbefb45e1d3d2b7e6631ecf3b159560eb412f9f0e5004d4d30a95ff461aced1816d11f858bbe23c7a5a72a1ac79c73d SHA512 b37a73eceffb0e257774ea9049b30720d6f3a3abf916ac809d73f97fc63b00fa28916cb84fc2d62b6e844b9f7bbf5ae9f634381fedaa0e07e53ccf5a562fc005
+DIST jikanpy-4.2.1.tar.gz 536588 BLAKE2B f6bf531cc57814d2740e1d325bc521dc92651a1a467b65277086130d9c00de7b592e81a7f82e12cb35ac8d8c7f1bcc6201f945ab9c49befb8b89093e627eacc1 SHA512 7f690745a790836ddae95aaffdaa59ea60d0c2b2d9c64be7548372719c826239d3d650931652ca75d8e35f1d4354c0b80ebf0d7e80a4fa4b65ec3bbd4bef1cd5
+EBUILD jikanpy-4.2.1.ebuild 531 BLAKE2B f2f93f4cb7c8b70e60ba93d5d41d5576cd000afd0580c7ef51d6e4b9ca550001ad1f8869629f69f3f3c7bc5df96234ee7b49a7689509210d72d144b8eda0e3c6 SHA512 bef6153db43749fa374d9cccd08245789ce474f5613e461273d9b963238d158b65e7a11557f73b17ebe62207d1cd5a9d886bf3a75eac81faffae1f336b25b72f
 MISC metadata.xml 378 BLAKE2B a984a5ec0db760455227f9506abdd294feab0fe6e5c18c1a489c789e80b38c0ab854b0c195edd7c132932396c4c5628be65677f6ab945371d0d8414fc08a03a7 SHA512 4ef2469712d9af410a4000b3ea5bbac2bb3c837042cf3bd0348b53d57ba463652eff2ae5dec045fcfc897740f2810a43c03b94e79a55b72ac15154e31be230be
diff --git a/dev-python/jikanpy/jikanpy-3.4.2.ebuild b/dev-python/jikanpy/jikanpy-3.4.2.ebuild
deleted file mode 100644
index ab08d9233e5c..000000000000
--- a/dev-python/jikanpy/jikanpy-3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API."
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jikanpy/jikanpy-4.2.1.ebuild b/dev-python/jikanpy/jikanpy-4.2.1.ebuild
new file mode 100644
index 000000000000..a901c883c33e
--- /dev/null
+++ b/dev-python/jikanpy/jikanpy-4.2.1.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 wrapper for jikan.moe API."
+HOMEPAGE="https://pypi.org/project/jikanpy/"
+SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a22fdbf86e9e..d91eb59460e2 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,3 @@
-DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.11.2.tar.gz 258055 BLAKE2B 5cf12d6c79e7e659b16318cb3dc483a276511192903469629ec497c10ba6cd023f5a834961ac74cbda556177aaac46f5045c5aaca3068dcef87017760895851c SHA512 453e0c94c57065ab78f997726256bd2a31bb79124a2ee17b632cb124a3ccefded33d81b35cac73497f095b1cd5d8cd4420d6932a637fd7c4cdb786f1753e49ac
-EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
-EBUILD jinja-2.11.2.ebuild 1604 BLAKE2B d9a4baf03d89da438dd84856e12ffbfb67d9464fec304c3c81e881d22a2602894a138af62997f8b97de7c898485401ad228a0bce44865b04fd67505bd958d9a1 SHA512 055b10439711e9b8b34689b678915ede71f0467c3a3c806f9861480ef2999d05bf0c0995d970a62dc8a2f4c10a1626400a5707abd02353dd5ac8ffb8d49e918e
+EBUILD jinja-2.11.2.ebuild 1613 BLAKE2B e8eb16f10a1708153e0583e60d5d346ec8d1e8665808a6f8f092b92b0ec7a006ce3ddd3dc9ecd3abd95aafd078bef502b0cb3925801179ece4c8a71257b36bb9 SHA512 d26bf525e36e7264af821422403b13e90b73a2fe05b3fb0b2a7aed651d94236ceaab8fc8c8870882e1b622e6bc5d23114545f538187a839dcdd3f86eb0d2921c
 MISC metadata.xml 466 BLAKE2B 89bbd7d238c94528f0ad8cca2fb358456f88403f06f517e71ca36ae63b01e8309a7ddda5c9063a01b90e8321445013ab5bc93ab33a1219e48b36a02f5ca23d60 SHA512 81af66b462fed2f8e9bfc8c3120e2e70dec933d0300a3d32264c73ce7606b6b3b375c4d4ed0c9f92ccb91c046c20ccfef17f1ed50a95844eccc3ee5baa0b56d0
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
deleted file mode 100644
index 5d8902f5f11b..000000000000
--- a/dev-python/jinja/jinja-2.11.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=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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if ! python_is_python3; then
-		rm "${BUILD_DIR}"/lib/jinja2/async*.py || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
-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.11.2.ebuild b/dev-python/jinja/jinja-2.11.2.ebuild
index b8c328818df0..4bf0c01a6ecd 100644
--- a/dev-python/jinja/jinja-2.11.2.ebuild
+++ b/dev-python/jinja/jinja-2.11.2.ebuild
@@ -10,13 +10,13 @@ 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/"
+HOMEPAGE="https://jinja.palletsprojects.com/ 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 ~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 ~riscv 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/jmespath/Manifest b/dev-python/jmespath/Manifest
index 0d38e0353303..303f8e7013d7 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,5 +1,3 @@
-DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
-EBUILD jmespath-0.10.0.ebuild 550 BLAKE2B a21409d5eaf91c3228d361b8ff454157affc1850b3b8de665baf055f5daa1a3ee42ea15997f6b3e41084b8e3565349c42b7cdcc0d3fceb7ba02a33e1c57b93e6 SHA512 41c73c709bc9d28d61753a777fb5f26bfc7c3eac6debafead141150c59085616b36ddfaa278db999d5f8449e4e86d61faefa705e8fdd636af9b34c4dd0e445ee
-EBUILD jmespath-0.9.3-r1.ebuild 458 BLAKE2B dbe074158e147965fe930d33caf088383bf19ee87ec2da5e1df4c6cdbb7feac7df2a6140b0686500a952c3ae6a664670a13d0fcffac509264aedac82a7ad477c SHA512 071efe7e8fee445b4550d86e7f96827fabaf877d5aabdcc274507ef739d34729fe61df5a50485d10f785b0d5add0c9c53b50099fa5e84aa71abea905dec889d8
-MISC metadata.xml 383 BLAKE2B 499175b2782977a9f367d29b3e185c6e3981f40fc9ee0498c62a986ac8f96151d26f5d66af5091dd16f67ffffff2f713ad5194441afe5962e3dc1f9bb39fe3d5 SHA512 94e829e583c07a6b21e8b25c95e9eaefc697c3b1cb8d1b8d61b745369d0977c8040ea2aef4c72e826d0cda9156b023ef60e8db808f526a65a971e4c1161bbab7
+EBUILD jmespath-0.10.0.ebuild 552 BLAKE2B a7512e4c0a342a3546225fee091da202cf7f109106a5e8cd02830a9941afe1fafa6d113d3ed3ec70428cc36d05d50098fd59dfd8cffe2261a52d615afe511f32 SHA512 500adc15f87d9a40eb1ca3f1d7e2471fc49247ed47558167307ba0d4c738b6e8a41723696609f1b460f190d524a6dc0fd435a476296e35e4e34ae25d5749d6ac
+MISC metadata.xml 408 BLAKE2B 9181b68543881bbf8c74385b007f757debcdf6e6dc8c92524b8f86eb9ad893a1fc8a23f49e37f68e568ea99eb52580b2f7c40d997705d54fb526ff3235bb941b SHA512 f7f732a0e399f618d1b5fd59211c2f8fd88883ba7f94b40745d46342b7c9ac61cbf47ee8b0938151eb5d5e1191341796c4e2cb89010560fc7468fb632ecbbbaf
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 70889dcee2b9..51de9b3bdade 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
deleted file mode 100644
index 744deec9e2ff..000000000000
--- a/dev-python/jmespath/jmespath-0.9.3-r1.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..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests nose
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
index 1742868cb146..46ef8e0d1456 100644
--- a/dev-python/jmespath/metadata.xml
+++ b/dev-python/jmespath/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jmespath</remote-id>
     <remote-id type="github">jmespath/jmespath.py</remote-id>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index fcbee69aeefd..95827cbcfeba 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -2,7 +2,6 @@ DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
 DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
-EBUILD joblib-0.15.1-r1.ebuild 1408 BLAKE2B 5a48b7c4e23c3a035c69230c73364cfefd07ec68b6469c676afcfe455f6a3011a3278c9d9e7e3a6c002046a95a2f0032eb0c623ccdf71488cedda979c2b46d1d SHA512 5b035c5424cc5342b0713b62f07e55f1da5630c2de162b26575b7b8d18886e0e320a22e6ff28c96cd3e5412501f5a261f5f0facba2998e4c8848466a33060f97
-EBUILD joblib-0.15.1.ebuild 1150 BLAKE2B f1c0c586328977f4953818ec205ee4d4702fc2118f64a6c60dc248d1ecf115e6b2207764243805262a998616648b4014791d467d443d5769118ab6da9a6ab889 SHA512 051ee65d697022daf61083db84c88666c3f43bdb8c2572b6440ae5d59336f32b5447f7636beddc6487f87e8592f79bed06f90f790d39ae95e8860dfdcb2f0b51
-EBUILD joblib-0.16.0.ebuild 1407 BLAKE2B a2f59b500f59a1aab4ad76ceb42ce324c7b122b6cea2075a7f57e570a1dd5fd7a161b57614a81eae0093108f7d20e996d8cfc51d4085a17d09f5a373b8ac0c91 SHA512 2885a36041aa07f0df9267ad76c74911a7a2898d597d407cbca7428a852057c90598ad1c5012e2a700acef6fc6a0837f6b2ec20d0588fb027391532b63aabe64
-MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
+EBUILD joblib-0.15.1.ebuild 1149 BLAKE2B e709f488c7fca5f6c292be9be23aad64e770dddfde15ef70f0ed8981dc96fc728f14bfb359f9de86f8c5594b9d61973f4cd37d25c294ff8f58e7a8a8148e5dc0 SHA512 0c5f8ba7e79646eb12418bae0b50a0a252547339e781c4d24fc93a07f370c8349edfa0c238b22f277aed92e004d3c7b988939f6e28051d8a5de6284e72317fdd
+EBUILD joblib-0.16.0.ebuild 1411 BLAKE2B 5149186a07a23d3b1bb74c325772f6c83ffe7ae7ee7cecc82b91d211af4c5976f65d399a793e59bd4ce17d135aaa25bb7a8f1468b6e1dde9c7027fe03d03d708 SHA512 31f125a0f98751656404299c42099eb693eede55f445ca88ed989f1cf2726552d9a5a667765689a02b4b1d6c5e9248e3da38f4d271183e17d9e995b73e9cfe65
+MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-0.15.1-r1.ebuild b/dev-python/joblib/joblib-0.15.1-r1.ebuild
deleted file mode 100644
index 23ccee52ebed..000000000000
--- a/dev-python/joblib/joblib-0.15.1-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=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 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-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() {
-	# unbundle
-	rm -r joblib/externals || die
-	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
-	find -name '*.py' -exec \
-		sed -e 's:\(joblib\)\?\.externals\.::' \
-			-e 's:from \.externals ::' \
-			-i {} + || die
-
-	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/joblib/joblib-0.15.1.ebuild b/dev-python/joblib/joblib-0.15.1.ebuild
index a9d0d5360f06..e046b8ed957a 100644
--- a/dev-python/joblib/joblib-0.15.1.ebuild
+++ b/dev-python/joblib/joblib-0.15.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.16.0.ebuild
index 392bb96fc6a8..f3d3f19a592c 100644
--- a/dev-python/joblib/joblib-0.16.0.ebuild
+++ b/dev-python/joblib/joblib-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
index 3875b1287e55..e1e3569d81b8 100644
--- a/dev-python/joblib/metadata.xml
+++ b/dev-python/joblib/metadata.xml
@@ -15,6 +15,7 @@
   Joblib is optimized to be fast and robust in particular on large,
   long-running functions and has specific optimizations for numpy arrays.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">joblib</remote-id>
     <remote-id type="github">joblib/joblib</remote-id>
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 04eaabe21e3b..00352c414239 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.3.0.tar.gz 53279 BLAKE2B 7dbbdd97491d4fab7a6f086c47458e2e34908ee4377e30138a64a42b81396cba72dc0f8483d21f4f7499715eb49f9503cc12b08cdc270d4cd6fcc05a6888dc8f SHA512 176eea34bb7fb75e192d6792c15581a42a1d2b986bc79ab49f72b16ebf8879e9b11db0d22fbd49ff5a9b85ab7cc45a0a935d06393273233a272537a861282f30
-EBUILD josepy-1.3.0.ebuild 664 BLAKE2B a245bf284cb179f5b766685e5d90312e71dea37b0f455d49da4bc33f8d7f0efa23901a78d3a0df9575fa04e1e67ea44074a7edc48cf66cb844c3f97054b09a12 SHA512 7c357aa5e6c1ea875eaa4bf608931794b043bcb16ac40c886847bad5afea8441c158608dd4af2b6e71760dd2d65590d0ef808e0927de77762e6179bd0508bfbf
+EBUILD josepy-1.3.0.ebuild 654 BLAKE2B 9995d3a757f9213792405a94ec24c239c246c232e9302daa21c05642527c8f5a48cd3f2d1dc696a3aa57c38627da51a5b3d89761385c994ed1281edb12568057 SHA512 f2aa7f2eb94ddd07e9da118931a25be104f752e01372e22cbd76e8377447450eb429be8d84bda44e65038ccdc18fa328f14e327ac42a3a6f80cf457e7f02b8e8
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.3.0.ebuild b/dev-python/josepy/josepy-1.3.0.ebuild
index 34d9145537eb..8f7ce5c780ae 100644
--- a/dev-python/josepy/josepy-1.3.0.ebuild
+++ b/dev-python/josepy/josepy-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 22d84d3a6d01..e8b9bb7cf765 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,5 +1,3 @@
-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
 EBUILD json-rpc-1.13.0.ebuild 567 BLAKE2B c98d7f08694847c4eeece08e6cac0fe34ffa187d09d9df250715b4d448ce4446cc0a4aeddcbd7fc575ddaa66f7e5d8f7b4408424a16207f5269ca4b825fafbcd SHA512 100a301573629c99dc5293623086ea6b6cb496192199876588f43556055654c0778c1423b633e120252145cd650b8f0db5d673cfa3ed3ee0155603267f2e1237
 MISC metadata.xml 915 BLAKE2B 39fdc02385c24f58d76e7fe3f726ca0f644ca8cb44be2043ee035be385c87f0c968e9348638f3780138cedcf5f94ba834416588d460eb713fc74df1021e62dc3 SHA512 b59d57bdc0a0f9b5a38faf8fabba2a9b6e4b8b0004fb094b98aaa2f28d308f3085791fa1cfc65011baea2dfc2f869c28a9344d9ba0fd662dc6bfb6109b72002d
diff --git a/dev-python/json-rpc/json-rpc-1.11.0.ebuild b/dev-python/json-rpc/json-rpc-1.11.0.ebuild
deleted file mode 100644
index 4c5cc11feda4..000000000000
--- a/dev-python/json-rpc/json-rpc-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=( python3_6 )
-
-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}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	cat > jsonrpc/six.py <<- EOF || die
-	from __future__ import absolute_import
-	from six import *
-	EOF
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 1284d2a57bf8..0f225445c20a 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,3 @@
-DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
 DIST jsondiff-1.2.0.tar.gz 15076 BLAKE2B 2d659598e6c647c8ea6622fc982808381e570c6ced23b5e77431b52e9fa746a5dbc743c739506362497d1f45dd2c290f23f459713ef31e927c05816e56659762 SHA512 5aa391ccc42d07330dfcf272b78aeb130f6f9033ca8b00cbea93549e32f07b98ea84cd6a1e61ab331da3de92838c69a501f95a9adb5f48e2eec46eb653264d55
-EBUILD jsondiff-1.1.2.ebuild 836 BLAKE2B 4f6fbd241419838ac7fe9060bbb12599773409954b69b9d2c7720684638fdc01c4505301ac73eedbfcedbbc81c840b761c29c3f26c4906699e45729a36d0f580 SHA512 9342596313ffe7ad344460438a740402239c167e8b021eed6a80ab035a37ea4910da1ecc56e5f8f206349b3c08ebb1e07260cdb20636fcf6461a595658b1446f
-EBUILD jsondiff-1.2.0.ebuild 761 BLAKE2B 372d5450d0485ca25caab2f0b2d55dd14f4ed8da10c610eaaa6aa17e53039ae8a3ad28f1ff2b9701d61f54db34e58b07ece61df89666db113caa19c7fb7824d6 SHA512 91e3ad1072edd8114ba7706658468b4affa15fb59848ceebd6fd4d10d176a8dce7128a1370f3c8cda0277041443d6b839996010ba51604409059c6585e343398
+EBUILD jsondiff-1.2.0.ebuild 771 BLAKE2B b032438cef330723ebdd4d66d63f319b566a9233be945b6ea1c72d2b1bf9c54f696a69491669606ce3efc897abc8bf01d835a29445e7d437ae4c46e2fad52af3 SHA512 9b60ed1ff3e9e1a4888b3a1597b7f3ff2466a331b016b1dc5210f443a21058d9027d624ad8256cba958433e65211c612bb7dbb5ce82ed9f3516f48f53f980248
 MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.1.2.ebuild b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
deleted file mode 100644
index 90d26c8ffdd7..000000000000
--- a/dev-python/jsondiff/jsondiff-1.1.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="https://github.com/xlwings/jsondiff https://pypi.org/project/jsondiff/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# tests require nose_random
-RESTRICT="test"
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli:main'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jsondiff/jsondiff-1.2.0.ebuild b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
index 83f6954f2d86..d96cdaefab36 100644
--- a/dev-python/jsondiff/jsondiff-1.2.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index f67da0579e30..40e6306d6129 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,3 +1,3 @@
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
-EBUILD jsonmerge-1.6.0.ebuild 666 BLAKE2B c372e50a769760a082db30c65bb685209e5dbef0e8931b8f666445a08c6f9868b9907ab5ca418f0d1fe2ff7a19cecee926e6093957ce284223cdb3f5d324689f SHA512 d7ffa81d3005261ac6cc1eb31e075b33c527ee3b42b941f954a075a380e0d39c1c6ba383b46c387b571f659b4ebf9485b32e491e8a4042d9ef00bc111be68370
+EBUILD jsonmerge-1.6.0.ebuild 668 BLAKE2B fa149db427feb2249f825b3745b0d1d2b70dab8e437f49d9a5495a8a4b9a5b444dc130d47dd91bda433c3870ff055d44419f7a6130d9ffbb7c0112898a976e19 SHA512 816cba06aa38821e8fb009770e5e89f35a56c340508de0759bf6d3dbd30ab9769755d774a5ebc4b5d736c437201fedda9b0bb6e0472cb1ecf709bd5ccbec1396
 MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea
diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index 6b51191e57a2..026e94237c3f 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${REPEND}
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index d79cf56a160b..5a36225b45ca 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
 DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
-EBUILD jsonpatch-1.25.ebuild 836 BLAKE2B 6f5bb95ffeff9389bc8ce9db031e5a377ef62e087078faa70106acfd3bef29ec2dd3a3224ec92f5c53cd50ec8cac8c833560d16b02839a487d59f70a70803c3d SHA512 fcbe73e291c0a10303c9d61b04c7bcd6b210ef0ee546153759479665fd7f9b57d2b9194cd72859ca89324ecff2eac900c861b3ecbcc2bf6e10b4c79856fd825f
-EBUILD jsonpatch-1.26.ebuild 840 BLAKE2B 39ff73e16252a6c56d31e50eae213ad5e545f656c96a270d9f4b6617c062d94030f9a7412ebd00b8dc274f7d7a851493899f02994bf2c4edc6bb91dce7e602bf SHA512 c559364bd9a81241d076ade6cdf6b893c3bfb85ccd38856f32f45304a403e6a1887c4a5e21d9835b38e84880c939c3c8f3821bf432f243987dbb6c50c1300439
-MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
+EBUILD jsonpatch-1.26.ebuild 841 BLAKE2B 5568878443867eeb529b3c513dfb9d31c924588ada8af0f5430e9fb25b6b3253ce69e82d81695fa98ab0bb7caaf99e9df1246520d34ee9f7c294974f64df349a SHA512 780d8d1a2e30a13df1c792a4b2cea0f970e8d3ab26e8692f8a2d1a0fcc8bd484472c10346b7d61c7cb3dec825615dee5cc478bd68e0fcbea9d7f5de90e0f58f7
+MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
deleted file mode 100644
index e8cf3b1d7450..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.25.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..9} )
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-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/jsonpatch/jsonpatch-1.26.ebuild b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
index 789683263633..f52165d4f2fd 100644
--- a/dev-python/jsonpatch/jsonpatch-1.26.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpatch/metadata.xml b/dev-python/jsonpatch/metadata.xml
index 90675b487db0..59af1ed74a77 100644
--- a/dev-python/jsonpatch/metadata.xml
+++ b/dev-python/jsonpatch/metadata.xml
@@ -13,6 +13,7 @@
   Python library to apply JSON Patches according to
   http://tools.ietf.org/html/draft-ietf-appsawg-json-patch-08
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonpatch</remote-id>
     <remote-id type="github">stefankoegl/python-json-patch</remote-id>
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 3f6aa7f2709d..116e7ea7419d 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpickle-1.3.tar.gz 76571 BLAKE2B 797ac90d1aacb620d9917bd2a34dbc960739b29f64d7bc003c934333fc0d836657a4907a965725248b2f9489876ae251440eab3888112f158c28f19e33efe036 SHA512 5e7faa32f4fd2da88d9cfea8c0355121ece12aa1b4434845e6bd679718f433e5c27835b405f833a31d69d09d7a6ae6c3d5e4bf1f6dc9c50c7ff1690cf82271b0
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
-EBUILD jsonpickle-1.3.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
-EBUILD jsonpickle-1.4.1-r1.ebuild 1290 BLAKE2B 40850b13753a047e8bfa80939df7733a863c0aaca17efb6c92f7e6449c010448bb12fe8e60e7d09d3df5b48e34f9e9587d010e0f4557bb63b53a500d79bbc6eb SHA512 9545f7bffd34dd158721c952619a406179156f9a354268efd44b71fcd468f91e301705d2806cba70ff85e63369f5dc733198a632b5ff06b91d1da9d5820e2ab4
+EBUILD jsonpickle-1.4.1-r1.ebuild 1297 BLAKE2B 4c1395725496b24e16429333a0aaa7d726a52b8155a8abb29748fad2362bb797b33ea9bf847df689ff7eb638de138740a4551f28f82fe7b7d211e74a92f60474 SHA512 10537693574be37f87edbe02657c3c97984e7df5d33e76270c774cfc6e2862173efea9aaae6f1bf500c790b395cbe1e995fc6fefd6c7c066b786fd534e335655
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.3.ebuild b/dev-python/jsonpickle/jsonpickle-1.3.ebuild
deleted file mode 100644
index f27e26fe6319..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.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=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/jsonpickle/jsonpickle-1.4.1-r1.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
index fa56bf7fde12..c990ed01191f 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.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 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/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 83f572b31b4e..3a9d9e737502 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,4 +1,3 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 604 BLAKE2B f3e7d7b4e1e6f2841b71a83a51dd4a56004af50393e0d0eda4f9d1b86f7f0fdc5567df6b240457a3044a465e4833a259117080f6b1ce26decabddf03d4a04915 SHA512 d10e60313026be6fb1d2b5d32a6b82dfefc305574c5eea0e8dcfc4d0561465814243f4c54b20de400197dfca917dc6546260368b47767230ee8994b7685c70e4
-EBUILD jsonpointer-2.0.ebuild 625 BLAKE2B d411c533826cc23808cbdfacb38ffe6d93bd63c663abf1bdcbf6ae12d36e8e2e2708c2cc64db493faf2f1ab279e224df31a4e7349ad60e84dc8828119927ed3d SHA512 3c21bb33e6bba667dfb62ecce849781b869c1bbd39071564df3f5e6b8c7491662d3dbb62de22673848aaa9aca8b9f937201732fe0f1c9fe5d4df3e14f26eda35
+EBUILD jsonpointer-2.0-r1.ebuild 598 BLAKE2B 3d4fe2d4feb89108888b733f8df3ac5bb232d84b533fd65ebb89504ed3fdbf8976ed63d317425f1618feccf07b60838a5c70331f0133909704b77168ad0035b4 SHA512 65ff5789537310c6e106cf3c40d23851dfaf5a6090b1e11e0e4f2a3167dd277234f9f272d4bb76ecb7dd0260c196f675e7490fd2b43a9a77e40322a55c0dfe6c
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 5250c3905761..30330a213fc8 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-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..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpointer/jsonpointer-2.0.ebuild b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
deleted file mode 100644
index dd6130470fee..000000000000
--- a/dev-python/jsonpointer/jsonpointer-2.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} 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"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index ae30a3d070ec..4870b7878ded 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,4 @@
-DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
 DIST jsonrpclib-0.4.1.tar.gz 58293 BLAKE2B 29beafb412402549d625efb2cbd00d75d70a9582a48eb9223d9b8f8778bf186a80936dfb35ad47186634aab862311e048d556958a4133d0f8461163a51ead4e2 SHA512 9e0c06c016a9e117bb0b8e0fa1dd9e472ef2e280ef5efee51d491f339c8792477430390918fc46a2d8bfbbbe4baa9d4289f67775b879d2a49a35fc7bd1e8ecaa
-EBUILD jsonrpclib-0.4.0.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
-EBUILD jsonrpclib-0.4.1.ebuild 761 BLAKE2B 37ead202440067775ad9258bbcd85b866e8e3855a4072dd81a9e6ea823d8c00b1f14f07f049009e111cd0c5cb904be0ac393a66e88bd77a430e96e6e255aad44 SHA512 63082af9dc62a1e43114b1ffd4a1b98f84e3f81cc344394124ec765d5e065dbc3d7311cd3dca07e0f24c33458a877ccde76d340d041518f487976c6f12f73fee
+EBUILD jsonrpclib-0.4.1.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
 EBUILD jsonrpclib-9999.ebuild 754 BLAKE2B 673ee6982603f06789bb9180006adc269ab05c00ed91af8a367e2adc705f1a45c0fa2424fafe44e9c4a741448f0ac5f44bc0d8502657188249d025911f7d7410 SHA512 3a7badfe2c8731311549a9634603024935e8503ede11ca42f4ac3371ad3f5eb4f7915faea463350575e33aff1c4d7749b5f618594373d962589e45839a42005b
-MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
+MISC metadata.xml 478 BLAKE2B 251f517c3f44194e274c9fff1bd653fbb960886a48fa2cede1be9caa1f3d592a57eb1374732b5bcc644753fdf00b2f21e39cb2a1318743242dae032c4004bf9e SHA512 62b40dbb4e594391c2e628d043df1361c9b41f7b162fa3ab533ff1a1839efdfd2501858e8f06325ef80d9a4af612f2df330f6184f5bd57ecce72cf56a8bfafe7
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
deleted file mode 100644
index da371501d210..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 arm64 ~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="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
index 3caeeb9a0089..da371501d210 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.1.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/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 227e6b1f2cbe..1c7bba27c5da 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">tcalmant/jsonrpclib</remote-id>
   </upstream>
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 123236004014..3f921e1ceeac 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,8 +1,4 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
-DIST jsonschema-2.6.0.tar.gz 53252 BLAKE2B 38d2d1d9f91e923e66aa44fede2597b129813b18b39133da1935758dc651a0e567515e8b97bbd0cb4f0a2cb652c635446aa3dd4026066dc3d996e32a33495af5 SHA512 03f916abd023b32fbe60f91718d6f2f94d8834bd1bd8ec85ab02f591a145161275c2cde25b037c4d2e94703b870159feb776d3556f011e4c394d2e20ab897b0b
-DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf93eb09a5d585e1f734ebe7d1bdb732b8fcd0c945106ac55c6d64a236def0e1d803a18a2df5e27322a2452ce99a55d SHA512 564e7385728b15387cd44c06cf50c36342fe4c6f497d208ce3d611d1659023e95ff032b2609a786cd9610bd915f878d138eef47913f18cc56eaae0651eb6efe8
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 53228667cdf093e796aa33d9a75051ff6f8d55a7777746227ae821af820f7ba782db4852d92369e5160c598ce1442fc8f693b1183802ba2f72724c0f0347578a SHA512 71e29830554566c8bc27c2d0d7a1d90a91006e91c6c930708f23a393f25a801bf4f56ad68d0b0d7f6319ce4dad4020e2bd7c784c1dee1fc6b1d235146a4a171b
-EBUILD jsonschema-3.0.1.ebuild 1216 BLAKE2B 8dbbb190ea4fa4e8b4717a85ea912e1c5b9ef318143c7a5093e3f39f312939fe4034ceaa9694fc481619b1ec1a15f926bceb9a46924fe55ad821f20ead6e1741 SHA512 ee670550b321627adf4db6ad3b8a55a2aa006b4709aa466d20630509349a5013ddd8d81798c7065ad6b2078cfd30d79656846d66e871b0e980ac84abf4770ee6
-EBUILD jsonschema-3.2.0.ebuild 1652 BLAKE2B 6e365a1189818589cba9ceb79188f4289c46760ffd86bdf57151098691defd2ecc1451efda09813a2efabab7bb9a34f4fc8b6bbe1cdb6444a931082bdcfd5b00 SHA512 6416cd44bf96c4a6f8cf3fe29d88035922bdd9bc1fc24de48e6d082beb30dd0a236357d4e834157da4a170685782a6c2309ca9aabfc4918858ed23da8731f07f
+EBUILD jsonschema-3.2.0.ebuild 1652 BLAKE2B 57d693be052fca3f6b3b3487df83a3c7438935d37c8d981ffd1ef1c8cb73b4c9769abc9782a7461b19a69a4318ca51ec43c8007d66c92a334a7c7016749f2790 SHA512 b87dfcffc165489b5855eee395cd52d722ffe3f4e469a7497f8d7826bde6ba3b7f7ad050e9268e72c8b64b9c2ae08580374dac6365b6ecb970b25e378494a9d6
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
deleted file mode 100644
index 6fa889c5c9e6..000000000000
--- a/dev-python/jsonschema/jsonschema-2.6.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*' pypy)
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/vcversioner-2.16.0.0[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
deleted file mode 100644
index f3875be46edf..000000000000
--- a/dev-python/jsonschema/jsonschema-3.0.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=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	"
-
-RDEPEND="
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*' pypy)
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/vcversioner-2.16.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 641d5dd31c29..a12e66484c43 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index f9596358e610..3831c9d79b4b 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +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-r2.ebuild 1288 BLAKE2B d6f76817f5a05fcdec372cc01f504e8a1528c16a949244a9574324a0d4b075f7f2eea2fc4658959d761a1d25256bc6bcf01169737bc14d462759a2a1ecc12fac SHA512 403bbb9ba3269a0e56e5b261c4e4cd4dd04a826287ec613e03175f3767ce0ab48f5055a15d74aa4a4d2755dea278e3d931d57e8278f668845235e7ab1cdfec8c
+EBUILD jupyter-1.0.0-r2.ebuild 1120 BLAKE2B 064d3e259174ae6208857dc0034fd4f42bcf8a5dd74458c47a72d2279f1d3ae858bafe04cc7517f2f1fae85d14513a473b4c3a98fb71dc86b8289d4b54cb14e8 SHA512 2df6a407c58b6a95f8734938726efbc92f98009bb59fd8fc6db65cd04fc9b6e1e8548ae7748d271a3b55ae455a20155cc20b5253b7e19afe33478dc67a4a354b
 MISC metadata.xml 390 BLAKE2B 1f4d29ef2bf8add19fc945beb9f7b92bc49ca189fafbb16bcdc2c25cf71bc5d248491d63bb88f67100504aa796723072342b4c225064339fefbce73905d78211 SHA512 e2b9ac43d44b647a247148e87403e8cb1aeb8e89f482740f489424caa3b5b0301dffcf2693297a0755b8ee3d6f82e519382b4b8bdbd760763a096cfebd66cbc5
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
index e2261ab869ea..22dc270ed729 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -16,8 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
@@ -26,9 +25,10 @@ RDEPEND="
 	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}]"
 
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
 PATCHES=( "${DISTDIR}"/${P}-file-colision.patch )
 
 python_prepare_all() {
@@ -39,12 +39,3 @@ python_prepare_all() {
 
 	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_client/Manifest b/dev-python/jupyter_client/Manifest
index 0b94b656dd09..5df1b199413a 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,9 +1,5 @@
-DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
-DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
-DIST jupyter_client-6.1.3.tar.gz 290112 BLAKE2B 205d4fc4bee263b05a36c562db11fe9a0d39defa5d633e85412a7e6382ddc49f9875c5112c1d23108b8e8ae7e57060afebeef949d7bf685b9541dfd06ae43fcd SHA512 39756e1bd7a051092c70c5f75ff1a8b8dd308eb054b3e572d5682e832dc83e6935c3f845230908f1c3debe95977c7b7ae63c373aad4ea6c1e87674b083d5e72c
 DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305f591597947dabaef3fd670c7fd595bc8a8fa5258ad07b0bbe170c134f8f50593e980c2360de2521216fc061996268032 SHA512 b289b07f1300a7aa541b15ece33340fde7dd9765a200214668ad3a124ec7fd98c742f61417c9d31d6daff9ecc1aaaca6ec516f359cc26007731c0f8d859a73a9
-EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
-EBUILD jupyter_client-5.3.4.ebuild 903 BLAKE2B ecd0184c24dc7820d44ce8f50e124fb3fc1f8ae1c494b2b7e6fd76f81f0eeac3815515be73285d8368feef61ff27ab553b569ab3100cd3fefda771a7ad5e33a0 SHA512 0110cfbd150b7be4b625a7d572a0aed9f4f9ecc88f2680a4b338813e5faaa21f7c8f0be92f770a311b73e2c28aa856ed2b2ba9c3d61e04fb9aa366649ebb676c
-EBUILD jupyter_client-6.1.3.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
-EBUILD jupyter_client-6.1.5.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
+DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
+EBUILD jupyter_client-6.1.5.ebuild 849 BLAKE2B 49328d173ac8e7f13e98e0479785d607bbcdf92de3b3642f94e3fb6737f4162debc0defd27043705212585aa8aaa4c48fc674bce6b36eb3cfc929b61626e544c SHA512 f527f2ab63ef66b74f6540db12896bc0a0ff0d3af5c4f82bece768c87471b810e592cf29e075e30372840b0408ac00593670b1602a88a7c5270d5420800af134
+EBUILD jupyter_client-6.1.6-r1.ebuild 884 BLAKE2B 17c74179956421da4617e2a4058dc05fced9860412c2142c0df8fd07cd7d7559cbf1224937fea1c7404ecee468bf9286440ec33809338e3386e46c603baa289d SHA512 1f1afa7805b4fba979bce7dc9ca34aafbe8c8d35bf6a0e54450e9b1cfcde2bfb7c72e01fbfcc02fab62f91d657e2b738048095f8ab55cfa829e82585d351189d
 MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
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
deleted file mode 100644
index 4a134529626a..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.2.3-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,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/ipykernel[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	pytest -vv jupyter_client || die
-}
diff --git a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
deleted file mode 100644
index a87a235485b4..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.3.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} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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"
-
-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}
-	test? ( dev-python/ipykernel[${PYTHON_USEDEP}]
-			dev-python/ipython[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv jupyter_client || die
-}
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.3.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.3.ebuild
deleted file mode 100644
index 2bf01c589f1a..000000000000
--- a/dev-python/jupyter_client/jupyter_client-6.1.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..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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"
-
-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}
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
index 2bf01c589f1a..3dd01f244c2c 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.5.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"
 
 RDEPEND="
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r1.ebuild
new file mode 100644
index 000000000000..79a6cf5dd7a1
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.6-r1.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..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	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}
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 8ab70ce8dfdd..82961d9378ca 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,6 +1,5 @@
+AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
-DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
-EBUILD jupyter_console-6.0.0.ebuild 1200 BLAKE2B 5a3c2949ae83be132e54670b8548bfe8ceccd69d73dc49d8d36ba1fe1044688670c92e34194d0b820ba96cd9077af56436096d2e5094d824826da2005c52ad00 SHA512 7825f0efa66645400f3ef3b1fc0164137dbe13734b0fded0d387e12def1e1922232b8cfe9eed370e1386557c21b15b1f7145beda0aeabc5a53940774be551f03
-EBUILD jupyter_console-6.1.0.ebuild 869 BLAKE2B 8ca12ecd563abaa9a011a90c4da3bee86405b85935d202166218599f7581abcc1946fb6304b9214030104638d963fd21dca086cdb72992473a4ce583b31c5f6e SHA512 77ad3b92664e3af1ab3cebbf8aa5cf3ad1f029521c9981e68e6d844b7465864ad2ff8e4c9462a820ee6d8960081cc66132256ab4d44fe39aa3c2e95dee3ef750
-MISC metadata.xml 676 BLAKE2B bf2c14249bcb77defadb810b89cd41359927e79722a4aa3e7f9bb493e2a567d076b7f72922f74a94023e4339e0005d5e28ee3f1599e33962ccb4b0b810f9e4e9 SHA512 fd331bc5e964ed1124d0a927a0d31ad8a22b1ed6e797023a0af1457d037bea96078553c78bdfff84a3512e11a08c5fb91c6287d032e99f3a6da739cf7d0bd04c
+EBUILD jupyter_console-6.1.0-r1.ebuild 1131 BLAKE2B 42127f8853c46650d1db81427fce1a4f643523828560a29ccefd7c8ae51caf583b8b2ffa372746cc7862044171f72e5ec4d252f989b3c0b499e2b3d3e32b09fe SHA512 5322b9645b1fc8fe749e517f12c6c9fe7abf8dccc02153a509d8fce74456e213512a37ceb4fabbd798da92bce5192b215255c083fec976c6feb9399b9f987944
+MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
new file mode 100644
index 000000000000..684ecfc0a841
--- /dev/null
+++ b/dev-python/jupyter_console/files/jupyter_console-6.1.0-increase-test-timeout.patch
@@ -0,0 +1,15 @@
+Very slow CIs take longer on this test
+
+--- a/jupyter_console/tests/test_console.py
++++ b/jupyter_console/tests/test_console.py
+@@ -65,8 +65,8 @@
+     except IOError:
+         raise SkipTest("Couldn't find command %s" % cmd)
+     
+-    # timeout after one minute
+-    t = 60
++    # timeout after 5 minutes
++    t = 300
+     idx = p.expect(r'In \[\d+\]', timeout=t)
+     return p, pexpect, t
+ 
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
deleted file mode 100644
index 643134af1a3f..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.0.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,7} )
-
-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? (
-		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.1.0-r1.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..fbea105a40a5
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.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..9} )
+
+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"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+	"${FILESDIR}"/${P}-increase-test-timeout.patch
+)
+
+python_prepare_all() {
+	# use setuptools unconditionally
+	sed -i -e 's:distutils\.core:setuptools:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	script -eqc "nosetests -v" || die
+}
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
deleted file mode 100644
index 37b6ca896bc2..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.1.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..9} )
-
-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"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)
-	"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_test() {
-	script -eqc "nosetests -v" || die
-}
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 2787cd2e4fca..d0ea336908b6 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -13,6 +13,7 @@
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter_console</remote-id>
     <remote-id type="github">jupyter/jupyter_console</remote-id>
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 40288d54c967..1aa2048732dd 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
 DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
-EBUILD jupyter_core-4.6.1-r1.ebuild 1077 BLAKE2B 811c274e81f9e8b5ffa2b13f9320879c3bcab774daba8c066f5d85bdf3e2ad58a6b165495ecc69c8db44f3e8bb7e86b28d80d8af0da1bfda98abde3841d2321d SHA512 19633ae6f33235f194379e8795a5af0602e4486917b4b9ceab6b170a45a23e640875961f0db0c1090a59b6436fa6b74565f48999e4c99599e0401e5e20e02892
-EBUILD jupyter_core-4.6.3.ebuild 823 BLAKE2B 7b497e6acabff002ccdf8d5b6926db693fc800ffb79d9a4114dce6ed438b4ffea1d5204880acfee7b020256e01653af550f72330b38b0285a657ea2919ee1bf8 SHA512 df825e9d1554647c86a087818df08b64091db134872bd78dc9df80bfc7f72af7912f9c29b747cae8a09c1cba22cdc218e0764e78cdc7e3aff8c431a60aeca656
+EBUILD jupyter_core-4.6.3.ebuild 873 BLAKE2B a9b154e32d11ed92a339b19ab9c0421693bf4fe8789f3b9dc4b8503b6024980ee3deb913f7d77ebecb1a9efce30fad6544baa1ba05dc5b39bf5ca69eb03e439c SHA512 015f86ab4e92bd94398378e102d0ad99b4a412b458b5b8dedd7de9948040e944819f996f615af7a334a48681bad1b36e9be7d642cf97e492acea3e236a97a6d5
 MISC metadata.xml 733 BLAKE2B 1ac253b8e7dedbbb5291296d40d16280514f3a12fd3c905d32690cdefebb1844e60cd0ab516d04feb8a947f32a86ec4f2813c3edb2dc48638c734fb207adf825 SHA512 e180aa5a798b8e7fac09d83f7125058ece7e2ed9be722de31616f09408e46d87153c88345615af2d4691f155ea3999b4d83c4c6e21360068af469181ce13bef8
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild
deleted file mode 100644
index 6f686d287886..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.6.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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/ipython-4.0.1[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-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.3.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
index 0891fa649da7..2a9d58b8c6d0 100644
--- a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
@@ -14,21 +14,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] )"
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinxcontrib-github-alt
 distutils_enable_tests pytest
 
-src_prepare() {
+python_prepare_all() {
 	# rely on imports working without PYTHONPATH
 	sed -e 's:test_not_on_path:_&:' \
 		-e 's:test_path_priority:_&:' \
 		-i jupyter_core/tests/test_command.py || die
 
-	distutils-r1_src_prepare
+	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 5757c5b805de..dce814485a62 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
-EBUILD kafka-python-1.4.7.ebuild 773 BLAKE2B cce44aa0f453dcecc1b0c92460db0e61d4390d4c4a6e27ffb55164353342d90bfc549dc0d3176529ed3b9219ce92e04f8ea888e93d1e7168b2c41b598efaf1f7 SHA512 8f34d385e900a875b6d3f9d3976a22d30ca4b1f439afb1174bc2966ba9b21a14a46ab4d5204bd05a81058983a527974bd62bb02175afbbdf1bda74843d14a576
+EBUILD kafka-python-1.4.7.ebuild 763 BLAKE2B e101d471aff2f45680c59e53664cc8d64f7ddf5e2baf6f80624e465b49941a1cb137572636c446023fafac8d4bcf3a3da59d93b3e985980084e0601f785e0223 SHA512 b4f9707b6548bb03df129e7769d24e7fa08354d9c6a04c743a4d1118f69aae90d86fb37ba4bac7e30a5d3d6399868450091ac4466bf6f80558b8dbbeaf3d9428
 MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
index 6a83fc9b9507..1a898aaef78f 100644
--- a/dev-python/kafka-python/kafka-python-1.4.7.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.4.7.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
 
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index a9a54e91b477..a709bc59c801 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,3 +1,3 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 520 BLAKE2B a7dc13451a18105e8e6ecccef50f248fbfc33bae9d5c6e8c6d182b615fc44b020ca346e707dfe4fcc6e1bfa12b1365c2b1f812a0ae376f504f78a292a787cc78 SHA512 29f1deadb2fe2fe4d88e108b8c989e1982c83dcfcf17d6562a9ee1a1e01096f9235bea87efafbe26884b27ff66225605b5270d8eec084073e323c2c9046c84a3
+EBUILD kaptan-0.5.12-r1.ebuild 534 BLAKE2B 13d108f0be7f1c2dab3a8ab7a5bf026afe0d4fc4a48469ce3dd221f2ca3bdffd9aca766aee06cf80616591634672ebbdb649a59a9dddb89a69e0950ae2bdd22a SHA512 c08ec74ba4508dfcdbda08177f45b5540248adb50e529100ec23972c0eee002a5cf641c0b9f99cf89e87d345e602aef1c8a3c9a46026c0c6d219cd4068455f93
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index d9b4846005c5..f17b75f1bba0 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="kaptan"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 0c4216c0a13f..7bf296cf219f 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,5 +1,5 @@
-DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
 DIST kazoo-2.7.0.tar.gz 163552 BLAKE2B d117ef62b324d074afae5d17f12e2740ab26076ce8e9ea5b0ec15400d2a57ac89053c92675c7e82f1b54e33d30d6029765ec29a72ad537b5d5cfdca976803b5b SHA512 04c3acef723ce306537114ed0f67e96d6c4c638d5dad12e38fcbf1b4dc3e7a972ca0c950adfbbbec7deb8da910e03e867e26ccb83d39eb1381daf0cb5dd2ac6b
-EBUILD kazoo-2.6.1.ebuild 1215 BLAKE2B e5c07c8f5101d32555d79865687af23cd1fd64ee201fc56be1a2a9f68a7d8880b98836da2dbc195d05c0b240dab184fab3dbe104bb975b151a338de618bb689e SHA512 1e5ea79ec2afbef232b36a0b6a5cd807e86e86905c1dd40644254816d8c9f7746ef416a47aceb8ca0689fbc7501e4b41d76aacf06f3b224baea4e4d1108c7774
-EBUILD kazoo-2.7.0.ebuild 1217 BLAKE2B e79635c0c2ba16963c7899b73e8f4e960e294ad3729666d0961e031fcbbb7f50edd226d8d05e49e0b6a8f9c3b92ea7f7e4e79375113db932916cc732b91bb899 SHA512 549767e5b8492faae8688722cfabc7192652e358e11fa30c772b2e7f979e34140d80f2e8cbc1487d07759b9dcfc0f64fee67621a28e07cc2d8a2787bd06113bb
-MISC metadata.xml 379 BLAKE2B 4cd47b54e2c56abaa610aea46ff71e832e573fa0938085e0aab255d5e518a72705d019f4dbcbd41fb581773756c0c67764815cb61c56e25a8cbe029e5159a3ef SHA512 cb94df5977e6629916f02303ea83da8d0d556d23c7c2e0fd17c65ed88bce35d7f42d5e9649eba86dc62e222f1bf6aa8d9f65f839c37ef4188a70f18a607bba0e
+DIST kazoo-2.8.0.tar.gz 170037 BLAKE2B feded24671d6f4f5f7973b76048e5b8416e4b56aabdd9d32a8ff27283b5e8578545cee62a385f764202ffb4e58cf083bd2c182dff9bf255e69dd1de83e88db43 SHA512 ae244a70356274d6259d255e60a5dff00eb22bcf16d5b25f9d9a03178619dacb57414905b473801347b4ec1a19e5600be6c7040a5e53b67b81b440c304c95cc0
+EBUILD kazoo-2.7.0.ebuild 1215 BLAKE2B e5c07c8f5101d32555d79865687af23cd1fd64ee201fc56be1a2a9f68a7d8880b98836da2dbc195d05c0b240dab184fab3dbe104bb975b151a338de618bb689e SHA512 1e5ea79ec2afbef232b36a0b6a5cd807e86e86905c1dd40644254816d8c9f7746ef416a47aceb8ca0689fbc7501e4b41d76aacf06f3b224baea4e4d1108c7774
+EBUILD kazoo-2.8.0.ebuild 1222 BLAKE2B 46c1fb40fcb9f9809bb678761425ea8bc6ebfe40a0c4ad0b05d21824978d8234eb85c2162afa76d3b8d332394c25260368ffe209b2ec1bc07d82822236b596c2 SHA512 f14f14fb0c329322123344bf15bfad0c773422238649805adbc8b4057240543bab25c4626372dde23a602adfa784b4253d6b2a1a3fb77baba4d2ff40638f71ca
+MISC metadata.xml 486 BLAKE2B b2ab78deb7e21479cf9d2fff4c6d3cc8936ae3eb9cd0b6632a0f419002465712433d21b749eff18a5462fb770c0464cb8853f2b604633517a34349b40ff7cc56 SHA512 6a9d26bed9501a86bae735d8585fd3ac163b0cb914a7d325ef903e04dcdc570e65097bd21f25104dca194fa47ba3092dd78603d054efe5f05ca807c0be08636b
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
deleted file mode 100644
index 1e43f82a01ed..000000000000
--- a/dev-python/kazoo/kazoo-2.6.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=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-
-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}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/objgraph-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-# requires zookeeper running to test
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html docs docs/_build/html || die
-	fi
-}
-
-python_test() {
-	ZOOKEEPER_VERSION="2.6.1" esetup.py test || die
-}
-
-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.7.0.ebuild b/dev-python/kazoo/kazoo-2.7.0.ebuild
index 5dc5703f6694..1e43f82a01ed 100644
--- a/dev-python/kazoo/kazoo-2.7.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.7.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="doc test"
 
 RDEPEND="
diff --git a/dev-python/kazoo/kazoo-2.8.0.ebuild b/dev-python/kazoo/kazoo-2.8.0.ebuild
new file mode 100644
index 000000000000..9efc213e7753
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.8.0.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..9} )
+
+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"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/objgraph-3.4.0[${PYTHON_USEDEP}]
+		sys-cluster/zookeeper-bin
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO
+	sed -e 's:test_close:_&:' \
+		-e 's:test_delete_operation:_&:' \
+		-i kazoo/tests/test_cache.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local pkgver=$(best_version sys-cluster/zookeeper-bin)
+	export ZOOKEEPER_VERSION=${pkgver##*-}
+	export ZOOKEEPER_PATH=${BROOT}/opt/zookeeper-bin
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
index f896e6b8c889..7e38f081d7d0 100644
--- a/dev-python/kazoo/metadata.xml
+++ b/dev-python/kazoo/metadata.xml
@@ -5,6 +5,10 @@
     <email>zmedico@gentoo.org</email>
     <name>Zac Medico</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">kazoo</remote-id>
     <remote-id type="github">python-zk/kazoo</remote-id>
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index a5e7096e3f76..2cf0f422486d 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,3 @@
 DIST kconfiglib-14.1.0.tar.gz 182990 BLAKE2B 1e5a5f7e6d1003f4fa005b2b08abfa17cbf9f6837d9320f313b23f19c6e9e7aa7c8fddf5ff38871634257ea050390b279becec0c4e0638cdb53182347217e937 SHA512 929a75f9b9f74ad7d4190c15d7178b94ee0a6d1fb71d85e2942935e3a9370a4f2483d8b49123d41d6610841ad9efde1dc4c14fc5231a08379d438a486ed3f97c
 EBUILD kconfiglib-14.1.0.ebuild 959 BLAKE2B 338a21d2e6d6cce169a46b27d64db5ef31b83f78648dcf2552e6163c78c82cfc0bdd9712b1fd00b5049d2533b232168840581edba9e399c9f587fdbe9fd3684a SHA512 c0e0cce217717e59dea79825cdeea9c6eb8553cf042ca8d4948be53fde503bda59642cdd71049d0adb4383278f78136bc00b4d7ef69a552929232c7c87dd4973
-MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
+MISC metadata.xml 252 BLAKE2B 6168f627d7d7a462a653d72ac1aa881bf809d46df71c15503bcba346e6d80c551ebfd7393a2a9467943142cdfd7cf99a661b94b53fa25be0989a51560567cce3 SHA512 72bfa8a1df14b104e2d1265bbfa2be6d5d32d61fe11485c6c8122cd0f96832c08259258a508122ef5f4ee5f0464d711c5c1209952a2811e0992742d7707d1b9a
diff --git a/dev-python/kconfiglib/metadata.xml b/dev-python/kconfiglib/metadata.xml
index 6af6948586ac..1e8fb02d3209 100644
--- a/dev-python/kconfiglib/metadata.xml
+++ b/dev-python/kconfiglib/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ulfalizer/Kconfiglib</remote-id>
 	</upstream>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 0ab0a218c9e1..d31abfb683d5 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +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-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
-EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
-EBUILD keyring-21.2.1.ebuild 1274 BLAKE2B 09ce045944478da8ded1c129c1510166a28910be93cbf1f1f5efa0b6f22d07f08395e123d1b0a2cb78cf1af43ff9a0eaf1d747e9e3c8e49950b77e6f709bc58c SHA512 0a6cf495b4bfd7da9d4be1fa471bb6ea2f1890552289fd1959dd809799f23bf541f3dbca0c15a6ae7a1e41688cdf532232bfd884700a7b29286e6b01944df7f0
-MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
+DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
+DIST keyring-21.3.1.tar.gz 73553 BLAKE2B 75824dc1ce757501ed286a2dc5c49c644df0fd3278f7344bf42c8e687f51b2c488e038377e776b13f0d97b3f60d940467248689d8f1572811a15400a14d85529 SHA512 6a95d602eed052378c78fe3d8134eeaccd5fd13051ecda32710061c2b9348ebbfc350dc004ef41df94df28006ead4bbefe3bc968bdabd136acf27c469a87ee7a
+EBUILD keyring-21.2.1.ebuild 1267 BLAKE2B f1a95e142caf22676560dedffacecfd0d06d1097916190e8219bcf472b536239f1effd6169b60a1c6564a5e5c0180b8bf935d5ae303ac10d76425fce02d6a064 SHA512 3c174310a9fe8665993891684da99d7a3c304c73a191059d4fc8095117a56ed2623a42b333e8224b9217fe0c698a695804ade899f5c5c17190bdbe248c957d29
+EBUILD keyring-21.3.0.ebuild 1281 BLAKE2B 1e2e062a47177c8928df23e48fdb99917e51e7da008a1483fc83b09fa9a98b95f489a879db37b6de17a7365a6ef121a20ba3507fecbe32a5d346f3aa84fd4537 SHA512 c7916d84182970017e8a5a955ee260661f09ad75202a53b0e73cc3b306496eea5646157596c5b2e1a0cf4c37fe3eab9a3f90ca179b77472e619271bb546945fb
+EBUILD keyring-21.3.1.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
+MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/files/keyring-19.1.0-tests.patch b/dev-python/keyring/files/keyring-19.1.0-tests.patch
deleted file mode 100644
index 0e4bdfd1960e..000000000000
--- a/dev-python/keyring/files/keyring-19.1.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/keyring/tests/test_errors.py b/keyring/tests/test_errors.py
-index a90905f..1d5f568 100644
---- a/keyring/tests/test_errors.py
-+++ b/keyring/tests/test_errors.py
-@@ -1,5 +1,8 @@
-+import platform
-+import unittest
- from unittest import mock
- 
-+import pytest
- from keyring import errors
- 
- 
-@@ -13,6 +16,7 @@ class DeletionDetector:
- 
- 
- class TestExceptionInfo:
-+    @pytest.mark.skipif("pypy" in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_traceback_not_referenced(self):
-         """
-         Ensure that an ExceptionInfo does not keep a reference
-diff --git a/tests/test_packaging.py b/tests/test_packaging.py
-index 3ede719..4bdfa25 100644
---- a/tests/test_packaging.py
-+++ b/tests/test_packaging.py
-@@ -1,6 +1,7 @@
- import pkg_resources
-+import pytest
- 
--
-+@pytest.mark.skip("for some reason we are getting 2 of the same entry point")
- def test_entry_point():
-     """
-     Keyring provides exactly one 'keyring' console script
diff --git a/dev-python/keyring/files/keyring-19.3.0-tests.patch b/dev-python/keyring/files/keyring-19.3.0-tests.patch
deleted file mode 100644
index 82cef178c6cb..000000000000
--- a/dev-python/keyring/files/keyring-19.3.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/keyring/tests/test_multiprocess.py b/keyring/tests/test_multiprocess.py
-index 49af222..8fdd1a3 100644
---- a/keyring/tests/test_multiprocess.py
-+++ b/keyring/tests/test_multiprocess.py
-@@ -11,6 +11,11 @@ def subprocess_get():
-     keyring.get_password('test_app', 'test_user')
- 
- 
-+pytestmark = pytest.mark.xfail(
-+    platform.system() == 'Linux', reason="#410: keyring discovery fails intermittently"
-+)
-+
-+
- def test_multiprocess_get():
-     proc1 = multiprocessing.Process(target=subprocess_get)
-     proc1.start()
-@@ -23,9 +28,6 @@ def test_multiprocess_get():
-     sys.version_info < (3, 8) and platform.system() == 'Darwin',
-     reason="#281: Prior to 3.8, multiprocess invocation fails",
- )
--@pytest.mark.xfail(
--    platform.system() == 'Linux', reason="#410: tests fail intermittently"
--)
- def test_multiprocess_get_after_native_get():
-     keyring.get_password('test_app', 'test_user')
-     test_multiprocess_get()
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
deleted file mode 100644
index 448afd7a7d74..000000000000
--- a/dev-python/keyring/keyring-19.3.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=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{5,6,7})
-"
-
-PATCHES=(
-	"${FILESDIR}/keyring-19.1.0-tests.patch"
-	# https://github.com/jaraco/keyring/commit/411204df606bdf02c99f3360ec033e3c235d5f67
-	"${FILESDIR}/keyring-19.3.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	# avoid setuptools_scm and a bunch of style checker dependencies
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r \
-		-e "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		-e "/pytest-checkdocs/ d" \
-		-e "/pytest-flake8/ d" \
-		-e "/pytest-black-multipy/ d" \
-		-e "/pytest-cov/ d" \
-		-i setup.cfg || die
-
-	# avoid other deps
-	local -a pytest_params=(doctest-modules flake8 black cov)
-	sed -r -e "$(printf -- 's:[[:space:]]*--%s:: ;' "${pytest_params[@]}")" \
-		-i pytest.ini || die
-
-	rm ${PN}/tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 31150c3125ee..63d0699c6485 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.3.0.ebuild b/dev-python/keyring/keyring-21.3.0.ebuild
new file mode 100644
index 000000000000..651413158c99
--- /dev/null
+++ b/dev-python/keyring/keyring-21.3.0.ebuild
@@ -0,0 +1,49 @@
+# 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,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3 python3_{5,6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
+	# relies on cpython's gc behavior
+	sed -i -e 's:test_traceback_not_referenced:_&:' \
+		tests/test_errors.py || die
+
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/keyring/keyring-21.3.1.ebuild b/dev-python/keyring/keyring-21.3.1.ebuild
new file mode 100644
index 000000000000..669cfb619df2
--- /dev/null
+++ b/dev-python/keyring/keyring-21.3.1.ebuild
@@ -0,0 +1,45 @@
+# 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,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3 python3_{5,6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index ff28974cc0c1..9faa7f300c0e 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -13,9 +13,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">keyring</remote-id>
-		<remote-id type="bitbucket">kang/python-keyring-lib</remote-id>
 		<remote-id type="github">jaraco/keyring</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 86c1608af2b2..619b1611aa72 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,7 +1,3 @@
-DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
-DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614
 DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
-EBUILD keystoneauth-3.17.2.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-4.0.0.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-4.0.1.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
+EBUILD keystoneauth-4.0.1.ebuild 877 BLAKE2B 93c70b939b0790bc9bd8e1c33121f411156905abb3642868b018ea069935330c98d084dfe2e89b67878f466fc056f70ceaf7c1166284ed10400c84ef2b22fd09 SHA512 10a15403a11302974bd4385812fdc48dcdeaf430d6bbe43b5f49137e64f2a5336879998690eddee5bc43b9ce11fe14d000c8703a6478ae8cdcae44ebf6d80d40
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
deleted file mode 100644
index 60b0dac745a6..000000000000
--- a/dev-python/keystoneauth/keystoneauth-3.17.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=( 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-4.0.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
deleted file mode 100644
index 60b0dac745a6..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.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=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-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
index 21ce2d584e88..8e061d534fec 100644
--- a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index aaf0434549aa..02e005ad31b4 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,7 +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
 DIST kiwisolver-1.2.0.tar.gz 54244 BLAKE2B 42590c2cbb78b3c2ed568373616e772326bf5a0e133396d9e9cf6468132ec88b45d40f68f51baff7bc22ca261567ebab81cf2585009657bd2a59df4e97c33f1f SHA512 05541ff46cc64b9958d714452138dc7bb343e6cc9308408a3f8cf25242e9640af37f8bfd22a7038e8ca70a895f57bdb983346259bce22b1630ac10b974d00a0e
 EBUILD kiwisolver-1.0.1.ebuild 538 BLAKE2B b79352b1c0dcd18240b0e93277b765a3d2e00b83462426586c52cec9534c33aadcfa912a7ca984dfd38c7b6aecdf03f909945b8882555b9fbff886859f0d288a SHA512 c6ac78627965c73122b84c78cecfa92766c55b9c6ed2a0a6397edc6880bebd3a60943e16830b671076bc30d77dc107a6b29d56ec8b4660f1be6c8d87696e9221
-EBUILD kiwisolver-1.1.0.ebuild 532 BLAKE2B f3ebb8cb5c1eccda8bedd563582df893debbc73af21e3809ced69ae2f747a035e36d47699fff77c0895da5c24fc89f6df087a124fa2dc2c7b6ab5a5b5834f0d4 SHA512 11a929d9d0806973e634547c02bee6de70a27f580dbc3e8805030c1e61dc14b823ac795092dfa865d410d7552ff85dbf23ee4b664c803bf6803397d5a6d95b33
-EBUILD kiwisolver-1.2.0.ebuild 571 BLAKE2B 2b911a5cb379e0f87d88ed7e2530ca1507ed4748e25884a2f871d82e7f0cca942c9738525b3157b03159c0482f6f58f8d8cd620563cf883e2b70fc9d65a3ed9f SHA512 e2aa1023324a18fad9c8819766683d93f7b99145147be49cf4a7ef3a01e68b545273a96b34810ff1c8c043d52a62682ca84d12fb898eb18a83f40b9cefcaf295
+EBUILD kiwisolver-1.2.0.ebuild 567 BLAKE2B 7039acf9b8ee3492399301babea6e376710837f7743d365562e098e779d8c3f59e8bb55783d510977d046ed5865fa82a3beb4c6027e050a0fb083e861eff4553 SHA512 df956b9396107fac591cb927ca718b0f56d35f9a3b4317a42d9829be473d497b83d8379a627786885a2727b3c46e5b12ffb52c9d999b2894c58c6551546f51f7
 MISC metadata.xml 589 BLAKE2B b855a937dd7e70011622983e63e7b227aace077f4fddbf2fdc558a941e446384561b3f0f798e97db23ce0b6cc2f2aab6af9a0eb7e2d6b221c7f511d5145d239a SHA512 df0848bd49ea1b4ff9d1fff0a60e288054c319acf1fd82776b24c07ac1dc8587d2db0d6ab34fb0d194dffa8734b44796b4f2599a20dd8cf6f68b4f68489696a9
diff --git a/dev-python/kiwisolver/kiwisolver-1.1.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.1.0.ebuild
deleted file mode 100644
index abc747aef0ed..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.1.0.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,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/kiwisolver/kiwisolver-1.2.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
index 2d2ec37813ab..839877ce647c 100644
--- a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
index 1eafea3b7ee8..ed3feee0fe7e 100644
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@@ -1,3 +1,3 @@
-DIST klein-19.6.0.tar.gz 100867 BLAKE2B 2d03a5040d7f470bd73b25a66a1dbb2d6278a12afd7ffeffe0055b2d8bf88d5fd6d97e08bdbc185fbfcd34aa0589f79d79488cba77b4b08430dbafd8ba5e0afe SHA512 c0853333269d4d79206446bc7ac333f536eb9dbeea0ada65b23610e4e8a35208820ef1bac78c17a4e71c22ed2c06f5467ce6c59666dc36fde3e4c0843ed69549
-EBUILD klein-19.6.0.ebuild 1392 BLAKE2B a4b186c76dfe95a00ecd5393232e70f1f21667044557691f7aae9cab72616f5605d39835df8a1d444c1060e96e0af3ef3dd2193fdffb7f5ff8f2b6b8009ae538 SHA512 58ce19ea372eb0ef919b20f0f0d5a43a6b0ce3b26e905d8a906032405cf8bcca40bd04f9201e23e5607280a0d9e2c48f5b458ae7284004f9b7b0206cad6a0cda
+DIST klein-20.6.0.tar.gz 125676 BLAKE2B 2ef9e4293cc7a727488ce4e95e2918eb3c5012559ff52699ef7d53d022d7238b33fc59774572ca8487870e8d242dd80659bca15c65c82b0aa76f45f8d8822fd7 SHA512 128b180c51c4457d3ffcd088e127d671d8260c3d62a80129bafbf6e3a2e47945290cd5ec695a64a1795465199e14c8f367445f8d90649f6384fd8338a53bb48e
+EBUILD klein-20.6.0.ebuild 1392 BLAKE2B a4b186c76dfe95a00ecd5393232e70f1f21667044557691f7aae9cab72616f5605d39835df8a1d444c1060e96e0af3ef3dd2193fdffb7f5ff8f2b6b8009ae538 SHA512 58ce19ea372eb0ef919b20f0f0d5a43a6b0ce3b26e905d8a906032405cf8bcca40bd04f9201e23e5607280a0d9e2c48f5b458ae7284004f9b7b0206cad6a0cda
 MISC metadata.xml 871 BLAKE2B 3c8af447344bf5629b8697933ef90310b1adc29392d7667e72f7b471d8da93da31125f434ab34a1717f9f5f80bf5d478c6e8f8f126eed92dbc54928584fa99da SHA512 6f9bcf2450d43a0f30568c93779c978d136aa9ecdffac561464e276cf29e5a44db60227c98d061072af1ea209d15b85790ef2fd64d4c21d0f7dcf4e280005b48
diff --git a/dev-python/klein/klein-19.6.0.ebuild b/dev-python/klein/klein-20.6.0.ebuild
index f89fedf523f1..f89fedf523f1 100644
--- a/dev-python/klein/klein-19.6.0.ebuild
+++ b/dev-python/klein/klein-20.6.0.ebuild
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 433662be4b1a..db2a7973c222 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,3 @@
-DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
 DIST kombu-4.6.8.tar.gz 406196 BLAKE2B 43ddb45e7e6a5bc1aff55867a816ebf7a1afed68bd41d9d74b6179a45d951ac4a4f0f687bbaebd23cf81b67fe2b81d47498b3e25eead0822e16d9acbb436338a SHA512 65b4ebb283ae380388de5d9f8fdc1ec0f41a9910744906b23eb150bc62ecb55ae6d65bb96ad31d8a033f26c2a8dc386939fced393866b6467e77a9760dfa17cc
-EBUILD kombu-4.6.3.ebuild 2311 BLAKE2B 3cc134c1c83e228ed750244514d4d0f9e7556efa77361b1660624d8552374fe6af83174ea60e4c6466661f18952aa7a086652dfd0e8e2e99b7bedc95e3ecb0e6 SHA512 74c33f886c0803e35e334dc582c1d7ed3001a5149caf3d3885c3c599733f760839b1cebc36e71ff2c6e227f690eaaa450a08b256b5cf4bab36df54b196348551
 EBUILD kombu-4.6.8.ebuild 2368 BLAKE2B 8626497de01426d473a5784a31515b4b3be59c406aa5d7b2b6490de2b4bd8f2404c2a6b1b63c4f1c679e9d70e62268b7ed4cf71083d20ee73674fffe1a320534 SHA512 9a6918db2a8805061f5b7469258ba528135da5a5c009c04978bfc75a76d689c5f2fd8c006db6ed14518ff95d9bed598746511cd18aa89b5fbe8e161c83a3c94b
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild
deleted file mode 100644
index aee6727a62c5..000000000000
--- a/dev-python/kombu/kombu-4.6.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=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 )"
-
-# zookeeper backend support possible via dev-python/kazoo
-RDEPEND="
-	>=dev-python/py-amqp-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyro-4.76: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/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
-	# pytest-sugar is not packaged
-	sed -i '/pytest-sugar/d' requirements/test.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 5244e450a0bf..db3fa96b2704 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,5 +1,3 @@
-DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-EBUILD lazy-object-proxy-1.4.3.ebuild 991 BLAKE2B acd6892546fa1a958b2985e06a1b4b68caaa6933a064f6dfa7fe05992a1f391a25179487cfcc1b3b32926c498495283051a6b25548f6c99c6a5bc923f4ef0bf5 SHA512 11284bb64221f0c476b26f53e017449c7457fe46a2e9f7e8d856ff0b1d366d2114cd4c3d3f5fab4f2fa1d664d4eeb091b694df4bedb0ef630add6be6b0846cc0
-EBUILD lazy-object-proxy-1.5.0.ebuild 945 BLAKE2B 1814f0a13cf57a1f1e607d7a3864a99464e7cbef81f04f732de5c2ad6261ca230c3da22df6d760584a998cab3847676b986ab51db529c1735b6fede61fb78b05 SHA512 8028494e20f567d82695b1fea2eaaaedda2fcd349170d029a337db2fc065ede3f6e74193758518a1d866d33dbaa22de8cc552bbbf645bca1611f35bd1b561e61
+EBUILD lazy-object-proxy-1.5.0.ebuild 938 BLAKE2B 53c77010b260d9afd108ac6ee78303a6153d18da90fd75c24cdaf70eba9bdf4e51f365762165daac5af6a5efdf7b6ed86474caf33fb8dfe57a631986b9d15ceb SHA512 a698baa6f2ec516193349b7215d41af38fa06f9b352885ffd8a911b866fbbac5e81c820d83bceac43a533ea091dc413a707ceda0c87ded4efd8b518c07f9b329
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
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
deleted file mode 100644
index e6bfbaadeeaf..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.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,8} pypy3 )
-
-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 ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools_scm[${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.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index 763b4358bbf2..3981dc8a7dbd 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -16,7 +16,7 @@ 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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 57b57c694102..44122c5b9ca6 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,5 +1,3 @@
-DIST libarchive-c-2.8.tar.gz 45182 BLAKE2B 8282c46f1e2bd4c9e83809743953fd8f11408e7c7b0849735cb1c4afda35387cfd6889a0443ecda26bd411a7dcab384e42c685650d62be591fc72bdb151770a8 SHA512 533b23081996f2bfbd558e379d69e0c02ecfc7e62d39f4ae2ecf5b639511ecffc073422e78d7357cc58daa260b956a6399b42db5d26d6e3933622c622fa8dc5f
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.8.ebuild 421 BLAKE2B 4e60170f9b21faa821c9d5ea7567be04fb200431102d6daf97f69910e07e70e773b133724c8756d31bd622493e719ac981b9a82464c0e0b8981e2a2118b9d170 SHA512 390681a093c000d1fb24dd92fc0550c8c091c03b1f6fd3982162b5f6d126787997c2a096ac21740f9d25c2fe6ce43a0bc81eb4dabd66ffcd087665f57a02a129
 EBUILD libarchive-c-2.9.ebuild 457 BLAKE2B c13f1fdbb55e216057e321819bccc0f00b641dfe1db2682ec154fb136c396c719774f764c6e8d50d759f0c0d76c4c5960ba12cea01fa8d702971dce019c766ee SHA512 d202e6f50f9bf308b714e443ed5a90636316b974d523212ad3008489e9b62292bf08b9605da03282c9fdfb1cf9f1755f355a2f81d56686c26b59b3ce29e16cba
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.8.ebuild b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
deleted file mode 100644
index 38360fd1077c..000000000000
--- a/dev-python/libarchive-c/libarchive-c-2.8.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,7} )
-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/libcloud/Manifest b/dev-python/libcloud/Manifest
index f2142f1be839..624b5dfbf5ce 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,7 +1,5 @@
-DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
-DIST apache-libcloud-2.8.2.tar.bz2 1559425 BLAKE2B 86baff68dae874ee9569646ac24831858784d8323dcbff5036ed0f26afdd47d859b68592d74084844f4b7d232c25f7a99d84fddbfcba54df6939f426203e59ff SHA512 9834cd54df11a27876bdc70c85e7d9e3063cd2639d9f19ccd17ec7841fc0e8db6fbc2d562320656a7db4edbe5a940e8562c929a21203757fabe78a4b48d89367
 DIST apache-libcloud-3.0.0.tar.bz2 1609684 BLAKE2B cac9f42a2e73c8903d9b29c8e39d0d16d56138adbe2bdf60abb52c02fbd41f8fbe063238a09ce27b2b921eb082a82881f31211dbcb864e183c3f582fdb75858a SHA512 17569ce820fc5bc792a23636c8d2cc2067059425217b9b0dd90fcba40a5f347dca66531201c458b12d61caf3854355b6a7dca7efc17b05fbab364c8d2bdc2405
-EBUILD libcloud-2.3.0.ebuild 1014 BLAKE2B ce793197b34426ea97c51c9282dc80e5e1752a9b097dfb8bb18e70b73617c47ee6da4bf3937b467d41c37a07f9c7a3670a01d70bddef36b77096cd47c05327a9 SHA512 917f4baab209452452b64ef4d28eb4c5e6485250dd5195a2ba1cbc24c330c8ac6539139f2221c6b33168966d92737d1d38bb08ed46094531dcab0cebdecfdb02
-EBUILD libcloud-2.8.2.ebuild 1044 BLAKE2B 0de7d4e0d6655325b5b5aad9935e04c85b3402fd67286d00724b38d683ad4ba8ed293f05689a63389375cf467941debd8eaf66b504ad81de572963a1300835a4 SHA512 b34c4fae3906d937f1a7b096554866f5574eee3ab81e70181ea568b4f7331600b16437e373a2c783ea1612d0e3d7708ff5dcf00a7ce68b75019cec9e422de79a
-EBUILD libcloud-3.0.0.ebuild 1042 BLAKE2B 681bdc24f534ae3096275c77add0f5a53ac8e91b584969e287cdc9f7672abe4d02d539ed4f968d1c647add33c89f4336b6b117af0c356c3416bf74c396cb3771 SHA512 2054b523a38c7ab0e9740d7904569a7d046e5bfd68f5ad8f177e8c7bae15678a264f8c564c3bb0ea743b7e3ee84f7037e74a4687363de345dba60f6955161c92
+DIST apache-libcloud-3.1.0.tar.bz2 1613381 BLAKE2B afc607a76ff3cd24961cfaf916b5813cd59e84d523f9a642bb8222d889abb44d6357d230b001ae03a0b021160384d6c6d8420e85825aa8d84f7619e900c4c9b0 SHA512 ef2fc4754281adc336d656d3a707710feae0f6c22f33156830dd0b299d06fbf9b890817f68192106320944f851265c39f175b5fae5f85053706ec2f0ccd04bf1
+EBUILD libcloud-3.0.0.ebuild 1073 BLAKE2B 51e7a9ce37b08669d3ca78abaca3f7f910e9bc2db73520fdc097cddeb8d296b3ff8656fdcbfbc5470d2c7a085bb2c442589fb633a17d984e6691b4aaef26c3ab SHA512 0b5c838bd97e5dd2ad2c949e1b1c4f6bd1c1935b3f2f3132e7dd8fd58727733c91ffd260d6f0f1e5be4d4570fa7159b80149827f217632fc78120c77359f350c
+EBUILD libcloud-3.1.0.ebuild 1065 BLAKE2B 913749dff780009479ac94edda7c0c973506407be82f2c6f5941f71ac7cc7c8c101f7ccbc51aa75491182d784370acf5e43106fc49119546be4a9ea907dfe0ed SHA512 12905cd077a7d2ad01b2c7051fa747f537e391dda7bd3f9ad2a1810dfa0cec21904f2aabf4a8c6f5283354b2027d9d3500dd882bdac29d76ae8e381058063535
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
deleted file mode 100644
index 5820bf095b9e..000000000000
--- a/dev-python/libcloud/libcloud-2.3.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 )
-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}]
-	)"
-
-# Known test failures
-RESTRICT="test"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		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 && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-2.8.2.ebuild b/dev-python/libcloud/libcloud-2.8.2.ebuild
deleted file mode 100644
index b8b53b82c69d..000000000000
--- a/dev-python/libcloud/libcloud-2.8.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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="
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/apache-${P}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-3.0.0.ebuild b/dev-python/libcloud/libcloud-3.0.0.ebuild
index 3bab3980f0fd..65e69f26ce57 100644
--- a/dev-python/libcloud/libcloud-3.0.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="examples test"
+IUSE="examples"
 
 RDEPEND="
 	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
@@ -23,9 +23,10 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	test? (
+		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
 	)"
 
 S="${WORKDIR}/apache-${P}"
diff --git a/dev-python/libcloud/libcloud-3.1.0.ebuild b/dev-python/libcloud/libcloud-3.1.0.ebuild
new file mode 100644
index 000000000000..8e3ceab26aa6
--- /dev/null
+++ b/dev-python/libcloud/libcloud-3.1.0.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,8,9} )
+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"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+BDEPEND+="
+	test? (
+		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv example_*.py examples || die
+	fi
+
+	# needed for tests
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 10168a987b36..36990d76a241 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
-EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 66d395a96bcf6b2d7f32f73f11bfbce375bbb91963c70a00d70aa7630d95362cfd28c053a5460a75012391dde6ce7adaf249ec16ee10bf76cdcf025a6de7133a SHA512 338af8b62356dd32e51694b85cb06083f18c43394aceb2f9be43d226ac2232132ae91383e9750ebec221d9b3f6c816fa8c819a593da5ed208ef79ab2fc61eb92
+EBUILD libsass-0.20.0.ebuild 882 BLAKE2B eae8e6d58a3b7f4813354049235ffa5e4a7ea62eedbd0573e7afe77e55d17337ba35455f2a7aa622769fda45e3e618c90582e03ba57160c52c7541a8c6cf60da SHA512 ffdfcad24892c7369dad358128676c22d8faa6b242e67d8656b78a39e33100b3634d3dfb7a6d4659990fa39a450c1b1f42c631e08a30adc63381b281bffcd836
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
index 6ae285a36e2f..b745260bad65 100644
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ b/dev-python/libsass/libsass-0.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 660dfcf56125..2bc15847a9dd 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,5 +1,6 @@
 AUX libtmux-0.8.2-tests.patch 1677 BLAKE2B e5d3e6717809c36411ab3b5991dc1dec7a38868015529fe867743c31eacd81de13d74e96f3232106d43b68abad7e1b94afdecab44cc2954135ef34afce484a33 SHA512 b5df69fcda982fb7d8b0bc0659994959a5d4d868e46cfda43e8e9d3abb14a1a094c63da25a73250bc8329a93cf9a5747fe4cee51580b3802a4be1dfc8a68d33b
 DIST libtmux-v0.8.2.tar.gz 117077 BLAKE2B 52e9c7c47911797e9d2446e7fbc836f9482912e255c05d9b329d4a33f5f03d0bfad4df492902eff5605180f90efcd81a7e432174646cb2051b0f9dfa6615a91a SHA512 e5f3768f4ddd746c5380a92899961be05b1b6c567d9333720b0fd9ed124131671bbecf1c04a7c4e658092424b6dc89dd656ba559385b0a6f673f9895dd6c829c
-EBUILD libtmux-0.8.2-r1.ebuild 944 BLAKE2B a66af9abda03382d2b88f8605c462fb9b85d2fba8cdbf9d00b8182335aff84393bbc2137b63753942b5968a342527bce0e2dd539af838a0e2b346e7ad6793a34 SHA512 4ef6187c51469dab5369de45cc69601eb6fa14d7aef08ac2dd8a1db7d8d8f61d1362a71282fdb74db58284c3d71420bcc79eefe554522d5373f4e0a4f6230304
-EBUILD libtmux-0.8.2-r2.ebuild 946 BLAKE2B 530ce16d9092ceba33276577ee1a93800da0bf0aa8bd692d27fb5aa4e4e19335a472d78917a57ece88c6b7fc7623278fdd234efc822524aee1b207fb32890dec SHA512 c04f25d26c55684664cfef9063b30451288076eb521c3b6717579f7eae322bd176ca31b575b39180963bf0ecc9ca13d5f6b4efd6412be3f467788498e1e5be00
+DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b50cf1f13b150809a1c7e24b0eab125701eada0431212afccc26f6479642c886b3f701c8c2ffc9c3ebb7d08c4cc SHA512 f7c5a84f16b400db672318d3c0b79cd8f328a0096d32349f6ce9360d72eecd75ed9915af5c37950adadd81943130b543716d718366522efee7780813a2c1a5d6
+EBUILD libtmux-0.8.2-r2.ebuild 958 BLAKE2B 8832e5e5bbe54cc5cdde6e74db5e99e23e75743f6a521c08aa079a9498be3cca2a9d6763bfa32b41e35247b8d673a4a663010d029222b9a50db40414e329cc75 SHA512 dde383d5a9be09daed79a2341ab7f392c86293c7dd7ec1150dc4eb7ffd6202db9baba94dab3372263317404b1560358bbf0f912dee5b42b7736f9c72be8ae3f1
+EBUILD libtmux-0.8.3.ebuild 906 BLAKE2B 7e7b3f4dc9d4097731f0613bc5fc723d89f533d6c7394acaa6980b4e2e2e599023cf7c4d5fd93c964793734bdc0f27a856e089a7a5310686741612b83c44d854 SHA512 5e093343c1453618f784136356e30488c0b1e05c89fb6c2d4b4f182ee33aaf1a2246b334c4c5d8f25043357424a8d6d9ceefe02d301b006eed752c33d49fec38
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.2-r1.ebuild b/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
deleted file mode 100644
index 1342100cf828..000000000000
--- a/dev-python/libtmux/libtmux-0.8.2-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,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND=">=app-misc/tmux-2.9a"
-
-PATCHES=(
-	"${FILESDIR}/libtmux-0.8.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/alagitpull \
-	dev-python/docutils
-
-python_prepare_all() {
-	# avoid a dependency on sphinx_issues
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -i "s:'sphinx_issues',::" doc/conf.py || die
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild b/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
index 8d4578ad4295..63bc25a2154a 100644
--- a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=app-misc/tmux-3.0a"
 
diff --git a/dev-python/libtmux/libtmux-0.8.3.ebuild b/dev-python/libtmux/libtmux-0.8.3.ebuild
new file mode 100644
index 000000000000..628783d9c6c8
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.8.3.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 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=app-misc/tmux-3.0a"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/alagitpull \
+	dev-python/docutils
+
+python_prepare_all() {
+	# avoid a dependency on sphinx_issues
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -i "s:'sphinx_issues',::" doc/conf.py || die
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index bf32aca0df4c..2034efc66551 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,6 @@
-DIST libvirt-python-6.0.0.tar.gz 196791 BLAKE2B 8fa524d76277fc0278158205f25da8a4331c732a7cbdbe7d9ef9c697b8d5758d8f4182ac749212f4b7c147cde5648fa8cd245cbe0ae809e9079ef654def3c4a1 SHA512 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58
-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 ef89689b51f250889f2cee6f0f5e60a1f698bccd1ae96f215ac386bef810e0533c304ffd6ce4eefea340396718cee118ddf2a03013e48f2e98645380e4d1217b SHA512 0559486c4d0ba13a61b480a6004bec296ffc6690926b6db7b06181a461717f8c62031c8d4434751642be914402ca75551956c4f906df76383483c1bc640fa37e
-EBUILD libvirt-python-6.1.0.ebuild 998 BLAKE2B 63b3df35fa4f1f70d41b853f67a2fc80a70306cabace4798b3036f2a643279c85b698dc0235122c1fc4e39aaa815454953d0368bdd1ba94317cb525c74b1d6e4 SHA512 9254a199c59e397e632b558da9c28ffb6f85190561eb7968156eb10ba5b8820dcb271e2fbd8c423e230fe0e50160033826c02b730ba430ba1cb502ba8f98fdb4
+DIST libvirt-python-6.5.0.tar.gz 198753 BLAKE2B 90951af538c664f5da20cfced6b81dc2b06d36e723b3c41a0b2763bf0d73d3036d7e84a2db57f20fa2bd1ede8fb01c45dad9e5097a9f6008579dae319f825898 SHA512 a69c75b615f674bbb89fdb3e5cfc3dddfde68adffd0599e9d03f1552bb765823dc003859fe713ac0a324835c61f909bd43518571ddde8f99c37bee2416f094eb
 EBUILD libvirt-python-6.2.0.ebuild 1005 BLAKE2B ef89689b51f250889f2cee6f0f5e60a1f698bccd1ae96f215ac386bef810e0533c304ffd6ce4eefea340396718cee118ddf2a03013e48f2e98645380e4d1217b SHA512 0559486c4d0ba13a61b480a6004bec296ffc6690926b6db7b06181a461717f8c62031c8d4434751642be914402ca75551956c4f906df76383483c1bc640fa37e
+EBUILD libvirt-python-6.5.0.ebuild 996 BLAKE2B 7d9d1ab02b9cc5caa4a85a1c42978a0dec3ccbd9059cdc1fa144f9f0ecf4d88e4924df803d9233ce0208522080b778ba806d491165505f830fd7b0794955a3bc SHA512 82fbf61c5652263fe0e2297b68c6393b283f3b647c097df1ce2328a41f126926dd3bdb5e7c42c11b0c952d21c412299952c5176ab53408714c0d9923b0818bed
 EBUILD libvirt-python-9999.ebuild 1001 BLAKE2B 727bfa4e64601efefa1a16aa24ee29091a8cc8060563c32e06a3bfd93c5dc6cd938d05973523f5666cc823017d18b7816079706ef4dd45ce6219dd3b4a055da6 SHA512 e56bb3138bcbb68a8b98dc5f134b6bbb319aff2d6a21bf63676c85c153e3a75072a9ca9db2a798beb2691e958e2a0d08e038549f1c8fcff719770d3df0872e0c
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
deleted file mode 100644
index 4f6663eb583d..000000000000
--- a/dev-python/libvirt-python/libvirt-python-6.0.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=( python3_{6,7,8} )
-
-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.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild
deleted file mode 100644
index bb55c2b9c375..000000000000
--- a/dev-python/libvirt-python/libvirt-python-6.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=( python3_{6,7,8} )
-
-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.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild
new file mode 100644
index 000000000000..d6867cec6ffc
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.5.0.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..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+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"
+	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="virtual/pkgconfig"
+BDEPEND="test? (
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests setup.py
+
+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/lit/Manifest b/dev-python/lit/Manifest
index e74b814c00e9..be0ce6026f2f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,13 @@
-DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 877 BLAKE2B 5ed8f853e73c362547ea54a2326dcb427e9fb8efd7d004ba88135b351f3d752433230f970df68674c124549d199fa431c744fe7cb4b2a4f0b6a2291647cb0f11 SHA512 5de884d4c48b3db0b5d87c88bef58826bcd4b1388a19b9ef6bf717ee503c876fc7bfd3526df6c9b41eae56464bac4dfb71fdfdbf57ff95dd5ac7a63f05f3c05d
-EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-10.0.1_rc2.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
-EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
+EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
+EBUILD lit-10.0.1.ebuild 898 BLAKE2B 25734042c465e9ac79acca7b98d487a30def0dc5e9e63cfa4d0519d35b341b08fe9627534a646a2862ccae7c50dd95344d9427e0b6f00920f222a713fa114c1f SHA512 14dc6b5e50ac3e23565791712af64cb34a03b9046db1ccf84d72d05a7111d35543754d9ab62bcd6e75ea588dadba700b059928a136ffaf15bd106bf3a17b75c4
+EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0_rc1.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0_rc2.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 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
index 55b531a08716..a61d6f3ca2be 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
@@ -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/lit/lit-10.0.1.9999.ebuild b/dev-python/lit/lit-10.0.1.9999.ebuild
deleted file mode 100644
index b9123ef7bf14..000000000000
--- a/dev-python/lit/lit-10.0.1.9999.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-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)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-10.0.1.ebuild b/dev-python/lit/lit-10.0.1.ebuild
new file mode 100644
index 000000000000..b49965fce7d7
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1.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..9} )
+
+inherit distutils-r1 llvm.org
+
+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)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-10.0.1_rc1.ebuild b/dev-python/lit/lit-10.0.1_rc1.ebuild
deleted file mode 100644
index b9123ef7bf14..000000000000
--- a/dev-python/lit/lit-10.0.1_rc1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-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)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-10.0.1_rc2.ebuild b/dev-python/lit/lit-10.0.1_rc2.ebuild
deleted file mode 100644
index b9123ef7bf14..000000000000
--- a/dev-python/lit/lit-10.0.1_rc2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-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)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index b9123ef7bf14..eafbdc683987 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-11.0.0_rc1.ebuild b/dev-python/lit/lit-11.0.0_rc1.ebuild
new file mode 100644
index 000000000000..eafbdc683987
--- /dev/null
+++ b/dev-python/lit/lit-11.0.0_rc1.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..9} )
+
+inherit distutils-r1 llvm.org
+
+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)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-11.0.0_rc2.ebuild b/dev-python/lit/lit-11.0.0_rc2.ebuild
new file mode 100644
index 000000000000..eafbdc683987
--- /dev/null
+++ b/dev-python/lit/lit-11.0.0_rc2.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..9} )
+
+inherit distutils-r1 llvm.org
+
+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)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-12.0.0.9999.ebuild b/dev-python/lit/lit-12.0.0.9999.ebuild
new file mode 100644
index 000000000000..eafbdc683987
--- /dev/null
+++ b/dev-python/lit/lit-12.0.0.9999.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..9} )
+
+inherit distutils-r1 llvm.org
+
+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)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-8.0.1.ebuild b/dev-python/lit/lit-8.0.1.ebuild
deleted file mode 100644
index 03682e862735..000000000000
--- a/dev-python/lit/lit-8.0.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
-python_test() {
-	./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 65669485c0bc..4ae5cb41cdee 100644
--- a/dev-python/lit/lit-9.0.1.ebuild
+++ b/dev-python/lit/lit-9.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 960d408d387b..bbb8ea65521d 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,7 +1,3 @@
-DIST livereload-2.4.1.tar.gz 25593 BLAKE2B 97a37349f14cb9d1841ec78cc3d1965b59f65f86b00cb972b9b726364f7f34e6409853f8af32215c6bd400698f9b3ac2b947ac7864a8df15ccec8badddaa0cfe SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb
-DIST livereload-2.5.2.tar.gz 27070 BLAKE2B 9d2af1eb313f8fd6e7a5176565c3f7a9ab7d8a36260d568d47a427e14e8ed76c0edb0c227ba5784681c82d7c7b5994e151d14302d8c9d0e76caea7d12e130586 SHA512 bb4ba50a31a912051f6036754bfc6ce7ba33b1b8abd5a20ac151f996e347d84367d4cc26f9c798ed6aef487ea335e1591d40ebd1c12f9487f74992e53e129749
 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 1131 BLAKE2B 9119bb291c148c3cf967dcde3798f05a2a5f4f912adc38a83a04f943ad8146854a7cfc2700cacc17ec0e2a2936cadfbf184b15b681f0c9f8b2e77997529918a4 SHA512 de832a862afc9260cfad474bf4650a134e50d5c30f40dc2f026f9d11e592aab559b08a5121663cb6b5dc881e80efb002e2297fefdd4befedaedcbc3a4bf285c8
 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
deleted file mode 100644
index f0ee8033d667..000000000000
--- a/dev-python/livereload/livereload-2.4.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=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-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"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	${CDEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
-
-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/livereload-2.5.2.ebuild b/dev-python/livereload/livereload-2.5.2.ebuild
deleted file mode 100644
index 487fd52dd92b..000000000000
--- a/dev-python/livereload/livereload-2.5.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 )
-
-inherit distutils-r1 vcs-snapshot
-
-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 test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	${CDEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
-
-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/llfuse/Manifest b/dev-python/llfuse/Manifest
index 93e97e38f631..34f8df5725c2 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -2,5 +2,5 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
 DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
 EBUILD llfuse-1.3.5.ebuild 912 BLAKE2B bdb568bf00c3c4f6ec5188ef0258930ae8f07e715a7683d70435238d5ecbbed06f838d02a7db13411546a794669dcde1d8e25179b0ed2f60f4858b12b9588957 SHA512 603f7a3c9abd584eb1469ecbb4356ba1bfbd30fde9c0fe28e23f37969df73865012601bfc6f019c666050dd8c6b2193b3075484d626b5edb66d2afcbe0069841
-EBUILD llfuse-1.3.6.ebuild 757 BLAKE2B b2263e1f5cb66433d656f83895380d25e8ec5be0daf2f81658c0e69156cfeeae458a86840c9f040d55382142693ec6781ae2c6abbcb7a8b5ffec576b1575f4ea SHA512 44b17f34d0a2c1585b78e837f0557c751feaac0eb873100dd7932928f6e698a8e6f8379ba52228128dce6b4472f6888cb867bc6f73277794def1bae07ad4d0c7
+EBUILD llfuse-1.3.6.ebuild 756 BLAKE2B 471832db1ce533ebe7bc576b26c6b4302e80253f157b2d7fcdc9dbb507c3789458a636c6a6dac8a76758a496423b90e68f5fa64d6542f1d28e4d6557ba779ca6 SHA512 38d81841e11835e673bccc55627518861dd53648180e9f94facabd6deb0fb65b294f4427fb4c6f14f3e211fb1c7129a1289adc626cc3cb9839cffe222a210a75
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
index 4b56e688f41f..962b4cdbe2c2 100644
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 9b51476c30dd..6db7e4be4beb 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,12 +1,9 @@
-AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 AUX llvmlite-0.33.0-llvm-10.patch 1140 BLAKE2B 175f1a5596e7ce1f20e7e89978066cea345af361eb0db9413bf105e657128d45fca1c170aa516d74376f4aa4dcff9699d5c48120378f239c61ee59cc29a61713 SHA512 666e2dd798d2598139a72560ae0a63a397dfb643645c3eb3d92f0d2dfbd3030484b7e59e3aec8fa071d314b974f8d54b1a174473c3fbf4534d69492331ebd456
-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
 DIST llvmlite-0.32.1.gh.tar.gz 194191 BLAKE2B 4d35ce0f4903a17285b6f6296f0260787cc102804f1144c1b329815d41ca7471e1942aaecac26f06aa76804cc1b8a77130063de22376c78f30819554e459716f SHA512 00ce075deb8048350f4d4ac23e2e8a629b7c12aefefe3855e430aaf5e2df8170cf97a043001397a84101a7d0065671b30eb327837b24f86dd36b855309c19bfa
 DIST llvmlite-0.33.0.gh.tar.gz 196450 BLAKE2B 3b1842b53eabf5cbc30aa642e12d214bd0cf8473f39873ad2b83de830a251ceac20281e2c8a528fff4623faeebf1583ab539cac74587bcb49ccaac22c922a16f SHA512 50b35db717ccc9d78cb7faa2e0b43cf4a622c5fca662ceb18c14163a26456fb79ed844db9a50e4566a2ea5c26089a419ca130d16b18a2486d4137e8a410ee3b9
-EBUILD llvmlite-0.29.0.ebuild 1451 BLAKE2B 0b5f4787b0ebd81640f9b71ce15b2ae93d14777ef20ae2cfee01b24cd1f22c125581759776ad0289d4581492b60be229f27a0e69e1f195c8af5fad719e1b77c2 SHA512 67dcd7ae4afc3b72fefa2484c7392d621866f7cad0fcba4c2f5732baf3f7c5be7f4af036e425167aab02acc366033ff87cbe87463a42ded54b8c85bc3a14ea17
-EBUILD llvmlite-0.30.0.ebuild 1455 BLAKE2B 16be8211b855c6ca41cd7fd86caebfecfe528c0fb9329b247b889aa6a4bbbbe0f67aa2a6548c9c951bd868820e0c98346aef663ccf9c2b2a4deb707f92237f87 SHA512 7d2fb4b689d6a1eccc89051d1beaf827ee18d271746b877c0bc95695ab373bc9aea9421ecdfaa31832a916676deb33863e0c515755593486c9032162733c8909
+DIST llvmlite-0.34.0.gh.tar.gz 210438 BLAKE2B 832ec28047a51b2874a0de5885445b9d77942a70f86620dfb0b25ff0b17395b6009d31d5e9f27ddf02c19ae97bd5b325fc49227fdc0499a9f5fa3bde44e6b564 SHA512 5540df4ebad835e294c00cc09ab1230a530566f563f751f890752f6e22f7b2a04aedcbb53dbbb8e323198d05c80bc9699b593d919eaf1af60fa6f94ff6f50bb1
 EBUILD llvmlite-0.32.1.ebuild 1608 BLAKE2B 2f588519db4c9def2d1bff835cec129fc90a16ca4e9196172d319dae75ecb9331696d591338f80f5e1ec2be6e9374e1be4535a336b71329309c1119dade752f9 SHA512 21e7f355dfa1835cc64849a29fc37bcd2cc46354a25b524e770a0d0083db98f66ed8a7c911c7476b974c46229dcc18046df568440cdd43e190ddc8752475253f
-EBUILD llvmlite-0.33.0-r1.ebuild 1655 BLAKE2B 1770b375b9d01fbfc50d939ea0c44a67243e301bacefe7fd58c45937cc16887dfebea2811a5607515b4f6439d6eeb00061482768c234bfefe328760bb7f64656 SHA512 38c39ec06953791cd24096dd7969d83524d195f3c2cbc913540057a6fcfe853083f60d63b50476c170488c64d6e658abab4f54c4f4492682368ad613b97d07e6
+EBUILD llvmlite-0.33.0-r1.ebuild 1651 BLAKE2B b994e16a95543513401b4826a595166608f8628bdabe32e27a5014c6971d8f13e03954827fe68c8eb83c25eb8f695b03ec7bfd56999b6236613839347a0f7ac5 SHA512 40d5e93e49c4aba8b0c7a0535de79e0471fbf670be6f53d2bebbcb8d2df0700900ae72a4fd80c07d2796274f124991ea299be0937bf27ec42773d7ba8d4368bd
 EBUILD llvmlite-0.33.0.ebuild 1607 BLAKE2B ab085835ea02ccc0729079da07089428625f9e5a196886406facf49cd7cf80614ce71acc9e9b7ee11e24d8518b1adb4250561fd84d3e4742ce93e4ccaf79aa54 SHA512 d24723298c85bf17f218595e0515b168de3157693370a00083cb57473202677ca87909013c5e9274d710d14c0f3473c3ae6de96f404f5a219dbc308efdc3af8a
+EBUILD llvmlite-0.34.0.ebuild 1358 BLAKE2B 30c83734202847c4e5da441445bac1c17928d011c87eee2d966d42b924d853529d2cc94f260a955d4a4570944f9e437c785ec1e8c8832c656567fdeb90d7275d SHA512 8775329a09c3ac903be72b4d3e329ab2971eda6596687231a096e0942daff6c78d15d66a68b8334a5fe5f647ef67d6ef4e7aec69efba466f61a53a4f8bf63170
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch b/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
deleted file mode 100644
index f7cfeae404ad..000000000000
--- a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: use packaged six instead of stripped module
-Author: Daniel Stender <debian@danielstender.com>
-Forwarded: not-needed
-Last-Update: 2016-21-06
-
---- a/llvmlite/binding/ffi.py
-+++ b/llvmlite/binding/ffi.py
-@@ -3,7 +3,7 @@ import os
- 
- from .common import _decode_string, _is_shutting_down
- from ..utils import get_library_name
--from ..six import PY2
-+from six import PY2
- 
- 
- def _make_opaque_ref(name):
---- a/llvmlite/ir/values.py
-+++ b/llvmlite/ir/values.py
-@@ -7,7 +7,7 @@ from __future__ import print_function, absolute_import
- 
- import string
- 
--from .. import six
-+import six
- from . import types, _utils
- from ._utils import _StrCaching, _StringReferenceCaching, _HasMetadata
- 
---- a/llvmlite/tests/customize.py
-+++ b/llvmlite/tests/customize.py
-@@ -12,7 +12,7 @@ import unittest
- import warnings
- from unittest import result, runner, signals
- 
--from ..six import StringIO
-+from six import StringIO
- 
- 
- # "unittest.main" is really the TestProgram class!
---- a/llvmlite/tests/test_binding.py
-+++ b/llvmlite/tests/test_binding.py
-@@ -12,7 +12,8 @@ import subprocess
- import sys
- import unittest
- 
--from llvmlite import six, ir
-+from llvmlite import ir
-+import six
- from llvmlite import binding as llvm
- from llvmlite.binding import ffi
- from . import TestCase
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
deleted file mode 100644
index da14d78a83b5..000000000000
--- a/dev-python/llvmlite/llvmlite-0.29.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=( python{3_6,3_7} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=8
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_configure_all() {
-	# upstream's build system is just horrible, and they ignored the PR
-	# fixing it, so let's build the shared lib properly using implicit
-	# make rules
-
-	export LDLIBS=$(llvm-config --libs all)
-	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
-	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
-
-	local files=( ffi/*.cpp )
-	emake -f - <<EOF
-ffi/libllvmlite.so: ${files[*]/.cpp/.o}
-	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
-EOF
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed 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/llvmlite/llvmlite-0.30.0.ebuild b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
deleted file mode 100644
index a5ddc040e87b..000000000000
--- a/dev-python/llvmlite/llvmlite-0.30.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=( python{3_6,3_7} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=8
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_configure_all() {
-	# upstream's build system is just horrible, and they ignored the PR
-	# fixing it, so let's build the shared lib properly using implicit
-	# make rules
-
-	export LDLIBS=$(llvm-config --libs all)
-	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
-	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
-
-	local files=( ffi/*.cpp )
-	emake -f - <<EOF
-ffi/libllvmlite.so: ${files[*]/.cpp/.o}
-	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
-EOF
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed 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/llvmlite/llvmlite-0.33.0-r1.ebuild b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
index 5b5f7d1db25e..791ef995d20f 100644
--- a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-python/llvmlite/llvmlite-0.34.0.ebuild b/dev-python/llvmlite/llvmlite-0.34.0.ebuild
new file mode 100644
index 000000000000..3fa3c11d9cb7
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.34.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..9} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed 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/lmdb/Manifest b/dev-python/lmdb/Manifest
index d2468df18925..6ed647877078 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
-EBUILD lmdb-0.92.ebuild 564 BLAKE2B c9339cebee0ac7abdcfee2b20de71b863605b8413b5842662ee8358849575f30bef6e8eeaed20bca97f370f3068b858a5dd96d399dd1cfc8c237572764f9bbd0 SHA512 d3d9156d577ca5bb852750c1f0f9908a044e000d7f18cdb24011352959c76b536cdace0a311afaf0d9af414538a7606bcf3f67c632a0270e61b532a4b8f3c030
+EBUILD lmdb-0.92.ebuild 569 BLAKE2B 67b60c349456abd4d8ba7f78013d2fc8fcb38ff1992128c1c9d4c1ae680d0b2f68850f0cc3a82ef8d946926bd803d47394b17a041553e67e76bf9c7274bea1c6 SHA512 d292090a491df1bcd155186b1a2eb93eeec51f556bf83a5c909af8c8ab43b956e5e8e5d64a5a8e99199238d32ee7421ec016864f60e3d3a1721e384b2cea22a3
 MISC metadata.xml 369 BLAKE2B 753c2fcd809cb0b69b60f4581421e3d2abb40158dcf3931a70c2c2adaeaf22f5558707a6dc39ec2b9d8724d9fa3bbc370cf790a8bb550d00d59e10cda643ac88 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index 1a28cb0f5217..c3be0c1d61f7 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 8f4d356ee38b..59c959e529c4 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,5 +1,3 @@
-DIST locket-0.2.0.tar.gz 3506 BLAKE2B 10f5c325036b5c0880c2b0261de180ee9d046ac346a64612d680170fad8664bcbd681954384bb6b9c4f812059b4418c618ee44f638ac6fc1c35b62786afe555c SHA512 ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9
 DIST locket.py-0.2.0.gh.tar.gz 5598 BLAKE2B 9b8a1b3d4c3fed3e9ab8f37a1e7bd9d0aa65e618985368691802b1b66d0dbdeb7a1635ff72efec8a7351ce31ffc00413d5ee388e520057bf181a18a39ef46f0a SHA512 e5e5d34daf5c36b0ac4871ce0dec50c67b504be16755e38d7721e40c4f2c385c022c305ac1a9bd641ba9eaf45a2693a4a77b6fa6e95d6ae5ab34947e4ac30393
-EBUILD locket-0.2.0-r1.ebuild 586 BLAKE2B ec79aea6f7912f2d785a5466148209ff7a2da36e54bba0848b7cadff3b701078c6f9da6711c9eeba18dbc4794ec7be8c9eeb841ff600299eb782a1000d0aff57 SHA512 cf4c593abb9559a4e8af3f9023facd89b5f82e72a427b894edafb4ad4d3442109f0b24e319b72a84531bd4b9fa315f264193d32a84ec1c31cd05bc1cc75b7411
-EBUILD locket-0.2.0.ebuild 440 BLAKE2B 24919155d14f3700e68919a9aa7519bb606c0a982568a08f5fea5b3c79afebdfe7415681e04b343c9321293f8d8c043fb328c23ee78d691ed86f13ea97bad2e1 SHA512 f83e7b3faaa6aae7e8773d1f7ec01c80c72ee71aebdbc6301edaa11bf6cb1a1010693589805af10ea14693383beef2e12bbcc69beb2426a3f3722c21725ebc21
-MISC metadata.xml 382 BLAKE2B 302f92403ee0fd1137778bd6e0edd9a89829c64370cde1650784edd3f225c3b7e29b8c9dea93dc7172c64c0082b16be9fb27e1188384b5a70f6c30c5c3c5cfa9 SHA512 71e6d7bb63db336b07549aa2aba9ab6cefb66a005db5df55772dc07a756c84edf13382beb7ee05736b6d8ac7810198695f2dfadbddbacacf5538f8e45e81c032
+EBUILD locket-0.2.0-r1.ebuild 596 BLAKE2B df8fa6dd9c8c36df059223accbfa81c48d39cc9b6a08deda4e2cfd4d9307e3a510d8c1c07965a3407094541432aad36e62a785b8f23b986dc867708103690cf2 SHA512 ba6bf0317fcb5781bcbb3608990c605a00107686ed6bbaa8c46032299f0378d3edbc1df09efef3a670f1e7d71a431c44f318aa4028695f5dc5e804ea4488071f
+MISC metadata.xml 407 BLAKE2B 731eea26051fcca41c8f1e20800bf36ac5a71b1235434977aa6b78cb949e019c676a6d7967f38348d6193d5de982d301ac924eb278beb40017938b1d35fb7b5d SHA512 7887bbf500b72670e3a9b88f17db104688bf509596f14ecb1a04f0db0baf4667adc262ee50079eb3d586752f09ff0022a0a4cdba76a83234ce5b5d3637f4f920
diff --git a/dev-python/locket/locket-0.2.0-r1.ebuild b/dev-python/locket/locket-0.2.0-r1.ebuild
index 756579658915..cfaba5c356d9 100644
--- a/dev-python/locket/locket-0.2.0-r1.ebuild
+++ b/dev-python/locket/locket-0.2.0-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? ( dev-python/spur[${PYTHON_USEDEP}] )"
diff --git a/dev-python/locket/locket-0.2.0.ebuild b/dev-python/locket/locket-0.2.0.ebuild
deleted file mode 100644
index 32d1cdefc998..000000000000
--- a/dev-python/locket/locket-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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="File-based locks for Python"
-HOMEPAGE="https://github.com/mwilliamson/locket.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/locket/metadata.xml b/dev-python/locket/metadata.xml
index a445a1d992dc..bde8812a2876 100644
--- a/dev-python/locket/metadata.xml
+++ b/dev-python/locket/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">locket</remote-id>
     <remote-id type="github">mwilliamson/locket.py</remote-id>
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 94a16bbfc8ed..fd7971e82ee3 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 1089 BLAKE2B e15075182011fe32992dc7bdba2564e651d1bd1c3cc3866dfbba4091fd490ae72adaebf107458a99ad7eb7e008f6e339bac814a124d628385b86a51bb99c947a SHA512 f5ddb0a88d124119d5741630d058ed0a7ab2956702a99d7e79ea4cd8f0f3f4654bcb47d364acaa8b9b09e31318b2c12e56edd517953529045c25011cf3a71843
+EBUILD lockfile-0.12.2-r2.ebuild 598 BLAKE2B 2144b7f1a573c7226063aa7d5b43a81799bcadd74ccf4dc71a3417aef140dd9c675ccc1b10c7215868127e1831ad847014e4383d8bd93fad9950aeb508e9de52 SHA512 8db7f59ce5b90c0c99e4ba60d2b4ae32bc76b6196756d46121d487cc984807bd1b3c068bf6465d986d41a5c2ef7836a37205912c583f5f26af7243d77c3b3ca3
 MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 61c5589f1a8e..43174f8deec9 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,27 +14,8 @@ 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 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=""
+BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 
-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
-}
+distutils_enable_tests nose
+distutils_enable_sphinx doc/source --no-autodoc
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index fa2939f5bbd2..4a39fb27f947 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,6 +1,3 @@
-AUX logbook-0.4.2-objectsinv.patch 393 BLAKE2B 9575e9f92379fc772755785bd10cc465c9c85085cc9261657a61754d179f8a8f790da8045c13bdabbc0d62ca12c74286bcb35652dc13b8675ef8aa2d6677e57e SHA512 7b62f943b48f52ae46d56a8835f0942d74feb757f2a1ec5165006cfb70a6e2030b422a20f278aa746d1f3c85c9c20d87c954e8c42c31dfd18050fef9dbd3f302
-DIST logbook-1.4.0.tar.gz 369335 BLAKE2B 02398be49d2a12aadbcde90561afe6ac08060877922fa04b27f08587115aef8faf47bfc352fc005b8a986ab619289c8544fe53a84e0e863a09c992685f78739c SHA512 3ea969e9e2075e34a915566be906266b408671657e4cecbe47663c28f2212c0522b0f0eb2832fbc4fb906f70c8e53d3cdbe65923dafe53a77545b8126ab539f2
 DIST logbook-1.5.3.tar.gz 371901 BLAKE2B e37924e06613ccf27380004b159966b7b42ec7b766afb6904751eafb3d774c5a9994b9d63f834fbe949fe345953c0da4693e093d717b589046412bd4056322bf SHA512 c9068324f12a189ced98e2c02753489847fa533ce3a3af07b62c73e9959c2e014d47515d47e756d031639cb220a2c4a9a380cba4cb3ea1b190c50106decba686
-EBUILD logbook-1.4.0.ebuild 1184 BLAKE2B d70ff600fb81721576c52d082b3f6da7be6ba15ffa2ae8ec9745a6b8671ffb940b8b843e69951b6690129c0b733f2e30686a3622a3a027e26c5295cbeecd2ccc SHA512 b79c9d68c333f159064e8ab2988598ddf032e3d4fcc81dd2b3d754b9a6217b64185aaf9155f6042ca62fbee44ef1722c35c58ad9b3636ef1ea89d095557cd963
 EBUILD logbook-1.5.3.ebuild 1067 BLAKE2B 574dcbb1fe843ad591eb4d47a8247761e2ee2105341562956b2a3cc87c1ccaf11e1a600b85abea4693746d560afcfb8ce6b027d2995497db0a6a703179ed1c69 SHA512 e4b6e1a195611a1c2a0e7973710d3d0ae92d1069cde12111efd9a0a0e71035baa3be207cb4ec4dd01e370aad678656590e8c481759de50377f835998a13830d1
 MISC metadata.xml 505 BLAKE2B d59b5ef93abf0902c8e9da54d7d2637e79f3e1c5d60ad2db60feaae4133e54a989a8c4b9cdffa51f36cb504385a80e1cfdcf69158f1e4ced2a3904ac85be6b06 SHA512 badf998d9f9d7096563ff3dd2246020a1c7dae59ffe8a62c532703107fe38b866d418f9eada3416300b5474e756ca5982157b62bcc7c493119fa7bb6cbca752f
diff --git a/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch b/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch
deleted file mode 100644
index 2575f862eded..000000000000
--- a/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Prevent unwanted d'loading of un-needed objects.inv files
-diff -ur logbook-0.4.2.orig/docs/conf.py logbook-0.4.2/docs/conf.py
---- logbook-0.4.2/docs/conf.py	2013-06-02 19:31:32.000000000 +0800
-+++ logbook-0.4.2/docs/conf.py	2013-06-30 10:50:38.604402792 +0800
-@@ -219,6 +219,3 @@
-      [u'Armin Ronacher, Georg Brandl'], 1)
- ]
- 
--intersphinx_mapping = {
--    'http://docs.python.org': None
--}
diff --git a/dev-python/logbook/logbook-1.4.0.ebuild b/dev-python/logbook/logbook-1.4.0.ebuild
deleted file mode 100644
index 4d02f031089b..000000000000
--- a/dev-python/logbook/logbook-1.4.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="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/loguru/Manifest b/dev-python/loguru/Manifest
index 1fdcbc36a57e..ec5f6c511e23 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,5 +1,3 @@
-DIST loguru-0.4.1.tar.gz 404393 BLAKE2B 2dec4a346db3652a35a758bb9ce98f29785f47a55a107c0f924005607001adbd6e873095b7212a86bfa66d5d8a24f058d775552c1fa044fabd9813c09f369f26 SHA512 5b7dbac11bbd5c7cb05fe380cf4a3337309614cac77ded3b1f5191c8865d16788cafa7e8da25817787a1ae94e1b6905afe54184d72df81fad08821cdb68c0a53
 DIST loguru-0.5.1.tar.gz 412284 BLAKE2B c28fafd0c9871b56ea05648847d837e0a45c9c0452840c27cb966cc61d7010d41695066dd6723d0987af600cb90fbca499b99354aec2bbe6f1542fd5f7bbe2e9 SHA512 62e53d9a6ec9d6f9b305f1522f0149d22931782d485d21df3e6dbceea9dada269c77de8f69629fb07f28c2afd0b743b4e8d4afb54381b03933a07667a14fb356
-EBUILD loguru-0.4.1.ebuild 656 BLAKE2B c12daee7cc82dd3e3f2f2cbe97618f94baf12320ff29a1ba13a537c55a67f3d0a001217bb8c01353e15b3100347d30a5833bd08ded28362d8d052d51adc9ca98 SHA512 fd591aff2a4fd4c44abb4f0a54c4f67c41a838c89b1ff9820aed1f26096c8552bbbf41d590fd13fffdfd532f62b1cf941c9bdfb1dd1d2d5fa842847dc0384138
 EBUILD loguru-0.5.1.ebuild 658 BLAKE2B a11d2fe151b026c5f169d1740ba69d6b6db3ff1de2004c17c7f065c2991bb13f056a11736d2e37c4a58e3ef0fd047d6450f092fb21bcc44d9729676b99cf5aae SHA512 857ee28f1d196215d7e616035f89688425c39017ee96ca2a102860ab128cdef0b8189d78ddbd6432166e9881804f5c1ea97dd743d4d8b3d6380fd94e7521d6ea
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.4.1.ebuild b/dev-python/loguru/loguru-0.4.1.ebuild
deleted file mode 100644
index aed8f0048adf..000000000000
--- a/dev-python/loguru/loguru-0.4.1.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="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 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')
-	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
-"
-# filesystem buffering tests may fail
-# on tmpfs with 64k PAGESZ, but pass fine on ext4
-distutils_enable_tests pytest
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index d16dec186559..954e40378762 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,5 +1,3 @@
-DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
 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 453 BLAKE2B 3e8aed63afa6a6d5ff907130c5fd7002581a557bfda1f8cbd61adcba43ca0bfe2f92118114da74fed8eacc2938f6a0780ff4b3cd2a55a482105aa20ca7cc69eb SHA512 514f582ef0dc0a5e1ccd191b0d1aead348722339fd0144246f98fb18dd56bef41f79b61338748099de82b8e3f98d43dfba42aad1ffec11ee145eac57ce37879a
 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
deleted file mode 100644
index cb4b39ef72b8..000000000000
--- a/dev-python/logutils/logutils-0.3.3-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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 09f8a4fbc9de..fdd152f40dd0 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,4 +1,4 @@
 AUX loky-2.8.0-cloudpickle-1.5.patch 1892 BLAKE2B c7ffea0bb50617db74d081345642ceef7044d44bbed10088fba6403fe69811957c13557dfcb80ef986337311078b02e3a97f7294075c3641fe9404327ec0a164 SHA512 aff27910cbabebc1c99e8765b11da7552ed09e9a145c841e82213304c7e3a00b028009e882e3b22471441066922a4e67feabac4bf9575f820e46b28fc3c1680e
 DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
-EBUILD loky-2.8.0-r1.ebuild 785 BLAKE2B 4a96b47729bb985a67d882a880df82f528d23d3a7a55ca27d580322cb9fffb02b9fbc43d74a17d055ee99123d842293c17f65f1889103d99469430b90f5747ff SHA512 b61fd0a822b8b319706d0d444d2d3a2917a124b80bd1155b927193be439d71e6b24d4fdd6650bf19d5d6501fcc3afd261429439fac8d01d897ecc1efe76ceb11
+EBUILD loky-2.8.0-r1.ebuild 789 BLAKE2B 2196086bc9839bd5384cc1958c2c94d6f7b8efee8ed8f2a496ea8bf55fd5d3c539ea274fddc59b2bdf30a7b02c15e35b156e5ac8767d122957d59c5f2a8565f7 SHA512 9fae99a352bb990fa9f6485df8760339377a3848bf8d72f9ccb15c13256991257f106f50cad273c7a01422d2573ccbb5bdda2b1307d8be84efb47c21d3b40160
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/loky/loky-2.8.0-r1.ebuild b/dev-python/loky/loky-2.8.0-r1.ebuild
index ba05e5dcaaab..09a94d2bab7c 100644
--- a/dev-python/loky/loky-2.8.0-r1.ebuild
+++ b/dev-python/loky/loky-2.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index b31f93e8e14e..97644fa6ba6a 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,8 +1,8 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
-DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
 DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
-EBUILD lxml-4.5.0.ebuild 2288 BLAKE2B d0757aff6f274f389a9c2356077581583e740ef177136f0e18dda34a8835c6e003d5537462d9a33caed61fa4c5223bd618d767d004175e5fa7c3a9a1231b9a27 SHA512 bc668896bdf781245d9ffdb51e98e47a15a816e1abb188c519473f5c920f3630c1a6e9b72eb5c7bec232864cfd12b0d47f8876dc01f3a793271b4561f7981502
-EBUILD lxml-4.5.1.ebuild 2289 BLAKE2B 93c41c346ba66dece63e747c7db8232ac4d60bdb5ea473d19cbb6c0de6bcb725518757387829a8ebc9ad931c2b45efeeaf0cb5c4f6f97af58bf01dab499b8032 SHA512 66d3d913164f1a5818f05d9218c51247646d46aacef6b73107c300a492bfc65f313be62560bb10826c0a795dd3d9cbbdd85d98630e14bb4efb99ae6ce4b60fb5
+DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
+EBUILD lxml-4.5.1.ebuild 2280 BLAKE2B 45e69675c800525b39a9f26960569910900f15d27e30425f4dcb6a59724f6962df1bd56c7e887739d82001a9ff5ba0b10219f0df23bcd3de32654380ef43206f SHA512 17d0324fe06c46be955af96a82718ae04e5fff68cbfe0c8f127ee805d8ebcd0502b6b8a63b29a8d21fc557b7d56da4264e75efbfdbc02376429c6afc1b0564b3
+EBUILD lxml-4.5.2.ebuild 2246 BLAKE2B d0e4b6b6b93e90ac0683596c0a36658f85331ecfb8d325ebe639c494d10658da99aa755d86b959c5ed9bfacb7ea898d242f9943f75019467f87a881397c042ee SHA512 60e2fca65bfb547af1adfac7bfc4890cc0ed0e49e483033de81488e8a9a1db4f9792907cb27830cd6bb345c58fea1b7ed4971ef82e44e14fc4ff3dfdc128dea1
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.5.0.ebuild b/dev-python/lxml/lxml-4.5.0.ebuild
deleted file mode 100644
index d999936411b0..000000000000
--- a/dev-python/lxml/lxml-4.5.0.ebuild
+++ /dev/null
@@ -1,82 +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 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="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-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 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
-	dev-python/cython[${PYTHON_USEDEP}]
-	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
-	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.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.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
index 076c86886dde..3759600dec7c 100644
--- a/dev-python/lxml/lxml-4.5.1.ebuild
+++ b/dev-python/lxml/lxml-4.5.1.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 ~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.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
new file mode 100644
index 000000000000..29cf22e36c1a
--- /dev/null
+++ b/dev-python/lxml/lxml-4.5.2.ebuild
@@ -0,0 +1,81 @@
+# 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,9} pypy3 )
+
+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="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+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 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
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.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/lz4/Manifest b/dev-python/lz4/Manifest
index bb5a8315efa9..09d005e42939 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,9 +1,5 @@
 AUX lz4-3.0.2-test-fail-skip.patch 680 BLAKE2B bd222f948084901cabb7e09e525707d0bf5182de216e8705a362fd7b9abdf376e3ea1daf3457fee96bb377e93b16a33bd163b9aee93011824147efc81c7f8b9a SHA512 77651611e228b103bf68f643c67ee7505b293e17d3b29f47e4a385dea334c441e77a7494cf1f72dc8a4713e89ad37ffac465fc36fa2ee0c044f1f47c355ffe07
 AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a6a14dfa3d2f418820d3917a9107c66f4a8aaaa380cf749a9faf2cafb5265364a1955830d SHA512 7968adb54b414a8dc1ba9b3b8ba4f11695564239786cd37474122ce83f8976920206fec2b846eefcacdd307da6c9f6ac73ead87c78dfefab746540021f44964c
-DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
-DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
 DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
-EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
-EBUILD lz4-2.1.6.ebuild 555 BLAKE2B 54679ccbd1c32044f5e2cda84f8d637d6c67106e873821120c77100f969123d706888de95ca90f3a7df2a4e8e3bf5c6651cf7b4ae8d149fddff1f64835e2dd17 SHA512 4f2286c51a425cdc5df1f5e11dd842d0984c6ed83dc3f679ce44fbd496ea9fe4e46ba43023d867ad0753365a0ddcb26fe241312cad9ddc2e8b5b9e0bbfacbd96
-EBUILD lz4-3.0.2.ebuild 770 BLAKE2B 3e67f9f3c77e2c6db67ce630c9f16703dd2102f0f52af6bd432381d6fa5c23cae9d3360268e1b2a4eb967722b69b708c07686fa2316ff8eabdcadd579b6ce202 SHA512 db662b6f827e7d3570c34fb5c232eab6a3e10c32c62d3f04b924942d3a76450e1fbccab143cf58b38d28eacdafd093b8370da9f9d89bb2bc6d68b5b9a5c27249
+EBUILD lz4-3.0.2.ebuild 766 BLAKE2B 2bc7a58f0258bdcdb1bb333fc9c885f595f2b02b5ec382924c4da8f8137944ef44c848bae7525cacc22010c4974a169017c57082cd75b5a75c8d45b045a09fc1 SHA512 a631b522af0864fc55e1405ea21c6313e39533984b1c25409a946d294f070472dd3fe974412605d77db99f229cefd32ce8d9ef1af17e8214a3fb3187215d7b73
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
deleted file mode 100644
index 7803badb5b7c..000000000000
--- a/dev-python/lz4/lz4-0.8.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=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/steeve/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed \
-		-e '/nose/s:setup_requires:test_requires:g' \
-		-i setup.py || die
-	mkdir "${S}"/tests
-	cp "${FILESDIR}"/test.py "${S}"/tests
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || dies "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
deleted file mode 100644
index f46f16e05ed9..000000000000
--- a/dev-python/lz4/lz4-2.1.6.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="app-arch/lz4"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/lz4/lz4-3.0.2.ebuild b/dev-python/lz4/lz4-3.0.2.ebuild
index f46bebe41b22..f766f1f58c75 100644
--- a/dev-python/lz4/lz4-3.0.2.ebuild
+++ b/dev-python/lz4/lz4-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~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 3f0d0e9bcb12..60903265d7cc 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,7 @@
 AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f140cd3b26ad771e9c6819315388dc5ef6be26fb730018c1869bcc8d68c54a1e0c54b3ffa422c981597c7a3518a174c9a SHA512 bc13bda02e42937e1793c46dbcbdd0ba887d49360899cbecfc53f5580bbdb070cf76d6f986e146aac0cf6733edadec855cb64b1e25ec74212f82f90a425bfb7b
 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 1546 BLAKE2B 537defe2b77238728e33fafae8d8193f77438f9a1c670049367c8a81ea181a6d79591be3a0ad8c760f9c8f2d1913eb7f72a76e08d7527900559da3f0c0924a36 SHA512 eeea893fff1ce693a6d1bbfe753d9a01fe251c84f23f0e124475c9a969b821daff371fcacb7d30e2e9798ee3a93b98a4bbda05e92d6f01835a5fbf4abdfbe98a
-EBUILD m2crypto-0.35.2.ebuild 1442 BLAKE2B 50b59640d4d8dce2204df4a1d3ee41b064d7e0f85f01b04edbc64f40a871a969e1c55ab7b309d1de278c8aa86f7cd9bf794865ad0c006302857dad34d6333795 SHA512 d830c4d5e867f8eaeefd7d2cd7ed18ebc99fa35f48b7aa93b1242f10c4b25f9c682aeadfd6284f868851a9fa5fa308c299aae13fbef7fd62ca9b4fc5230af660
+DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
+EBUILD m2crypto-0.35.2.ebuild 1433 BLAKE2B 36599cd736a015dcd9a4b574fa127bc77e103c030830f19005135eb433f49bd57e0f7fbcbee5ea9a872415528415e1d3b81116de7dda18cf126036d0549a8491 SHA512 1138c7bad9f33994cea5f22d298f12c5f9f551f63851228e43137a85df125616421348cac4f375cbe7715e0e177c28fb34149f02df649d55f4c003a3174d6aa8
+EBUILD m2crypto-0.36.0.ebuild 1566 BLAKE2B 5e84731a51589c1bd70f6a40dbc75da2d6fc1c1937047db41477cda045f36abe19a1f5ee2e9a3d7445979a1a89f8bf7addc49960efc4a4b1136fa0c44a9dec24 SHA512 f1c7884557007c32ae2ab929565be7349a438725288dd2e33a2c4d6b59ce59e2a7957aec0d725a6b88e6d12eda2777a681fcb2823bedb7a450d4be394968a2af
 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
deleted file mode 100644
index fe82518cfdd5..000000000000
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ /dev/null
@@ -1,71 +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})
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-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"
-
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep '
-		dev-python/typing[${PYTHON_USEDEP}]
-	' -2)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-${PV}.patch"
-	"${FILESDIR}/${PN}-crossdev-${PV}.patch"
-)
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index de0dfcb82c44..cdf94b348b4f 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.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 ~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="
diff --git a/dev-python/m2crypto/m2crypto-0.36.0.ebuild b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
new file mode 100644
index 000000000000..243fa4672aed
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN="M2Crypto"
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+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"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	$(python_gen_cond_dep '
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
+)
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+src_prepare() {
+	# TODO
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 9d5da619617f..a47894a2f0fb 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -5,5 +5,5 @@ AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1414 BLAKE2B 3767158c460d5f80b2beca40a7341e35268bd66933fd96822d7fa73f339ef38cb68d62226387958bb74116bb185c15436af94a8cc27c8c6bc10a26d396892e35 SHA512 766b5c42697cef00e1b0e5f13f3ba67d40f8fe0ef8e3ebc6c5ddfa77ef0179667dcd69edb2951b8fe23e477a66faace30bf296227dd88a8c42dbc9a373ff5671
+EBUILD m2r-0.2.1.ebuild 1404 BLAKE2B 24127287875b1a0756b9c67847ea0d40528e9d2c56536c8c0fd5fa6788ac6dd9c7b007cb3682cbeb7134dbda52ba279a37e79513126716dd2075710041102b20 SHA512 bd1f9b40c0fe70d22fe33e7990c9c6cfdd8fed669283429b88555ddf5b397f7823b5172dba400f98a0ea6bd1bb5b3be7056a5205620e184cfefd5dc2d17105ec
 MISC metadata.xml 460 BLAKE2B fc2b57003045116830f1a25dd6cd1f6230a05e1fe14dc2bb7cfcd65c49b1b7d05e405007335a32bbfef95ab660ec5f0c476392f2ab516eb513add9da725abc87 SHA512 b32f1840054745c2985203c25baa12aeaafb2db1fff06f413ef95ad6e72ec7f5f78528db32f06d5b1f600c76f38d13b6ee541c77a2c6e36ba726174375782b26
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index 524fde1d1afb..a0723dd76814 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index a82afee15129..9d5bb6155f52 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,4 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
-DIST Mako-1.1.2.tar.gz 469385 BLAKE2B 45c2f162a788c649f00938f9f9cb7a31f89ad92e0bb72a41d71287553d3f30d80394ca54002f669db0763b54570126c01400c7d08e04d79b0a002a2f45e698e7 SHA512 73b7a32ceb6e39dc2491734546c83a752bf0c8bc7546bb236801c02a5bccc5b59f2440333a328ff747eee936612dd12279f08d27d76f065fd589081d232692a8
 DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
-EBUILD mako-1.1.2.ebuild 1192 BLAKE2B 72d4456b5161cd6c67b770d5f5d94141b9243a8d138fab8deaae51c161ea60cb24ea1e687efa9d9d76f8dd585ee1956de253c3b844d22d82a1380b36e6eaf0f2 SHA512 e167baa394a710fc492ee267b1b3ef4350cfd882da1bea316cd657f122766fc2690fce2b13ab39946e2e5e071dcc7856694b0c0e835ac69ac08097d9a1030669
-EBUILD mako-1.1.3.ebuild 1201 BLAKE2B dc402be2671be270db3d1414fe930ae5413ba2608118fb3b3998e0c637958d6dc83eed0592abc4e848f4c30880f3fab0f6357e16e8a5e52687c55b73807c9c62 SHA512 6341d0e92111ca82b3fe8f3f37e40ec71da01250915838e06fd9d2e78aa03b12566ba27ef8a2ff6be4aadf7f4a21ecadb09eda6e0fd1302d51db233aed9647fb
+EBUILD mako-1.1.3.ebuild 1192 BLAKE2B 72d4456b5161cd6c67b770d5f5d94141b9243a8d138fab8deaae51c161ea60cb24ea1e687efa9d9d76f8dd585ee1956de253c3b844d22d82a1380b36e6eaf0f2 SHA512 e167baa394a710fc492ee267b1b3ef4350cfd882da1bea316cd657f122766fc2690fce2b13ab39946e2e5e071dcc7856694b0c0e835ac69ac08097d9a1030669
 MISC metadata.xml 464 BLAKE2B aa08f15bb15d98ba21a42c4cddab014f83b701ada29a2e8f9e445e4055885da957d2029189c895630d914ae0de040a47fc6e088a04c2a33fd47b92d1e564776a SHA512 dbd099adfc1137934764551e38ae97b9a5a32473f86402375e70fb638131e748392f7e0a3397ee7850de3142fb840160269f24be53ab4f532490869397952279
diff --git a/dev-python/mako/mako-1.1.2.ebuild b/dev-python/mako/mako-1.1.2.ebuild
deleted file mode 100644
index 5f82325b04d1..000000000000
--- a/dev-python/mako/mako-1.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
-
-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/mako-1.1.3.ebuild b/dev-python/mako/mako-1.1.3.ebuild
index 41ee455ad58f..5f82325b04d1 100644
--- a/dev-python/mako/mako-1.1.3.ebuild
+++ b/dev-python/mako/mako-1.1.3.ebuild
@@ -16,7 +16,7 @@ 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"
+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/mamba/Manifest b/dev-python/mamba/Manifest
index c9cdf59a13b3..66a35ef7e357 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,5 +1,3 @@
 DIST mamba-0.11.0.tar.gz 33598 BLAKE2B c52ccbf1fca5dd6f27b4515fa6db65a8a28537e705d734bb126bdc9a4bd4afb5119aabc212f871508f91c21679e7e2215d0c7f13adfaabdf6ea49c942b7b3d64 SHA512 2faf941700800ba0432bfd170d6ff2278e5fc3ba4e85f486d33ed5f07e148284d400e2b02ac0f957a27d47b705fc52b042dc4311bdd175907e307e4dbfa95246
-DIST mamba-0.8.6.gh.tar.gz 15428 BLAKE2B d1c13d2e7b5bd4b18c497e1b1df21c19dfdc19b235c796e8277e96a95b787df56466661b995bcd424e550a2f139e7ff8b5d75e72cabde3af1593edb36321f9f5 SHA512 1ac59c7df23ec5d2abe5123756c438c282be668f615a8737f35478ab314cde8ffde2b02ef78ead1946b9c467362b825f73e0ba7f441ab44a1fd116db9b7f2750
 EBUILD mamba-0.11.0.ebuild 985 BLAKE2B 7511d4c66ee08b4c98d41d643d357555fef8f976affa9adc6edc027514fe3bf232379381a713346246cec305ade97929c4826aaaaf2d8cae8f05fc7aa6a6e088 SHA512 3726358cc420f008cb682d4d89207d1af605f8fb7998240b228dda5a34215f8fb4cc464cd8dfdfe3206a03bb563322856925a34fbd06b41c0849fbdb2b8d8590
-EBUILD mamba-0.8.6-r1.ebuild 917 BLAKE2B 84d077583450081e42796de95ff868cc0efdca189f7a2b05bdf52b0a1be05a731f12deacc49cfcb59c2cf7bfc8fedd04be815fc27f6b49ebc7289efbcde2b3f4 SHA512 456d68087911b09109d3ba6916d77d2d75646e6d4b2ff1b1bb35f9e80208c2babe30e1ab98d1e24d10192f76984331b38bd35fae5273ad957644db4f664d7ee9
 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
deleted file mode 100644
index a014801ac041..000000000000
--- a/dev-python/mamba/mamba-0.8.6-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=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="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.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/markdown/Manifest b/dev-python/markdown/Manifest
index 3361430a307c..7372546fae5b 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,9 +1,7 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
-DIST Markdown-3.2.1.tar.gz 297048 BLAKE2B b7f72cb856f0986e0e3920bd7d7eb65790312ef9f270ba3cfa679786b921d1c4ce0a86d591d7d748254c11e9c86d9883130efbc0c2d6a26d94b1fe3d9622aeb9 SHA512 5616c77004e4e8f2eb3b1276526ba131891be6edc7371b412a4050bbd59904220e48986d556bb9bb0b9e8acadfcde7828b609d165f68b6aad7bb90a221f80480
 DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c
 EBUILD markdown-2.6.11.ebuild 1345 BLAKE2B 2cfd63d4168a44df5ddc9845e0c785930f46334b1d9d32b4387b80a8ba8e1f9eb79c757ce4beb065179dc39c73d2bbee59fda07a010d201b34645acfa6b70235 SHA512 6b176ffda719576552b071fc2eccdd6a6b2cfbdfb51fdf0ee19e4807569587b7063415b15fcb98ae506b03f9ca96b192db2379f42a7c1bd58e2f27bbcfff805b
 EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 60d5ba2d6c2b2686b3c83295ff1f7065dd9992778595adfeb3c2ee38a4d1a74d488756e8e4ceffa96ba37893e2dd233720f0d0bef3b49ed5b357a5262af3923e SHA512 16fd37690ea6fab8ae54ec8db11aa517d541620f20cf89c51a6027bc07fad8990a05a4741fff40b72f45e83fa564aab327b16b60a0a5739dffbec29efe054bab
-EBUILD markdown-3.2.1.ebuild 897 BLAKE2B 70da13b9a271b2dba5887e73bd79fdb73c78f1e25993b43665e714f5ff74fe15a7e12895af864af4ccd8316dbb6fafe58e0ab72d36c0404bfb0cf7cfc7c12368 SHA512 1ab68f71756464b0fd724fffb56140f783017060d1415b2da1ebc44564252a4235bfdfd484096f0e7d01420eaf25f38262b9e9aa8c5e205a233296c2f15eda00
-EBUILD markdown-3.2.2.ebuild 1016 BLAKE2B 86dd6a862379ca20e1066700ccd3eb4ce9f88744b32da59552126d074bc77085c482f494b7e275f3c82a15f14ae3077468a9b856b25b96a76d104e56fd85a30e SHA512 db801769aa22afe3833626e0f0ab730c917ab28ce5c858932988983cdeb2bbb59beb8190d5598e839cd1db12d2643f7fdbc67016fb3ec68c79c7f198ac6b3660
+EBUILD markdown-3.2.2.ebuild 1087 BLAKE2B 7058888df12ed02a3cf894c4dd0814b593a407c55ad24229f77d2554bfe252edfea06c6187063b933686d775a3272967778daca0219e5bb72ef2ef1ae01f102c SHA512 79cb2516a15f66614366d0c9246aa2968aa7457e51c2ad85f1907462c2c8cd1c2902729a37a2b64da7bb8d04ac2eef9f41ba17f9dc3cfd11c1ae16d76465c4b1
 MISC metadata.xml 490 BLAKE2B ed40aad7c21b46bb6e3395f5a2fd019256a6a47f587eb2a37c42ce1d4407bae188b581ce20be2f2f01f1d4003d2a76aa44ffd516b0d6bbf08010d7d3d9ad02b6 SHA512 4a93ed6bce680acd807a2ee9bed7a3dd999014681ce7d5e5ce95025b6fc5e078716057ef25edfa7f4656a3feb8e92041aa99f52e62e04b034c7a493ee26d7b97
diff --git a/dev-python/markdown/markdown-3.2.1.ebuild b/dev-python/markdown/markdown-3.2.1.ebuild
deleted file mode 100644
index 83427e2277da..000000000000
--- a/dev-python/markdown/markdown-3.2.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} 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"
-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"
-IUSE="doc"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.2.2.ebuild b/dev-python/markdown/markdown-3.2.2.ebuild
index dfc0217a35aa..10513178f132 100644
--- a/dev-python/markdown/markdown-3.2.2.ebuild
+++ b/dev-python/markdown/markdown-3.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,9 +18,10 @@ 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"
 
+# importlib_metadata is only necessary for <python:3.8 according to setup.py
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 50eb500119d3..87c1bdd5659b 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,3 +1,3 @@
 DIST markdown2-2.3.9.tar.gz 101067 BLAKE2B 4b1ba9e90e2cd370edaff4d61bec9182ca30952351274c4aa508e2e3573a79bac7ab70a1d29d279eb2a94da56a823222a9413b0f3f871f3bd2dfb2ed60621158 SHA512 1be193b27efff9bd084da94cf4121fc91cffda57165333ac644a4ad31b33da62bcda1df0fdb450a02421c0199484de5d6b65131a0afe2dd941c52a3f81bb218d
-EBUILD markdown2-2.3.9.ebuild 638 BLAKE2B dc37eb35566e4c1657a06fe3ec698188bf27668a63bbd59fa829714a2d533eb9194107070932daef84439996add5ed3efbf6e0badb33d8da2ae8efad8799351c SHA512 4683b0218df4bdf3333a06f5c37763a7e422535c51f428d1aafb00d3fb1311d294e570bc8a26480872e0f27822038c162e226607f23d6a97e5873d80557a4d10
+EBUILD markdown2-2.3.9.ebuild 650 BLAKE2B 320d5f405a1ad5c9771e5ec3388f0a457e9c7c4df65c72540bc2c2131996081a308c9b4f359096afb27e60ec7663b38afbc75f74fedc9a5e50c019bba9df65ac SHA512 0d7499456d65f1fc0e185fd7411f7efec526c427076aca6c410664879d9a16e09a9a5fb6c68ebba3b834bdf3b8071f3a0d73121717f706cebe32ed746fa6c63d
 MISC metadata.xml 641 BLAKE2B f1c0e61b9c9e1229be9dbc2d913af9398d8ed41dc69afa0d46dcbc3c74aa583eedea6e1c8132de436b10b288f76a9657e3c74f7e546d357bba817e38b01606f6 SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7
diff --git a/dev-python/markdown2/markdown2-2.3.9.ebuild b/dev-python/markdown2/markdown2-2.3.9.ebuild
index 34140e887c9c..a99a9aeef32d 100644
--- a/dev-python/markdown2/markdown2-2.3.9.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 62165c1b9722..d9e0d91adb09 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,4 @@
 DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
+EBUILD markups-3.0.0-r1.ebuild 871 BLAKE2B 44404c136dc9b2bb9ecdc1fa6974f6dc09628100d778178da2ecf7febb5bb3c5a40e7c7787185dba71dd03fd6b3f28e2683dc989cbfb2d5b55589331a00f7e5c SHA512 754c3a6927d56e7e04de1d7af646d640809b9be5e3254af4a2cca5287f69b2712ea8f6996abff2e6a9c64ef559c7bdc65535fe70523fa5f6f88541e783cce588
 EBUILD markups-3.0.0.ebuild 796 BLAKE2B 3319db8fdba0f385bc3522fe3059e6e33e50525bccd6589b904057c8c5754a4d202666a4317e6f498df2c566a055996f36f11738fd2d5c0e69dc62747747ac4a SHA512 f0a29debc1bd4ce4f076d77f97f39254b5c5aa734db45c8fd078bccd19ddbc52a9a375ed4beed4aaae8e27ce77736623e2110814c404dadbcdd4cf0907b01322
 MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
diff --git a/dev-python/markups/markups-3.0.0-r1.ebuild b/dev-python/markups/markups-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..49bfc95f270e
--- /dev/null
+++ b/dev-python/markups/markups-3.0.0-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=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=${P^}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	https://pymarkups.readthedocs.io/en/latest/
+	https://github.com/retext-project/pymarkups
+	https://pypi.org/project/Markups/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		app-text/pytextile[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index f19a47e6e911..bb9c06099928 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,3 +1,3 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-EBUILD markupsafe-1.1.1.ebuild 649 BLAKE2B c99f38808ecea2ca5c66b385791fbe46bce6631795dbd2ffe0dce116e3da921a8a999cef9997da80a44d2361963810521f2e2557cb06f6ed70fa523ccbeb8ba1 SHA512 9044a2fd15861c8aeb9d9b09c1bb1d875a06850bf34e107ccb005a3795c7b1ccc59cd0c1ca865dfa6d95eb75b9495f33e94419ca7f971f11d60d7e1339a929d8
+EBUILD markupsafe-1.1.1.ebuild 656 BLAKE2B 636ba05d17a60365c79a175990395ec1cebdb1067a6a327befa4aaa51a5ca69691a0207e37444d4c3d356ad7edb4b0eecd8a04eb828e4d8d95567114f04858be SHA512 dc3921476d157926ee51b3f3c61b58795643d69204a8aefc34b61ec46712b170b5c96c673cbfb80f4324d80f61296ccb210f055eaaee09f86e4826e3ffd2c31d
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
index d1b297581d9c..40bad5b4a181 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 0a415c8e246a..d2a460197883 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,7 +1,3 @@
-DIST marshmallow-2.20.5.tar.gz 152733 BLAKE2B ba509624e3715ace53eeb1a835f533172d676b3645ae3226c6da3727dafef7084bde896f3a66459112d599e3e422d600d150934313b813fea9d819658ce3b4bf SHA512 a02b6a3341d2cd08174937112eba2f69a07de59054a088eef64ac12703699e2b6f561ce76ebc0cb43334056f02f3898098bb0d3501ae8a1b6350f9a168eb3355
-DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
 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.5.ebuild b/dev-python/marshmallow/marshmallow-2.20.5.ebuild
deleted file mode 100644
index 55c90417ff2a..000000000000
--- a/dev-python/marshmallow/marshmallow-2.20.5.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.0.1.ebuild b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
deleted file mode 100644
index 0310d0cfc11e..000000000000
--- a/dev-python/marshmallow/marshmallow-3.0.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,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() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
index 0c82e8b96f98..2977c77fc6be 100644
--- a/dev-python/matplotlib-python2/Manifest
+++ b/dev-python/matplotlib-python2/Manifest
@@ -1,4 +1,4 @@
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
 DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5-r1.ebuild 5004 BLAKE2B 7cbf086980178195a9d438a8678840d0184a5c8e54eb157d13eb8a0381d40d4b46386992bed8497655ce179e38bad5a14fbd132ec4b451a3c1383205b24a9185 SHA512 e9ba1067a0eaf7fc170e8b861b2b84964d5eecb2acb7397ef568ddec659f4a91acfc4c074938dcede3df165e008c1a4b7f86445a8dbd2400b82bb681102a402b
+EBUILD matplotlib-python2-2.2.5-r2.ebuild 4950 BLAKE2B 7565efdc034c6814289e90376321a20f8069de7c7be2f2ab7a4e52a96ba077571f9b2689d9f7878366c446968c47423f3570bd2e7b7b0128ef3da39d5a3e0810 SHA512 c4080465961e67dd52a013186954928a2f6e32acd78b0fda02772a844b9b9acfd281523f66ac397e07d4b21ec77bd98d7e38847b17e6a0c06039ca368b3d817d
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
deleted file mode 100644
index 203da895b9af..000000000000
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-MY_PN=${PN/-python2}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pure python plotting library with matlab like syntax (py2 version)"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
-REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
-
-RESTRICT="!test? ( test )"
-
-# #456704 -- a lot of py2-only deps
-COMMON_DEPEND="
-	dev-python/functools32[${PYTHON_USEDEP}]
-	dev-python/subprocess32[${PYTHON_USEDEP}]
-	dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-	dev-python/cycler[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	)
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/matplotlib-3
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${MY_PN}-2.2.4-doc-fix.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-		gtk = False
-		gtkagg = False
-		$(use_setup wxwidgets wx)
-	EOF
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
new file mode 100644
index 000000000000..4d925d88348f
--- /dev/null
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Pure python plotting library with matlab like syntax (py2 version)"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="cairo excel gtk3 latex test tk wxwidgets"
+REQUIRED_USE="test? ( cairo gtk3 latex tk wxwidgets )"
+
+RESTRICT="!test? ( test )"
+
+# #456704 -- a lot of py2-only deps
+COMMON_DEPEND="
+	dev-python/functools32[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PYTHON_USEDEP}]
+	dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	dev-python/cycler[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	)
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/matplotlib-3
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-2.2.4-doc-fix.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		qt5 = False
+		qt5agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+		gtk = False
+		gtkagg = False
+		$(use_setup wxwidgets wx)
+	EOF
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ee37954791ef..47d80a8f7c18 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,19 +1,11 @@
-AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
-AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
-AUX matplotlib-3.1.2-no-jqueryui-download.patch 544 BLAKE2B aa5e55ec734f3847579864d2d9133da9b4d483ce91b9418dd275ced1f7367e7ceee728f0f4a271743e50b554980005871982bfabd523d8b20d0bdb0f2966d3f8 SHA512 a5900df8735bc6956ce9ea79334d4eb22f8029b9c025e81ead16d41fb061fb94dfcd8d2e773b70bbb8912469b18e18ec194f5bfce0ec668a5be423f1b9de0d7b
 AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
-AUX matplotlib-3.2.1-test.patch 17670 BLAKE2B 7cd7b29ee7025fcdd21496ab0327ba3b78f608a32bac17a0cbdc720da0911cb9e3f2e16097a2e473c11841fe80ca5ebc94f312b54a6dcc27bacb1a2ebd384011 SHA512 113decad09a49c7f4dbd57deb49bf0e22f46f8953a86908bba936ae414254930755861db7e56242c8759e08637ece7d8821c27542a0503747caf3947eda41e93
 AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c
+AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928beeaddb22be236a17244f289c9032564d3bb1e2e5bd63f6017e51d71008efbd8c86ccc96eed0d30abc50537563720271 SHA512 445076feec916e508a3673babacbf8a8372a6f05c3d067eb77584c4352387d1bc3b1dc6c76beb18549df4601b50943d271c8db510f30748dbcdfc56727030b41
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
-DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
-DIST matplotlib-3.1.2.tar.gz 40909582 BLAKE2B 670907670335ca13ec01f3acf036fd502ce34abd12666b2e0d10867c6115a0fe80039326cee89099471aa6b3bbd25f1ca4aa837072dea624ee41984da9f647be SHA512 2eff3c0525d01824ed758a87f50a3f6094767b580fca1eae4e9dbc2cc972af3d0cc3ac9615e576c5685e8bfc1ec90754bc826635f4f2a919d0b26bbb686cccab
-DIST matplotlib-3.2.1.tar.gz 40325615 BLAKE2B 7fd299f7d3948987e341e4313ed82d15de286a05c9819893e099ccd6c1f861ce5548ec85588a382603011e7710d08d6fc9a4f168f0b5705b0873b97e40d2dd39 SHA512 d6497a3c47eaff9c0d981bc03de5894a3f4a5413cbe320924b1df6d68eb421e548cf4247c035fd636a4403cd2d50071633e6906e795b74ec7d9c4816193e42be
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
-EBUILD matplotlib-2.2.2-r1.ebuild 6227 BLAKE2B 32c5311bd4ee746cb0a6df097c9a2a2b34725031cbfcde1273b22929b20cf197597502be6722923ccade763e8a690dde0683f50fdaff313465b4bbfd6f5a52de SHA512 dc4c2387720aff34780d625022ee0a0f5806e4313e27cf1885450e6b2564f923d5a73b99534721c455d777bea2d43637a5b61d45b028aa5a22ee2ef2e5642b48
-EBUILD matplotlib-2.2.4.ebuild 6299 BLAKE2B a4513d93def3dd7fe01ef4e237a1ffa7e5e1d49ebb4a4fa04c4de14d02ac28bcb2017102d44002bfe4e0cdbca8e8a8563b862fafe3d06e01de4ac58d6c154619 SHA512 bd4a7941b7807552078f05c7bcce15dc18e8df1e93291c598a5d96d25a901556c69d31a7130406b7192903e5b1f81eca001af23675a03369c5fc42cfaa2110f1
-EBUILD matplotlib-3.1.2.ebuild 5647 BLAKE2B 7d6344c94f05cd4006a636fdf19dd68752c35459b01c85ee4bc8eea4a93851ac330491b9aae63c4b8c698ac7e329f579966d294143c9398058a154fc5ae9738d SHA512 3b9d297aa36cc0438d4f17e5fbee9d4a78525787cd19c3eb1a8ca1c3bf486ed899a0a427efbc11df40da3ea36de6bc149d51977aee04074be5d00b6ad144865a
-EBUILD matplotlib-3.2.1.ebuild 6534 BLAKE2B c537979c12904c6dc88f491b9e4266f1a23b26a044a00f9348c683c03afd2f6b9f6ce791b3b221772c267faef400c683dd6995b3ad42f90593797e1a311a7623 SHA512 c4d946e95769e97e40619cf6044edf27dd5a043bf2fd1cfc6b564b72d7f3eae380f426753687ee53fd545860c67cdf285d2c09698994803501908f6076a97eab
-EBUILD matplotlib-3.2.2.ebuild 6534 BLAKE2B 2b44325bbf66b1915654a045b0a1c539de9af2ac594b83b0fb2db139a59bf73d50f3e4fcfcf14e531821d4fd3b7e81d70bef94d13c7665c84e2231d097bed469 SHA512 b508b08c9843e6ffed20346363fbfb09bee7b88887160f9392dbcc12b3b4c8ad59232496cfec9a8f2b08fe0eba2f641317b34b04bf6be48fb376004aab7e0a95
+DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
+DIST matplotlib-3.3.1.tar.gz 38780756 BLAKE2B b67388408da5ca6c36333705f0c19db6a1dc815819f01a5b0a7fe4ebd990f3e0df8def90971494e308ba8731f305db80dbe367f64c4fbf1294fd0f884cbb2d64 SHA512 cb3c61b7c96dde226f978980ebc960edc1329655efdeb974c8b6d8fd0cd3b660a8dfa3c98c1b140128b2ba13b134c81b000f6e87fa049d77512c81b1138b2b35
+EBUILD matplotlib-3.2.2-r1.ebuild 6529 BLAKE2B bd5d59fa18590dfa91a7ee9ec6c675489a4bd62ef9f4fbbca126854b148a5cfa453cf77bb68ba32058b69966fc36bc69c05929186a5510c2af48cb45b60617e3 SHA512 ce34651998a057438c85ed198dc0ac3bd461b789ce8a931020405c4a8456fd03f4b316fecb2ed53538ce70da3b3dbdca8ca67505b18b6341ba18fdb60a64ec42
+EBUILD matplotlib-3.3.0.ebuild 6652 BLAKE2B 617db8e27e957d351479da54926834320179f1d490cb55c91eaf5834607c6a69cd1b75f6db99cc5dbe77d45a1174d3a4157090ea4ae12268bc494dff401687e6 SHA512 d2f62cb2ce8a05963f4117623dcec047219210f8de9d81778cf990f3dcfa12046645f3b275bd53295a78641ca3f51ba84f6e81dfe9a799a69acea4db4a89377b
+EBUILD matplotlib-3.3.1-r1.ebuild 6719 BLAKE2B 31acd9a95a4f146040dddc8ad70821108c4ba6c0dcd356c786f741cbd7916e52023d2118fee68977ba5b4db1f66059755d40f2d7d3d6b3d29e938bed1eb8105d SHA512 5e70f4386a5371dc4e5543e5e43d2c0ad86dc35db6ea408dbf5d891fc6f51776b5ba8c9b40694b9650424a15d736b2de98dbf4e425f56e14ff6d1266e5a97b34
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch
deleted file mode 100644
index 7ca0c6974234..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
---- matplotlib-2.1.2.orig/doc/conf.py	2018-01-19 11:07:49.000000000 +0700
-+++ matplotlib-2.1.2/doc/conf.py	2018-01-21 20:06:44.120901546 +0700
-@@ -136,5 +136,5 @@
- }
- 
--plot_gallery = 'True'
-+plot_gallery = True
- 
- # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch b/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch
deleted file mode 100644
index b6a01b097a61..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/doc/conf.py b/doc/conf.py
-index 017ce210e..5a397082b 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -170,10 +170,10 @@ source_encoding = "utf-8"
- master_doc = 'contents'
- 
- # General substitutions.
--from matplotlib.compat.subprocess import check_output
--SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
-+#from matplotlib.compat.subprocess import check_output
-+#SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
- 
--html_context = {'sha': SHA}
-+#html_context = {'sha': SHA}
- 
- project = 'Matplotlib'
- copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch b/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch
deleted file mode 100644
index 9d13adb8ab53..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 41037e95d..6a438fa99 100644
---- a/setup.py
-+++ b/setup.py
-@@ -178,9 +178,10 @@ class sdist_with_jquery(_orgin_sdist):
- class install_lib_with_jquery(InstallLibCommand):
-     def run(self):
-         InstallLibCommand.run(self)
--        _download_jquery_to(
--            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
--
-+        # Avoid downloading jquery ui during emerge: we already have it in
-+        # pypi's tarball. use this!
-+        name = "matplotlib/backends/web_backend/jquery-ui-1.12.1"
-+        os.rename(os.path.join('lib', name), os.path.join(self.install_dir, name))
- 
- class develop_with_jquery(DevelopCommand):
-     def run(self):
diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch
deleted file mode 100644
index 145f321039b9..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: matplotlib-3.1.2/setup.py
-===================================================================
---- matplotlib-3.1.2.orig/setup.py
-+++ matplotlib-3.1.2/setup.py
-@@ -125,7 +125,9 @@ cmdclass['build_ext'] = BuildExtraLibrar
- 
- 
- def _download_jquery_to(dest):
--    if os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
-+    # Avoid downloading jquery ui during emerge: we already have it in
-+    # pypi's tarball. use this!
-+    if True:
-         return
- 
-     # If we are installing from an sdist, use the already downloaded jquery-ui
diff --git a/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
deleted file mode 100644
index 281f15405c9b..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From 36e8d90d8065aa5fd1cd83554e6d2e7d031e5b3d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 7 Jun 2020 20:02:48 +0200
-Subject: [PATCH 1/2] Increase image comparison limits
-
-Most of the tests require exact match which apparently doesn't always
-happen in non-pristine environments.  Some of them have very big
-differences due to texlive font rendering changes.
----
- lib/matplotlib/tests/test_arrow_patches.py                 | 4 ++--
- lib/matplotlib/tests/test_axes.py                          | 2 +-
- lib/matplotlib/tests/test_backend_pgf.py                   | 7 ++++---
- lib/matplotlib/tests/test_figure.py                        | 2 +-
- lib/matplotlib/tests/test_legend.py                        | 6 +++---
- lib/matplotlib/tests/test_pickle.py                        | 2 +-
- lib/matplotlib/tests/test_units.py                         | 4 ++--
- lib/matplotlib/tests/test_usetex.py                        | 2 +-
- lib/mpl_toolkits/tests/test_axes_grid1.py                  | 2 +-
- .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
- 10 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index a9409e2c1..0e356e921 100644
---- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015),
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol={'aarch64': 0.02}.get(platform.machine(), 0.018),
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 93548b279..9910e63c3 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -3653,7 +3653,7 @@ def test_vertex_markers():
- 
- 
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015))
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index 7843b4101..ddb2991c1 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -97,7 +97,8 @@ def test_xelatex():
- # test compiling a figure to pdf with pdflatex
- @needs_pdflatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_pdflatex.pdf'], style='default')
-+@image_comparison(['pgf_pdflatex.pdf'], style='default',
-+                  tol=11.669)
- def test_pdflatex():
-     if os.environ.get('APPVEYOR', False):
-         pytest.xfail("pdflatex test does not work on appveyor due to missing "
-@@ -133,7 +134,7 @@ def test_rcupdate():
-                 'pgf.preamble': ['\\usepackage[utf8x]{inputenc}',
-                                  '\\usepackage[T1]{fontenc}',
-                                  '\\usepackage{sfmath}']}]
--    tol = [6, 0]
-+    tol = [6, 14]
-     for i, rc_set in enumerate(rc_sets):
-         with mpl.rc_context(rc_set):
-             create_figure()
-@@ -161,7 +162,7 @@ def test_pathclip():
- @needs_xelatex
- @pytest.mark.backend('pgf')
- @image_comparison(['pgf_mixedmode.pdf'], style='default',
--                  tol={'aarch64': 1.086}.get(platform.machine(), 0.0))
-+                  tol=1.086)
- def test_mixedmode():
-     rc_xelatex = {'font.family': 'serif',
-                   'pgf.rcfonts': False}
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index a9e8dfade..7e33bcb3b 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -14,7 +14,7 @@ import pytest
- 
- 
- @image_comparison(['figure_align_labels'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_align_labels():
-     # Check the figure.align_labels() command
-     fig = plt.figure(tight_layout=True)
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 71499da44..a8bda6e84 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -106,7 +106,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(['rgba_alpha.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_alpha_rgba():
-     import matplotlib.pyplot as plt
- 
-@@ -117,7 +117,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(['rcparam_alpha.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_alpha_rcparam():
-     import matplotlib.pyplot as plt
- 
-@@ -145,7 +145,7 @@ def test_fancy():
- 
- 
- @image_comparison(['framealpha'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
-index 0fad3cdf2..4d2599607 100644
---- a/lib/matplotlib/tests/test_pickle.py
-+++ b/lib/matplotlib/tests/test_pickle.py
-@@ -41,7 +41,7 @@ def test_simple():
- 
- 
- @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
--                  tol={'aarch64': 0.082}.get(platform.machine(), 0.0))
-+                  tol=0.082)
- def test_complete():
-     fig = plt.figure('Figure with a label?', figsize=(10, 6))
- 
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index f14425144..7f744da47 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -74,7 +74,7 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol={'aarch64': 0.02}.get(platform.machine(), 0.002))
- def test_numpy_facade(quantity_converter):
-     # use former defaults to match existing baseline image
-     plt.rcParams['axes.formatter.limits'] = -7, 7
-@@ -101,7 +101,7 @@ def test_numpy_facade(quantity_converter):
- 
- # Tests gh-8908
- @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
-diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
-index 8d8cf29d0..4cdfe1aaf 100644
---- a/lib/matplotlib/tests/test_usetex.py
-+++ b/lib/matplotlib/tests/test_usetex.py
-@@ -16,7 +16,7 @@ def usetex():
- 
- @image_comparison(baseline_images=['test_usetex'],
-                   extensions=['pdf', 'png'],
--                  tol={'aarch64': 2.868}.get(platform.machine(), 0.3))
-+                  tol=3)
- def test_usetex():
-     fig = plt.figure()
-     ax = fig.add_subplot(111)
-diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 9ed9a9280..56a3bd14a 100644
---- a/lib/mpl_toolkits/tests/test_axes_grid1.py
-+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
-@@ -343,7 +343,7 @@ def test_zooming_with_inverted_axes():
- 
- 
- @image_comparison(['anchored_direction_arrows.png'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_anchored_direction_arrows():
-     fig, ax = plt.subplots()
-     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index 611908063..dc294aef5 100644
---- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
- 
- 
- @image_comparison(['custom_transform.png'], style='default',
--                  tol={'aarch64': 0.034}.get(platform.machine(), 0.03))
-+                  tol=0.034)
- def test_custom_transform():
-     class MyTransform(Transform):
-         input_dims = 2
--- 
-2.27.0
-
-From c1d6cce894de12bd32095c73d15d4f4f6ff5f2bb Mon Sep 17 00:00:00 2001
-From: Antony Lee <anntzer.lee@gmail.com>
-Date: Tue, 10 Dec 2019 11:18:24 +0100
-Subject: [PATCH 2/2] Rewrite test_cycles to avoid image comparison tests.
-
-They can all be reasonably written by checking the artist properties.
----
- .../test_cycles/color_cycle_basic.png         | Bin 33044 -> 0 bytes
- .../test_cycles/fill_cycle_basic.png          | Bin 70692 -> 0 bytes
- .../test_cycles/fill_cycle_ignore.png         | Bin 65439 -> 0 bytes
- .../test_cycles/lineprop_cycle_basic.png      | Bin 41852 -> 0 bytes
- .../test_cycles/marker_cycle.png              | Bin 44979 -> 0 bytes
- .../test_cycles/property_collision_fill.png   | Bin 24923 -> 0 bytes
- .../test_cycles/property_collision_plot.png   | Bin 37723 -> 0 bytes
- lib/matplotlib/tests/test_cycles.py           | 141 +++++++-----------
- 8 files changed, 51 insertions(+), 90 deletions(-)
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_basic.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_ignore.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/lineprop_cycle_basic.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/marker_cycle.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_fill.png
- delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_plot.png
-
-diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
-index ee67b4e41..a340b6166 100644
---- a/lib/matplotlib/tests/test_cycles.py
-+++ b/lib/matplotlib/tests/test_cycles.py
-@@ -1,6 +1,4 @@
--import platform
--
--from matplotlib.testing.decorators import image_comparison
-+import matplotlib as mpl
- import matplotlib.pyplot as plt
- import numpy as np
- import pytest
-@@ -8,133 +6,96 @@ import pytest
- from cycler import cycler
- 
- 
--@image_comparison(['color_cycle_basic.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
- def test_colorcycle_basic():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
--    xs = np.arange(10)
--    ys = 0.25 * xs + 2
--    ax.plot(xs, ys, label='red', lw=4)
--    ys = 0.45 * xs + 3
--    ax.plot(xs, ys, label='green', lw=4)
--    ys = 0.65 * xs + 4
--    ax.plot(xs, ys, label='yellow', lw=4)
--    ys = 0.85 * xs + 5
--    ax.plot(xs, ys, label='red2', lw=4)
--    ax.legend(loc='upper left')
--
--
--@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+    for _ in range(4):
-+        ax.plot(range(10), range(10))
-+    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
-+
-+
- def test_marker_cycle():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
-                       cycler('marker', ['.', '*', 'x']))
--    xs = np.arange(10)
--    ys = 0.25 * xs + 2
--    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
--    ys = 0.45 * xs + 3
--    ax.plot(xs, ys, label='green star', lw=4, ms=16)
--    ys = 0.65 * xs + 4
--    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
--    ys = 0.85 * xs + 5
--    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
--    ax.legend(loc='upper left')
-+    for _ in range(4):
-+        ax.plot(range(10), range(10))
-+    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
-+    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
- 
-+
-+def test_marker_cycle_kwargs_arrays_iterators():
-     fig, ax = plt.subplots()
--    # Test keyword arguments, numpy arrays, and generic iterators
-     ax.set_prop_cycle(c=np.array(['r', 'g', 'y']),
-                       marker=iter(['.', '*', 'x']))
--    xs = np.arange(10)
--    ys = 0.25 * xs + 2
--    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
--    ys = 0.45 * xs + 3
--    ax.plot(xs, ys, label='green star', lw=4, ms=16)
--    ys = 0.65 * xs + 4
--    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
--    ys = 0.85 * xs + 5
--    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
--    ax.legend(loc='upper left')
--
--
--@image_comparison(['lineprop_cycle_basic.png'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+    for _ in range(4):
-+        ax.plot(range(10), range(10))
-+    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
-+    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
-+
-+
- def test_linestylecycle_basic():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
--    xs = np.arange(10)
--    ys = 0.25 * xs + 2
--    ax.plot(xs, ys, label='solid', lw=4, color='k')
--    ys = 0.45 * xs + 3
--    ax.plot(xs, ys, label='dashed', lw=4, color='k')
--    ys = 0.65 * xs + 4
--    ax.plot(xs, ys, label='dotted', lw=4, color='k')
--    ys = 0.85 * xs + 5
--    ax.plot(xs, ys, label='solid2', lw=4, color='k')
--    ax.legend(loc='upper left')
--
--
--@image_comparison(['fill_cycle_basic.png'], remove_text=True)
-+    for _ in range(4):
-+        ax.plot(range(10), range(10))
-+    assert [l.get_linestyle() for l in ax.lines] == ['-', '--', ':', '-']
-+
-+
- def test_fillcycle_basic():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('c',  ['r', 'g', 'y']) +
-                       cycler('hatch', ['xx', 'O', '|-']) +
-                       cycler('linestyle', ['-', '--', ':']))
--    xs = np.arange(10)
--    ys = 0.25 * xs**.5 + 2
--    ax.fill(xs, ys, label='red, xx', linewidth=3)
--    ys = 0.45 * xs**.5 + 3
--    ax.fill(xs, ys, label='green, circle', linewidth=3)
--    ys = 0.65 * xs**.5 + 4
--    ax.fill(xs, ys, label='yellow, cross', linewidth=3)
--    ys = 0.85 * xs**.5 + 5
--    ax.fill(xs, ys, label='red2, xx', linewidth=3)
--    ax.legend(loc='upper left')
--
--
--@image_comparison(['fill_cycle_ignore.png'], remove_text=True)
-+    for _ in range(4):
-+        ax.fill(range(10), range(10))
-+    assert ([p.get_facecolor() for p in ax.patches]
-+            == [mpl.colors.to_rgba(c) for c in ['r', 'g', 'y', 'r']])
-+    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', '|-', 'xx']
-+    assert [p.get_linestyle() for p in ax.patches] == ['-', '--', ':', '-']
-+
-+
- def test_fillcycle_ignore():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('color',  ['r', 'g', 'y']) +
-                       cycler('hatch', ['xx', 'O', '|-']) +
-                       cycler('marker', ['.', '*', 'D']))
--    xs = np.arange(10)
--    ys = 0.25 * xs**.5 + 2
-+    t = range(10)
-     # Should not advance the cycler, even though there is an
-     # unspecified property in the cycler "marker".
-     # "marker" is not a Polygon property, and should be ignored.
--    ax.fill(xs, ys, 'r', hatch='xx', label='red, xx')
--    ys = 0.45 * xs**.5 + 3
-+    ax.fill(t, t, 'r', hatch='xx')
-     # Allow the cycler to advance, but specify some properties
--    ax.fill(xs, ys, hatch='O', label='red, circle')
--    ys = 0.65 * xs**.5 + 4
--    ax.fill(xs, ys, label='green, circle')
--    ys = 0.85 * xs**.5 + 5
--    ax.fill(xs, ys, label='yellow, cross')
--    ax.legend(loc='upper left')
-+    ax.fill(t, t, hatch='O')
-+    ax.fill(t, t)
-+    ax.fill(t, t)
-+    assert ([p.get_facecolor() for p in ax.patches]
-+            == [mpl.colors.to_rgba(c) for c in ['r', 'r', 'g', 'y']])
-+    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', 'O', '|-']
- 
- 
--@image_comparison(['property_collision_plot.png'], remove_text=True)
- def test_property_collision_plot():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle('linewidth', [2, 4])
-+    t = range(10)
-     for c in range(1, 4):
--        ax.plot(np.arange(10), c * np.arange(10), lw=0.1, color='k')
--    ax.plot(np.arange(10), 4 * np.arange(10), color='k')
--    ax.plot(np.arange(10), 5 * np.arange(10), color='k')
-+        ax.plot(t, t, lw=0.1)
-+    ax.plot(t, t)
-+    ax.plot(t, t)
-+    assert [l.get_linewidth() for l in ax.lines] == [0.1, 0.1, 0.1, 2, 4]
- 
- 
--@image_comparison(['property_collision_fill.png'], remove_text=True)
- def test_property_collision_fill():
-     fig, ax = plt.subplots()
--    xs = np.arange(10)
--    ys = 0.25 * xs**.5 + 2
-     ax.set_prop_cycle(linewidth=[2, 3, 4, 5, 6], facecolor='bgcmy')
-+    t = range(10)
-     for c in range(1, 4):
--        ax.fill(xs, c * ys, lw=0.1)
--    ax.fill(xs, 4 * ys)
--    ax.fill(xs, 5 * ys)
-+        ax.fill(t, t, lw=0.1)
-+    ax.fill(t, t)
-+    ax.fill(t, t)
-+    assert ([p.get_facecolor() for p in ax.patches]
-+            == [mpl.colors.to_rgba(c) for c in 'bgcmy'])
-+    assert [p.get_linewidth() for p in ax.patches] == [0.1, 0.1, 0.1, 5, 6]
- 
- 
- def test_valid_input_forms():
--- 
-2.27.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch
new file mode 100644
index 000000000000..c7ce64b9b3b3
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch
@@ -0,0 +1,225 @@
+From 2fa4f25b9db19a1f59b03d56221c4752c03912fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 7 Jun 2020 20:02:48 +0200
+Subject: [PATCH] Increase image comparison limits
+
+Most of the tests require exact match which apparently doesn't always
+happen in non-pristine environments.  Some of them have very big
+differences due to texlive font rendering changes.
+---
+ lib/matplotlib/tests/test_arrow_patches.py                | 4 ++--
+ lib/matplotlib/tests/test_axes.py                         | 2 +-
+ lib/matplotlib/tests/test_backend_pgf.py                  | 8 +++++---
+ lib/matplotlib/tests/test_figure.py                       | 2 +-
+ lib/matplotlib/tests/test_legend.py                       | 6 +++---
+ lib/matplotlib/tests/test_pickle.py                       | 2 +-
+ lib/matplotlib/tests/test_units.py                        | 4 ++--
+ lib/matplotlib/tests/test_usetex.py                       | 3 ++-
+ lib/mpl_toolkits/tests/test_axes_grid1.py                 | 2 +-
+ .../tests/test_axisartist_grid_helper_curvelinear.py      | 2 +-
+ lib/mpl_toolkits/tests/test_mplot3d.py                    | 2 +-
+ 11 files changed, 20 insertions(+), 17 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index cca505ab9..871935c15 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+     """
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 6eedf20d5..198ed41ec 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3718,7 +3718,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 702cc6c35..71038e702 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -114,7 +114,8 @@ def test_xelatex():
+ # test compiling a figure to pdf with pdflatex
+ @needs_pdflatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_pdflatex.pdf'], style='default')
++@image_comparison(['pgf_pdflatex.pdf'], style='default',
++                  tol=11.669)
+ def test_pdflatex():
+     if os.environ.get('APPVEYOR', False):
+         pytest.xfail("pdflatex test does not work on appveyor due to missing "
+@@ -151,7 +152,7 @@ def test_rcupdate():
+                 'pgf.preamble': ('\\usepackage[utf8x]{inputenc}'
+                                  '\\usepackage[T1]{fontenc}'
+                                  '\\usepackage{sfmath}')}]
+-    tol = [6, 0]
++    tol = [6, 14]
+     for i, rc_set in enumerate(rc_sets):
+         with mpl.rc_context(rc_set):
+             create_figure()
+@@ -178,7 +179,8 @@ def test_pathclip():
+ # test mixed mode rendering
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_mixedmode.pdf'], style='default')
++@image_comparison(['pgf_mixedmode.pdf'], style='default',
++                  tol=1.086)
+ def test_mixedmode():
+     rc_xelatex = {'font.family': 'serif',
+                   'pgf.rcfonts': False}
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index aab35201c..a657198f7 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -22,7 +22,7 @@ import pytest
+ 
+ 
+ @image_comparison(['figure_align_labels'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_align_labels():
+     fig = plt.figure(tight_layout=True)
+     gs = gridspec.GridSpec(3, 3)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index 8e9c0771f..d1fb3818a 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -105,7 +105,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rgba():
+     fig, ax = plt.subplots(1, 1)
+     ax.plot(range(10), lw=5)
+@@ -114,7 +114,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rcparam():
+     fig, ax = plt.subplots(1, 1)
+     ax.plot(range(10), lw=5)
+@@ -140,7 +140,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.02)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
+index 82bf4d8e8..13046357a 100644
+--- a/lib/matplotlib/tests/test_pickle.py
++++ b/lib/matplotlib/tests/test_pickle.py
+@@ -41,7 +41,7 @@ def test_simple():
+ 
+ 
+ @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.082)
++                  tol=0.082)
+ def test_complete():
+     fig = plt.figure('Figure with a label?', figsize=(10, 6))
+ 
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index 252136b4d..f0e7ced31 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -74,7 +74,7 @@ def quantity_converter():
+ # Tests that the conversion machinery works properly for classes that
+ # work as a facade over numpy arrays (like pint)
+ @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
+ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -101,7 +101,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_plot_masked_units():
+     data = np.linspace(-5, 5)
+     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 25006f174..694a510e7 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -13,7 +13,8 @@ if not mpl.checkdep_usetex(True):
+ @image_comparison(
+     baseline_images=['test_usetex'],
+     extensions=['pdf', 'png'],
+-    style="mpl20")
++    style="mpl20",
++    tol=21)
+ def test_usetex():
+     mpl.rcParams['text.usetex'] = True
+     fig = plt.figure()
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index 96830441e..c403b0bf2 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -331,7 +331,7 @@ def test_zooming_with_inverted_axes():
+ 
+ 
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_anchored_direction_arrows():
+     fig, ax = plt.subplots()
+     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
+diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+index 05534869a..6e7053722 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+ 
+ 
+ @image_comparison(['custom_transform.png'], style='default',
+-                  tol=0.03 if platform.machine() == 'x86_64' else 0.034)
++                  tol=0.034)
+ def test_custom_transform():
+     class MyTransform(Transform):
+         input_dims = output_dims = 2
+diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
+index 37532335e..5a2645235 100644
+--- a/lib/mpl_toolkits/tests/test_mplot3d.py
++++ b/lib/mpl_toolkits/tests/test_mplot3d.py
+@@ -287,7 +287,7 @@ def test_marker_draw_order_view_rotated(fig_test, fig_ref):
+     ax.view_init(elev=0, azim=azim - 180)  # view rotated by 180 degrees
+ 
+ 
+-@mpl3d_image_comparison(['plot_3d_from_2d.png'], tol=0.01)
++@mpl3d_image_comparison(['plot_3d_from_2d.png'], tol=0.012)
+ def test_plot_3d_from_2d():
+     fig = plt.figure()
+     ax = fig.add_subplot(111, projection='3d')
+-- 
+2.27.0
+
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
deleted file mode 100644
index 9503034ec4c0..000000000000
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,250 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
-RESTRICT="!test? ( test )"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-PY2_DEPEND="
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			gtk = False
-			gtkagg = False
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
deleted file mode 100644
index 824ae05fff3f..000000000000
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ /dev/null
@@ -1,253 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
-RESTRICT="!test? ( test )"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-PY2_DEPEND="
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		>=dev-python/numpydoc-0.8[${PYTHON_USEDEP}]
-		<dev-python/numpydoc-0.9
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.2.4-doc-fix.patch
-		"${FILESDIR}"/${PN}-2.2.4-no-jqueryui-download.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			gtk = False
-			gtkagg = False
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
deleted file mode 100644
index eb1517ece9d8..000000000000
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ /dev/null
@@ -1,229 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
-REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
-# tests are fixed in 3.2.1, this version is beyond repair
-RESTRICT="test"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython:*[${PYTHON_USEDEP}] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.8[${PYTHON_USEDEP}]
-		<dev-python/numpydoc-0.9
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.1.2-no-jqueryui-download.patch
-		"${FILESDIR}"/${PN}-3.1.2-qhull.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
deleted file mode 100644
index 5f616ebccb19..000000000000
--- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
-		"${FILESDIR}"/matplotlib-3.2.1-test.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local -x MPLLOCALFREETYPE=1
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..a653f14fcd90
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.2.2-test.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	local -x MPLLOCALFREETYPE=1
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.2.2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2.ebuild
deleted file mode 100644
index 59b723084553..000000000000
--- a/dev-python/matplotlib/matplotlib-3.2.2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
-		"${FILESDIR}"/matplotlib-3.2.2-test.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	local -x MPLLOCALFREETYPE=1
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.3.0.ebuild b/dev-python/matplotlib/matplotlib-3.3.0.ebuild
new file mode 100644
index 000000000000..0ff607bcd6dc
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.3.0.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.0-test.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..981026cbe93b
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.0-test.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 032b5783d5d6..3ea76bf57399 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,4 +1,5 @@
 DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48f1fd2752ec0c3934608172c8970cc4ad6ce984e227bef811aaee9ca2fc352afbf4e4925a6930adf798edbdd3 SHA512 1c9d264fb80b7d6d746f8379c869903e80f0b4a134efb3ca571630fdbe53eb7b1ac244470f7c2f8229cfe54e7597594427e253f35f0b103fc4c4123a935c5193
+DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
 EBUILD matterhook-0.1-r1.ebuild 494 BLAKE2B 14f5af598f16368c6d26fc2ed631f32b8d84e58ee5a8d10d0df2dac84279396b0c909d5aa57fb0f3f29cfd381a2665a5c035e81058d5c7937d10e79d182c3c06 SHA512 454d714e7618be61c5da34208d7c5d703875ca70754ef0594d238e78aaf93f1e5203032abfa1970c1ddcf09aed385a53578f70faddf3778e6e1af86343e7f0e7
-EBUILD matterhook-0.1.ebuild 488 BLAKE2B 6a1b674be15e7e5f3f9af63d754230d144cf7101d845f15ae7d188eb8333b41848a49d7fc4d3d7ec95e579dd8e2fee835f2c4f6793392686b464720e877a1c3e SHA512 21c65b7dee596d26e2e6fa85352348757a391c96ebd6228c1ed74551cc1192ed0ef4febea9d54dad93dcc3df4935f10b76ff63a555cc8dc1c3c3a8d95f363cee
+EBUILD matterhook-0.2.ebuild 496 BLAKE2B 7fa2d6857b8430c50773e6ae17c6a79b6b1e114c6bf4b7246468e2d07e4c15b475b9735e8feaebe4102014ccd683a462959cae6df0b7d0da15503a30a4e70bb8 SHA512 2c3b9b70a7bde1eb2945e027ba31fe7858c2df5188270992d6bdcf5708e70e8721906621aa5093c65539f1d253ee362301f17584880728195366af6a8d53d379
 MISC metadata.xml 311 BLAKE2B 53b986a49d3c6615c99e1a79572bf81af5cd3f094d95abb417148c0bbe29bbd4d6f412a18b16d366cf0c9fd487acafebd6d0f192b48b855e8f7db3fe08add8b0 SHA512 0702ce6e8985e0c20f35455802d955e1cc69769de6e92cba5aa5de0edbbb5ed9104c6ebe82cc689d144226d64414001b8ee41a575786f6377f863d6bc0bab1fd
diff --git a/dev-python/matterhook/matterhook-0.1.ebuild b/dev-python/matterhook/matterhook-0.1.ebuild
deleted file mode 100644
index 94091ef9c7c2..000000000000
--- a/dev-python/matterhook/matterhook-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
-
-DESCRIPTION="Interact with Mattermost incoming webhooks easily"
-HOMEPAGE="https://github.com/numberly/matterhook"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/matterhook/matterhook-0.2.ebuild b/dev-python/matterhook/matterhook-0.2.ebuild
new file mode 100644
index 000000000000..0a9016cec09b
--- /dev/null
+++ b/dev-python/matterhook/matterhook-0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Interact with Mattermost incoming webhooks easily"
+HOMEPAGE="https://github.com/numberly/matterhook"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mecab-python/Manifest b/dev-python/mecab-python/Manifest
index 4d07df743d71..bfef4d604170 100644
--- a/dev-python/mecab-python/Manifest
+++ b/dev-python/mecab-python/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-python-python3.patch 253 BLAKE2B 979ef7ea020bfb405faa366a2b87a42d5c5e03e6b49b04ffc4ac0586e4e09912e6afe333072a47d676c4c3e7829ae336e61c402da280b6fffca80fc89323c00f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695
 DIST mecab-python-0.996.tar.gz 62338 BLAKE2B d2f8749bf4ea0b30b9f7ee68a4210a3af600803296197f48091d1c9fe90f5baaff3eb94ecb3aa04d994771512c1ef5b68a62e0a045da95992bffd1710725e832 SHA512 08954ed801419fd7f65d055244227364bc37b063f8d21babb6ceeb02ca40e0146fa4401d1426255f3656ac1a5e51439bde981414613153dca5972f624289447e
-EBUILD mecab-python-0.996.ebuild 604 BLAKE2B 1630d779c0aef86a070c69346b01a2d7362784c615a67dc60b410c6566c4c59d381b1592c4eeff7d5cf683eacce14b6cac876b7dba572ba74a371fb99ca9663b SHA512 0a07dffb0ff471f2cd56804fd094c2eaf7b68b9971aae854cf2fb9626638832894de8a8503ce61a2fbd7e8b6fa76989784cbdf1c1fec3e19980e716dc4ccc319
+EBUILD mecab-python-0.996.ebuild 610 BLAKE2B 7bdf32941cb067ba54043992e1409caa9f1534694a6ea69178030663e7c9587beafa9a0dfc0dd6ef0d2162417a8c888cdb114b44577424288ef864171d05171f SHA512 6d13e9c0bdb89b93527ccd56b91250cdded84c70f571fadab7d9949dbdbdc10b1c88b6619e39166707686bd2d46d90d0c96d5db047ecb5dc284ab5f1336095ca
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/dev-python/mecab-python/mecab-python-0.996.ebuild b/dev-python/mecab-python/mecab-python-0.996.ebuild
index 55d37f73ff77..e69f2dc6c99e 100644
--- a/dev-python/mecab-python/mecab-python-0.996.ebuild
+++ b/dev-python/mecab-python/mecab-python-0.996.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=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
deleted file mode 100644
index dacba9767810..000000000000
--- a/dev-python/medusa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST medusa-0.5.4.tar.gz 107744 BLAKE2B 13050a97887d6dac4ddf561b109880fae9eb4f2e1462ed92a4963724580821190d94c3d9086dcf2b4656551d9f6e1f9d6d3dd6d501923cb25ff1f68257f6a985 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f
-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
deleted file mode 100644
index 502529c46cf4..000000000000
--- a/dev-python/medusa/medusa-0.5.4-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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for writing asynchronous long-running, high-performance network servers in Python"
-HOMEPAGE="https://pypi.org/project/medusa/"
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc CHANGES.txt docs/*.txt
-	dodir /usr/share/doc/${PF}/example
-	cp -r demo/* "${ED}usr/share/doc/${PF}/example"
-	dohtml docs/*.html docs/*.gif
-}
diff --git a/dev-python/medusa/metadata.xml b/dev-python/medusa/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/medusa/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/mem_top/Manifest b/dev-python/mem_top/Manifest
index 02e9b04d70cd..a7ecb40f8a95 100644
--- a/dev-python/mem_top/Manifest
+++ b/dev-python/mem_top/Manifest
@@ -1,3 +1,3 @@
 DIST mem_top-0.1.6.tar.gz 2520 BLAKE2B 427ce48da7b16e08bc6fd0943beafe9ebb42cea65ac550f5cbda1f4a1dfa9dfe10c0700a3e9f155d158dd9049944f23e24f01d4888843acef16215c6fce34799 SHA512 0feb736c154fbe5e1b81bf12ca183b1dedf4ad5037388bfde5b32d2c077724af98b81e6c069075c606eda7121ed20e8b71c4c6039e0c558698db58e2d0a7a1c6
 EBUILD mem_top-0.1.6.ebuild 421 BLAKE2B ee4fc089392f82f5b06c5156fa8a6ec9a5feb785836b8fc77ec912d0a57809e80a86a7a17bf504883c57debeaf167296cb5ad953c0767f824fb5090046afeef3 SHA512 2525355a5d4138ceac02b66e5d78beccf23d9f16696dea32a0ff9ed19bed97ed2447eb8206fe9a6c143ed5dbdf4f84096422d7e71f6f22498ebc8ef1983747d0
-MISC metadata.xml 349 BLAKE2B 064288e73757f45cc157a4c80e3a79a47ca0e9abbe5d8b1242b84490d03a2e7b70aa6c506f113786a49f9f2c6b5dc44bba1545b2362c891621ceef62d4bb3ffc SHA512 7695d89a8e220255089ca202257775d148d2293cf29d37045c0647536e38bd427253852c62ce8c6f5eedc9a007b0e60e78e7c309f0851593490dfbf825f0c0ef
+MISC metadata.xml 296 BLAKE2B 88752da13849b1cd6564e76222864b3a4c942972a668a41c847de70df41581bf59117b554544fa0f09524e7ae19d4f90a11da4b0345d811dce89d1f2ea982d48 SHA512 e9a5c0491fe633b0aaea4b32e2a51a3b942d2450239c32d475a68e243ffa407100a3ad6a29d8f6f634e318ace727295b8cb85ef616345ca152a69616d415d5ff
diff --git a/dev-python/mem_top/metadata.xml b/dev-python/mem_top/metadata.xml
index fd48f0ec3cd0..6e513a6c8de6 100644
--- a/dev-python/mem_top/metadata.xml
+++ b/dev-python/mem_top/metadata.xml
@@ -1,11 +1,9 @@
 <?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">mem_top</remote-id>
 		<remote-id type="github">denis-ryzhkov/mem_top</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index ecee35a6aad3..2eeb04665c5d 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,3 +1,3 @@
 DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
-EBUILD memory_profiler-0.57.ebuild 1756 BLAKE2B 819d6c6fee376fd738156516a28ea877bec68cace31950f20cb57ade4ab101b30faa9ab3881176b99b0dfa1c43f4af9fab0819809ccf6b2562e6ec9cead7bca1 SHA512 e34bc023dbd765b813f78edf5366f3c606a673fcf76f51bbfa114dc74fee5b625576b694db6dbd922105e086020fa72cdf09b420e2360eb99abbc658019e2949
+EBUILD memory_profiler-0.57.ebuild 1756 BLAKE2B e1ef53722465b2d4171aa84e7274b81855b2dc8461e156c6f830e90de5dc568406f08c612eb84bd2ce9f96bd74d5b5a58bee7f9d3b646e5f1013f54c7e2d4b23 SHA512 d7c8a1c2aa3a1946123b888885aba2eb7284559303119aa9df699b008575cf88b4a74c8ad68300ea7b5979229c9fc167933b247817f5308212d3137d4a4b81bc
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
index 9b0b4220a754..823832fa016f 100644
--- a/dev-python/memory_profiler/memory_profiler-0.57.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -17,7 +17,7 @@ IUSE="examples"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 # dev-lang/mercury: collision on 'mprof'
 # https://bugs.gentoo.org/571176
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 491a3449d206..328f1bac1954 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,3 @@
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
-EBUILD mergedict-1.0.0.ebuild 434 BLAKE2B 12b4f13a521c8a8aef3981293a9c1e05d94860195ea42e55968404d86a03587476fb66d3b11458a1874636f9ea18e6d2480ce4790dfd9eeaed26c5ff5fa5e985 SHA512 eed7df36b89f898bfad0ec98574f10dd3a2bfdc9369b0ca04002c2c6a3f9ccac46549455e291756b4c1e97d69c4535fe9ad0732815cb5676ba14fc7b489fa973
+EBUILD mergedict-1.0.0.ebuild 433 BLAKE2B c169661779dba78c873832ff832a2d9f809dbd79e588b238f19475edcb92632d837fcd9463947343abaa6fc525a9405785c91669fca2a7178a7521e62b2337c2 SHA512 87087f573a57cfeb5208a6f40c5000e6bb6c492af36b6e9021de1733e4193439108e57454a033002441e58ad097cac310f23db06bef20e0d35a7ab2a53488810
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index fd15f4587d65..2d6066f7870b 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/metakernel/Manifest b/dev-python/metakernel/Manifest
index 63bc364afe77..511132f06bfa 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,3 +1,4 @@
-DIST metakernel-0.20.4.tar.gz 67895 BLAKE2B 17cbb8238eb092a9f31616e83ce638a921f84dced9ee7ed896d2470b6c1d1424e2b165da386cc997647f83bf0da02ddfabc3b74bf2fade1d312124906a2dda2d SHA512 8ab2943a93e61bfca276607adac5e619c407a2356656424d261eb520002bf582469f71329a3b2b2fcc290b21a4dffd724f5b73697c6853b5cb74eec07e26ede3
-EBUILD metakernel-0.20.4.ebuild 651 BLAKE2B 05b328be8b3d8d48dc69a65097e1bb326980a01d61532cf313880f7dba4813f9ead883f4c34d84926deb245ddfdac228d3e18668027673499c2a4a4a2b504d1c SHA512 e85869047ec51cb749962a5a911f9f416142dee37c4351308b2411001a004b11f0f99f75d80ee90f4acab01ce42989aef55594adb82655b74fe9052fe2a769ff
+AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
+DIST metakernel-0.25.0.tar.gz 182808 BLAKE2B 40fbd44109e3b9e88fa8065138e7ffe3b42320651c1731249a10c443a456a5eaa5c91110fcc223f1d557aaa1acfee670a3a36dacf78e6bc9b2ecba0e39f7cc21 SHA512 89a46d3b746a0f4c435dcbeefdb485257c2813790849f95bc0508fee7c2a892e688fdbe2dc9db5f2a0c69ed4917e8de81753492e686337d5e1ab692e9e51ea5a
+EBUILD metakernel-0.25.0.ebuild 567 BLAKE2B 9c415d6b47b82b7bccc5059f05c7d323ac147c4f7bfa861a281bdde14c89a86545c995dad63d4aaa206ebb09384227b38447605f94a77ea36ae89917904174bd SHA512 ddd0fdc652e0d1a0c3a26d888d7c0b40d88a32fff43da36c67222689b8751076bab2e59dd4d18dad3bcebec6ef2f471997977c40d92f36e772b2971e5fd2badd
 MISC metadata.xml 634 BLAKE2B 18f77a465ef02244b5ded5cea7751fabeb5d1fbad17c2e47239228e7512512eabaa79fab71f480fd11d33af8b43ca6859f4749b81c14c2e93384b051f1ea3590 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad
diff --git a/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch b/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch
new file mode 100644
index 000000000000..673a96e22af3
--- /dev/null
+++ b/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch
@@ -0,0 +1,23 @@
+--- a/metakernel/magics/tests/test_parallel_magic.py
++++ b/metakernel/magics/tests/test_parallel_magic.py
+@@ -2,7 +2,9 @@
+ from metakernel.tests.utils import get_kernel, get_log_text, EvalKernel
+ import os
+ import time
++import pytest
+ 
++@pytest.mark.skip(reason="requires starting an ipycluster")
+ def test_parallel_magic():
+     kernel = get_kernel(EvalKernel)
+     # start up an EvalKernel on each node:
+--- a/metakernel/tests/test_parser.py
++++ b/metakernel/tests/test_parser.py
+@@ -41,8 +41,6 @@
+     if not os.name == 'nt':
+         code = '/usr/bi'
+         assert 'bin/' in p.parse_code(code)['path_matches']
+-    code = '~/.bashr'
+-    assert 'bashrc' in p.parse_code(code)['path_matches']
+ 
+     for f in os.listdir('.'):
+         if f.startswith('.'):
diff --git a/dev-python/metakernel/metakernel-0.20.4.ebuild b/dev-python/metakernel/metakernel-0.20.4.ebuild
deleted file mode 100644
index 0e01f81bd81b..000000000000
--- a/dev-python/metakernel/metakernel-0.20.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="Metakernel for Jupyter"
-HOMEPAGE="https://github.com/Calysto/metakernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/metakernel/metakernel-0.25.0.ebuild b/dev-python/metakernel/metakernel-0.25.0.ebuild
new file mode 100644
index 000000000000..55484982516f
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.25.0.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 09a4657478fd..fe4b0f3f8a42 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,7 +1,3 @@
-DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebbe67ba3e9f38c08eddcf22028756b17c5ce8aa460e5d3113ef54cdafe782cb471aabfe208b093af702694cb7 SHA512 92879d6df61b0f9f72f9fe8f1cf38d559477983c6bba8c88ed02289570daff02f6f8d7010c0a95ffce049ab67be69323c47caefdfe3a8b008038377235ed9a5f
-DIST minidb-2.0.3.tar.gz 13992 BLAKE2B 7ccb26625c199517ee63e99b1839037046c29a4c72a26f457ef3b4c22ef1f23b0bf632b37790c2981fd2c08929a39e8f015b4cf890d04d5e9926cd07b5def699 SHA512 90e2c51af64a373a9dce5e6fad94440a8e5ff3136ba4004deebb5f9a7a7f039ebf1b903a361d678771b6e18e951cacbd7392f1fe2df8db04cef04526a07a3ce2
 DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
-EBUILD minidb-2.0.2-r1.ebuild 592 BLAKE2B 53d23badbcd6caa90f6b76359d9f44b85e31f0ec20b3d2f03d671e49e8fe24926899d254f6ba4209425082ebfae4ec441ea71b174a8b9a948b111b3242631e55 SHA512 1d0354576b6a1a174ccc7404fcd4331caf49b72ada41a59635f03df70648abfba0ca32355304bf3868f61eebf822bdd45eb34d7021ec56f58c4e70646c9fde7d
-EBUILD minidb-2.0.3.ebuild 440 BLAKE2B a7093c6d5f6e7c10e9473f7a06526f6b498b0b8f8ac5013a372941d7887586d1d01d3b687269cba0e247b7847c18adb8e4a9c73e1f892a2cc8207e6907f3263b SHA512 701fb99146f30f35e16b9ddf3a92a559220e740cbffccff871fd1409e503897f7c2908a5c62f71716bbf65102999f417f47efceeb5375f9a232edbb8a264433e
-EBUILD minidb-2.0.4.ebuild 445 BLAKE2B c4645c6b95b4622d3fc536f95d2104c40137d479227a3434d6f0971892119b2c04effe98a547bbe546030833370639a012711a0eb11fa64466eb029ec89431f8 SHA512 25822938b715a87de7495503c7bde24ce9baba2a24e3f7a06fcdf16314b5598e98b5ee88326d2a98517806fe483888873a468e406b0b1075ba5516758492f0e6
-MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
+EBUILD minidb-2.0.4.ebuild 444 BLAKE2B 3ce6430b124191a32897bc11b2305bb49c2a82fe6238efc33fe0c13ca063df319e65ea482321e59c3fc937612dd3b86f66c8548c42c30f0f5cf2cc643aab5f00 SHA512 3844d2da038c18d68c2b8286cd41a630486c2ab60a4fd3b30d7a623fb19564a6b94c2fc0b769786dd8b5c91dcc21d15601b0165ac6ba3e72f2edcf954fd4ea63
+MISC metadata.xml 446 BLAKE2B 46a86136a6790fb2e9923525fec5e8b52420ab0342ca4089f2ca7ce55afe41d96bf39f55fd33af8e006f65e15f59eed09e0ec473ab72041e6bccee8bb06c51a1 SHA512 b29032fafb54b53261e748273f5cee899a91a87e2480057eac9aea9f170e2bda001fbdf1519349cc8e3d411cd64a1185f954920f461c52bb8652d87286207d92
diff --git a/dev-python/minidb/metadata.xml b/dev-python/minidb/metadata.xml
index 91fac9f6e930..c2b5d697e187 100644
--- a/dev-python/minidb/metadata.xml
+++ b/dev-python/minidb/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">minidb</remote-id>
 		<remote-id type="github">thp/minidb</remote-id>
diff --git a/dev-python/minidb/minidb-2.0.2-r1.ebuild b/dev-python/minidb/minidb-2.0.2-r1.ebuild
deleted file mode 100644
index 9ac6acb7f24b..000000000000
--- a/dev-python/minidb/minidb-2.0.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} )
-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 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	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
deleted file mode 100644
index 2b821d0c6734..000000000000
--- a/dev-python/minidb/minidb-2.0.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=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/minidb/minidb-2.0.4.ebuild b/dev-python/minidb/minidb-2.0.4.ebuild
index 4f6ce1effae1..41443b8339ec 100644
--- a/dev-python/minidb/minidb-2.0.4.ebuild
+++ b/dev-python/minidb/minidb-2.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index ab1242e15de5..ad20da47d0b5 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,6 +1,3 @@
-DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 BLAKE2B aecbbab8a0ede98d52cca778d6d8430945f3b1e962f3bd4b3a5c0d544c51d0a06a21e4d0b15390640097d57b8f30ea5f271d201ef9ed0a15ff034e08e1529e33 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66
 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
 EBUILD mkdocs-bootstrap-1.1.ebuild 681 BLAKE2B 09261a96412e41a75d59e096c2d209bd4751f33d1d472725c27ea4aaa7a8fd1d16a7b6ee3c51a617368dbea6a7fe6133d23ca54f518975f55e3f67115150d8a8 SHA512 9cc237da10d39e465792afad64fb5cad41f9cdc6222e714b84066a791e68af569067cfb9a8185e4b392b05f6dde7e015ee1dffb5b8054b2e67cf7a8838bcc3fb
 MISC metadata.xml 454 BLAKE2B a04b5ede94af2bae3761a94d865459150ea448baed4dd070d868d202eb9425836bf5e001238efd9c75f95489d2b0927edbb33723d54dde0c7984ad86a42e3e90 SHA512 56c8bf33debd320089a4886e3af540eae08686db30aba3bd56daa7ac7dae926a0abdc484a0ae43f296bc7bcec26de8c2956f3e26a0152594c70aeace3d6f56fa
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
deleted file mode 100644
index 1b5f36b25b03..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.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="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
deleted file mode 100644
index 3a26b9a98edd..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.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=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index 8a3ed8685d12..f9fbc3a96bef 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,6 +1,3 @@
-DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 BLAKE2B 219d341a995f39e58ed5aaceaf0b94f468b21a9959220f598cb7d6370c550f67591fb8a480583a0969d6b6bad94af84d4b874ee80b63b430c6f7177a0e2ce46a SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec
 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
 EBUILD mkdocs-bootswatch-1.1.ebuild 684 BLAKE2B ce0a229db0818af7450d2711a789f1ebdd7fd779aecc705a09ec9f69b7549439a95dc431ef25828ebfc83a1987b786426cff17d9ad1324074a85b6e0dd8d0445 SHA512 933427ef910927f7fbc0d688f1cd90184985533f37d4923f17ebfc3428fe6dbdcd60e8db14c6f323f255a5f444cb774a2f23f7eb4b556a0c0f450155d09e9476
 MISC metadata.xml 455 BLAKE2B baf1c6309a414120d78311ab6ab98a54def434d5db9423f4913392277e58fb077cd90ecc01be7502f4fc4754ba5b16ad38bee675928635509b842e5a0d872b52 SHA512 73d4c31dc3bdcd888d50f0d7d84821a0398707ec2f99770f972f4e13cd9c757cc6cabde3a91f074bf729728febb682de9dc7cdcf4386bbc81ea10bbda1378df3
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
deleted file mode 100644
index 6cde3ec1477e..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.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="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
deleted file mode 100644
index 04376952225a..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.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="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index d1475c5128b2..0eaf9a49d619 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,7 +1,3 @@
-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 1335 BLAKE2B 293870d3a952abdc3abd86e0619a3dd71fb77523ce9b06996d37b86eb0911bb84ca1ac6bdf6af748c13c48b9819aaf6b38e120d92e77bc5884f163675f4f5ce6 SHA512 9e6f99d09794dc44d096f9e3f9ff7dcc50af5a79c089117645389c65df0247849837dae62772732114ddc359a00041fbfeef86422cb6e08cca44872fcd5ff251
 EBUILD mkdocs-1.1.ebuild 1323 BLAKE2B 8e6895c8a148781362fcc55ac3c8b12bc693eaacd6aaedc190bdfbb3e321ed26865148d3703b0db83596d4a63bd38041d5f472987a19ffa9aa4e796d9c24cf71 SHA512 3fb4a4197d6894c9916f2ce5e35714db62013dd612e1566f1de4b6ced0de308a5e3a322a6730294b39c0a0da1a7d923964ef155023e1a47b7dd9a8a3ba5a45d8
 MISC metadata.xml 458 BLAKE2B ce343abd6776491064d2ababef8e680cf279e8413ec5007cc9b19a1a4f996706d5e51fcf9dfb74e0f977d6c8067320bf6cd90c28818768c7b3570c27b7f97680 SHA512 f94bcfe8a93ad939c54e501426bdc879a24638d88a434144c5fc2beb5d737845fd79989a204ca92f9fa3209610fe5bc81b74df242ded15ab06d805d9209f6e2a
diff --git a/dev-python/mkdocs/mkdocs-0.15.3.ebuild b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
deleted file mode 100644
index 113f50d10b56..000000000000
--- a/dev-python/mkdocs/mkdocs-0.15.3.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 vcs-snapshot
-
-DESCRIPTION="Project documentation with Markdown."
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootstrap-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootswatch-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mkdocs/mkdocs-1.0.1.ebuild b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
deleted file mode 100644
index cc0da185048f..000000000000
--- a/dev-python/mkdocs/mkdocs-1.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=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Project documentation with Markdown."
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootstrap-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootswatch-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	# mkdocs works fine with torando 5 on Python 2.7 and 3.4+:
-	# See https://github.com/mkdocs/mkdocs/pull/1427#issuecomment-371818250
-	sed -i 's#tornado>=4.1,<5.0#tornado>=4.1#' "${S}"/setup.py || die "Failed to fix tornado version"
-}
-
-python_test() {
-	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 8e28be7b9111..18b40d82d73d 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
-DIST mongomock-3.19.0.tar.gz 100891 BLAKE2B 3a5f31be32f209527d371a6125f930f2d9e3c9a105554e6c4e34c68e390333179198c7c54b54d4f25a6032152b71b1f62a7c393c3d958e913d222ffc1230a9b6 SHA512 591fb398917850ba4163ebbb58470e4fc51a057f9b1a8c92897fceaba3c8e4b95645dafea6f8e58d182f629ab767923c5b75fc474cf2ac6ea952ada5b9522310
-EBUILD mongomock-3.19.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
+DIST mongomock-3.20.0.tar.gz 109297 BLAKE2B 9045a74b4478f00ce4959b6890d5e5aedcbfd7dfddbfc8b7f77c60e64bfeef7c2bfc80c5e30a085fce7f5cf1411465c3551e585b0bc521f55597cc5806c977b1 SHA512 37b96634790eccd9874a68e7d74b234576ce928fdbd8705a7b1cf09d7c3dd69af5adab15ff6be5efefccbbf6e994f836e7b18fef5ae7e825fd22117449b6b983
+EBUILD mongomock-3.20.0.ebuild 852 BLAKE2B 8e9bdcec3740a4b2a3c08f999431179e7d3ac1e63e93fdf8c9ad310b4c07cd1db0bbfe4004699d4948d39dfe4e35bd46889237973f59712363bc5eaec44c8c60 SHA512 9808692de45c70bae0a3f68e8a3e5c0db027c8a4bee7f802820f5417e08c6f34ea912539d2f31878f3b524dd1402d542fa34ebb25c395eba79fcefcf3a0f7947
 MISC metadata.xml 595 BLAKE2B 3014a8c24d47db3840066581d8c88307f4ffbc270700dbeb8cde95b4bda3e29bd7b0833c7c5dd13dab0eb7e9a3bc6b61ff75d4e128b813fd30db1da0b00f4d54 SHA512 c844e1e8ddc89a83dc4a0ee4b41f5d08471fa1320a5e8d1c139ab5803b4a11d28e07326cb2cdeb125d24f4af218adcf15aaca3b3272b54201024d5d7a5a7f059
diff --git a/dev-python/mongomock/mongomock-3.19.0.ebuild b/dev-python/mongomock/mongomock-3.19.0.ebuild
deleted file mode 100644
index fe73bdcae26a..000000000000
--- a/dev-python/mongomock/mongomock-3.19.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-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 ~x86"
-
-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/mongomock/mongomock-3.20.0.ebuild b/dev-python/mongomock/mongomock-3.20.0.ebuild
new file mode 100644
index 000000000000..8621caec2d99
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.20.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..9} )
+
+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 x86"
+
+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 d092041ab54d..6da33449a422 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 471 BLAKE2B 0e27a2cdbc2176fe1283611036b4339a56c979494aaa3267ac17888987a909a06988e9d828964f847b78fcafb566373df0734939b19cb685f9916eb89b971198 SHA512 3c5c0eaa7a1c4be4bc16394e0f201ce4af35c1e1679788e8f8f1b729c5be0dd38e120f2a0e314218bb6d89f7fff0087dc57849b625e0877d26c4ad5981cad64d
+EBUILD monotonic-1.5-r1.ebuild 464 BLAKE2B 15ee2febe06bf675ac87b6b07df58caf1d3b80fe99f549ba84e4d046dad36e98ef68598c2cd9aff9a69361685d6b008de6edc94f9c38cce3fe364f23608d5229 SHA512 1acc9cd45bf18c57c397aabead32bf8d1bc6da2cfb4c97d2e634eaea331471a5f6fe1f8761089216b01352fca3f381bca3da6070167e72d85e9297152c6700f3
 MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 06aea1709212..e85560961fcc 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-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,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 # no tests
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c710eb4d3733..687e1f5c5bd6 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,9 +1,5 @@
 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
-DIST more-itertools-8.3.0.tar.gz 86850 BLAKE2B 2438d235a3778237c0b9e1bcbf47847e1322dbe029dc15c47215b516d37948a51e60fe2198060768dcf527a54e5d17396a23d138cc00c55f811d20753cfd6178 SHA512 34e5489277477a2b8a51de3e28c3d010f06c9071ad98e58901734431d5640a6a03e4239cf405f75e4dd0838e5e3fe8910b64ad542759874c0f25725e4b9e78ed
 DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
 EBUILD more-itertools-5.0.0.ebuild 714 BLAKE2B 157f253d495410285f2c9c38f6487943eb2965ad1fc9fcb18ae4222f199b7db215995193f10b2d23163756a8ce5dc3600a7517cee2a2ffda69302faf204bf839 SHA512 75274ecf32e551be840489f74ba6d03c5c0cb3bbf85138282da5836b07f7b0555afad83d7640075e380cb90bef1db12327b44fd402a5b26c33ba085316b4c474
-EBUILD more-itertools-7.0.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
-EBUILD more-itertools-8.3.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
-EBUILD more-itertools-8.4.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
+EBUILD more-itertools-8.4.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
deleted file mode 100644
index ef2bb6f5b256..000000000000
--- a/dev-python/more-itertools/more-itertools-7.0.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=( python3_{6,7,8,9} pypy3 )
-
-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 ~mips ppc ppc64 s390 sparc 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 unittest
diff --git a/dev-python/more-itertools/more-itertools-8.3.0.ebuild b/dev-python/more-itertools/more-itertools-8.3.0.ebuild
deleted file mode 100644
index b1c4f1688dec..000000000000
--- a/dev-python/more-itertools/more-itertools-8.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 unittest
diff --git a/dev-python/more-itertools/more-itertools-8.4.0.ebuild b/dev-python/more-itertools/more-itertools-8.4.0.ebuild
index b1c4f1688dec..ef2bb6f5b256 100644
--- a/dev-python/more-itertools/more-itertools-8.4.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.4.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 6e697d335acb..19c5e09494e1 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,7 +2,5 @@ AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9
 AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da02bf7f5a1474e6f8a934815cdaf00951898af292ebc5b38a0cc961d685c59fd8dd952d5fbe64dcff086d9d19 SHA512 336d9c1d399d2969cc603a3070285ebd4cc2f58bd8fa8d477fd6bde8cfc9a9a873c15b98fd2814f8c3b1cf591826101c024658f5b4468f40e6beaa229c8c8f50
 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
-DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.3.14-r1.ebuild 2775 BLAKE2B 9e2f967235cd50ee71dce187ee58238937de62db595a2951e43e4558f85424a796944fefa54e743c1ee226727b0bbe7703e087e79ca867b0932e13abbed77384 SHA512 141e31aa51209c5a466c649617912a8c4c753f6edae743d871a5d34214459b5c8d2dcc7073ec2842205d2f521fc773d05bb7f7fbb209feb8238d15db11b04ab3
-EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440
+EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B a59ffb75225e6df25c038a683deaec98fedc2c875c142696c828dd0d2a3daddb59c7c2af21417c4f9236473032d36e091bd4ed0c625316479338bce4efadb21d SHA512 f79e21f53adc1498d650446a17d1cd20ca10151be63778b880d2c61b3cb64459da23e3cf9fc70b9d89409fe4c962359bc33d062017abb41ca94fb2d82c0288e3
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
deleted file mode 100644
index 915c8ed2a58b..000000000000
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/moto-1.3.14-newer-botocore.patch"
-	"${FILESDIR}/moto-1.3.14-tests.patch"
-	"${FILESDIR}/moto-1.3.14-py39.patch"
-)
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -e 's|==|>=|' \
-		-e '/cfn-lint/ d' \
-		-i setup.py moto.egg-info/requires.txt || die
-
-	# Disable tests that fail with network-sandbox.
-	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
-		-i tests/test_core/test_decorator_calls.py || die
-
-	# Disable tests that fail with userpriv.
-	sed -e 's|^\(def \)\(test_invoke_function_from_sns()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_invoke_requestresponse_function()\)|\1_\2|' \
-		-i tests/test_awslambda/test_lambda.py || die
-
-	# these tests crash nose
-	rm tests/test_xray/test_xray_client.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/moto/moto-1.3.14-r3.ebuild b/dev-python/moto/moto-1.3.14-r3.ebuild
new file mode 100644
index 000000000000..2d8ff45e4809
--- /dev/null
+++ b/dev-python/moto/moto-1.3.14-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/moto-1.3.14-newer-botocore.patch"
+	"${FILESDIR}/moto-1.3.14-tests.patch"
+	"${FILESDIR}/moto-1.3.14-py39.patch"
+)
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -e 's|==|>=|' \
+		-e '/cfn-lint/ d' \
+		-i setup.py moto.egg-info/requires.txt || die
+
+	sed -e 's|idna<2.9,>=2.5|idna>=2.5|' \
+		-i setup.py moto.egg-info/requires.txt || die
+
+	# Disable tests that fail with network-sandbox.
+	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
+		-i tests/test_core/test_decorator_calls.py || die
+
+	# Disable tests that fail with userpriv.
+	sed -e 's|^\(def \)\(test_invoke_function_from_sns()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_invoke_requestresponse_function()\)|\1_\2|' \
+		-i tests/test_awslambda/test_lambda.py || die
+
+	# these tests crash nose
+	rm tests/test_xray/test_xray_client.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild
deleted file mode 100644
index 49ed8ad77927..000000000000
--- a/dev-python/moto/moto-1.3.8-r1.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,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/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/backports-tempfile[${PYTHON_USEDEP}]
-	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.86[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.86[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${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-1.4.11[${PYTHON_USEDEP}]
-		  )
-"
-
-python_prepare_all() {
-	sed -e 's|==|>=|' \
-		-i setup.py moto.egg-info/requires.txt || die
-
-	# Disable tests that fail with network-sandbox.
-	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
-		-i tests/test_core/test_decorator_calls.py || die
-
-	# Disable tests that fail with userpriv.
-	sed -e 's|^\(def \)\(test_invoke_function_from_sns()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_invoke_requestresponse_function()\)|\1_\2|' \
-		-i tests/test_awslambda/test_lambda.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=${BUILDDIR}/lib \
-		nosetests -sv ./tests || die
-}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index fec9d11dd689..b11911a54bc2 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,7 +1,5 @@
 AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7ffad5ccb344b0b87f444461132919f26b42b861fd86ed4b785b2de176b726c6ac14d5f69aeb4cdac0b6e182cceacb265b SHA512 1193779d8fc0a26845d9435a55b6fea808785f6d2299c3b0fe6ba16c7c8b846d35041ebabe7f51f67aacbd3d1e4a1d334a36ac2b457941b2467cc0ca8a4b30f3
 AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9
-DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
 DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
-EBUILD mpi4py-3.0.2.ebuild 1137 BLAKE2B f1f4357752c4db2b6e0dc6ff36e1d440c2e39c32f7f34c3dad8a2f156fba35f13b9765123ee23ddb9bcd3647e3488cd85f537421dde8ac69fae22c0f4449b67c SHA512 111a3074e7eaaf69c84a92f2a657ae17ceb2c6814a102a0b62615c9b44f16ea9b249f8a6fcecb8d19a2d50918b750f6e2bceea875f655684544e0eec242808b6
-EBUILD mpi4py-3.0.3.ebuild 1439 BLAKE2B 321ab070f8fe4b2b060071863cf3eb87c9ab0f780e1b8f92890ec2fa3fcad96e18045f33402e356db3de4c18ec7e57bb5db26b996898995275923452e2b4d1d2 SHA512 168c8f310c9ac68157d9b581293ecfc6647cf6ccb9fbd741da511945826b0436174cf25912679cd1a9350a3434de9771fd65ccec5b47ab7911dc8d1f0f2073d1
+EBUILD mpi4py-3.0.3.ebuild 1437 BLAKE2B 426da58fe2472cc81f74bc982c59c1f361836833d03a45e197facb311cac9f5a2feaa5ab6879e9d0d17b3e23d08585db924b40a5148b5b10b80b56e0939e55c1 SHA512 39a34875f2d3f8dd43f52d1fc2e14b894cee278d447660dedd35183326b3f15172d0a61a325d9bc0fac60a20f9cf2de12b6c0d7986f7ea449634656c867c9be6
 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
deleted file mode 100644
index 71031851a637..000000000000
--- a/dev-python/mpi4py/mpi4py-3.0.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
-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 examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/mpi"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/mpi[romio]
-	)
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# not needed on install
-	rm -vr docs/source || die
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	export FAKEROOTKEY=1
-	distutils-r1_src_compile
-}
-
-python_test() {
-	echo "Beginning test phase"
-	pushd "${BUILD_DIR}"/../ &> /dev/null || die
-	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
-	popd &> /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local DOCS=( demo )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mpi4py/mpi4py-3.0.3.ebuild b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
index 123da6c26869..5accdda0fd5e 100644
--- a/dev-python/mpi4py/mpi4py-3.0.3.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
@@ -12,7 +12,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 examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index fe3b1debbf4f..3b16c004bf1f 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,6 +1,4 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
-DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
-EBUILD mpmath-1.0.0.ebuild 965 BLAKE2B 6516b708f6796943be71bb2b77e0403746b672c443074ee55614d276d70eb0c2750bff3da7650807fac689f61416b81659ab1e6c14d0329f3b641ead04d8b3ac SHA512 5399977dbba604a6237a36e290ff5eca05f628ff5cee6b5d730cc510c428078f026e7c24afdf7ccaaf0c45daf4b1c1baf0fc95ecef07160fc2e85ee116b61693
-EBUILD mpmath-1.1.0.ebuild 992 BLAKE2B 3b3f4e59ecd7934d229275f161931b736b3a6a8eef9e4ebf2dd6c3b026f2a9131a297e75a91c35c912fda3dbabb78d8f9fa85a91a574e5d5df775406edd468ad SHA512 cbd70c1fdf5ff1d05503a0d2c0f195dc5a11c17abf487734ed39cb44a035c8c249f3ce798bb35db1ec860c32570361d831cf3e5058a723d24777d2154f73d6ad
-MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
+EBUILD mpmath-1.1.0.ebuild 1035 BLAKE2B f9cc254300298441a3339787b93e117a927283b6a3b71e5f98effc9434246e34e25cdd95bdd934dc320f6fd593a583b17dc00a609be6902c246345206f15c56d SHA512 c787a372ffb0b8c75b88dc629b3ae2a3b05f12e561db3d5760361ee006c0d7b9f56631fafaf2b75b928c54ad795eaaf9270d1cb2e9943ca7e8ed1a81fe890d23
+MISC metadata.xml 534 BLAKE2B 19f996d0a1fd717bf099b05dba1c2313dfea37108b412da6ae4efd37f5d982e924f6134a4ea6a5f9e62af33ce52793d7208b31aa993e34ced42b56e0441c7ef4 SHA512 d791c8fd0722872e136f3c9fc222d55d39c5b1ee5f71f1dab0a475c7e39a164e646274c003e97b52111505f0f1d96f973971fbb51965d713c2e60e27b5b37f92
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 75c9c7ac5925..c769837f2044 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -9,9 +9,6 @@
   <email>sci-mathematics@gentoo.org</email>
   <name>Gentoo Mathematics Project</name>
 </maintainer>
-<longdescription lang="en">
-  A Python library for arbitrary-precision floating-point arithmetic
-</longdescription>
 <use>
   <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
 </use>
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
deleted file mode 100644
index 0b40bbf7c867..000000000000
--- a/dev-python/mpmath/mpmath-1.0.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=5
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="gmp matplotlib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 83effa8f6031..6c2236b75bc6 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://mpmath.org/"
@@ -14,7 +15,6 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="gmp matplotlib test"
 RESTRICT="!test? ( test )"
 
@@ -27,16 +27,17 @@ DEPEND="${RDEPEND}
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-1.0.0.patch"
-		)
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
+	)
 
 	distutils-r1_python_prepare_all
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	pushd ${PN}/tests >/dev/null
-	${EPYTHON} runtests.py -local
+	${EPYTHON} runtests.py -local || die "Tests failed with ${EPYTHON}"
 	popd >/dev/null
 }
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 149198844556..6b215a73cfcc 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,3 @@
-DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8eff56009f63df5daa8cd5b6dbce4406a06ffa8d478cb44dfbdfab2f3b4b29cd11279ea82f67906b97d507f7eda SHA512 bdbd193bd3bd02e78d9c6e8d9d8fa687d13583dff2813bc77c5e6cbbe0d180765da3c9a80d176f9993589e35f548ad04973e3d523d0b6d41ef7916ecd86195aa
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
-EBUILD msgpack-0.5.6.ebuild 1059 BLAKE2B 03f0bed0b448843d186d7f52557791612ded063755bcb9b91d1229ac09932f1bda433853cfbb3c9e3c0babf9bb21fc914e44f96b8ebceb6e4de238301242711c SHA512 83ef9678a4a8e2cada864cc7fd946960e422deaeb572e1c4a455d5e5e829ad6fb17f8a4ff099d6888a37f9824e1bd5cc24703c31a043a3c6d0e4d9994032725b
-EBUILD msgpack-0.6.2.ebuild 966 BLAKE2B 05a47b666780f9ff2b38fffab68c8dfeaeff0fb409d09e11a030ad3d4195bc2d1e5c75d75b8643e6e3e53c65514523a112c7769a12bb8fdcd51648f22d4e1fb5 SHA512 48b899e1c082a2fdf19c41673185806b9405880dce7f4c71fb6333374794e8dd66079f77e10b12895f7750bb13a24c47c8721cbaf6e9c1ec79b89650fbc1a41f
+EBUILD msgpack-0.6.2.ebuild 965 BLAKE2B 22e255852af105f9ff8076270f05d98539d4524f18334fe688222e271d52b775bea7017bdce52e3055a551fe90c5c3141bc3ae7399ab2ddb0ffb23c1e5154bf7 SHA512 a8b61e21a45683de30bf09f9faf22b926d47e38215e756b9735cc856789832a2bfe18dafad61d073049d5211eb1621be3d77536b024a74cf8241ebd34b3426f5
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
deleted file mode 100644
index 50d4c3283466..000000000000
--- a/dev-python/msgpack/msgpack-0.5.6.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,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}.cpp || 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 589255ff1f32..e65cd1b6e4c4 100644
--- a/dev-python/msgpack/msgpack-0.6.2.ebuild
+++ b/dev-python/msgpack/msgpack-0.6.2.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 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 bc834c6689f5..72dd78169bd9 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,3 @@
-DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
 DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
-EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
-EBUILD multidict-4.7.6.ebuild 732 BLAKE2B 1d275ecf90899551cc5d44f08bfcdc8642bc8b787f654869e91675eda46b897d0f855b30a423cb65f62ff72d036f20d04859190ef2a545491c5367f1fefee285 SHA512 fd3e5f8072f003227a292f7d61c707a34f090e8338fbd80c2497c5243c89f324443b846a08e6ceb98b69dbe3f828db67b372cf86d29eb3d404f7c0c275c94509
+EBUILD multidict-4.7.6.ebuild 734 BLAKE2B 32068b1a933da24d53f7936972e45a3d5e094b7326fbf4dd3e8b2e5260be3a06a74f7532ed1cd8e6868563421c66a6b6a007645a82c18209588231c410c3fcf5 SHA512 c95fc9d6489ea4914df052a0fb6b7b04acebe33e15d36f5126b82dbae18456ecaf2929458ca46cb7d66c8d1f909dd932da4c838eb4b1c15809dbfea691ed4933
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.5.2.ebuild b/dev-python/multidict/multidict-4.5.2.ebuild
deleted file mode 100644
index fb963f98c47b..000000000000
--- a/dev-python/multidict/multidict-4.5.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=( python3_{6,7,8} )
-
-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 ~arm arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.28.4[${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.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index 80f447507069..d0789c39d20c 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 9671e0e281e3..968497453ae9 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,6 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
-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.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0-r1.ebuild 734 BLAKE2B 144795255472d5d21b46551cb52bc61dcbfd78d8d64d0eeac24d7507cfc818c8973be04254d51676ca08e237a0a25b1ebb0a7df4e75bc4b94ad920cedcb0964e SHA512 3289269d643fb36189f557da333a4c902b06a9e7ee3dcc47564fcc094028d0eb5bffc3d0d029ed850d3d31716ad658cee36c4d528d42bb00ce6f24936e922bc7
+EBUILD munch-2.5.0-r1.ebuild 730 BLAKE2B ca265f58fdb1753c943f603edf034f229cdb2a388f84dc2190d5bcd89301d9f6ed57a103446038c8b31b492bffbcf50e4061cbf010d36e5515cf99204da26872 SHA512 f116b4f1a213f3064f06f53a57e4ca72c860e69ed822f8b46c528fc54cff28146b6ae4b7b78159ea2f22908d1f183527253fbf506c6deb07e975ceb38924f11a
 MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
diff --git a/dev-python/munch/munch-2.3.2.ebuild b/dev-python/munch/munch-2.3.2.ebuild
deleted file mode 100644
index f3b03120e566..000000000000
--- a/dev-python/munch/munch-2.3.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,7} )
-
-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}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index f0a35b912d19..1f0c3675ecbf 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 81f9837d56fb..215facf7ccf2 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -3,5 +3,5 @@ DIST mypy-0.781.tar.gz 2056785 BLAKE2B aa95d71400d5d46223a141adae5a8d797d2f076d3
 DIST mypy-typeshed-0.760-a06abc5.tar.gz 498726 BLAKE2B 9a2b3621806101cab009ac38e73c8683fba2789cad55da0a6739afd37bfb3ac4d8ea4e6b9cb9ba154a6fd45790f8dfda9e921d98485305c244573adf745d2adf SHA512 82559a91cc482f0cbd0cf5042d5975de21abc143708605a08c54088ee9ce3c9f52607ed3c00950442f4f526fd57f9ad4ada12a4f2acfb383759ac05f2be1a0a4
 DIST mypy-typeshed-0.781-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
 EBUILD mypy-0.760.ebuild 1716 BLAKE2B 26e0aeded0092360541dd435e85965cf0ee3627e28669d5b58b1e88dcf5f29a8c2501cccb4c7f3ee86a580c6f87372a01dc1a0ac83994a0deb04e26379c30482 SHA512 8238bf9823d63090257b5cb2f2c8dfa0599d570234c00faf02226f4ddeec7e94ab1aedec1f424aaa0e8cf7818d877ccbc7d95521efa3981c487aba6fdb6148ae
-EBUILD mypy-0.781.ebuild 2053 BLAKE2B 1ecc47467899ab7014180aa21d20d49a969984eb17411e7593b67172c0994ce51447d6f884f0f81350ef41faa77d0605374586b80b436014ab2c87d7775e578d SHA512 783cb0064654e2aca66a19b253b73c7d11703cbb216ec800447316866dd1d4c1a41cb655d9ee508d80c45e212f72a91efdcf605dc7e8d14308e2128c8de7f5a4
-MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
+EBUILD mypy-0.781.ebuild 2051 BLAKE2B 162d0bba6a6df6680550a449200fffe6764703fbd729f47198ef4f0209195e077852a1789c76b9e54ecf48ba5c0dcd389b2d6b4c62410948d0d3dc6c078c4018 SHA512 a0c4f0ebc0aa004c72cd3ef4a3c05e48ed90070a37b37775b60dbe6aaa405ceca0528b8bfff45fc8fadb74d6649d16ec8722d5ac311da19a01a736c934fda702
+MISC metadata.xml 342 BLAKE2B 5004da46f2571d8e3c8ac09beb7e680802ef3ff73b8a2904f79f95f290a5c20aaf72f1008f3c90df08c0cba02257b1629062d58912e6d97b2229f387d7e86229 SHA512 f815bc60369f60a8204fa3aa455cebc961fb3dae4eb013a13314a0dc57e2f7b43426ddc009a05441232e0e0b978da6e97071900ede1239d89ce0301344e5bb27
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index 22d8582c9dcf..a24960ff0e93 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python/mypy</remote-id>
 	</upstream>
diff --git a/dev-python/mypy/mypy-0.781.ebuild b/dev-python/mypy/mypy-0.781.ebuild
index 78823c7e84b7..c4c7141a8eae 100644
--- a/dev-python/mypy/mypy-0.781.ebuild
+++ b/dev-python/mypy/mypy-0.781.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/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 4dda2af3923a..821b0a319dd8 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,5 +1,3 @@
-DIST mysql-connector-python-8.0.19.tar.gz 12051609 BLAKE2B 252d4ee650c1eddbe54575451ac378236b6a795237c445239ecec096c7adcb60da2244592f083a50df57c9e2ae6447f1dcaf861042973a31c3fe7292509ef93d SHA512 9137b0b6aafbff16c83f59ab03da810232a92f6b76e38f460782153c5ddbdf6ae55d0c72a0c7902b7bc05ad1010bdc849662cd3d2138ae93476abf013e7a508f
-DIST mysql-connector-python-8.0.20.tar.gz 12058227 BLAKE2B ac16d0eb7ccc884e89bd493ce821b06223c7ea7a4c4ffce2ebc586c736524d826d92d3e3c7803c1f937c93a9f28df32205a04b3bd80474650e90bc267661879d SHA512 3b7298036f1b28eed98ca05ebc52619dbdf65393b4a01bf6eccea87d298da430ecfd19a3b327050ebc48b2c237698c7545c0196949d84cb79117f4d767d736aa
-EBUILD mysql-connector-python-8.0.19.ebuild 1526 BLAKE2B 54cb1d1096378a1e55112f6d7a59257263143a4ed20260dbdaf6fc16e91b99d5a17a134cdccb52f6736e6cfdb219ccd06025532322d1a217b48164e8a5df42c3 SHA512 697f961fc9e06388abeba2644fae2e6b5f5faf545ebf911535a2e7e0279bcf2b1ebc79c24507c6e498a7b61b1d666ff054efc3368bdf7231cdee8fbb3838aed9
-EBUILD mysql-connector-python-8.0.20.ebuild 1526 BLAKE2B 54cb1d1096378a1e55112f6d7a59257263143a4ed20260dbdaf6fc16e91b99d5a17a134cdccb52f6736e6cfdb219ccd06025532322d1a217b48164e8a5df42c3 SHA512 697f961fc9e06388abeba2644fae2e6b5f5faf545ebf911535a2e7e0279bcf2b1ebc79c24507c6e498a7b61b1d666ff054efc3368bdf7231cdee8fbb3838aed9
+DIST mysql-connector-python-8.0.21.tar.gz 12069002 BLAKE2B db4e7672f0daace08c88e52560db66629d5eb9d9903b76e616bed7ef4a21d80139a65ac24d47d16f9fa5e978f3acb262292c72933f0c348d9494cd51f96f1654 SHA512 d73efd99774450bbf729ddbb19b80d09b8db151715d12b76e40497bf1d9ff658e0ad1e22dc9a73dd5f6736f7c075f94808a2f28b1c975aaa380bbb92cf4e7184
+EBUILD mysql-connector-python-8.0.21.ebuild 1523 BLAKE2B e9699410d9a65611169ef9cd82ed9e7067a2f927ccb780caca96f321cc71a1a22525b78a17c476389b30681fc551a9a417565bede1f11b2c043ebec2b8ef576f SHA512 b2ad29767cac03861f243ca7804a1edaa9f1ff963cb414f68c01f19c4f6386f7286c809a0d2a81b84324426a5a0e841547735eb8f1673ddcb437150b2b17c6bc
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
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
deleted file mode 100644
index b6c5eebd14bc..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.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="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}]
-	dev-python/dnspython[${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.20.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.20.ebuild
deleted file mode 100644
index b6c5eebd14bc..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.20.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="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}]
-	dev-python/dnspython[${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.21.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild
new file mode 100644
index 000000000000..ae8e4244143f
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild
@@ -0,0 +1,53 @@
+# 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 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}]
+	dev-python/dnspython[${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/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 9dec1b9c376d..4f279b618172 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6.ebuild 882 BLAKE2B c447414c5caec67eea7ffdad207677ff39c151f2c837a2e1bef9a4a4f5fb668fed4f7c2473971f30f38c79953cb3ed9b3fd0d90058ebc74ad492cfd0e44c638e SHA512 ef39e9e0ebe1b93bcd159ccae949b3be989bd8b953d30a54415862e0888cefee976ee3ed835c1b5dcd4379635968be33582e75a62bd899b860fbd4f87911a3e9
+EBUILD mysqlclient-1.4.6.ebuild 888 BLAKE2B d6087f6f9fcd24ea80246561be97438ebbe923461287bb8bc06e18964fb04a07201a24571aea6e96e99d0e6fbc831eabe1816d851a6950fa2da4c78a49d914b2 SHA512 9bdafc569ae591c23beb61265e037acea88e232e9856f15786dfd4dc059115b15afa6aa18318334d6da8d60589601b7c2e82af45f2c1b17a235f55841f25816c
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index df0424f30bf5..447adb80c5e0 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 13110e58e518..9a8428445847 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 837 BLAKE2B 18be9593ac96ffa68b072c97cf4664aec87fae0ff97ee930d648634ba052a5c2fbc0d4f22b36ca2631df2d780c4252ab76d9a748349eb6499883d81286ac0959 SHA512 246765acaf3231dda56da07720de6c5470a9e9b58bef9cda1738da174c9112350240580bf4f596c3ac585d40bdabd12c21afb486f83d17177ff448a031990ae5
+EBUILD namespace-google-1.ebuild 836 BLAKE2B 3bd6d4b42336e1c9b57e101c8a3b156b53af3e2d69533c3b979101d9bca8b3e42927d051d52384ee58679f086283b94fdcee6800df5b1230eb8e4c62babd8b2f SHA512 dcc8bdf7b2058c2e6e54dad6b953eb7a5c59371a90376ecec6c41c321735eda1f5ccaafd603569823869257ce179bac41652225a0b152ece331e6b657ab7e1f1
 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 cc6fbd2abd25..a54997c42810 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index 06487c326da4..d65ff3bbd63e 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,3 +1,2 @@
-EBUILD namespace-jaraco-1.ebuild 876 BLAKE2B c926f0984079e1e5c22c8e09e624f2449dd89714f70e985877989b506e86899ecd5bd4be0eecd0e79740816799fcb83cc2805c49afdc079323cbfcb57c550d8b SHA512 59eb2bac6cdbe986929dc557b29abe0e77d087452a2608c49f385d457fe1e8b16dabd80442b0c1b67da142cad55a86733feae1fcd5069984bf5b914cab7fb21f
 EBUILD namespace-jaraco-2.ebuild 802 BLAKE2B 9962312b8a6ab98c8de61911297395824c3971de11ab6df9c0266677b6c83d60c32e24f1e7b75548291338efbf3fe5a317be523f9a22635e35762d218949808a SHA512 b429a8f406b2b0e03d237bcdad954be5d82851181ffb363f54ed41e475ad5d1b312ac5b8c027790d2e3b9e97882d1fb56f7e326f356547623b12d64afda8a02b
 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
deleted file mode 100644
index ad4e6536633a..000000000000
--- a/dev-python/namespace-jaraco/namespace-jaraco-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=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for jaraco"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	!<dev-python/jaraco-logging-1.5.2
-	!<dev-python/jaraco-packaging-5.1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/jaraco || die
-	cat > "${S}"/jaraco/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule jaraco
-}
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 36ad366fa051..683be60bcce5 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1-r1.ebuild 821 BLAKE2B 8add050ec10292070ed10737a660ae788ad8d05a46dc65518179184ac56b246704a2bf88de071f0145f10d097f95c376261383386eb6095fe8b20c254e87876d SHA512 0220466975a07c9091f448424d42e905b017795cb38f318fa6bdfd50e5e16d41e9bf93ffc98ffe3dcc94bdc94d3c78016ca1b0ea451cd2963952af70f682f2c1
+EBUILD namespace-paste-1-r1.ebuild 811 BLAKE2B cafd9319b893e27c3b4459a0b139cd8cad54a2719dd738c841093a6a5008559c4263c17247cdfe4cbbeaf075c98819856001fa5533d4c141515e9657013a2747 SHA512 9efc44d303edec13892bf6f7811cd8d6147952cdce94635bbb6380e20f4544b0a63d556f4a95934335b826bc91a5ef5a4ce2d3772143951173cc1f2e06b2468a
 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 ebdd860ad265..3483bf71177c 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for paste"
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 4fd5a8a5dce5..5867f49909b8 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 755 BLAKE2B bc0249534844203cba784fcceee9d066054efac9f402fb095d1eb65b61751f411c71432e0a4234a88de1b99760952b0b78934c1ee8f195740c05f3968b2bb425 SHA512 9346da9418d67c1b06276aa9a1cfbe1afaccbbfd3d2eacd779d2ec5696ab188e7ef375e90438579f277bef0c0e0c189eb3d1f0487cad4cecaa2f63645fda8705
+EBUILD namespace-repoze-1.ebuild 753 BLAKE2B 6b7b2d560bd3d0e3dbb2d2f357724c605e668c75d140b3aefd6e0fa5a5d478b8334fd24d34c455bf9cd772988d21b665a1b818cbd4dc934bd9042a7d812f1a2d SHA512 7beb7ee6f0edc29be9c2c1ac0e0fe0c7745e1203103d3b0f9fa676b97758228252d965acd8f798b34b179bb718974b48333e332ec25cf73f6f148888faaaecd0
 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 ae9ae8dde346..d00f74454522 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 59057dc41421..5f5ac594a969 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 953 BLAKE2B 541c16054080a1336600907bd2b3272d2d47bb4b79cc6940817364164c57a3dcafb4f9de4c1ecc6ad4005ed889ec66d089ee04097fd4fe3852b96e98c8cf7418 SHA512 da1d0e816a62d0069785463d8a3724829714a37edfddd33c8b8e343d8a5886140ecb82d09bcf03e4542372709620528be1c5794738df4860a96456fc366ef833
+EBUILD namespace-sphinxcontrib-1.0.ebuild 947 BLAKE2B 93a6c34672c05ddb007159ec10d4874aa678921acf5dd8b5ad0136340d97339aa74146191083eb16968368de0840668677608bf1afc482793cbb3733918da12b SHA512 13c436bca486506c392aa4c6d7048cb3cfb7a8c296bbf9fa57225a1c4e75a8306275538e5613c3490601bcfd80c3a3bdaeecba7e16acab6155cb200e515bd7d0
 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 6eb0c2ebaede..d1895484fb09 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 91782c573a37..2108a670a9d2 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,5 +1,5 @@
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
 EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059
-EBUILD nautilus-python-1.2.3.ebuild 952 BLAKE2B 6354343ec86b42de1cf0db07651468559fbb0ddaee6ac1bd7c767c85e5a4cfc7de653e9a6aef8d2cb0104256b6a37248bf17971457bf094668766d399352501f SHA512 9a4a5a29377a5dca89d3cf57352c61ff692e366010b4e2d60abad9f52aa4835c194367f987aa3cfb705c24216b363767a696a961f8e202dc681c848bb60be38d
+EBUILD nautilus-python-1.2.3.ebuild 950 BLAKE2B 2d627aa0ba9d3849551fc3c8c0d14ec0f0dfdbc34c726d12804934360f61977bf28476f8d48af7b2a69b814e8880a282ff813fb59697ff10cbd6e79ab669bff6 SHA512 a8bf41cb4c593e089e7f81268f982cb7a50ec269c79b127fe6548abd2239b344c944a1942dff3aa79ec74f361835aebb98fe15189bf90b8ad7a4f8504caea4fd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
index 8f8557f2af2e..8258df11b31a 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Require pygobject:3 and USE=introspection on nautilus for sanity,
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 0df0127104c1..e6cdfacf2150 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,9 +1,5 @@
 AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3
 AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463
-DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
-DIST nbconvert-5.5.0.tar.gz 583216 BLAKE2B fce42d68fcfb5439607fcb0fa8475462e929a5ddb9d160985956a85e09c7561e1a966be633b4d59e6afe873fb7f1300997c97bdbf4690290401d14bbe351c47a SHA512 4d10cbd6d6854d7672537cfb2e0a79854be1ed4adf96f805b1a0ec0dde0e149ed465a26ceec8d7c325f7011c30ff646054585b65d1e83540622e25a96cc207bf
 DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
-EBUILD nbconvert-5.2.1.ebuild 2119 BLAKE2B a08f56ff246159f89f487e7d4f671d55d64c1e5f0e1fb1ade29d211c84774731f166f0005f25958c560a49f95ff3fe6ea836c556455669e77c4b7c8aee623b8c SHA512 320938050a6f3a3bf7ec2430e04c76443e2410981ce7622d7dca8deaacd2e4e33a8c1b081d3a354e3deb64df333b16fc3e81177a53bc9a343601e09fb35b876e
-EBUILD nbconvert-5.5.0.ebuild 2103 BLAKE2B 45671ea644d557087eae45329e1dc1c869ff2f9ba347de47c5cb1d50497d3af39a6d4f927d75447e3f86988137a25e24edff1bc845b5a97957d5cdf245cf638e SHA512 4ced8cead706d1341d4edacf163f78223855096a48245d619792d80c80ea67bdb43b1fa8f2073d2a124ff4cc5cb72aab7a7df5bf8eb4c34eed0a398197d2f8f1
-EBUILD nbconvert-5.6.1.ebuild 1776 BLAKE2B 73e15c1584cbf8b935319cdbfe4e5362d686eb4c752ffbf6d4dc43b21fff9930dadfe2e3772ddb2624e9fcb68357d35c7ad5700984091a5e610fd53ea34167a4 SHA512 bb202323abdc76426cf5b5c754909451925b1002f1968a9fde7571b76ea9176bf79ee53d5f4358d5cc1cee6c52d42ea3858bb258445865904f55ac058c51b5ea
+EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473
 MISC metadata.xml 501 BLAKE2B a99beea687357c74454ec232dea268f95e9b775c882b1ea29e196ec124e829b9749d5fbc4c585f88e46c16bc868d57a757b6f9043545bc5905e0dc86c7f0b44a SHA512 d0735c82e490860baf8ae76f78058a9981dc345d7f5b06d54bbdfd1741a7619f68dbca3386f7bba12b58df46a1125384935de85dff3ad883fb11781df933a866
diff --git a/dev-python/nbconvert/nbconvert-5.2.1.ebuild b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
deleted file mode 100644
index c1571315de51..000000000000
--- a/dev-python/nbconvert/nbconvert-5.2.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.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"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		${RDEPEND}
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# still failing in many places
-RESTRICT=test
-
-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() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test --cov nbconvert -v --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-5.5.0.ebuild b/dev-python/nbconvert/nbconvert-5.5.0.ebuild
deleted file mode 100644
index 2f180f651028..000000000000
--- a/dev-python/nbconvert/nbconvert-5.5.0.ebuild
+++ /dev/null
@@ -1,82 +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="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.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"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		${RDEPEND}
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# still failing in many places
-RESTRICT=test
-
-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() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	pytest -v --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-5.6.1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
index 594d35db111d..3efa859bc6be 100644
--- a/dev-python/nbconvert/nbconvert-5.6.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4a1f7a70cdd1..b03a77922f4d 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,4 @@
-DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
-EBUILD nbdime-0.2.0.ebuild 1627 BLAKE2B 516e39cb3daf12267d12115dc79c64bf8c95f707eeb508f72a7c862609336d677c7a2b76041867775b3cce8a8f9f7078c71d3e39d02dafde064894c254c385f5 SHA512 f44408101877b5b097cc93637e64ec81fe2a1e550ed09c76e62c557d58f892d9a03d1df68ca3f7ff0f381b249c288ce3c41845575a400dcf3bdf8e48af924d83
+AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe
+DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
+EBUILD nbdime-2.0.0.ebuild 1514 BLAKE2B 1302952447550212f5ecab52bb21a0e36b656c77af163596731df05d9e51b44311fbda8583683320f4dd2b003dfedb02996a71a9ba52f224766f43cc8aa39cab SHA512 0ddf533cb3c97b40d3165f1507993365b8b2b4f48886a4754e77fb2c2ce7a9253b89a26f963602ecdb8440b01732634ae8ca6b9417666807ec1310ef16bed682
 MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
new file mode 100644
index 000000000000..ff450f2ce447
--- /dev/null
+++ b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
@@ -0,0 +1,36 @@
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -129,17 +129,6 @@
+     build_py.finalize_options()

+ 

+ 

+-class bdist_egg_disabled(bdist_egg):

+-    """Disabled version of bdist_egg

+-

+-    Prevents setup.py install performing setuptools' default easy_install,

+-    which it should never ever do.

+-    """

+-    def run(self):

+-        sys.exit("Aborting implicit building of eggs. Use `pip install .` "

+-                 " to install from source.")

+-

+-

+ def create_cmdclass(prerelease_cmd=None, package_data_spec=None,

+                     data_files_spec=None):

+     """Create a command class with the given optional prerelease class.

+@@ -179,14 +168,9 @@
+     wrapper = functools.partial(_wrap_command, wrapped)

+     handle_files = _get_file_handler(package_data_spec, data_files_spec)

+ 

+-    if 'bdist_egg' in sys.argv:

+-        egg = wrapper(bdist_egg, strict=True)

+-    else:

+-        egg = bdist_egg_disabled

+-

+     cmdclass = dict(

+         build_py=wrapper(build_py, strict=is_repo),

+-        bdist_egg=egg,

++        bdist_egg=wrapper(bdist_egg, strict=True),

+         sdist=wrapper(sdist, strict=True),

+         handle_files=handle_files,

+     )

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-0.2.0.ebuild
deleted file mode 100644
index 63b92348ff58..000000000000
--- a/dev-python/nbdime/nbdime-0.2.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
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test webtools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	"
-# The package recommonmark is required to build the docs, not in portage yet.
-# Furthermore, backports.shutil_which is required for python2_7.
-
-python_configure_all() {
-	if ! use webtools; then
-		mydistutilsargs=( --skip-npm )
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	# user.email and user.name are not configured in the sandbox.
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	distutils_install_for_testing
-
-	py.test -l || die
-}
diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild b/dev-python/nbdime/nbdime-2.0.0.ebuild
new file mode 100644
index 000000000000..29db8fbcd28d
--- /dev/null
+++ b/dev-python/nbdime/nbdime-2.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=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="webtools"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
+
+python_configure_all() {
+	use webtools || mydistutilsargs=( --skip-npm )
+}
+
+python_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 0289cfc4583e..857d14e20584 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,5 +1,3 @@
-DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
 DIST nbformat-5.0.7.gh.tar.gz 125328 BLAKE2B fa048ceef9d0612052dcf3180bca4228dba5117c6b0fb642f777bbd35e2b6f868454ae3d793aa0da3904757e42309ac53be19621a62967b719da86ab37d5f052 SHA512 3c1429a232d15d023f161f41cdab3364242f1a026349ea5aaeceba6a80afba981cc512a9f148ae3a0fa856a847c4560cc95abd965cc5d088a9f89c2b61d48fd1
-EBUILD nbformat-4.4.0-r1.ebuild 1244 BLAKE2B 05e194add2b79c08e6b6635de2f0dfb5aecbb3da1de181389d1427a704825fc564633fd5af2fa41a18e434f77b556e4e06fdfb49500f59479802fa9d350091ab SHA512 5b1f9548ef925c350dfc7502fba1487b0d0ebff2ce3a2ebf359313de78e8548594d6be59e49a68fec56b58b22cbd8965fee139e62b17f88940d36d224d2492f9
-EBUILD nbformat-5.0.7.ebuild 801 BLAKE2B 2781bfb300d2ca1a73397a4af1cc01cc0aa6e16b17ac9e14d037cc56024954fa8bc71799fa9cb94cf2ffed4691796a094dc188d06b946aeea320c277dc36b40d SHA512 90517693fe5f401c7c45af8413877c24faf666d6c793e31eba8cd6c9d2c46c9c288a046296357c612a2c35815a2b20ab616d37250e98fa41f55c4fab70e731a2
+EBUILD nbformat-5.0.7.ebuild 798 BLAKE2B 52e237055211a98d350c7d366fc50942eb562f83e994a4ad8c9d1a0a81d62595eccfb9e5c2d1067b6ed432b1c6540ae03831c630f3000c62e0391d7439b286ca SHA512 ea73628104c7c7b394cd2e537ea824b36f13fdf32220b5fa4e0b312ecdccee2a0ae74836892f213cbaa154e23fdc20d7e69eb1cedc17d4dd931c1483cfd0891f
 MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
diff --git a/dev-python/nbformat/nbformat-4.4.0-r1.ebuild b/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
deleted file mode 100644
index 61e1acf0cea6..000000000000
--- a/dev-python/nbformat/nbformat-4.4.0-r1.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} )
-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}]
-	)
-	"
-
-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
-	pytest -vv nbformat || die
-}
diff --git a/dev-python/nbformat/nbformat-5.0.7.ebuild b/dev-python/nbformat/nbformat-5.0.7.ebuild
index 23f19a3586f7..4b93f0fcdab2 100644
--- a/dev-python/nbformat/nbformat-5.0.7.ebuild
+++ b/dev-python/nbformat/nbformat-5.0.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 6f3d82f61806..8ea6a1fd8f9b 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,9 +1,3 @@
-DIST nbsphinx-0.2.14.tar.gz 98368 BLAKE2B 2ce32043fd3371d54b1922f973b9f8b4fc1bd1ace05fb2ee4136ed759454ebc5b3ac34030156d15a72d8e58bd739e7a4bc458e2cb26b8f80e9498df47c857a7a SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6
-DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12 SHA512 5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617
-DIST nbsphinx-0.7.0.tar.gz 129485 BLAKE2B 0a11934cb53c5c20498abd1d189f26351ef088f7fd7972f7e1a4bd98e21ced330a600a2beb1a4976798e1ead1170f6322ff8b5f393c30cd85d33593720dcb57d SHA512 2c8db730102e483b76bf899bb5fc1e34bb4ed817a65fad221ccc5ea7dc74c2a4f4b69398d01209a904f503acc7fae2c29ad701e6cc11ac30bae3a7e9bdd89357
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
-EBUILD nbsphinx-0.2.14.ebuild 654 BLAKE2B 98f4dd4715a5a776cbe8a0b1067a8571e0ab3c2e5e4cfd000eeda249e28d5a0e0b129a2f3dc40ae4eaff4d7096f7d64cacbdaaf921403b718d354e7a3b91e6f0 SHA512 9e7a26f5c5c6e5f069507b1c6ef5c1eed9f395fd8f2a56271bc6a2e00d450400939ae89d7fed3cf2379c41e999b0c8148dfc45496e8568fe599c618f5fae9a61
-EBUILD nbsphinx-0.4.1.ebuild 656 BLAKE2B b8a9396284ecb1c9582d5098a3888f03c05cea445dbff6f7975e44e8afc44812d1af9276976f33511e00503850b746f9fe8528a66ea1b0507be46c878fbab494 SHA512 dcc6024e0a741dbbefb648c13796f03d1ed05cbb396c40f53f8e27d4c7bde38633d148bc6876f00263a010c94c50824848b3ad94e64acbae7df77dc4770f8be3
-EBUILD nbsphinx-0.7.0.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
-EBUILD nbsphinx-0.7.1.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
-MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
+EBUILD nbsphinx-0.7.1.ebuild 632 BLAKE2B 9f4a0c9125368cd69a5b52e0f4dcde41d38b7eeeb0385341c7856a0a9d7bbc34cf134680252e7e423fb6cc14879d18c7648e2e87ca0d5a953143bb7ebf075a0b SHA512 a79724d2bd9dec926bd1082b6fcc27e1a2e65150372faa952cd72d0a734a9d6877154155218cc872233a18f07bbafb6a2d00b686cfee454a424a874598038457
+MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/metadata.xml b/dev-python/nbsphinx/metadata.xml
index a586fea8a7a3..bc168d6b26ca 100644
--- a/dev-python/nbsphinx/metadata.xml
+++ b/dev-python/nbsphinx/metadata.xml
@@ -13,6 +13,7 @@
     stored output cells -- will be automatically executed during the
     Sphinx build process.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nbsphinx</remote-id>
     <remote-id type="github">spatialaudio/nbsphinx</remote-id>
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
deleted file mode 100644
index f469dc231b4a..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.2.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
deleted file mode 100644
index 4af0f99f1107..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.4.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.0.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.0.ebuild
deleted file mode 100644
index 45662ca939f9..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.7.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild
index 45662ca939f9..336c38f2e77d 100644
--- a/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index f90922c6d65f..1e6e280689f3 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,7 +1,8 @@
+AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
 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 786 BLAKE2B 6967c45cc141118acb98dfe34e4067553a0931b09fd35472c32aa5ec6dfa6ad5dfe132b1d565f1057f892791096dde0891414a467f90c35c86146f37ea23c6c9 SHA512 95faed72c02e8b2db8da43931b03aeacf217c358b9ca11c97d9f702ac097227eb9383db98c906c57b4de7b28043bec3e2c26f17666795584896ffed8469a463c
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
-EBUILD ndg-httpsclient-0.5.1.ebuild 1275 BLAKE2B 0e883c4e2f525084eb505074c57c28c739724168e11281e9d4d3883b56486238e88b589b17af87d2bb8228245960ee982a76076a6c17fae332cc18a0dd638ff9 SHA512 0e6fe2a145229b4b1d866d7293bb50dc1aaf00fd18a2b4c5fe2415a69b298978948022080d93eef48eecd4c0d24d6bfa6230cb86fc4fb6ee5fb97c35174df72b
+EBUILD ndg-httpsclient-0.5.1.ebuild 1155 BLAKE2B e72bbdebdcd51e22f27a04baee481e3cc6ae9a7092501dda21962ed42bbd23e3dfd4cca0294f3796a7ee7894a8b5e91fadbe562e7e7f8a42eb1e5b7ca018e7a2 SHA512 24f5d02fa2eab41cae879add46a9df5955773bfcc9454467fe1f88b21883aa910d1b984aadd0484a5ffa84c9708c49fbb36ed7e6fa58b275a5cbc81081d5f8fb
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch b/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch
new file mode 100644
index 000000000000..b1328e89a6fd
--- /dev/null
+++ b/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch
@@ -0,0 +1,282 @@
+Patch is from upstream:
+https://github.com/cedadev/ndg_httpsclient/commit/370c1ec9713e68f8d9f2cd9984cb42a269cea384
+
+Note that we drop the useless gen-csr.sh script for now, as it doesn't do everything
+we'd need it to anyway.
+diff --git a/ndg/httpsclient/test/pki/ca/7e15277f.0 b/ndg/httpsclient/test/pki/ca/7e15277f.0
+index b9b6ac9..9a4ab56 100644
+--- a/ndg/httpsclient/test/pki/ca/7e15277f.0
++++ b/ndg/httpsclient/test/pki/ca/7e15277f.0
+@@ -1,20 +1,30 @@
+ -----BEGIN CERTIFICATE-----
+-MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
+-VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0xNjEy
+-MTUyMTMyNDNaFw0yMTEyMTQyMTMyNDNaMDcxFDASBgNVBAMMC05ERyBUZXN0IENB
+-MQwwCgYDVQQKDANOREcxETAPBgNVBAsMCFNlY3VyaXR5MIIBIjANBgkqhkiG9w0B
+-AQEFAAOCAQ8AMIIBCgKCAQEAv8L7md7A3NvKIYndyjHV7f1xVH6gJ8JPrecxAiVs
+-nidsYUm8saBV/dFf1jPMQ6hdjIuxLXlopLxThkHlCes/OTxLzBFLvFQQaxLExTsX
+-OmgeM4q20a2JLTqkmItPIYDVTYgi0EaF+I9Z1BwWGEfYr3uTizpr48rnzpXgRwrZ
+-rjRc53zLKpeqyBs7Qmg5Jlzmk/A+UWJ2ryCWLY9KFE3uPstybYpwq7YayD6upVwc
+-vedhh+zpXU3E9r/cnlZ4sKSP2M1QSOTb2l5XnlOU/MLODYW70uItNqs1j1XPuHYh
+-/ikO+jmjPUtL0IE47+LcaMU6BpaOCLzcjsSn/DDMYcDB7wIDAQABo0UwQzASBgNV
+-HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9S+bGqsW
+-uQzR/yHDdHoU6afNTE0wDQYJKoZIhvcNAQELBQADggEBAF2scAHd7xjgnJqAUX0b
+-7f7QKjpuYHrt48tH+pFOh5j3IgdOqTgRLc/N8lEqoH4M0lKZKbBerM9FiQ4eXCwy
+-3Rswn3wXPvi3HJGgvZYUt8J6KY5+syHU4iuzuSHOjznC0lLZkRz6kfZHX+paqro4
+-1CsHhCt3ew17QMWEP6UtfZfBCg+kiEfBtSsTUIth0HgdH033PWh5v+nOzGN+3o2t
+-ORlzpttV+0RLlsw54l51I6rCEnfKOKtEy491JUs2whUwzp9v8tG4jev3PDVWhSSS
+-6jaSNvW4v7SDH0pnw52ZWzaRtA/pV/dCQOlqJ87wDNPdoVGpwqtYF/7Zdw2ty4gU
+-oSM=
++MIIFLjCCAxagAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
++VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0yMDAy
++MjcxMDM4MDhaFw0yNTAyMjUxMDM4MDhaMDcxFDASBgNVBAMMC05ERyBUZXN0IENB
++MQwwCgYDVQQKDANOREcxETAPBgNVBAsMCFNlY3VyaXR5MIICIjANBgkqhkiG9w0B
++AQEFAAOCAg8AMIICCgKCAgEAoLeKc7StJLjyWuPBc+0pg8y5QJ4VQFzOc1jXbhqo
++GugSvV/BpTqAPPCbd5hkET8nMIHkZ6EkXWNlxvYvrqKOKnrTvw3WUjEmsdoHkaXA
++hq+v1IHbPbCQbB+RCCObuxlZ9Y72llUrODATb7dc9Odc4LCLPR/9+FjncB1d5b4x
++Qt74VolID0dCd5dmMqy+lUYjsyLSycItmWcamdMEEPCop6AXlkAq3Q3eQDxaHtly
++IOmyrYv2EWnFH5FRevhJdTnb48FdUTDya3T+BWpRqzF/Rh3NmI05JTbmSutCOs8m
++SgSyi0JTNgaOaLlbtYVBLEkETUHPWABWwrXghIMIHaw3BZas2a9nlKE6zQSBxjsC
++M/jJopgCDjLIxCw/SZ/Koovye/yvhMKYo71YnQCIv+1pIaL7GMrxMQZzrJiUVlpY
++XtCyjx+5uiD4WuKCq6/aEKUd3o6ZdmNhkG8R0uBmivwxAmuMoMssCZC2GG7dBG+a
++FlAG0OW+qzez4njjVwT7ePaO/ggRm6yJRNo7s3+SlEppV/orKLH4+O7FJm2HwTIB
++Z3HSObrOJtjlcjM5pzhAFC4M0ul9vnCcnaFmhzB7bH7h8X7RaqECuHIhhfWTUiEP
++f+riC5C962eGMqJH3zzPaXCKFVgyYXtphRZJYzf3oU4bGn69uumPl47McLd9lseR
++uLkCAwEAAaNFMEMwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYw
++HQYDVR0OBBYEFIYdooV3qYYhM6aq0LTBYQWA9j1BMA0GCSqGSIb3DQEBCwUAA4IC
++AQAzqykz00ztLxbAEVc8QbfxMYVa5QYp4Ljdl7Wb4IPb4WY6fDkkJ1wRNg/KWZov
++CkTsiFvQSG5eHEVDLPUjW4WJ+eJI3uPeNjUTB+9i88pjbLqP1VBeiNdpTcOAu4w8
++cosK1wk6K3LNHATXZArD+8mHEFAHinuqlYwkBekIPBgMgbKr/WlaowV7fkIAUpxm
++K2W7oLt3ZvWmFrsFcywLsyXmA8EC3d5svQ01YLHE7xJUcjatKSJyc+0dnMNy+ZZN
++6NTPCefHwi5ShWWmkwtmvCChzePpYP/tBqkAIHLB7js2nHLZYtJYT1CqOGHdy3bL
++DWHYU527Dj949K03/ZE8jkBqzQje5uAw9bqluydXXkAtMO8rMktIsEjZuMsyzD1b
++Z8qdeHvwHQjnA1fvMuAO2QDTb8zGc8Mcn2/Jbj9ZD61cej75GWPIDolwSmMIA7fT
++HyyD8NiOnqM1tGQZQWGTlwZidH6Z7jUASZd+J/+pVKyFmA6ecgo54/w/wTQSv/6S
++ZWGp4ZYdjdpZ/coX2kbulej+Z3m0m4WB66LbvKD8zCYymRu5ULtS59QElliDKERS
++U41awYtdgP/R/cz/SBoYxPvY/n1sOWT0mQp1+ctehDf+tDMirjOst71eq6n/85CR
++NuP+k4yntJuzOjuxZ2MI8iuGDrqi/rFx2AhXXNCkCFDArw==
+ -----END CERTIFICATE-----
+diff --git a/ndg/httpsclient/test/pki/ca/ca.key b/ndg/httpsclient/test/pki/ca/ca.key
+new file mode 100644
+index 0000000..4e79919
+--- /dev/null
++++ b/ndg/httpsclient/test/pki/ca/ca.key
+@@ -0,0 +1,52 @@
++-----BEGIN PRIVATE KEY-----
++MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCgt4pztK0kuPJa
++48Fz7SmDzLlAnhVAXM5zWNduGqga6BK9X8GlOoA88Jt3mGQRPycwgeRnoSRdY2XG
++9i+uoo4qetO/DdZSMSax2geRpcCGr6/Ugds9sJBsH5EII5u7GVn1jvaWVSs4MBNv
++t1z051zgsIs9H/34WOdwHV3lvjFC3vhWiUgPR0J3l2YyrL6VRiOzItLJwi2ZZxqZ
++0wQQ8KinoBeWQCrdDd5APFoe2XIg6bKti/YRacUfkVF6+El1OdvjwV1RMPJrdP4F
++alGrMX9GHc2YjTklNuZK60I6zyZKBLKLQlM2Bo5ouVu1hUEsSQRNQc9YAFbCteCE
++gwgdrDcFlqzZr2eUoTrNBIHGOwIz+MmimAIOMsjELD9Jn8qii/J7/K+EwpijvVid
++AIi/7WkhovsYyvExBnOsmJRWWlhe0LKPH7m6IPha4oKrr9oQpR3ejpl2Y2GQbxHS
++4GaK/DECa4ygyywJkLYYbt0Eb5oWUAbQ5b6rN7PieONXBPt49o7+CBGbrIlE2juz
++f5KUSmlX+isosfj47sUmbYfBMgFncdI5us4m2OVyMzmnOEAULgzS6X2+cJydoWaH
++MHtsfuHxftFqoQK4ciGF9ZNSIQ9/6uILkL3rZ4YyokffPM9pcIoVWDJhe2mFFklj
++N/ehThsafr266Y+Xjsxwt32Wx5G4uQIDAQABAoICADoHa08xyl57BM66c4wW8qlr
++Dux857FwkP5m8ooHx/DHIJUN8Q5mnAzk102MUX1ErzK9g6nDLi0mCYaYN0k32lsO
++NExEg8DzjEQlNBxrm6NF5he1t2KD0PGpSCWHLeCVW7zlHLXVFKDaAvqQW1j1/LwI
++Io40ce/sscvyXofob0L03Pfp44HYufASU00ywDGHvLYeebttiCdeaeVmoo43Rr4X
++eMzAaHmeW0QYRnXjD2lA2En/Qh6xcQJf5uqeoW9ZL8MBe18obC9Oc7Wi2NAWNB0t
++/6D4RMziEK62WRiA2RNatNjBXugf3+WCH9HfxlNmHc6DV4kvviPZpbJS2WhVWRvx
++8fgodN3nT6Rbl+bgc1yy8BUHzoBecRELStpZFapsYnEhXzXJkmLtwxVF5gIvVwMR
++fKJKTFqpVzfD+XFP2VonbDrhgIHSEK3TtKmks7tkB/swz3ftIQiTvGq3Oca+22so
++8P4xVRsmzAoyumeJgK0pW12hg891HKQzrcITiO2XO5TM+3RszOJq7/KSi4d7ebS0
++Cd/+g0F3VrfI32VTQv2eS6YKHyHxzZIwq1OdRDQCl8ZCMUk72MpF80rjJfZCXgII
++/Yq65ez60eW+JsF5Ua+jaSFfjAjQiFxLyUUZxY0yIybzNWsDeyy2+kqya+rvvc8c
++3LQc0pkJiROaWXr6NOcBAoIBAQDPpv+RdON4DLA5DZjs9nDlh2Q9jxHoRPIcPVUJ
++shQUILjCQxeYyeOww7g/p0BhA/3BHhJSxCKkvHbo3OD0S/G2TOmpHjifR9Lvv5vm
++pN/t5EJYJHbXUIA7XKq9wHLvg8W1cA+RjPaGGlTIoCZNTXh11p741fUxdcNtOCPH
++p+OBE1nVZFotpZllKafL6n4vRurwpt/Ip6pygCMKQ8fllkNmSX4UwXxNPBgJyO+J
++mW1Vp2EMHqVOr5mZaj0hH6iddazsBIF2cFbz8bnP06kuhDqKzXQR6T2FelycFyfl
++OH0vC1E6F/cr7YfDxcxSBrtHTnxmUk4vJc0nlT78FiLwH/dhAoIBAQDGIvw+t5ue
++gG9DIEjd5eJyI9rCOdyMy67gavbkLywzzfAmIpD23zMoPp1yyhB1oXMGjWns5AJz
++vZ+9I+aiLoxGHFumq5FnWgxq6GSOb+xgmL8SiwRSjjc850vGjkWRNpx7/hcD0T7m
++qAAHxYOowtW4FRg4xmJM3YIK/NQ3gYz0Kqn61BnXwrbJSga91fTybtXqTIPCoK7G
++cJQMIXijChl2HahtL2dn+e3VNktLmRqYcG1gGOcS0qZKgLikiZaXJobm87AHVB8J
++gnpN7GjeQekilE6zYg1v9mJ4KGtn9jlc+z5in8M9gzxh1UMtJGmo7eLiKpxjnnI4
++MmOqfmfvB7hZAoIBACfLyY8G59FKHTvR70z6rghPOlbR5IyvKfdfibyh9FcnLkGM
++uij+CDUITXdlhmERcsBgEwLps/n+ZIucSUCIjXpyoxVWRWPBUBvCjQ5W6tOcu1pJ
++Ir2BIBJAYDideWmNx4ZOQ62RZm2s/jK0/qIyBrQOvcjSuHsSJrH34GOTOXazTrQm
++12GIKy3IHfBmsGg/Hyef06OQ/omTJSQCeXz2n1QrIY64xinHKpQ1fjLQxLN1sJOy
++C9xYqwdL5QtEFfyXYNyawHUCcqet2/6IghP4I4AWf/guyyuZl8YSagL0IImzkY2g
++qi4xB6PtdIsD30B7Ojwh6fn/NKIxaDDHzUpX1gECggEBALrBzTsce52J99Wwv54Q
++ikIF07PRMDax4jL7/50TbbmiumJnoHZh6elcI7JIDf2iYTZi4t38COepa8Cu7zwd
++XfDT1/ugqdxd/2hhhi7QBmECeM90o21hSWWpqj4Majw22obw+CaL+5sT7Xtly/St
++OR9bGsqhC5TiESpkJ2/uN7sJ39BiTb2Wdg4DLZmP62L737wJxQQVyseW46UPg5NB
+++L/hspi/3tsds/SNSamHNY9MIXw73MpcLYv6CpBkc8Ii+XMFbP1raBnhl4CNfkdI
++nwQOAKSKnpnTBfu2NY73ghhHZQU3C6OWaLradog9Uy58k6eUfHZVqdmYfWL95N9k
++SnkCggEAQ9oqCgTs1H8pEVZPGGAGMjoFJT69HH+tKI3I/kLTEkJFP5zVz/jlFWqD
++E5E935r9WexLSHazZFwb6CAaeJuzuYKfZmOgCKSPmHLkop1jR1yBqvzjXPPqJo9b
++Si6igNS7ufEw1uM8ru+/wCYrUA20sVQSeECNL1B1re1Av8AtMvNCJxkclo5o6A5P
++mFygoVlpPasKJr8dzMExtcLdtHl6XbpNS55kcO/JpnevhUTVpq3URvpsf21xmFuj
++fy27gWvcokG9WLpuPyd90ShzocJyjLRXteFcjHkPtNwUJc3QGh8xlPoqs7MfSA76
++ep2Pg4lXDl4+iO5SDobGse4Ka/Pkkw==
++-----END PRIVATE KEY-----
+diff --git a/ndg/httpsclient/test/pki/localhost.crt b/ndg/httpsclient/test/pki/localhost.crt
+index 99711dc..74a393a 100644
+--- a/ndg/httpsclient/test/pki/localhost.crt
++++ b/ndg/httpsclient/test/pki/localhost.crt
+@@ -1,19 +1,30 @@
+ -----BEGIN CERTIFICATE-----
+-MIIDDTCCAfWgAwIBAgIBADANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
+-VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0xNjEy
+-MTYwMTA3MzJaFw0xOTEyMTYwMTA3MzJaMDUxDDAKBgNVBAoMA05ERzERMA8GA1UE
+-CwwIU2VjdXJpdHkxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB
+-BQADggEPADCCAQoCggEBAMOuihdNsoWgVg+DsRBc4kckQ5oiCVsx9NiRkUoCE3mu
+-dQb6pCRhoD3vjMMt18Ajr9xNMtqTtP3lqQ4iId4bd3WaNc2L4a9698QOnpY+Z70T
+-0pFckNvVcC+5kXHPCFsm/jIVsjJDdPQWM0fFqPGZTwQ8ssS5P9jdB2JHchHFOCWd
+-IYYO0jY1BEJ1AXeK4XzfU0/00s0LnleLrbEpNB9ckQaSbLU7I9o7fDr/5+WbV8tI
+-C5OG/ZZW7jlc4t4TLpzkUatBGW3c2PKJPgtWBAbtScxbtHB4mXV6iwmp3hlLT6tx
+-vKD+b8TFpxGPdoOfIHX6/hjMJa+kr4Z4MDHeNfHu6eUCAwEAAaMmMCQwDAYDVR0T
+-AQH/BAIwADAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEB
+-AHm7NNZvti4QfopARMIcuokWHac18Ka7HBRE04WxLw9vKuYYu1m7d/0sUhk3KuBB
+-ANOyzlt5y7ecEIAqxGe0m1yftD4Dgj33wB7kHvbIKUceKI563PM757RgDm6C70/p
+-3OwOCcx2FsSaKLFBdtahzv1cMriN7JpEoa1qT3MnmFyaK8hEaXxbRGwDDAXRgOix
+-ftOkNc5w0glQ7dl9CYq2QvsnMtG327pvyo6lBTKNjFzppZ/msOagPONuAcrtLAiU
+-wTNk5Aqlj6a+Njtq/LJFdeyYsVxwuqvVnEsU+9FJFL8PYrWpG8fA1dIXaPS+06Oi
+-vAMwOmVKhtgKvbaGcYa6efM=
++MIIFDTCCAvWgAwIBAgIBADANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
++VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0yMDAy
++MjcxMDU2NTlaFw0yMzAyMjYxMDU2NTlaMDUxDDAKBgNVBAoMA05ERzERMA8GA1UE
++CwwIU2VjdXJpdHkxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEB
++BQADggIPADCCAgoCggIBALAc2LCkaet7eZdOPQgSRcz2e1mJQ3qwMqT1BdMn+AG/
++9ZMInCftXmJBHpb5WKeA4hclCP+sFUfaxt2TcJ7rNsPX6rkN5JFwMAIDMzjaq8Dr
++1ZYjenTvInnb6tWIK2KP9nVdJRxSCXHIdN0pvJQdyi+3LOnTHyfHKIH9lTBLf2HY
++Y1tpGFDWL/ywHbh7krUkIfC3vSx6xZXBNgStIH4gjpP2DxKfuPmSw1Kae2vOKcRJ
++29PwB/H1TaPr0VvQTNN+cBC2oOehXpH/QRbU8Nye7uq4z/llKD5LMZAOJe7VUU5A
++zxUH7DE27824CmS1ywd5JueyednsnsTjltEayQcnvAm/OEIr6rO0aDVmZH40i/W1
+++NdiWgGxt3OrvjU71BQAlaknshv2xDx9UNsLrQ+iOpDdsYxpD84s4Za0V+qnq1J5
++QCSD7oaQLi4SG9nPLC+wpEhMCVGCHtClfL1NVSBYVycbPp1iLQP3xCiwV9058XVP
++T2psI+PaPLeXp1ZNpEkRl+/UyAdDKqb3C6nE1tqNbTURhuL/ECFFHiH1k4mlGZfG
++n2YL90ROqKFm6YdYE357vPrdjDbow32Cqt8wJqTE3mIaxZH+vLqKRezbU8fmo+7g
++yEMePsCTWw0yXPyorioLAbFZBO5512sa09CXLGmeTaLs0215zaK81HnAgMwFWT+9
++AgMBAAGjJjAkMAwGA1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0G
++CSqGSIb3DQEBCwUAA4ICAQASq7gPmWVMjm6XzmHJ2LSIJAjGEmjWSNBf1rvbEItH
++NjxzLu4VfiShgj9y53yWoNJSJGGGtoKmaNQK63x9GzTQbN60izXlW20FP32b9Idz
++6y7Ta4JSqNx1Q/OW+ABsWZZ68Ob19XLr8QY5fog3Teh7Q0jzln/rxteB7OUTJ5QC
++o5Nq7PDlg/R9buRZnHHb1tmBHbSbkXK9wjgSQMtbga2EQuewJ5KYHYUrdYsklg2u
++wqnxtL7iND1dGcG2J3QKdC2fT1i7EdU5ZFvDxo9VOPvQmrIzzHKfyfgmOD3QhOrz
++2rCcze86Vi8zlk0yk8oQNTjLndnJgSWYq0OFl7iape1ObblulILDhb80RI5N6pK2
++WIb05Kl4Sm/bNcphi5KHtQlr7HzSNojr4qgHlo5KdQ6IW/ZOIGHgq6OjcifAIsKw
++wkojOqriFdeKAiU83bWvxVUW/F9Yfe/hHCjjRxp6xMRoGTh63jGmAWxu/WR9GpFP
++pfVsHLHg3p8tU4TusU1I5TuHZ/8B7atpFdlS5J8mc5bVB6oHYuaJVg4bbMGQIfll
++m5CTfEKfTxkLjVtUGEhmoutb60qnXECNhUYFef69hMZ5VOUj4gAC8e2JKm/8yjG+
++K9USxsK1YTAMIKBbLqNsJmOB8mz08CxPU8R6XCvzDPr4rqnG18IcUxAlbYiH77eA
++qg==
+ -----END CERTIFICATE-----
+diff --git a/ndg/httpsclient/test/pki/localhost.csr b/ndg/httpsclient/test/pki/localhost.csr
+new file mode 100644
+index 0000000..a3c5181
+--- /dev/null
++++ b/ndg/httpsclient/test/pki/localhost.csr
+@@ -0,0 +1,26 @@
++-----BEGIN CERTIFICATE REQUEST-----
++MIIEejCCAmICAQAwNTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTES
++MBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
++AgEAsBzYsKRp63t5l049CBJFzPZ7WYlDerAypPUF0yf4Ab/1kwicJ+1eYkEelvlY
++p4DiFyUI/6wVR9rG3ZNwnus2w9fquQ3kkXAwAgMzONqrwOvVliN6dO8iedvq1Ygr
++Yo/2dV0lHFIJcch03Sm8lB3KL7cs6dMfJ8cogf2VMEt/YdhjW2kYUNYv/LAduHuS
++tSQh8Le9LHrFlcE2BK0gfiCOk/YPEp+4+ZLDUpp7a84pxEnb0/AH8fVNo+vRW9BM
++035wELag56Fekf9BFtTw3J7u6rjP+WUoPksxkA4l7tVRTkDPFQfsMTbvzbgKZLXL
++B3km57J52eyexOOW0RrJBye8Cb84Qivqs7RoNWZkfjSL9bX412JaAbG3c6u+NTvU
++FACVqSeyG/bEPH1Q2wutD6I6kN2xjGkPzizhlrRX6qerUnlAJIPuhpAuLhIb2c8s
++L7CkSEwJUYIe0KV8vU1VIFhXJxs+nWItA/fEKLBX3TnxdU9Pamwj49o8t5enVk2k
++SRGX79TIB0MqpvcLqcTW2o1tNRGG4v8QIUUeIfWTiaUZl8afZgv3RE6ooWbph1gT
++fnu8+t2MNujDfYKq3zAmpMTeYhrFkf68uopF7NtTx+aj7uDIQx4+wJNbDTJc/Kiu
++KgsBsVkE7nnXaxrT0JcsaZ5NouzTbXnNorzUecCAzAVZP70CAwEAAaAAMA0GCSqG
++SIb3DQEBCwUAA4ICAQBQ+niVozKfjJP1VCTDb88/mAGEpEOGF+BXwN7EdQKAwZva
++vAxQSpqt8h0EYyToPCV6P5GNzFQ/rRW2OYgWwXEHk3ptiQzcJzIF/F9CbE9vgYO5
++Xvosxy3uyJr15sAoS+qL4jEXg7dDni+LesYYR5qx6l/5nYG/6ql0Z/K9+Z/1xrci
++00Ml6+xq/oT1kc0JQYuUKnMXgQb6Mishyt+ESoRDFt6oFqlza7TNhC/Q3YxuOjqw
++Hr3rc1T9L8ArYFMhwjCBSitJS9ojqtPyXTkE4ZrQoaAAl/jdwbiHQ81/PQErgrk4
++3RkyokdrOkeK2CssJ402s8ybnbYzaI+wg4K7r4APsiOXAacfVObmPYzQLamqCNkE
++hcGD6Yp9JpSgVWH+cTHa47slz3RjLxMW0EMfffYOlsWlxnlY+LHTMrphfd7otSlD
++c3lSbUgURW6babKQBxOULR0AooaJK/uHgarb+6xNQoPTA7RSDfemfBGu+xAxIeE8
++xPRXH6DYjhzwiHB8tFKcfdXX+MZCQ+QUHsbeVLVl+0kkw3J5bRTo5lS6menuzbPA
++osnOO2IMBrhctgspj6MJg6lyFyWUDYzWn0JU6+rF/NHmnrlFgJ5in1eg1u783bXJ
++0jKPpw1QAOz+gI2MHKx2Tpbu43UtAb/35GtW711e6lhm3gZUxjVQj7qhfW1pcw==
++-----END CERTIFICATE REQUEST-----
+diff --git a/ndg/httpsclient/test/pki/localhost.key b/ndg/httpsclient/test/pki/localhost.key
+index 98a3db4..4be01f3 100644
+--- a/ndg/httpsclient/test/pki/localhost.key
++++ b/ndg/httpsclient/test/pki/localhost.key
+@@ -1,27 +1,51 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-MIIEpAIBAAKCAQEAw66KF02yhaBWD4OxEFziRyRDmiIJWzH02JGRSgITea51Bvqk
+-JGGgPe+Mwy3XwCOv3E0y2pO0/eWpDiIh3ht3dZo1zYvhr3r3xA6elj5nvRPSkVyQ
+-29VwL7mRcc8IWyb+MhWyMkN09BYzR8Wo8ZlPBDyyxLk/2N0HYkdyEcU4JZ0hhg7S
+-NjUEQnUBd4rhfN9TT/TSzQueV4utsSk0H1yRBpJstTsj2jt8Ov/n5ZtXy0gLk4b9
+-llbuOVzi3hMunORRq0EZbdzY8ok+C1YEBu1JzFu0cHiZdXqLCaneGUtPq3G8oP5v
+-xMWnEY92g58gdfr+GMwlr6SvhngwMd418e7p5QIDAQABAoIBAGgyO2PXQpU24DyY
+-oiMVYoQBQmIDd7nwqvDa6mNfIaGsjLIvqlGZDmuMcAbKFVVBa3ZCQS70ce60aMWW
+-1TPgqkab28RclMsNDnt+UWGtTy32LSyr/pKgX4F6LYFNfaST6c0fkmiDVPZYD+xK
+-ywAC43ldHM/12JKQd0sUwh/GRXR4/Y9anWR4uLcfWCRU/7JVefdUe1VWeeelCMB4
+-wCcv9aQeFKnKeRopg5sryMo0thXSJCrO7UTSBmyasgNlMjUFpIIlPZQrWKXBtN48
+-NT7yGZ4j4RpSS8jhIxZASmyj1eyn2bZEk5SFcFM0wN78lOIOyGBB50QJBSEuKvHT
+-suFBzI0CgYEA53PCyAxHcA4wfuZJgF24VTVUpyZEjjTBRtLrZxUrIagVph5iS9f8
+-X8henBabaNBB/xsb17qPesCpqGJJEj2XpSKjTQdzmjCUZV8oZSLW87esXwm0Jfb6
+-dmDqShwlph5l31ZG27I2uTMV8HE8PAOta5rBEFsEwEZDmwtsIvwu6NsCgYEA2G+Q
+-ZbFelFC6+aGKPTPrPVzX45IMPRE23f3euTJdEA+T06BD60LC0jQlxmQghlDUZkxs
+-s9ihPnj2nHuaxJyR4G+/56oba5Jds2ZAiU7FNGZpBHh5J6tUligRJ8cjdRiKJheb
+-H6imcRiD++6P2PnQUPuSnfnxo+yxDotUxtfflD8CgYA3brIn10kEvWFAA0d3Rvru
+-7Wbo4XFp3ZisrbdTaO57kRYeQwinwYLgLcz69S8jWz1zK7rvX+8dJyd6/I8jnzzC
+-gBk8SZyWQSxJWxEBp+ZzWHogCOLsdMpnr65tMXCS6JTdeHxgAb65fFK002nptbfD
+-Hb0/fY0Vv75RU9sCRgO2IQKBgQC+MALuKZdXsz0qIRZtw5LCQDSBiBPzEY5qMiym
+-BqiadWXMP/eO4wJ5XlOXauLdxGdwYVXgD8tZL0hdp4wPmxng47H5q5QeyeZGv+KU
+-BcDq09cSk567CiXxMNIqZyY0PlUfNf0dK8DeftFz72U+H/87OmXTJhB9oH7RrgPY
+-G1gfVwKBgQDiCfLBoEfwOpif1XAglNdIv6J1M3rwS85txHlY8H91iiBaoKosLzdj
+-ZTeqOn6ofsWj1NaR8OudZApZZT1gHjmDUnpzrQZvHn1gelsVwoZfXs1ZWX+J4giD
+-Rt3aZFRc4uPVgVNLHf4kADWao5bwvbxWfx74J2LQ4QJ4rxFumeg8HA==
++MIIJJwIBAAKCAgEAsBzYsKRp63t5l049CBJFzPZ7WYlDerAypPUF0yf4Ab/1kwic
++J+1eYkEelvlYp4DiFyUI/6wVR9rG3ZNwnus2w9fquQ3kkXAwAgMzONqrwOvVliN6
++dO8iedvq1YgrYo/2dV0lHFIJcch03Sm8lB3KL7cs6dMfJ8cogf2VMEt/YdhjW2kY
++UNYv/LAduHuStSQh8Le9LHrFlcE2BK0gfiCOk/YPEp+4+ZLDUpp7a84pxEnb0/AH
++8fVNo+vRW9BM035wELag56Fekf9BFtTw3J7u6rjP+WUoPksxkA4l7tVRTkDPFQfs
++MTbvzbgKZLXLB3km57J52eyexOOW0RrJBye8Cb84Qivqs7RoNWZkfjSL9bX412Ja
++AbG3c6u+NTvUFACVqSeyG/bEPH1Q2wutD6I6kN2xjGkPzizhlrRX6qerUnlAJIPu
++hpAuLhIb2c8sL7CkSEwJUYIe0KV8vU1VIFhXJxs+nWItA/fEKLBX3TnxdU9Pamwj
++49o8t5enVk2kSRGX79TIB0MqpvcLqcTW2o1tNRGG4v8QIUUeIfWTiaUZl8afZgv3
++RE6ooWbph1gTfnu8+t2MNujDfYKq3zAmpMTeYhrFkf68uopF7NtTx+aj7uDIQx4+
++wJNbDTJc/KiuKgsBsVkE7nnXaxrT0JcsaZ5NouzTbXnNorzUecCAzAVZP70CAwEA
++AQKCAgA7nFgAWnZ7vZyniVUBMWYs/VU9Nkf/9DoAOeuR0JqSxQ3ziduJbEAhU9dt
++1NKcR/S/Tsrf97hwTO45O9nIAOfVnHUX1EsEq4ukcr7YxLOUJn9yRWoCwJrT0ouH
++YYMF5qLOkQuprV8DA44C+kiZfgfc5MywDMUj6racYWApK7TfQqZG36jaW9V8W4SD
++2FgNNkDCwP6oWpocmXyWUp+H8a8xB/2MGUI8P+AbSqzyDaN3jGR7NWkLDjQMgxqn
++UDdg8xAtqBOIs8dV9adregJZOva1vn6u9P2NMFiDYTaXw960dR1jCf55nhXHdT8X
++Xa1uRyTTEkdKa1xGWp7HAqD+6gUsWw+fuavVMmMcgBm4tYSvFActBPZrpIuh6H1e
++8g/ow+mnn1E/sfeu5vbvYCaq5mhchC7T9snI0FDH+eDqa9xBIqBA/f11IFE/kryA
++zw2ZdieB5EtW9E8yMOdfVhTAj5y3nuBPcQPwlWVpoYY7PVX407qth3SpT7x8Xgan
++lZFFraKvQ2MSI3iOrzHCinlsvc8SsmWJifDHAFxFmqead+Yi+M/BH0F8zkFikvmp
++swWGE5znZX7EBiSVBwx7H6IFH+3HhAPVnADW4WIyykdoEydNczX0STuoj7XJdKiS
++BPgse3aYfvy7bDpwUhdKbjT97Uvsm3Zj3HkEl8X1TMK2MtqUYQKCAQEA6PpoGQke
++p2LRLsVdOekYG2M4uJDNtqEQ5qaZxrYEMupFPlcZv7JbIyqmE98hgKAaf+mE2fJq
++Qn5puydgaLfsHjmcn3UUDTEvLnAx9Qrp79md5VFwOcAtTNA/eKhJSYujAMedJlFC
++RcnHuxK3qWy0VODDx2qwqC+9GBUtH/fREQ8SXeJXfnGVwaR8vsWgtti3JefvcP21
++pHKmA8EpAK7tEuJuKBbqabbNXfsBswpfKnlG4DwcEbIWyOZ6GjSJKQuVvDQ6dGcI
++YW6wC0jiqvMr8g5KbpfXP9uWhOTMg5epQqn9ALEetpnRZ3pIzLauW/pKKhcm48wG
++mnADLBsYLvyuFQKCAQEAwYPtbG2RhFhMfOJjZxOVx6h/0HDsfRYmV9YZXpSs9lJE
++9em0hdoA2ZF+aO8kjgWpZzG/yEnn9ZYTrks6vD+Q+bxXmtGOgt5YgB9XcaOFzhMy
++QbqN9ChqZ7FezhWnYVz05GA9WQ0YqNmC7wRN22DlYUkkSx8vViDTpcTxZrgq+KAS
++7h3tpENsQ9W8VEzCnKk8UcvvvbrjLDZ9AdZhbsgWa6YMxzEHduS7XnRk4pzKsLoD
++zE+Flu5f0TYZoivNCt2v8qZToUt+3x63clgSxssxh40HCkpq8X46EvGSySTADRN9
++ZQTnxF+IxrsBg08DEkvYujUHyOx9gjSsdwPu1jPdCQKCAQAi9YAtUYsB/vf4lrD4
++gZuWcHsQZtoXb2/DzHgCs0lKApFFW3iHpVG7oyisjqzOSjfvvbCrq456T9G5vZzf
++2clad7aizsSlfh3gUAGPDYYw8WyZ/nBimg2yGwWLK2Vj3col0c4o88SICFEqJxLc
++H22n1tpJ0B6V/iPXu0W8KEl8z9AnulD6rjyUhAQb9De7eCVzUKxDPi7FcFas9Y0b
++hyQX01ZIObgPCNkkIwgMP6AsFWqnNx3XIev9VWg5Cm0SdaSQSx4CXXuKczuDVfp9
++QGP1vGM62Rn5gQ/C/Toa/OTvFeba9bjwGYCskFLgNQFQ1+vNCRBS2kibX/d55M7q
++LgxJAoIBACq29jdS0CYIX4nJZuuftRYHKX9XDbxmoTwONDdeVfdhHXuyhHhvMHTV
++2rNK5iS7NzNiFdUeCyd4Ywu761EWLugRHL09uFlGvv447NJWp/he4F8F0MOuEB6n
++VifjO7kQDbZDUAdSDrlmmbIsnwrnjno07N/wGEDIqi8TE736tPGAU+1fic8SWtl2
++WkW5U9PEv13GyDp3ACIIPPuk2IjdfaVxV6y4M8+YmYs14fbraQotZR06CGDSaTAC
++4xGa3X2ihW3oLNmTkoOpghCpRCvBOkOTa5Rn7Mc1d5gq3p2rkQDR5oHf3VDJTaWg
++LatQS3tEZqhjgD5nhSSyf8cdhSCe/hECggEAW8H26QCB+oDaQjevURUbkT4a5tE3
++sX9bGXlpAK+JE/hMJqxspNmXeTKm/GsMKT/JGaOIqstIYNsILjAihGbZj9OalOnX
++re4rVYq5Cs7mDXVP7vLSeyX8Z6Y8qiWiwtx3UMwMXYs6+2qPbHFPr5Ult53rswaE
++lIbGdYbPouEGPXxs4J0Xy4h+CQtCi5UVuR16gq2gPmqhMwLz19gXRPh3V+5hH32B
++cgnqMKgAKxoJNpuPBL/v1OJ9YTFwFUokUMk3IzgTsblOXtxtpAlomv1lX6Y5JQxX
++aBw0t8HRxMF+fdqq5xHEcgvp+CWqBNuPXdVPAH25nibsPuTgnPIb27PTew==
+ -----END RSA PRIVATE KEY-----
+
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 ad71ec5355d3..3f2b0667f41d 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
@@ -28,16 +28,15 @@ DEPEND="${RDEPEND}
 	test? (
 		!!<dev-python/ndg-httpsclient-0.4.2-r1
 		dev-libs/openssl:0
-		sys-libs/libfaketime
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-expiration-test-fix.patch"
+)
+
 distutils_enable_tests unittest
 
 src_test() {
-	# bundled certificates expired, so we need a time machine
-	local -x FAKETIME="@2019-12-01 12:00:00"
-	local -x LD_PRELOAD="libfaketime.so:${LD_PRELOAD}"
-
 	# we need to start a fake https server for tests to connect to
 	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
 	local server_pid=${!}
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index aa32f83624bb..8c87139bc40f 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,6 +1,7 @@
 AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
 AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.4-r1.ebuild 1573 BLAKE2B 295aa550d91e38a9a891c3bc3e1599e2c1585321f9d750b4bd31118e43d553f83056d86e3cb5248189d29194fc9d107d5fbb92839d713739f105e2c5c2327454 SHA512 5abab020ce2045a9f882636d40a599827169038c5ac3a4104c08ab05804b8418b05d443ee71c743972595465efba69220ecb7cdd45b1fa9b807ec6ca0f387d3e
-EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
+DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
+EBUILD networkx-2.4-r1.ebuild 1576 BLAKE2B 6d048939f2edbdaa8d072120dbbd1a56de2f3dc18839a605e3e7643bd7c3dbf1e4786ad35f18dbc8e18608837119070025e9c8809da659345a6d96b7a6bcd330 SHA512 fecab39597d16a78c155ff25149c1469d618cfdbce8909e03506269d18b42c4d899ef1aa4f76242b6d391a8365e8bf68b790d5e4c3181d32e1cbced503290b1f
+EBUILD networkx-2.5.ebuild 1339 BLAKE2B 92132a22cca5dc8edb0ea9619553a23dd789de66946cf2c9e67996e83d751244b342e2c087c2e04bf0be85ed0bf3b6b2db8d244ea9c74b09753d71db36ede169 SHA512 5058a309182f9173bd308c08c7c3dde09a1dcaeb6799d712d2f95fb3afd5dc8807ab741b74b8b189ce0c44214e97c3afb1866090373924103302afcacffed8eb
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index ef197baa3467..d98c149620d1 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -12,7 +12,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 ~arm ~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/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.4.ebuild
deleted file mode 100644
index 07a98d729cc8..000000000000
--- a/dev-python/networkx/networkx-2.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
-
-# networkx-2.4 supports up to python3_8
-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}.tar.gz"
-
-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.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
new file mode 100644
index 000000000000..7b9a1d6f392f
--- /dev/null
+++ b/dev-python/networkx/networkx-2.5.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..9} )
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="https://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples extras pandas scipy test xml yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
+	extras? (
+		>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+	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}] )"
+BDEPEND="
+	test? (
+		>=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 2aba5d369622..d489d56dfe50 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,3 @@
-DIST neutron-lib-1.29.2.tar.gz 455629 BLAKE2B 2969a7d844ec5a972bbd5cacc07d3fbeb59bb9a62bb98a94d6fa60dc1f0b7796499433fa54de80d96e2a467e3c022092e816e282e390febeabc8d87d1c13273f SHA512 9c3398e268be56864410fd7c71d796c3944f49c334faa1e7099fe768f1916b23b2b996d06c76c23b54a1889b605717091c787d345069cb51852f3f9cae636213
 DIST neutron-lib-2.3.0.tar.gz 444674 BLAKE2B f572c58f21034522ff0d30ebabadb19aa291ddb257757bcc25fbec24d46206ea9b44d36d547f454b43bc1fe611be4046fd186837e64b8cc54d681f301bc6494d SHA512 c2b0b36474d0a83c3720639b107100292dd65ad80986848b4c7a9e4304832ecae2342e451bcec68e21232901259d7b7d2a3a6f1b232d70014d262e6c7b594a80
-EBUILD neutron-lib-1.29.2.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
 EBUILD neutron-lib-2.3.0.ebuild 1938 BLAKE2B 783d99d9a8b53a142e7bf0f148e69248d5f5c8c048199fcaef308c911fb89b1d341c6921378d45b312ce8cdffbd064e66e68321079cce4a4a39547862982e330 SHA512 1af9fb0f697a07658cdae45082a31dcbbd087e389c6e4c8a5d328a283d70dfbd98aa3781d6a3de554ce45b5cc0da816ece80b2a869bfd56919a4c65fbeb224ac
 MISC metadata.xml 389 BLAKE2B 818db87a0d2106f73d59e638d0c5c94f382cc977fcb7e214e91de2073ba2b19017cef3ceaccd1b80e968ddd5bd0d8761092c1d5b31099810b5ac761c71a7413f SHA512 34c1660258f8aaf1ad5188e57f64de238b3c66a5de9e8ad1277d40397d0276a176240fc5b550294132c74a170e126ee08f3fc9931fee5f03023be1f1d9758343
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
deleted file mode 100644
index ca6dda873e75..000000000000
--- a/dev-python/neutron-lib/neutron-lib-1.29.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=( 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/node-semver/Manifest b/dev-python/node-semver/Manifest
index be5d8350dc82..756628b3cfe3 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,3 +1,3 @@
-DIST node-semver-0.7.0.tar.gz 18090 BLAKE2B 669da955b62c35be1a0fccbdce8c66c9de915c5498052858f9f0ebe6a07109947314c904b2077b4306b8fea9f1d0747ab7dcb63a803b00555320e44ea0a59081 SHA512 9e11af16ce7a9a7f2aacd77ff14c8aa574e62bc27f902860b97fda5cc8ee19f54118e90ca39241741da657b87ec2653239b0c4255570ffe4d1ad49e2c9484e74
-EBUILD node-semver-0.7.0.ebuild 1091 BLAKE2B 5b31a5cc74f19ec9a4bfcf185570634cdb209b68c58cf91d792d84d2020f849cad6dd11ff6367281aa0dc058fa520ebb3b24d71ed1b8f4141ae5f2582746caa4 SHA512 ea6c3fa500ca28e7d97bbfbd779e76b7c5022fdc01a03689e994d580934c5691b1eebdefad8119fab64358fbd4447710e31620a2d9b9ddb62553c66bfee8c69b
+DIST node-semver-0.8.0.tar.gz 18449 BLAKE2B 171374808e18b1f3fc2807abb9b99ecfe18a392afbc59ad056f0524e374ef4a27e5a56acf0c3927c6f351503981d743e4e63f108bf0e5bd5eda62f04e24191d4 SHA512 665ae0dbced16e0f05306614b1577464aa1bdac666b35cf2e7ad4b8844a6814dc7e8672f0dff3043c7bd048aa455d671efd268052ac59166293b91d1dff17784
+EBUILD node-semver-0.8.0.ebuild 894 BLAKE2B 78f9925c1f238848fb73919b43a53441c79ea22aa3a4b1ad733af846233c58c120fc9a3648d998a0d6204e4234d3bae72495a6f6fc1ea2e3ad85db8091f2780d SHA512 9d2d42bf21b3ed8f3465b6de499cb8747e11d41f69180f6767c94432379df446a88134775f09bf87b84f0b11ba27a83f468630497613d00d123a9b90461481d6
 MISC metadata.xml 678 BLAKE2B fd7f2ace72fa8748c1ab94c2583dc49527273f10f09724cf63e44a053e1c8030935605b5abf500711037bcdf1f0863372177970ddfb8f7d54135ebc37487ede0 SHA512 5ffd4bf5a5823c487e20c3daf566748e095ace0ee75a93a2fef7be8837ba6eb0a371d0dbf682653579c1071ba9988c0d469ef075c7d71f8639df0869cc3e4dbb
diff --git a/dev-python/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
deleted file mode 100644
index f1eabb0d93a5..000000000000
--- a/dev-python/node-semver/node-semver-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=( 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 ~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.8.0.ebuild b/dev-python/node-semver/node-semver-0.8.0.ebuild
new file mode 100644
index 000000000000..cebf767d37ce
--- /dev/null
+++ b/dev-python/node-semver/node-semver-0.8.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=( pypy3 python3_{6,7,8,9} )
+# entry_points is present in setup.py but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
+
+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
+"
+# 0.8.0 has no tarball on PyPi
+# https://github.com/podhmo/python-semver/issues/43
+SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-semver-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index e5a75ff4eea3..f0433816c229 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,3 @@
-DIST nodeenv-1.1.3.tar.gz 32368 BLAKE2B 4b3b9213c115a55c0b084505b05f1d646e7519175ba42845af6b2a0933cb75574b54257a524c561e1b90614848bd6d68e0dbaf382692529476a69d1bf7cc7aa5 SHA512 54829345bda2130c3728f33e04ee68c36cab281c9f6f68ae257bfd5019c51fe5b80bb95e931ebdd7403aad4db4a41062bc59251786811a1563c18b2745f4e7db
 DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
-EBUILD nodeenv-1.1.3-r1.ebuild 431 BLAKE2B 30e4a4fcec2a17fbc9a806b1be67bb3e83e0a7747060d949de994c01414061fb8192a78080cdebf164ba4bfedfa089064af806252e0823e2442eac2490e732be SHA512 1bbfcc236a76a07c9f9efa32b738ca0554194b436d0472d3aae30604b4bfc96b2d6f5cbb3f6c31da76defc377b6edbe3681d9e9fa32552d7579cd2bdf5b7fd2c
 EBUILD nodeenv-1.3.5.ebuild 444 BLAKE2B 07355be0bb8db7952e044c9a0a645b50edc9cc6e20928ebeebf059c6b6c58098aa0925ce0102e667d529eccecbcfc11dc8e8b7fdd706aa0c5fe95b50b8c16684 SHA512 42bb169a4e7f8ea8f7d1f73c64133a5d9ad05e4b17971de6756b6aeb21544833139e330b060b62de09cb73c04156d090b6f92a69b2d76ee745320fd7ea8c6034
 MISC metadata.xml 362 BLAKE2B 5e3b70f0d8049ba6ece30933fcb91db7f533fa647091c6f8cc240b4f074043a0da1b3d1078d10ef41c05311c6ea991ca52b978dafbb8f3591348871f168ddc33 SHA512 16874c2d41c9d85485115c5128ebf55439ed1b163f1e919d847177971718e7a113afa36216c35a8d19f6d92f474001084013bf75797fe82f6d25a369d42e8fd5
diff --git a/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild b/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild
deleted file mode 100644
index 906d095b2737..000000000000
--- a/dev-python/nodeenv/nodeenv-1.1.3-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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="https://github.com/ekalinin/nodeenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-random/Manifest b/dev-python/nose-random/Manifest
index da430832ca77..1394908fe8c4 100644
--- a/dev-python/nose-random/Manifest
+++ b/dev-python/nose-random/Manifest
@@ -1,3 +1,3 @@
 DIST nose-random-1.0.0.tar.gz 3776 BLAKE2B 18dc40b13fcb970c4d2edeb6be9c6f3e710b36d14dcdc4a56c6e3ecf811ab2acd6be3e1c1cea2231eb5dc10581c77f201220354c77f3d9f67d89d894ed8b4f24 SHA512 9c62413fb00c3b774954ae7a65b08b122ae0dd2b24377efba8de345597b4ce4952aad09a0c2fea7f9d92f57a3664908fccd6eabadf32074a35978c958ea2b66f
-EBUILD nose-random-1.0.0.ebuild 497 BLAKE2B fe53a173a263425caf3119711a1170945cde05c1d86c75d011d2fe9c21ed93be10ba332af6be77de269cd1efbccfa60e9d08176d0765fe2a514569dd46626cca SHA512 8fc022257b97d0f965ee2925deadec97fe8a6b7a5c8e3b654345a5a83a0ce28004b8dd71ff692442eb0b770838063c14135933d4b8f1189cb11066f04f4ff159
+EBUILD nose-random-1.0.0.ebuild 507 BLAKE2B 4f8aee628512c50ac76d7761de88261fba082f58ef4a4186ae3f2b74f37500a9043144a30a07663fcc634370f751ee8553f03ee0e91bb95ec9f214f9e1bac8f8 SHA512 63adda95d54245bdbf256b06b242b806368064c0470e43fd3e78828d4fc6cf8203589de13614bc6838dc60dbc9905ed60e9e3fc7d19b4d64602f485945b0f3a6
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index 973cf59a42b7..3b830e6abb7b 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index 3b436023bd47..b542650fa6f9 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 617 BLAKE2B 8a87c455ce8f5a08b1d6482bc2f41b0933da6b3417aa155b598203f92bccbd295bab4b683d7a137cda63712a566d1e8ea53e0abc4fdeeb35c9724a475b8a6f93 SHA512 82c933914d08c53cb1867f049284b46192dee1eb1f3276f7550497d8aa6d73d8507a3386431fe195c3b2a005810a0ae17a4895b10774d3d1d6f9e7de030c9b8c
+EBUILD nose-show-skipped-0.1.ebuild 607 BLAKE2B 182f90666cbeaeab2e7acb44e860135df2cdcab06cdb776edf9018950ed39355856392b92d37b2d6ef4edf5ab240400a8181d3a0655586bbdbc4e6f7f0a752bc SHA512 4eb11d91385bdb1b03ca5ab15badf77235344bf9fdaa7b35a4cabdd525c1c76c9528073b62dbaf213b575effe0c9a9e873bfdf5c6eef029641a49f2e869195c0
 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 bbe6ddbcacb2..51081681b2ab 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
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index ac2456e179ab..b0743105ea93 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-r4.ebuild 2756 BLAKE2B 35632aa573ca794f3ebeaec11b83c6f7d51d292f84567b070c4530a8520a0603dc453c66e5680895610f0d6f5ae91c6fb07a1fad13aa70691ebda7771893d9ff SHA512 a3475035911fe40dbc9787b7554740983fb6bc4a9b1d7ff9ebd0018259e62eed7948d0ac39c2b1c3e23428ba2fce6c7bf5d388f97205d82e10fa688abaacbf5b
-EBUILD nose-1.3.7-r5.ebuild 2314 BLAKE2B 9930f846e80f5f991e3e7bc1871e805029597adb6b5628265e0d769086f94aa0992d1a1725026966cef3a09c180da30a4fc929213416d3375448fb6a9e097504 SHA512 aca4b69d95206ecfd0aec7b5733c682965c0bbaad17364f0efc796daec1fe9ec646641a214932673b8c2514dc7fe416c96589fdf277a9bdb3b4b2028f5f201a5
-MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
+EBUILD nose-1.3.7-r5.ebuild 2295 BLAKE2B 4b784950f9d1e23fa439603751ed9f353f16741001fa990577c25442cf6ad2abc9f70165d7858cef941b8324872540e44a464e9460e09edc519db5d908b98178 SHA512 bd596cd6d76260fe5290d2c30f318eec3fa76061076a785413e93068f0c49ae6212c5115c8d33403abc2ae91fa6fa5822cfbef3906ccc7edd1739a5f8e7d79ba
+MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index a92a97fc50db..e00e1107d375 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
deleted file mode 100644
index 4c1588f59bce..000000000000
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ /dev/null
@@ -1,101 +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="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 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 )"
-
-REQUIRED_USE="
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[$(python_gen_usedep 'python2*')] )
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
-	)"
-
-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() {
-	"${EPYTHON}" 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-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index 0b0eda13af04..7cd58888bdb7 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -18,7 +18,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 ~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 examples test"
 RESTRICT="!test? ( test )"
 
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 		${COV_DEP}
 		$(python_gen_cond_dep '
 			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
+		' python3_{6,7,8})
 	)"
 
 PATCHES=(
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 65246278289b..63ba130aabe1 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r3.ebuild 517 BLAKE2B 7b2ef60aba5937c54c6138f7b28acd9a7768770f8bfcf91705c1bc4f6a0482051a73f50f156954900841e551a19988bc68162224a3faf7c198c76e0a15806c08 SHA512 4e0aea11dbb3e83ff200f957904d0da55c321e13a461de481f789140099a6e399707b36aa4ad257f81b5961c8c59ee8a8087770971aa03b659ee3941d1fd783d
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 516 BLAKE2B d396ba74968e8c96d7513b0cda042cea3cf836f465127c447381300ff24e08b31be4297c5cf220c7fb4499eb748e50432ddc1732cd95508b364f6ee56eb05c0e SHA512 3544b6d0a7b77e83ec992306d3596d421eea4c1d0d4f1add63412dd5189ac65e42342c11ac62646d4e1dae18225a91dcd088cc7d5438ac0acbff7ea3b3015505
 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
index e54eb5690252..a63e32099f56 100644
--- 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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
+KEYWORDS="amd64 arm64 ~ppc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e649199ecddd..dd85724d460e 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,14 +1,9 @@
 AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b759121a43d269d1092288c1384d61844430d90e967868ad71fd7eddb6bba4b2493e489ac6b57b01f21d8a48297cd36438cd98861b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512
 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
-AUX notebook-5.2.1-setupbase.py.patch 1407 BLAKE2B 0c7a0872f62df6c3e77aacdcb3736c09441479de127eb228fc8d65828a16656f37c4742c6101de841326a24c62bd4a4c76cf8d31f9dbfe61bc4249ecdaf55582 SHA512 6a01feb531b4594bbc0520c80dce53da66fbad3cfb3fce22c2b20e5d6652b8691581fe6a321ac5771b47ee1530bd27b0fac3fda55ab15573037379b84362bf67
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f
-DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
-DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
-DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
 DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
-EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
-EBUILD notebook-5.2.1.ebuild 2481 BLAKE2B 82733e9825422222c2ea37146741ec5d510d7bddba8f331a074eb5ff8893be9e2b25cae279e519a43205997b1f2ea4a549baaac42b36d74060602241795c9fe4 SHA512 7ae45ff9d12cac19894432e8dbd0ec1fbdfc818bb76bbdf67cf91c8b19d1c79acf0bfebfce550b634529974201ce214db52018851838b47e8ba650cb48c157bc
-EBUILD notebook-5.7.8.ebuild 2965 BLAKE2B b2cec1042caa14371ffb788d8380410131b11d4d6d62a2f248011227edeb741444db7c2fee142c2800f858e15e75cd035e4072fda9f67ca3e03d337bdc1d164f SHA512 514a170ce702ae495a6f0aff2b0c1d8aa467d00f7af69d27a54c891139d9ee258ab106ba99c4b3a6ae4afcd7dde677ef7e8f6289cfd576dc0c0ec94284cca1eb
-EBUILD notebook-6.0.3.ebuild 2371 BLAKE2B 72a81edb848bc1623ba651aae700e751c439abb3c079ef33e843972817e86af2e897adcbf0dc221726b86a1166c31d79fc8dd6925eb14b268e62fac5b879aa62 SHA512 856dfb48af215bbd61ed8aa757de218639d327e87a3147649a3d374f6fd4363c6ff07d54f7480111aa154a556ea08cbc0fc97dc0d044cd1ad5c58b0da3b53c7c
+DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
+EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4
+EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch b/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch
deleted file mode 100644
index 97be84cb364a..000000000000
--- a/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler.
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -168,38 +168,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--        mj('jax', 'element', 'mml'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
--
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
- 
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
deleted file mode 100644
index d4c0e2123f49..000000000000
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ /dev/null
@@ -1,93 +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 Interactive Notebook"
-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-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch
-	"${FILESDIR}/${P}"-example-execution.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || 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
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
deleted file mode 100644
index 3faa47b3b2ee..000000000000
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ /dev/null
@@ -1,103 +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="Jupyter Interactive Notebook"
-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-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.4.0[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.6[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		=dev-python/nbsphinx-0.2.14[${PYTHON_USEDEP}]
-		test? (
-			dev-python/nbval[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		)
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || 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
-		addwrite /dev/dri/card0
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-
-	if use doc && python_is_python3; then
-		py.test --nbval --current-env docs || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
deleted file mode 100644
index 4c9dc036bc2d..000000000000
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ /dev/null
@@ -1,113 +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 Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.2[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-exclude[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.6[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		test? (
-			dev-python/nbval[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		)
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || 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
-		addwrite /dev/dri/card0
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		--exclude-dir notebook/tests/selenium \
-		notebook || die
-
-	# These doc-based tests are broken on gentoo for permission-related errors
-	# (they try to write files in system's ipython folder). Disabled for now.
-	# if use doc; then
-	#	pytest --nbval --current-env docs || die
-	# fi
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild
index a92fb17d8b10..cbdc69fba953 100644
--- a/dev-python/notebook/notebook-6.0.3.ebuild
+++ b/dev-python/notebook/notebook-6.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"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.1.3.ebuild b/dev-python/notebook/notebook-6.1.3.ebuild
new file mode 100644
index 000000000000..aea8ab5d0aa9
--- /dev/null
+++ b/dev-python/notebook/notebook-6.1.3.ebuild
@@ -0,0 +1,93 @@
+# 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..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# network-sandbox?
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_culling:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	sed -i -e "/'bdist_egg':/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index f23fe3b1d0fe..7065a2b267ee 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r1.ebuild 743 BLAKE2B 162a00192344b3ac3455803dcff0b5e3ad8fe0e0dcfcc020fe9dbc7905f64bba6387e5d14d5a388af9d4278d9c3e0f435f090dac460ac87f520f76dfd23626e2 SHA512 731090b79e20c962fee5151d692751290c5773fe7f7b119dfbd5d74ce17ebf0d9d14754fd939c521dd7e2fdbac12ef996bf4bc5e9d1ce8b1d7a7e97d0d5ce63b
+EBUILD notify2-0.3.1-r1.ebuild 739 BLAKE2B 9832fe02bc2d9b5a961e6c5fc0819f86a1f060e82a99a5b6072fdba33aa311b6990e2c66da774613071f7a92746e3a078d5ecde443bf7dd72fed58d2af790072 SHA512 5e1d6d1570c494b204029ee1e87bcd24fc532f82ce79517f8d6e955521ef08a6757c35123df93912e0584de8c41ab8ae9568aa19480df35dde14dbd8d9305702
 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 a6cead16420b..e7caf510a82a 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 488f6ecc1183..8a08940323ee 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
-EBUILD nototools-0_pre20200207.ebuild 965 BLAKE2B 28e39eee5f7c040618a90a64da3dcc1b23995b8466316db7ed143b2af9627f772838a236fa2ab4636773c34a758debba854373ee4f9080e677a83a5352805b69 SHA512 65f4a585c531756e57d685e74ba791901d2d431f4027ab7dd0d2f8c229185556fc492aa4d08a9e884fc33f2774f83ad4136e4011a666a46a188d7077a110b075
+EBUILD nototools-0_pre20200207.ebuild 964 BLAKE2B ed5933b5b5f61091d0c6b7a1bf8fa1f049a3e687bdec71366f29aa2dd026941dad46600dc2a117d182e6adbf897ba3d8af6568cb499313b79e92acb15556e4c6 SHA512 3064bb93da7b9d6f4f6659165ee28f7aa0a56e5cb93efe2da320ed39bcf714923822f4b860702151d7df5af59c6a1c690a2ad5a70c4ae51a8e35d5db5c94856e
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
index 2546deda4b2a..0f4cd7e61caa 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 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	media-gfx/scour
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index 2a0f9e54710f..c6aaaf684114 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,5 +1,3 @@
-DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
 DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
-EBUILD ntlm-auth-1.4.0-r1.ebuild 515 BLAKE2B ffbc2ac4faafdf85be7ed0aabd7a36403ee3e2cf8daabb480020041b3731e067dc7fbcd19cbb7c36c76f2c66c1f48acabaae40f9121adba44eed3c302f6205c0 SHA512 664ff7d65ec506432254078a0bd30e9091a24f912a7aa6084c19ce5041f3e44e47d91c4aa3d5c291499a54c4ef8579de7a88a8e70ea2b3b9ed20bbbe49fed95e
 EBUILD ntlm-auth-1.5.0.ebuild 515 BLAKE2B ffbc2ac4faafdf85be7ed0aabd7a36403ee3e2cf8daabb480020041b3731e067dc7fbcd19cbb7c36c76f2c66c1f48acabaae40f9121adba44eed3c302f6205c0 SHA512 664ff7d65ec506432254078a0bd30e9091a24f912a7aa6084c19ce5041f3e44e47d91c4aa3d5c291499a54c4ef8579de7a88a8e70ea2b3b9ed20bbbe49fed95e
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
deleted file mode 100644
index 0c194f2bc5c1..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-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="Calculates NTLM Authentication codes"
-HOMEPAGE="https://github.com/jborean93/ntlm-auth"
-SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index dfdce86e64c4..7f9eb6ddfc07 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,3 @@
-DIST Nuitka-0.6.7.tar.gz 2284868 BLAKE2B 91c2e5362697d8c14f0627d757c70922aff3ccc2c9eb359f6b303e9ae7580d594106328b9fe644e8f668018aae496e50041948bdfbf59c27fe1ce0e50eb90177 SHA512 9f3dbfe67f2618a5363aa47974fe0199428a4798e79ebfcf78f15365048a6c676b5b2c9d5569adcd264389c66f643b3190647dc17acb76e59b9b95ee6762f5a2
 DIST Nuitka-0.6.8.tar.gz 2390759 BLAKE2B 5f207a2dcac6a2825143268d3c28eab113705c050b67dbbfd3b655a0221ca3c04b2b206f3e8a85b4f17d28db52c11f19ea6260d2e7853c382942a76a15dc1973 SHA512 d9a9add759736c35fda57bbf82382effbcebce954228e56bf7c124502b96513f17a7083ded66da3ee33c52443b18c92839bff59a5c081d8fe44d6eec6c15fe54
-EBUILD nuitka-0.6.7.ebuild 847 BLAKE2B acfa001eba5272a0475c1485dc8fa0d78f6332f55a6a31ff28ba7dfcbf7b3e6a79eacb034847c7640a9729734e240a1d2e84736ad43d97cb4b5bfdabbbabeefc SHA512 5966ce002682111f0cffd9be9563394580cfc8d961f4173836fc639c9b0ab8d9346b9fe0b7db31d77e0a52070bdf782aa3eaa0d61774b95b537f4a86ad971923
 EBUILD nuitka-0.6.8.ebuild 798 BLAKE2B 621164897d4845339bf233f9cab2a5d3ca696b31bef3ca89c972ab1341b64a38ac117ede67a69d57b660b06fac476a2ae2d42f9b0511c9c053c45fb2b14e8ccd SHA512 e9a855f2d946da21b8a2abf8248f991c5509eed06cacb64507326723171b6a88ff3e6518b25be258bcbd6df561848e17575b4ed9dc85ce37fb47ba0951516715
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.7.ebuild b/dev-python/nuitka/nuitka-0.6.7.ebuild
deleted file mode 100644
index 52e9e3fb9f44..000000000000
--- a/dev-python/nuitka/nuitka-0.6.7.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
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 eutils python-utils-r1
-
-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"
-
-IUSE="doc"
-
-BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-
-RDEPEND="${BDEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-S="${WORKDIR}/${P^}"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka.1
-	doman doc/nuitka3.1
-	doman doc/nuitka3-run.1
-	doman doc/nuitka-run.1
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 235bd9e00cc0..f782d6ebe1e3 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
 DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
-EBUILD numexpr-2.6.9.ebuild 1384 BLAKE2B 1079484cc597630dc930b9d9e497bef95903cbb8284ef5aca62a1ef95f452f3bda92fcf9ecece5eb00e53e5197dbf43e6ee5b3fbb37942454ceb27eb3b4cd343 SHA512 f57becdfa8847a6752dc1194d4157fb3f9eabd8375260a73de18a2f9af889a42542c53b95089b8b95eb7d4c9e94675f4cefa1d3f82f49ce0abfecea0e5b7dc25
-EBUILD numexpr-2.7.1.ebuild 1389 BLAKE2B ec2700682d0d4543d6c251436e93d17d922fa303888e22d24e30700d9c2c245e91f3dfe8371389a6c89d8b88b9504052d491f8019bad1c6185c3132c8d9b2bfe SHA512 fa0060822e1eec5609c171bd5b46dbd4aabbbb8a1701dc6e5ae837638e97d94d3c33f16c2f18ab26c4750ab30a62c137c35f5ca801cf366b762837c9a18a75ad
+EBUILD numexpr-2.7.1.ebuild 1246 BLAKE2B 1e124b05528f9319c99830af4d83c5c433742bab7ae7478d5c470ee3db84404fe46ef662dad1b19d87a241d82bfd8f92bbc6a3f8ad7ca7da49c457d2ade8d899 SHA512 865b624119189e888976b489b6f3c41c10854eea18d760a99f50d0c20a6dc4f909357c0c1e23ded979873de7c5e2dd06af0fe076e6bd5466fdc1f996c674cf3f
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.9.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
deleted file mode 100644
index 315336382eea..000000000000
--- a/dev-python/numexpr/numexpr-2.6.9.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,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
index 138fd440b66e..eed440f7e010 100644
--- a/dev-python/numexpr/numexpr-2.7.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.1.ebuild
@@ -14,7 +14,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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
@@ -42,15 +42,6 @@ python_prepare_all() {
 	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}" \
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index 83b805005da9..62ea92993ede 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -4,5 +4,5 @@ DIST numpy-1.16.6.zip 5143340 BLAKE2B 2c31473551aaf00e7d3175ce37463ce0f14ff3e77b
 DIST numpy-html-1.16.6.zip 12190671 BLAKE2B c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b SHA512 ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16
 DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e SHA512 66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22
 DIST numpy-user-1.16.6.pdf 621980 BLAKE2B ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b SHA512 ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a
-EBUILD numpy-python2-1.16.6.ebuild 4544 BLAKE2B 73d2aad4b4bcc88287eb7c6f285d1e046ec8ef6eab83a51760ce27a617743c8fcfe8260b3496d045ecc6f74bee2c25c369463a49b4fdaa74fd8713019bf3ea61 SHA512 0fbfeaaa16ac3a552186f3cca77798694a40822c2a6ba6f2fdc3823042e6ad0d6c18ee1408c358f287ec4bc8c56016dcdc29602a045cf18f8b57b3bd9c54c18a
+EBUILD numpy-python2-1.16.6.ebuild 4543 BLAKE2B 423fd59758352ba0036661a083572de9fa5ee33e75d45b241c0f7fd05023d58bbf744a6331798383c55c308e459ddf3b1e93f6c6274d97e1a73cbf2bb01bb9b0 SHA512 f7948397cf6d9eff64ea198f20750adbf1031462fb13fc1181bdd5f05b88075271df08a964a5079fe00a255430c4e930bf25932ced97883906042eb789a06383
 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
index 4fd160747814..85e1fd687f83 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~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 8507f1eb09f1..e3a8305f34b1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,15 +3,13 @@ AUX numpy-1.16.5-setup.py-install-skip-build-fails.patch 916 BLAKE2B 0745e076d43
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
-DIST numpy-1.18.3.zip 5435268 BLAKE2B aaf14627ca24e27806e6a5498a8b91f85c2582794db2ef2ec315e88b107435aeb2e8f288c68ba00593150787d6deb887faa029f850df4c6cb65426499f7ee83f SHA512 afb14dec81ade556e10b7de372e9d7b01b4bf246609c5eea26ad76ce93e6d9caa95479ae70dbfb725f28ac4802f94203c92e1e991852d2866b5225fc9d68e68d
-DIST numpy-1.18.5.zip 5441636 BLAKE2B d11bbf3c38a4194942d024ef82d63aa80a3d9044480a54e1b25d57b26f4dd7936b8ddd9c8b2636e307392c96fc51cb687e7a0e32ea7df9c85d46d80be45bdb46 SHA512 ea1896535016d3b207152c503005bf82095cc82c263f7f32ea75ce2d9394724f9700cf2265f9fb1f38169c37a0fe63ef97e88f84637f11758c52c624eec3d141
 DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
+DIST numpy-1.19.1.zip 7301568 BLAKE2B f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa SHA512 ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
 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-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
-EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
-EBUILD numpy-1.18.3.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
-EBUILD numpy-1.18.5.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
-EBUILD numpy-1.19.0.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
+EBUILD numpy-1.17.4-r3.ebuild 3563 BLAKE2B 638577e95e35d83b2f343e35c7035e3e7e4f6180e1d5ba4b2088febb5dc417acfaa17704d2b499ec2ff4196dc276a55f5050e6f43c01b9e55a94a991de305d6e SHA512 ed5d291db03806a28c16fc1011bf61a52cd81457b2d6825d94f0e3b2f11a32353e2ff7b93f2d0927bf81e710dc457ca9eea896159d6c52bb72fa3d598c1a1077
+EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
+EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 77a3823e986b7cb9fc4f29b8eb29988ad63c73d8d0a5cc40836339519b9d54978c725e4e68f6c191be2e47ef53bf6d53b916a9fb1246355b428ebe0e6e6aa2af SHA512 ec1db0b21abbe07d24267a4d773ed6473efb1b640aaf2eea874526971a75fae4dd263d0f13581756703b4a923c037239093dc266a64ef5d74678cedd3b562100
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.17.4-r3.ebuild b/dev-python/numpy/numpy-1.17.4-r3.ebuild
index 6c64e49ccdba..9a848fbc3731 100644
--- a/dev-python/numpy/numpy-1.17.4-r3.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~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 )"
 
@@ -103,11 +103,7 @@ python_prepare_all() {
 python_compile() {
 	export MAKEOPTS=-j1 #660754
 
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
 }
 
 python_test() {
diff --git a/dev-python/numpy/numpy-1.18.3.ebuild b/dev-python/numpy/numpy-1.18.3.ebuild
deleted file mode 100644
index eb27fd1bee00..000000000000
--- a/dev-python/numpy/numpy-1.18.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
deleted file mode 100644
index eb27fd1bee00..000000000000
--- a/dev-python/numpy/numpy-1.18.5.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
index eb27fd1bee00..099367952cc5 100644
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ b/dev-python/numpy/numpy-1.19.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~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"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
new file mode 100644
index 000000000000..e70cf23d73a1
--- /dev/null
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+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 ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 39898e0b0ab4..89019d7ddecf 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,5 @@
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
-DIST numpydoc-0.9.2.tar.gz 27555 BLAKE2B 47b7788c502a26c40889c84563c0b94983655a653fa1f783f47d667021c65c7ffc0d2cdd14a16dfcb982da48642c0b07c949f57336d5b67c897a78815684bcac SHA512 db8f5c3b409ece0a40f1c2ccb06eaa182896d173a5c913c7e6c5780fd021d746c48557fee6f050db8c42cfa41a5021901342bbb93dfd8b8daf7d43fead9cf94a
+DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
 EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
-EBUILD numpydoc-0.9.2.ebuild 598 BLAKE2B 37a54df7e8838af8bfaea968cb0953aaaa923d6a4ccc3bbefbb389953d11856decb7c6615386c1e36f8cbe2f3caea5461313ba88b80e6a12f7083e7c7346705e SHA512 793fc4c9ceff3b528a82ef09f1949d337e87ee7627a58e90d649d11dc53cf684e2fccef501603ebc0c82ac530e0dcb527941f918b81257f555179cfd777bb05c
-MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
+EBUILD numpydoc-1.1.0.ebuild 933 BLAKE2B 0d9ba3fcd91ea8dfb990a6b46b4d793caa9d20f265506572a3bcaf408688676cc669a432b9ef0ac4dba81fd00233d42a54edd4f024eea35c9cd6a436611546f7 SHA512 4bfc101c5525f8ebc7e3d5848926a95bfb9d1a0351948d2ba9b415c7fb861ca6e6bbd9feb13984707830686d4b17f47418c3851445fc292e83d26f091e94db64
+MISC metadata.xml 346 BLAKE2B 4cc694f3ee24d59fb18bc7d1ecc4b2cce5931d450efb57b75765c2762a06ff10458f55a4c472a75ca6d64e4e1a79dac0b5ed610e4963f52498ab4a3701d18ede SHA512 737d553f25d503f5257b1bfd36bf295a528e600070b00cbe5b0fff9c1fde9f967c89b5be92968b2eef617bead31780d7cad4a0deb419f0a816c806c2a688e9b5
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
index 03512508d0a1..d1fd3820e131 100644
--- a/dev-python/numpydoc/metadata.xml
+++ b/dev-python/numpydoc/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">numpydoc</remote-id>
   </upstream>
diff --git a/dev-python/numpydoc/numpydoc-0.9.2.ebuild b/dev-python/numpydoc/numpydoc-0.9.2.ebuild
deleted file mode 100644
index f1101578b636..000000000000
--- a/dev-python/numpydoc/numpydoc-0.9.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=( python3_{6..9} )
-
-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 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
new file mode 100644
index 000000000000..5163fd43f16a
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.1.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..9} )
+
+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 ~ppc ppc64 x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+
+	# these require Internet (intersphinx)
+	sed -e 's:test_MyClass:_&:' \
+		-e 's:test_my_function:_&:' \
+		-i numpydoc/tests/test_full.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv --pyargs numpydoc || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 14f403133881..90d1db0afb64 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,5 +1,4 @@
 AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r1.ebuild 1813 BLAKE2B 1171899000256d0f2da45c687ffafb7749d061ba1c0c8f454b9c00c4decaec3e57e8d6dc4e1340705d886533240fe3267c1a09a7753939368f5ff750c9dfb2f1 SHA512 50946e1f0a41b47f792b5018ab22394c8205273190834b91f3528f2f1b6dc0676a03d9f26863a2701a4b1efd01149218936630109ddac66764a736cd4acc66da
-EBUILD oauth2client-4.1.3.ebuild 1683 BLAKE2B d2b335f5dbb376a877641711b27aa0be0f3475f403fc110219cf66114dea7b49d658eaae8fb28a2174710e8ca740aa20d2d560d6fdcf33801afb9e434ebae14f SHA512 e93763a8b6fb6944123ebb1fa52fdfd0a3e591dbd68cfefdb7fd6704546753cf5e84d20872cda9eab21a9629197699e63424dc088019ffd548c5626ff1dbb3e1
-MISC metadata.xml 338 BLAKE2B 83fcd745b218d67169e4c38046821df108a4fe02d6ea671ef3ea5a317b21499d20ebbfb1d0575e651c34ccf9c907e281bdafa98c6cbde62eb5df86ce092b9285 SHA512 2148a99b18eff64225de89dfe5de617b5584423483a6265f1f7247adceb62ea53b3dabe2d185ff51a535494e81bdec3dda2de59c83320ce1f4febd665d101a3a
+EBUILD oauth2client-4.1.3-r1.ebuild 1720 BLAKE2B aa1429a130493987dc7b7970135d55edbc45502866bc8bbb187874a4b117365dbc3c7f50ed53c08483efd976297aa72740b068da03470d77ea1d46cbc5b3572c SHA512 4770227dc48a378f76cd6cb8397a7824cacbe31f6437f6917286f20b70547bed1d19df2564db794b216f351a2f76051aa11dea106882f254e2a07b193174fbb2
+MISC metadata.xml 363 BLAKE2B 7c5e946ba58960ecbb9458b57dde2175f003d827f4178c51c2746053333af96d55d973a81668d7bae5c7d4e706e870678da540467d23b5d43c020691552314da SHA512 4058fc7b16017ed09f27da96d66e9d142dbffd476c8c7d4c2b31127ee2dc43b002e0f431391784465101a329d172bf7650c5ee42e09a1edd21c11be8a191ab6a
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 9083df5a2ff2..84013d57af40 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">googleapis/oauth2client</remote-id>
   </upstream>
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
index 3563b832a5a6..d9457f52e90b 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,10 +13,7 @@ S="${WORKDIR}"/${P/_p/-post}
 
 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*') )"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
@@ -27,13 +24,15 @@ RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests nose
+
 PATCHES=(
 	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
 )
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
deleted file mode 100644
index 5901030b4f92..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/googleapis/oauth2client"
-SRC_URI="https://github.com/googleapis/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}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	!<=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/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 8c9adc005d0a..1b116f87c8ff 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
-EBUILD oauthlib-3.1.0.ebuild 735 BLAKE2B 4aa92a17513b21ae16bdfc52505218354b928c46598160b9c43499dc7ddc2191fbc653025013bb71a6992ddf871e71bae51836bc08263f117a35cfa47eb34f78 SHA512 2580936996eb14973ed1e6e3a6ba02fd5b7c8cb049dfb1a35b9debe96c056720e6443aa2ec0489d4409078318caad74d04116154f37ee75de3a3a4a0fb15def7
+EBUILD oauthlib-3.1.0.ebuild 734 BLAKE2B 0474d305655f08f4fe3102a487b6c4e250480d9dec1169c9c2f6cec7ab750123a858b22a9dc3a2dafbf54524230d5fadf76934e51119af9c916a65d1c6f0c276 SHA512 bfac2cd29c2125ab4c201ff0aed42000590efb4ee44031893db46f94623a475c2643a91710e33e6e60e7f380cf442520e233855da76022bf50e63ed347e24eaa
 MISC metadata.xml 380 BLAKE2B aabec34e131c6054ca301f037676730606c49f70870b4ac17d887fba068d6ae1bae2ca8fe74366f306903655665de5d93ded051bc2a61e5b97e3b09cd725fdda SHA512 920b499fff04028ef2a6e0df9ef5e71a7d598833ea41113b020eb8d7ff5b77a87d99ea8754d5192510901c84cb8c3b99709fcfee38d27c52a51afae7d917e058
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
index b395c45adf69..45791c624a97 100644
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index fa7bc758a21f..9e5b0a5f4c52 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,6 +1,4 @@
 AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
-DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 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 684 BLAKE2B d6426f19e63f349e7fec55e4eca3f433327bc63524dd8c2c2795b19c48a0a6eef22a64dec82f1409d4124c3a9e3a8409f0809955057521b6316411227467a68e SHA512 5393bf5b1bee55852ac63cd9dc741060095dbb77525568369342f261e9f8a0734991b3a304f2fef17183825e88810060835ecaf4a2fd93b1d7cc35d7eb3eebaf
+EBUILD objgraph-3.4.1.ebuild 681 BLAKE2B 10640d6919f8c5e0c5db51977c1a5e2526d86c43221df63424567a2e458d84c611f70c4a238ed1bc61aee25ee143c0f5057bece372e2e90bb1396abc41efed70 SHA512 afc62ad12bb7925dd2bc68092eb0c9c339e1ee491921919007581193b0cad6848b14af8698f9412514bf4338b08489ecf85b6e5d592b534f3bd8d069068efc9e
 MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
deleted file mode 100644
index 854f7c924c29..000000000000
--- a/dev-python/objgraph/objgraph-3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-gfx/graphviz"
-DEPEND="dev-python/setuptools
-	test? ( media-gfx/xdot )"
-
-python_test() {
-	esetup.py test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=(  docs/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 9d9fca972a5f..52a0b40de5d0 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index b5894f81f1b9..0ee6366bbcad 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,5 +1,4 @@
-DIST oct2py-3.6.0.tar.gz 668836 BLAKE2B 2edafd7c054a70a604273a7f3f5846926cb54dd05e7f2625aad57034d7760c099e9ad01120b719d3d047e6e6aa11f16e5fe8ca58e51079f038cea6d7aa3efe13 SHA512 f414a0231665bc3bedb7dcdaab8c86f32c140e5107ef80b70e2f99467e737d033de6ff492f2af7233671bff9b148475e0af4881c073ac727d0fd1228b7cf59b6
-DIST oct2py-4.0.6.tar.gz 431738 BLAKE2B d76fd323fa2405cd70dd1d4cbbdf64bbd346d45dc8065de0913d44d833f6d609d20ec8887cefeafdc4e59c382f862a8954b395557ff5ec127a67b1df2d560083 SHA512 997ca843571d2d68c4c57c0213a525c1be5f8b3e3dbffffb6cd41e423d68c8836dd12a03d5210d7f0cbf8ff19be7bb9d25b48c62a236cae68a0762547e574caa
-EBUILD oct2py-3.6.0.ebuild 1429 BLAKE2B 667980c3367e76fa7e3bf0e9cf3daa0885da9f25ba86bf1c35db162ccd9baa5cef41aecc84d2a4a9154023dfe1ac3f708790516dcca88ebbe6458bdb9e519d1b SHA512 e3aa34fe02c58ba077a4d675b9eb8e4170dcaf4a09bd506b40235e81bd2c5226d03562a2e44275a18ffd57103bf966e7f9d05a56c45620b1ae3ef9e164220d2d
-EBUILD oct2py-4.0.6.ebuild 1206 BLAKE2B fdb7df28d2b19e57178d5cdd3b7336deba02aba41627bab703293bdd7c34da4d9b617baf9956a8b38a64debaa80cdd0e592d4acbc7bf3e7d8725ddee04970726 SHA512 56851dff88a8762fcaa263058421abefbf83676f1fe920d3080af1a10bd30d5f129f2b65813e0a036404faca7c6e32bfec91ad8c90fc7401bc254eb80694d592
+AUX oct2py-5.2.0-mask-pkg-load-test.patch 384 BLAKE2B eb97b0f6fdf6df1bfc6907984ee1b223b9ec406c831c8c7f5908d3f5e130cddb85610487ee6eacf664e2e1859c3cc2ec1f5a22072d3dcac09b68bb631534e015 SHA512 44755cfd9725ef5e4dc572ac5e17954f023c4ae0bbe68ed984e696b485cf96bb15e11ee2d0a8a4a411237d0f5337269f13767af509554a9826fe572a7a2bfa71
+DIST oct2py-5.2.0.tar.gz 436128 BLAKE2B 674bd034a44aa9cdb5fd4258c96665fda1b1d79a13ae9fa8d36d168e39385a978ed75bf8748ecdd53f57720785ea8e6c5ffd85d81f3b3c307a748fbc8d328a86 SHA512 55c2ee68b4fd73a8901fa2f7f67fefde5fa37d5070434aee03bfa2a746ff5179f51ccb96541a112e416438eb912caa81e040a5a1cbcbfac36b0285d496ac96fd
+EBUILD oct2py-5.2.0.ebuild 1239 BLAKE2B 841a92e8634f7408e365705c35074559e40a5e9dd0e280988475a5a5fa93e996a78dcf4228f681985aacb2eaca9e30c37f648dfa5aeade4900851eab2ca65644 SHA512 3c1ec1c2c18279bbae0fc271addd4cb76486e13963042bcf1625a7d48fb75a4c9b61cb5d02caccb30c06a9fda0e5124c158e371d8a75264703ca4f11feb4a120
 MISC metadata.xml 615 BLAKE2B 32a95461360131faf43212d3e419ba75a12f853749baf7f862499155d6f445492c311860ea5ee7c7e22c5e9586c722df8382cfe2eb6f67ac7bc1596f6cb9602a SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2
diff --git a/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch b/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
new file mode 100644
index 000000000000..c233b45ec2c7
--- /dev/null
+++ b/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
@@ -0,0 +1,10 @@
+--- a/oct2py/tests/test_usage.py
++++ b/oct2py/tests/test_usage.py
+@@ -338,6 +338,7 @@
+         with pytest.raises(Oct2PyError, match=exp):

+             self.oc.pyeval_like_error3(1)

+ 

++    @pytest.mark.skip(reason="requires octave 'signal' package to be installed")

+     def test_pkg_load(self):

+         self.oc.eval('pkg load signal')

+         t = np.linspace(0, 1, num=100)

diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
deleted file mode 100644
index 7439762cf917..000000000000
--- a/dev-python/oct2py/oct2py-3.6.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=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
-	>=sci-mathematics/octave-4.2.0"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# https://github.com/blink1073/oct2py/issues/77
-	sed \
-		-e 's:test_help:disabled:g' \
-		-i oct2py/tests/test_usage.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	unset DISPLAY
-	[[ ${EPYTHON} == python2.7 ]] && local OPTIONS="--with-doctest"
-	nosetests --exe -v oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oct2py/oct2py-4.0.6.ebuild b/dev-python/oct2py/oct2py-4.0.6.ebuild
deleted file mode 100644
index 95327776d8b7..000000000000
--- a/dev-python/oct2py/oct2py-4.0.6.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="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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-1.11[${PYTHON_USEDEP}]
-	dev-python/octave_kernel[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.17[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)
-"
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	py.test -v -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-5.2.0.ebuild b/dev-python/oct2py/oct2py-5.2.0.ebuild
new file mode 100644
index 000000000000..ddc73b701cdc
--- /dev/null
+++ b/dev-python/oct2py/oct2py-5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python to GNU Octave bridge"
+HOMEPAGE="
+	https://github.com/blink1073/oct2py
+	https://blink1073.github.io/oct2py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
+	>=dev-python/octave_kernel-0.31.0[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.17[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc dev-python/sphinx-bootstrap-theme dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-5.2.0-mask-pkg-load-test.patch )
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+
+	# remove cache which breaks python_install()
+	rm -r .pytest_cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index 8fac1ed302cf..7c9533761e3b 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,3 +1,3 @@
-DIST octave_kernel-0.26.2.tar.gz 11152 BLAKE2B 8331bb595a2e95c8bd1ba2975d45cb65a3cf417bf56c21ee7dc0c0d1e25bd45c51ea6c317f72bd868fe8b401ecb20b862037bbe8ef7cadd44569c17089504415 SHA512 95072ea3e0f74c57e71ef51c3c2050be9c739693bbee22fc5fa63e24fd639daf1bcf4f3a8b5be499de2e4e723bedc8d1f59237ffc1a17ad634a519c96cdde34f
-EBUILD octave_kernel-0.26.2.ebuild 570 BLAKE2B 7cf28e84634170e12846c29a243d64f90a00ce494f7004f0b44d4c923612c844e814dc438fed3fba02f640f78805f614b6f9ca83d2d1da5ec94d72e49ff8ad65 SHA512 685c35a3c6ac9470017f5051b14b52b14510f9730747b6ef96d398a65914afa67d1d6160b23b02062af396747a8c04d24b4a030cf0d4f8c9deaee07aa9f9dc31
+DIST octave_kernel-0.32.0.tar.gz 27353 BLAKE2B da8ddb0c50c65937b4c2b803b6ecc6c5627b3044597ad21377fae9aca5e0ad4bddb6ba65dea77606741c51e435d55c83770d7442de66874c2124f63fda333ac3 SHA512 de8293bed51aca9fe16c2969a467916c90c0c900c5818d48368cd4307bc2b5f0a925f85a0c824c4789d48f72bc31fd7cb341486e70c87a0ca6bc61c799da0ab9
+EBUILD octave_kernel-0.32.0.ebuild 575 BLAKE2B 33f5d0cf9e6a57896e7e450ede27126331d423da8ddda591ef0e89984b0a02465abbd6015cbb549043f72f60610ff18bdebae24e051110cfe2a87ff19cebae22 SHA512 ea9f6c1aaf06f51a437c1dbd9e5bc3f65362ba2099d73ef2240d200ff043d8239b725c630a503964b7217cdd005950ae34d2a97ffc27f701a717dfbf85e9c563
 MISC metadata.xml 506 BLAKE2B 1c7c71e71c9a75c082a771cfc01c2ac9d1fb1cf4d80ac7694a993380952db728387365b44939b398b22a3be589caf0c696cc010ae68562fce8b62ca0463c8077 SHA512 c53f4011a2474c2295d9e3a3f216aba6711b08304c6b59da8b81bc40aa2d3bdf7911e69b23abcec4a0e5e9a3c75663f0c7e693cb2bca6c59a108393185f445fb
diff --git a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
deleted file mode 100644
index 4cec3862631b..000000000000
--- a/dev-python/octave_kernel/octave_kernel-0.26.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="Jupyter kernel for octave"
-HOMEPAGE="https://github.com/Calysto/octave_kernel"
-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/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/metakernel[${PYTHON_USEDEP}]
-	sci-mathematics/octave
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
new file mode 100644
index 000000000000..de26b97c2fb6
--- /dev/null
+++ b/dev-python/octave_kernel/octave_kernel-0.32.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter kernel for octave"
+HOMEPAGE="https://github.com/Calysto/octave_kernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/metakernel-0.24.0[${PYTHON_USEDEP}]
+	sci-mathematics/octave"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 307b334a4823..0a8528555693 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46.ebuild 553 BLAKE2B c01da87800cddcd32de90f0ad84e451a4e090bc3c600370b1c02fec0868f74b89d69b1fb41b120b66b05f04d62459a54c7d48dd68b330684da74a70552fc819d SHA512 c245fade510e2fccf67710dd0e1fa2416670a53490f352b643dc8fa6b4a6c90fbb4db452fb8ed36857394e550ab8613b75079e948bd032aee309b10cfc2760b0
+EBUILD olefile-0.46.ebuild 559 BLAKE2B ff2e3bd1e0737050f3d1cd9bf847ebc5e5f89e17dd5ea174b99dc1beb2e36d4021d48e0f9358abc349bef1373f9e6da2f63d59e4e0f50b48fa6ebb81e90078c2 SHA512 86e9252a0ea67104ed6c9537ffbbe51e3a95928db902002dd65e1fa4852d908b333bc010031076b915472a8269687ec168c17011fa4d2db8b28d25aaab74bd58
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 7631f5395f7c..2e938c7472ee 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
index fc75eb743bb5..8e0e487451db 100644
--- a/dev-python/onkyo-eiscp/Manifest
+++ b/dev-python/onkyo-eiscp/Manifest
@@ -1,4 +1,4 @@
 AUX onkyo-eiscp-1.2.4-exclude-tests.patch 453 BLAKE2B 966418a94703f5af908a19d7ad7aeca907f5d4aa91eb5955e632b8abd23f16b58e57a7a223545ff418c58e3a2a3c71ac0db579da4cb8321f0623586767deac28 SHA512 ee529c6d8a096014a4b2acb2a5fe9f3f7b9086f11dd3f43f280b0f95a2b56edd2fdade60118f6d043303cba76ddd62f775f8969854b02eb9fd3a0a7f4f4f4877
 DIST onkyo-eiscp-1.2.7.tar.gz 48290 BLAKE2B c583b2af2619b6dc070c431a91d77ce507d3bf91f87a5ee181b82333ef597fd45d122c85f3fa4dfe5454b5059c89888744beb0a44a916f8e8cba64fd94b6cda1 SHA512 0fe8f23762d49b3b2c45ef24b94345d9a342cf04b2fa55538abf4ea21a6039011c0ade945f7432555ec948811ab521bb6a611909e19163e0e0c806bf87604635
 EBUILD onkyo-eiscp-1.2.7.ebuild 615 BLAKE2B d6d01c5269cc1983317153b73d6236193946473e884e93ace248aeddcf946474c01d2fbf4593d151909c97b0b0cdde9b58538d3650acd8694c816898c7302d02 SHA512 f79a5014e63e25e8ffe5b8fcb91ccfe18149ac2ee85623e0dc0470600bd1319c7c72c9d5cd85a5e78ec04829342866459880787d22ecdc870f635f5c942cb177
-MISC metadata.xml 381 BLAKE2B 66cc4f148b9ded0452971c614536bdd681d8e0279ad9b7dab1795eeaf503ee383056ff3bd574fd53291f7a6ced9d95aa9636381a4211a3f478e42aa9b21873a8 SHA512 974fd1d80260721251f781d060526f7b545ab67cf93d1ac3fbac176c48d496c72be817b053278f7e8ba6e28ea4ff7519fb23c181cf51def1980b028080d576b1
+MISC metadata.xml 302 BLAKE2B 62d6f4a22b263ced73144dd3fd13e2e5b9e28f9c8dbf6a8a7438b7693751efb44dacab301c5763ff43e317ec440468297da35d855abe01405f05287ce4900887 SHA512 852ef36b4789446b07808a1e10e1b2e5b957c8060853050ddfbef7cebe19017395c885fb0d5faf8b69484e5f00649e0d9ae5c74b03ccfa2a2a7c8ece090176fa
diff --git a/dev-python/onkyo-eiscp/metadata.xml b/dev-python/onkyo-eiscp/metadata.xml
index 257521c026af..caf797492af4 100644
--- a/dev-python/onkyo-eiscp/metadata.xml
+++ b/dev-python/onkyo-eiscp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">miracle2k/onkyo-eiscp</remote-id>
 		<remote-id type="pypi">onkyo-eiscp</remote-id>
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 33aa794c4899..b3812c9fd08a 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,4 @@
-DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
 DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
-EBUILD openpyxl-3.0.0.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
-EBUILD openpyxl-3.0.3.ebuild 804 BLAKE2B adb26f9f521ba77248725e7a4fb791372dfa1e69b2bd84212ab021871d6ddb957af879c004663dc28d2fdb9b48b9c8a83f19f3b82f3178e09a3ab43a0502fccc SHA512 9d920cd8fa0e772c3675eb319fc5bedc60962469c5d649640447f98a2f774c155e506ba03c65b4837aab68bbaa2a83c2a32aa172bda307f8441c7877098aa8f7
+EBUILD openpyxl-3.0.3.ebuild 802 BLAKE2B 435588e4dedea47bdf08abcbe46725ff78e962a859bcef3aa17e0c89e5e30c7143ecb21577d105398f4c3be1c72db5978a0308939aec8a931101381c1a8fab62 SHA512 f8c9b0f7865d4348d21fc32a7a3df61ba13ea278c725b83a50f1f12e7d6b295bd727f46286549facb0f8756a8de2bbfda46d495c0b6c6f83b1be2c6bcbc07482
 EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
 MISC metadata.xml 519 BLAKE2B 29b675ac6f0a0e38ae80b3f3f9d1a63bc2027f7d7def1f9dfac5fcb36cfbf19115eb9cbc94a98f1b99eca7557fd96b3d8c8c1aa00f67800de497671fff0a809e SHA512 e9d571588fa37161b57b5a65739ba59a9058392d1e96f004193054ac0605f1a144be1e0d1ba4b199fd1f49365d44e568b8ab00f3b051bb2a736c0c5926aa9f44
diff --git a/dev-python/openpyxl/openpyxl-3.0.0.ebuild b/dev-python/openpyxl/openpyxl-3.0.0.ebuild
deleted file mode 100644
index 284935b4f7ee..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.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 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/openpyxl/openpyxl-3.0.3.ebuild b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
index fbd7e799e45c..19752acacd70 100644
--- a/dev-python/openpyxl/openpyxl-3.0.3.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 9d537d4f21df..684924f16912 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.18.1.ebuild 608 BLAKE2B 5168d48c4c1aee24f269cad82721d76c08eabdc734c4b7e955989548ab0b4cb4d80a8bcb1a8a51e868664636169b1adf5727c20344aae1f22dd67f251d33be1f SHA512 da49e13f0425b5b10cec7b3e0e5db833eab8b60cc62b2456086bb79e32111fc5db506098fbf3da0ab3e04bd5d1457848536914367a0f2a453ed1d7a8210b8a0b
+EBUILD openstackdocstheme-1.18.1.ebuild 603 BLAKE2B 69574280b2da073f116dc3f25aa02a7875657e097f3cd21cf14308e82b061a33a0a9c77f5105b6e7084fdf4d1cc5ff5303cf67f66f28883cd3f3da11e11d42c9 SHA512 30d6cac1a1a7fa5de9b49401c806e1fe68a33695af6e351bf3f5ddee58ea4f91d6e9c83282f88793cbf55ba2275aaa8c75347a6eaf1f5f1b672178a5f9af16c8
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 40f43c5d2d37..d0995244de72 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-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"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index e2c819bb8778..02a92721726d 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,3 @@
-DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983
 DIST openstacksdk-0.46.0.tar.gz 928650 BLAKE2B f1cf41cc63efb0824ada0c9ac5fea2c1e9b7bc32482df612ba655c6bc94c707e4472c0a5995609914c4e73531aa730a28ee9612a2058a3867d7980581244e20c SHA512 188bb2b2ae9fd3100aa64356d282bc6402c6f175371d8b514ed753f1dd2b1774e3bab22ca45df455fbb7d813236012c0c5174578a84d3f87a3390821f888d709
-EBUILD openstacksdk-0.36.0.ebuild 1324 BLAKE2B e674ca88c81c984c631350b2617950b7622d83a627a09aca2db52bf1ef12c63e703e31faa449349f4e603080b52d9c55b99b083d5939d5f95f3434f2054ad162 SHA512 d39354584cccd47a93e2526138bcc3399782fb6c2552e6a80413aeac2b14d567e40cb021719e3a8b3afdf6c188a5c3d2c23176607268ae9f78c627228327d874
-EBUILD openstacksdk-0.46.0.ebuild 1326 BLAKE2B 1c222d30bfbb5dea44e6e6649d9da855c38fdf3d6d9ec1b2074e6e36c96d99669c4145b402415bd31b9bdf03ba8a7855f7afbabd4b92ef904b3fffe040e6f416 SHA512 a8f3f1f6374997bc569062ef0a31107eaaa45cd799af1c64773e5baa69d99316c8e822b10e9f04b6d556f765cea0c4290ad9f125606dc5f1430db453d3eeb413
+EBUILD openstacksdk-0.46.0.ebuild 1329 BLAKE2B b38669e9550d67bf88d84079cb9d641e3c642f0f41b4229dad80da3ee116073936d6f0f95edbeec86066b91fea4864ea0fb994168b8e3caa4f61f9fa8c687b7a SHA512 1123203c620fbf233369092942476a794e8f4889ca459db554c6cf95ef5e7e698ea41ac83115eb3e0a71c84540219845232e53b35a154fa7882c4458073e60a0
 MISC metadata.xml 398 BLAKE2B 59bb0477f0821bc0460e08cf1f7702f105ef5cca807f5a509ff52823686faa6ffa3f6fcb18ddd92d7bf37450cfbdc42765de5929e552cceb917d3349a9fada86 SHA512 040d0a893c1f8b6e14b222ebafe34cc45de3b912840a2683811950939691d18b96a50bfb97126dfbf4e4736783e5fc584acc70bd3a149f340d41515012656426
diff --git a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
deleted file mode 100644
index addace85d893..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.36.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,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.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.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}]
-	>=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.46.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
index c6694550a51b..2bd3cb7f6e73 100644
--- a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.46.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 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index 3a031074bbf7..e44e87473a2b 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,5 +1,3 @@
-DIST ordered-set-3.1.1.tar.gz 10520 BLAKE2B 885c24d5cb1db95d0056c9216bde16bc41b27e6489d8169ec2c60f93bf9fdf5e112b6183c4adc0d3a34209442db725d0afab3e53ac21420b223c9f4ddf2a9e49 SHA512 9a0d6c2fe1e678ebc5e4bb8229f2a97cfd0b579624f1f5e7153a9fe41937069a845271e431d626dff799136c3c90d8ecd7a7094de8b6f638c581ebe9c4e71ec6
 DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
-EBUILD ordered-set-3.1.1.ebuild 501 BLAKE2B 0a9dc7ec7f4846ff2d3c25be9c2453dc07ab177ba452de7116114f44fd5df70f76ca21dd2f9eba9a143065a6155b853c29330c580a1fbdcc819b6e36bdb139de SHA512 89007830d01382ddf3cb6acb07ee8bc504eb3c58ff94d35ece991b4e79554bf8ed7de2a891dd4d0a31fe7ad777fe6d86d0a13904d2aaf11b36ddede107a1b9eb
-EBUILD ordered-set-4.0.1.ebuild 503 BLAKE2B 888a417f2951f02f8b8a3e55a13af08ab9eb44f7098ffb9f2043c79a0e959698561e939e559aba81394f4dd5bfa754493b236c5b74b11b33cbb59a5ea8ff797a SHA512 6c1bcdeccd492f6c2b766c6396545364bd258832457c412d35749a16f9d8dfbd37f23c0ccaef094ee190aaf219b8e2b3f4a0235f8aa9fb45f1df3bc4f12425f6
+EBUILD ordered-set-4.0.1.ebuild 428 BLAKE2B 48611d6f202b9e463f3e41c407570f76a58811004cfafd1c4d4b99cd471fe5a5bc05bdca2178bd937444e8ba8592d54217393a0044f0ab38c71b214d9ed44e54 SHA512 46cfff275712276d347e68c36463411e0acdccfa7c1d8acf76db3128f3184826361a5646de9901972bd8fb2c7dbe2243805c6053e5c12f983363f16c980f2ce2
 MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ordered-set/ordered-set-3.1.1.ebuild b/dev-python/ordered-set/ordered-set-3.1.1.ebuild
deleted file mode 100644
index a92064a27062..000000000000
--- a/dev-python/ordered-set/ordered-set-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A mutable set that remembers the order of its entries"
-HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ordered-set/ordered-set-4.0.1.ebuild b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
index a2c0c812648a..14092ec7338a 100644
--- a/dev-python/ordered-set/ordered-set-4.0.1.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
@@ -16,7 +16,3 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 3c5a099cec04..d54b750f856b 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0.ebuild 550 BLAKE2B 153e53bd3db528e55bf1c356f3e036e290d37ee8f1e74d69c0a3d7c4b705f314d81fe7467446ba25db1c39f17faa3ac2e58677fc6f2362ed6e3bd860a8c4bdc7 SHA512 ffa33bd37097055f4850b97b8d3ce29d0be5f51a6ab4cfe4113f0d2f74bf99787f8f90ba7518447f5120bbd59af4c84a914354d4ebda542c5bc8ae69d2af7e3f
+EBUILD os-service-types-1.7.0.ebuild 555 BLAKE2B 38fed3a4cb04add0f59a62d8a9cd58a6a1a371c0070825d26a3e3dcd481a671a8053e5466ac7b3a98ec7460fb513a8b2bf62289de6e05437eb7ea52ae602f4f6 SHA512 74f40b1a3fcefc4960c4cce7edc49e755da7534bf46c62a4366cc8fbb3bfc9e6bd7ab42c014685915a394144e6f31af0b292967dcadad047a549f72d4189a633
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index 6db0f3f857eb..8f0547498dd6 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.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 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 99e3f589921e..947a9c49d0f8 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +1,3 @@
-DIST os-traits-0.16.0.tar.gz 24583 BLAKE2B 8f81c4ae3cd88f74b7b44033800af4475c2e76cf4ca402504bb54444c3952fa97a2871336bcdd4a5ed870e423c1201fe0ca658d663d19286098641efd88bc060 SHA512 93ff4c066e0819cacf3a8cc8b80b05960e7a4b7c31af1d249f61f95eac1f37ea21f0f1ddb6e6dbc5b9c023394e10db88a105bbfbbfaf10afc57078040838a8f7
 DIST os-traits-2.3.0.tar.gz 25968 BLAKE2B 9c749ca63f7d67e979a732fbc5de3285ec2635a6ca92fae26f8801e9d9f3dcd1a09b3eacb10162a5e53be932ddc48a8f379a17c8cfb3dbe6114339c35d943111 SHA512 0dd7379dded33a89e1163fb929cc50016474912817f99f048abf325cedd9369d155cf8ecfdcd868ec1bf124c0a44f9926daeffa68877bf723f78a15f6c091e90
-EBUILD os-traits-0.16.0.ebuild 725 BLAKE2B d12117c2f4317fc72b1c2c7a85d803b51fae25f9e11faac73bd120dad8fdb2de01cdc8d66c2126e88f8b0b18ae21a20ba50a81d90e138e74353e8cf058a3ad2a SHA512 c42f01be3ea291fc5a5876075e189f55ed88490f019e9555bce3ff7e49bdb1a291da5f6fd61555c0b10d6c3b34cc6dc859ad43643b10ef7ba0c00084c3dbe553
 EBUILD os-traits-2.3.0.ebuild 678 BLAKE2B db66000923e361f0cbd2db62a170bdd318f4558c33210ef36701d44ff450d24f8249bb3a9cb6553c5524822e72b7a66300d71d4c915b9bd97c41c7272b5dd35a SHA512 25433ca2fb0278b80984662685017ec7899dfc7a5bd46436ec68e5f6e884f8e49b571f9a30b45f23eae8e8e7be9bca1f0ead753415cd37743121d55e66c975fd
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.16.0.ebuild b/dev-python/os-traits/os-traits-0.16.0.ebuild
deleted file mode 100644
index 92ca6d87d411..000000000000
--- a/dev-python/os-traits/os-traits-0.16.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
-
-DESCRIPTION="os-traits is a library containing standardized trait strings."
-HOMEPAGE="https://github.com/openstack/os-traits"
-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/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 4e1b57727f27..cb3192e2f1ab 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,3 @@
-DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b2715e70786e6d293a3087d9fe7d0b3b3a04fa343337bff6721d32bf25a35920e12dfeb03368d1308fc0331f12 SHA512 0b5c2e1376ea078f0641d3e2b69508539531b2d369f2171773ad5d44ded6f25112c3b0843dec11c481afd51b2b804d4e56736ae65a24ad4c59ab142b86da678f
 DIST osc-lib-2.0.0.tar.gz 93445 BLAKE2B eff1ba7e87fca3e6ba080066d46b7378f902ca6fea464ea6f5189175f7eb82d65b3a2d5cc5d4efc482412001505dd3edde48404f6dd448996f25233ceab6ac46 SHA512 6947ea6ac56b644dd9be4b3052905313c42c9ec46b4031d4c77e7df43292f3b04fa288e8aaaaad748eb7dd1a88edaa8d7d9263c8c7b899ce1607a7b2174e696d
-EBUILD osc-lib-1.12.1.ebuild 1170 BLAKE2B 9a947fcf245efeb4d51494df3fa4b74073eab452e77f14b23e4a04e9e54ca89476d900de65a4c6d8dcb746ea3772df5e30071b93a689e08d358603c9455cf4e6 SHA512 4ea1fc91b6267385bf6aa2ada31cc9cc767a338c0350f1e75310ed024dcc89269c89836c9ec76840ee655470f7427050f24db9715ed393f0ec88e726a01287d6
-EBUILD osc-lib-2.0.0.ebuild 1172 BLAKE2B 367a1a0d9b47f5f521728e70cbf68f1a8c7d7cde43aeb7095bd302d96cecf324d24627273189f7024761071a521a41057c4901fed391bd8ab9a9bf0c3682766d SHA512 c133fc30ce7a7f07c3c109f99bfb24248e2439cc26b659814b1e917a1b7b7d33a16265930413d0b51e096ce760c8f8a0bf566d31bd6c146499b3ace3ad173353
+EBUILD osc-lib-2.0.0.ebuild 1170 BLAKE2B 9a947fcf245efeb4d51494df3fa4b74073eab452e77f14b23e4a04e9e54ca89476d900de65a4c6d8dcb746ea3772df5e30071b93a689e08d358603c9455cf4e6 SHA512 4ea1fc91b6267385bf6aa2ada31cc9cc767a338c0350f1e75310ed024dcc89269c89836c9ec76840ee655470f7427050f24db9715ed393f0ec88e726a01287d6
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-1.12.1.ebuild b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
deleted file mode 100644
index 3aa2ab043ade..000000000000
--- a/dev-python/osc-lib/osc-lib-1.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A package of common support modules for writing OSC plugins."
-HOMEPAGE="https://github.com/openstack/osc-lib"
-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}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/osc-lib/osc-lib-2.0.0.ebuild b/dev-python/osc-lib/osc-lib-2.0.0.ebuild
index ec6dd58f6bf2..3aa2ab043ade 100644
--- a/dev-python/osc-lib/osc-lib-2.0.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 6ad0b501ef9e..161582c9d271 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
-DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
 DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
-EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
-EBUILD oslo-messaging-12.1.0.ebuild 1655 BLAKE2B 39675af234182615ecb6be434e76b453cca4b4c41decd32a56fcff6ce3a48063da0e3ef1c5aaca6c3c19b8a85abc4e7344b17a9150a42ea4236d3709b7a6e229 SHA512 826aa5ce473aa5b1f30e046adf856b9ba213a5762c4669c5df40bc6cad73c645dde5a9da87792d308404512156fa2284583851508db21f8a3c6f2f6bebd88ad6
-EBUILD oslo-messaging-12.1.1.ebuild 1657 BLAKE2B ee3291ac61488c7d758eacdf0c4e3464d4744b731305d652ac74196fff83c004a5cd0be289af1fe79644528b268dbeb2aeffa4ed9d0b045f2e8e39c1d7beedb3 SHA512 331e6a745f999bb295f5a1abc14c3a54126b4f63a9c78bfb093a951d601a2f0105237f66dea5606b154866590ea7705da2ef48776a3c708282a001c218346449
-MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
+EBUILD oslo-messaging-12.1.1.ebuild 1665 BLAKE2B 158d297eb479ee1e5285f0767d33276e801e8e1c919ba478309e83c5b2d21c54becafb67be46a33bb746936cbd025e31b44ed3ac2a4325dbc36abe0b660914a9 SHA512 d34237c79ce7655dc18561dcfb510cc0b95bf612d7be0da66e33be4390b7dcf3d65bf17a2c462eafd37d7cce11c8bf55559da8b6fc803fcf58c1d1ca9f39f27f
+MISC metadata.xml 448 BLAKE2B ff664f6b4361855501d59eeeaf4d3bffe64549604d1f0cc079926e22f8e10f9b8563414dd80f38e46e0a17491cd9deed5e7f4645393c828ef81c6efc39b600ce SHA512 35b9e9504052c5a2181942101c8d8498fa076463cd1023899f19da16dd76d6bd1b4319ebc2cbd5f596b9acc4efd9e3be57f5a20947689a6ddf3be6b966030cb7
diff --git a/dev-python/oslo-messaging/metadata.xml b/dev-python/oslo-messaging/metadata.xml
index 5256a24f8b45..5ff552fab61b 100644
--- a/dev-python/oslo-messaging/metadata.xml
+++ b/dev-python/oslo-messaging/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">oslo.messaging</remote-id>
   </upstream>
diff --git a/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
deleted file mode 100644
index cef773967641..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-10.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.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/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild
deleted file mode 100644
index ef31654a32a3..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-12.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=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.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/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.6.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
index 9e9105ff46e7..f3a9989e9c84 100644
--- a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index ea1543dac736..4c4ba23052cc 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
 DIST oslo.policy-3.1.1.tar.gz 95063 BLAKE2B 2173ab727bceb53f8a4d4babb3b4a8de47b6398ea842cff097be21446a1aef0b77bd1b4a89dadc1e48acc9f0355d378e65f8288ff559e970d3ea1da6f2163e8f SHA512 3021433d4e4dd496ee7aafdcce60e3cdc4a9a8fe64724babfb146a077c91dfe0300500c199e7e7664f89dc2430fbab47700e767db64a5d9c931d8838cdc9ee65
-EBUILD oslo-policy-2.3.3.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
 EBUILD oslo-policy-3.1.1.ebuild 1148 BLAKE2B f5daf6bb6372625486725325df48c3fdafa80705555c9dc44500385ba37bc198bfd5b9e277d502883bcba9973ebe227d67ae9c5984b204089085702c496d3e0f SHA512 36ee4e5af51fe21473ef9a663452c9f48c4f931e8294e621ff3d652eca9c08431aa8ed216517e7d19039e8422bffe080ee396637680877a265e07dcdd9200abf
-MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
+MISC metadata.xml 445 BLAKE2B a35bc1555ee546bdc71303edc3ee4cc5d5f82867f4bd1c0a07abbcf368910dd65a240a38b87f2f50933074cc504ed38566f486f2e4af6e8ae26c9ca8ba5f81b1 SHA512 3e5e4f7760d54602f66324ac540d3192d2fd321538c997efd96a1185fce8077441c6ba98ce3bb43ef0ea2cc8be1213bcf8f020573147548beec51c55d430045a
diff --git a/dev-python/oslo-policy/metadata.xml b/dev-python/oslo-policy/metadata.xml
index 6efb29a58d08..f56757d7bf7f 100644
--- a/dev-python/oslo-policy/metadata.xml
+++ b/dev-python/oslo-policy/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">oslo.policy</remote-id>
   </upstream>
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
deleted file mode 100644
index c3144b2fa23a..000000000000
--- a/dev-python/oslo-policy/oslo-policy-2.3.3.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="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.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[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.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/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 10f1ea407659..2ca891cdea16 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,7 +1,3 @@
-DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04
-DIST oslo-utils-4.1.1.tar.gz 92838 BLAKE2B f468f77bc72124c404d4aac2b8ca9fd7f05140e45bfcc9b19e04e5d3181532fd82f941b7a00d22f1cb656ae46dc205e7da449772666a8892b8d7ea6469bb6505 SHA512 d6388af59caa7531901eb5585e1dd9eca544dd722bb4cdafb19221c33c543508306415f504b27559366eec2a9c7102acb181d8b833ee038e46e90567208daefd
 DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418
-EBUILD oslo-utils-3.41.5.ebuild 2993 BLAKE2B 9227ce9e1b4e41051590efe145bbd63463becba6a6da1808925ee88a25a4c73f3dacda976d2e30869608d0ad6386e2dec86b189d4e67231155e85e543d223f71 SHA512 93f08ce2acd34994393f33961d5b07309883cb9091dae741abab3eea5e5e11fab7ad63de6691469c86f70a5d7976cdf6bd83fc2f293224508e930dd6e28f04b4
-EBUILD oslo-utils-4.1.1.ebuild 2439 BLAKE2B 587dd08ddc8114c9192b4020f90e7a235e37138967cb4ba74bcf579bc7d7049a7663b73e31732cd0436d19a10e7bdd80057c0ba6daa2b6d2f6aa4824c725a44d SHA512 c5731b398ecf7b1adfae81ce1e595d7bb8cc48f49cf07049bc0e4fe23fccb3a07e35ea2bad98b10cbd1d423b74ff4a5d0cf87e8ed445181d96f2062c282b22c6
-EBUILD oslo-utils-4.1.2.ebuild 2441 BLAKE2B 42c56c8118abbf75815af7fb3a9c0c96855b7965a072e81444d68446f07e4afd3788bff8e764f70f110bd906b31b513871c3f1f03792351501e8aa22d2d41248 SHA512 0111114e3087b12ea316095bb3e4b91c67d76e3bb0567e0c6f9c0175c12be4e76a2e40a189574ddc93904e7b7f8c234af27d357ceca35700477950e78accf656
+EBUILD oslo-utils-4.1.2.ebuild 2449 BLAKE2B dcf2c3583b98de2706dc29b01c8fce68633ebb100ad408981fa6e0a7ab94a4a565669c40526e174d34f38d42da2fb2c5e0a02d5a1bf06ddc89b81489f8daefd1 SHA512 f5d1e7f22bacc3bfafb9453c2db5671b3e4d1f5cac6f68b71b72447cdebb79a85bb33d51565430316b522acd7bce4041b2a878f8cd02a9abff92537c9394bac2
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild
deleted file mode 100644
index 41b6669851c7..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.41.5.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} )
-
-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/oslo-utils/oslo-utils-4.1.1.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild
deleted file mode 100644
index 52ecfe5ad491..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.1.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=7
-PYTHON_COMPAT=( python3_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="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/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/bandit-1.6.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/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
-}
-
-# 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}"
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
index eed1c4c3fe24..7a5cefe94e82 100644
--- a/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 927984b2ec48..e9a099e80dbd 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
 DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
-EBUILD oslo-versionedobjects-1.35.1.ebuild 1345 BLAKE2B 3a6f24e9c06a0aa63ccc2738c8ca008d4096c0434753fe6ac94f12e5ac25490868bb091dd8c3a2525c6d4f200b2983cba4db0c7b05869de4f2f7761153d9d801 SHA512 0402a890433ff23f6f790d733f5756ef07c4a7cbf2835cbf33a43f66db773a984a98b1a827a60f106f120de12cd8ec36ebc5196c0789848d87747e1232a3a1d3
 EBUILD oslo-versionedobjects-2.0.2.ebuild 1302 BLAKE2B dc1763bcb1c10a66d363f3868fabe0b68d2ab28cb73a37800bceb1063b509c97186dc9887ad50a9642a007acd581667ec7a55e33ee448224c3b8e1d3b8f39b9a SHA512 28f2a9f2ba4f930846249cb6a52c106c2c5000ff4777deeffd6ee79d923249b7a92b3a439c08ed77a4aaefca8f6a17b702e67d3ee4713cb9f04b3e533bf9a727
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
deleted file mode 100644
index 15911f24f26f..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.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="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${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/six-1.10.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-messaging-5.29.0[${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/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
new file mode 100644
index 000000000000..667a69b59ddb
--- /dev/null
+++ b/dev-python/osrf_pycommon/Manifest
@@ -0,0 +1,4 @@
+AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
+DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
+EBUILD osrf_pycommon-0.1.10.ebuild 670 BLAKE2B cdc95910f9bc9a63e53bf3563cd3400def5f8e6e61964fb0e7f1b8e9ba72ea9799cdc10fcbc9251013884d33b79e7af62c2f78037b9a9d8cd25afc491bb4a5c3 SHA512 0a65b2ea65a42944d74630d8e2e98f7e129f6569d0b154a15b9ae485ee4add8142fa1957c3692a49b0bede5012aba6ef64814856cded14c692ca7bace8366c5d
+MISC metadata.xml 332 BLAKE2B 646ed0c829539be3417268e0b8fcffda5a51492f9083d5d20ba037e794b27f54347c8bf5119fc75ddb38760942b8af2ea7d22c379408d02d9e407a9696bf866e SHA512 ae0c307ed8e480f49cb5ba866ad6990fae1feee6bfd6adffa9e1b00d7ff56d8a7acde8e19559a6ea4043f262f8e3cbfa8baa9ad96f053f240694aec3badf56f2
diff --git a/dev-python/osrf_pycommon/files/str.patch b/dev-python/osrf_pycommon/files/str.patch
new file mode 100644
index 000000000000..336813e416fa
--- /dev/null
+++ b/dev-python/osrf_pycommon/files/str.patch
@@ -0,0 +1,23 @@
+From 515fd938513b8e458ce5fb3c937c100a3bc87745 Mon Sep 17 00:00:00 2001
+From: Chris Lalancette <clalancette@openrobotics.org>
+Date: Fri, 19 Jun 2020 17:48:05 -0400
+Subject: [PATCH] Fix the __str__ method for windows terminal_color. (#65)
+
+Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
+---
+ osrf_pycommon/terminal_color/windows.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osrf_pycommon/terminal_color/windows.py b/osrf_pycommon/terminal_color/windows.py
+index f0f6120..21f5e8f 100644
+--- a/osrf_pycommon/terminal_color/windows.py
++++ b/osrf_pycommon/terminal_color/windows.py
+@@ -224,7 +224,7 @@ class CONSOLE_SCREEN_BUFFER_INFO(ctypes.Structure):
+ 
+         def __str__(self):
+             return (
+-                '({0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0})'
++                '({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10})'
+                 .format(
+                     self.dwSize.Y, self.dwSize.X,
+                     self.dwCursorPosition.Y, self.dwCursorPosition.X,
diff --git a/dev-python/osrf_pycommon/metadata.xml b/dev-python/osrf_pycommon/metadata.xml
new file mode 100644
index 000000000000..b48cc9c2c50e
--- /dev/null
+++ b/dev-python/osrf_pycommon/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>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">osrf/osrf_pycommon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild
new file mode 100644
index 000000000000..d38cfc41188e
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-0.1.10.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=( python{3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/mock[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/str.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 4c286a234ee0..77ad7d6e902c 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,5 +1,3 @@
-DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
-EBUILD ovs-2.11.0.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
 EBUILD ovs-2.13.0.ebuild 484 BLAKE2B 8e45f2127ac5826bf56a95f65623e147bc7f704d3d56eb6ea02a54ff90dac18e6d079c354fed1f3e4d2d9fcc5c931c63ac81c477624da963aac6bedad7e21e40 SHA512 34bc16b3c97ac0c56d0e6e89974be2daaf0a13bdcb6b74ea70e2e844425aa1913d1b2adc6e12fa4e2fc70410e642610654e898957e08037d14d8bf70a6520f15
 MISC metadata.xml 375 BLAKE2B 19b2550d0f82a3aa091d80fe888a2d1d1ff657a8cd74da54e47a5d7a888a8180309385b1677fe99fa76dbf94547f7686ddcc5abccec70b711c52922815f3f969 SHA512 c30b29dd16ce17b01bb126ea62b15ec72e740584e50ff5b329e29902969c080e7761fef4aa59900ccfb8a87aa38205e59afacc765cec513680872d53726e7444
diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild
deleted file mode 100644
index ffad9a0f0909..000000000000
--- a/dev-python/ovs/ovs-2.11.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 90a1619e975c..bc8c3018cf6f 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,3 @@
 DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.17.1-r1.ebuild 974 BLAKE2B 6cbf6cb83499922b1fd6edfd00e024abb06691324a9b69897440dedc426a066e8c52d05aff61a350bb873e1ba7fc247e28d46c9073e9cdf0ed52085fdb6fa490 SHA512 0155c5ea7c6b2ddc4e3a6d4a2e6393deb16509f852db0c58ec47190a86e2f4552136aa64221b6bc71ec75f8b86eb27c20578d749d88d3da4b88a3dc2e7334e9b
+EBUILD owslib-0.17.1-r1.ebuild 921 BLAKE2B 12d28b134d2d7596bfb464e7bb3e268a826028156553aa7ec8adf82ec817f65665bb54dbac99e819b71dffbdcbc7ce846ca63a79645610f69cc45b55c49c2bed SHA512 4b3a4890b46b58559f2dd6c66638871f4f235aac40ca1ec2303729a939d97592b1b37a1564a8a61c3f70dd8ac10aa403a816c7c5c24963cd1a43d59889573a83
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.17.1-r1.ebuild b/dev-python/owslib/owslib-0.17.1-r1.ebuild
index b8195ace184a..139f916e3d47 100644
--- a/dev-python/owslib/owslib-0.17.1-r1.ebuild
+++ b/dev-python/owslib/owslib-0.17.1-r1.ebuild
@@ -20,10 +20,7 @@ RDEPEND="
 	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}]
-	)
+	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 21c70f94f338..60f8e10fb12a 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,6 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
-DIST packaging-20.3.tar.gz 73015 BLAKE2B 863a04124543d510455ffd6cd6974e7b3ed0c43e02baa5124631e24e7d56017d0289475fbcd9a4f038607c4a13aced32d2b98a82d975903afa154b520feb0019 SHA512 b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f
 DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
-EBUILD packaging-20.3.ebuild 1404 BLAKE2B 214c4582408bb5621afbaa34f4e0cec6b9ab7863ed5f209b45cbd2721c5f1bc41055539a7c453371064d37b19d14daedf91640285bc8c161d7acefb633d249f9 SHA512 b96dcc379f1ad70766d28b3317eb340512fe8d18becdcf9256183aaf86f2e8bdcba8d39a492e53269a04f3ab0f801501dbe84570506460e0269dffca306b2424
-EBUILD packaging-20.4.ebuild 1415 BLAKE2B 3f12a177e0444d48e6751969ea8ac0a4cad274af23ed7d16a67938e4a0bf243a39db36e30935a90807a238da6777743b40aa9a5fb09e0d1f9dc248fa5e96fccb SHA512 fac44e8d0f5fa8335b218a08f0fa8049f6d5a812eafb13732e34b6179d43a10dfe001f1d4be5fb299dcb94cc07888091c777254b4257d7beb01b498d726937c9
-MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
+EBUILD packaging-20.4.ebuild 1406 BLAKE2B 9b948feb8a5976aef30817d0545c8e3e6cd551ccb41ce8f5eac1408d8d9f0d87d443a07616746cbde4e16ab48bbec9819d726c2bc891b045f1d4443ed5858e09 SHA512 99f1ac586b369e123fa201ec4c4a0235ffbaf472dcf4159e0b746d61488beffc4da7f899f5b39389f504e3645201994a54a046db306448ae4e475a2e8d1df6b3
+MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/metadata.xml b/dev-python/packaging/metadata.xml
index b995a0f3bbcc..5b75b7a3b0e2 100644
--- a/dev-python/packaging/metadata.xml
+++ b/dev-python/packaging/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">packaging</remote-id>
 		<remote-id type="github">pypa/packaging</remote-id>
diff --git a/dev-python/packaging/packaging-20.3.ebuild b/dev-python/packaging/packaging-20.3.ebuild
deleted file mode 100644
index 046ab3f6ba5d..000000000000
--- a/dev-python/packaging/packaging-20.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=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/packaging/packaging-20.4.ebuild b/dev-python/packaging/packaging-20.4.ebuild
index 37353d3203ec..a9225d1e48c6 100644
--- a/dev-python/packaging/packaging-20.4.ebuild
+++ b/dev-python/packaging/packaging-20.4.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 ~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/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 22dafd6105ff..a1fc838ca6bd 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 c1309861d8a3903448734629dfe121eddc72b5b1dddfd31efd8efce67632988b01cb05320f2ffc7842892ec85a624d158c9cc519e56a85a7a4eb61e343232916 SHA512 cc9a6025590138ad143fd063fea3a8ee2d32cb38712e67fbe6e3092d3ee370d0485c33d68c0a4dfef178a3bad27829894a3ad39d9de29cd93e0ef314233d0bdd
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 645 BLAKE2B bf0e30d8ccb8633039ca2970e46739abfa54b0a22f91e324c80def35363c9aa5d04b30b55d443d74bc67961712043c356c1ced17a5bcbc6673a48571e712c924 SHA512 1555dac88f1e9c0d2ddf6b553ad3ad1de5756d02f153064e5121aa209a09ea4b97605b38131b21c9d2bd5188b9e45d55bd70f48934bb13837dee8274d4265998
 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 2d2a62dd4d51..c4e8e8d6f90a 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
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx themes for Pallets and related projects"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index b5160d037c34..00a0e8837bb0 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,11 +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
-DIST pandas-1.0.4.tar.gz 5040267 BLAKE2B 2855b1708e1ae4c56b6118613ec644d010a3af7db474bb30aec3cf84e497371af03b63a2168f6daf0fc42da07274f8724734117c6aaea34f49eeafbf6ac73b9f SHA512 01ef73cab3db067ca4a29992d71aa637425b8d70473fde6ccfb359dfedc9546315c6d37d74f3825c924cab789c2536ec69db071a303cfc5e1a7897b253dd9467
 DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
-EBUILD pandas-0.24.2.ebuild 5376 BLAKE2B 9277f27158afa9b9989d89190d04a67165d6452fb8a83964c85582b6d984726499fb2d10aa684194d5414500e04d86fd3307a0b74330d35848952d2c6c780a84 SHA512 b2577e30bb76a8b86d3ed062acf3978ff885c355428b677a0cb66cdfb80de84a81eb6126753a94b642e608b19990589518acb7aa2ce7209ff5e04bbdd05748b2
-EBUILD pandas-1.0.1.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
-EBUILD pandas-1.0.4.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
-EBUILD pandas-1.0.5.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
-EBUILD pandas-9999.ebuild 5689 BLAKE2B 4bb1564c464ab25e04e6de09de01a3c60981697537b53533bf81a3bf057fe89950b3ecf87eebe55affb194e2658d2067a73b69aa0e5fd522e737466c32812374 SHA512 f2153d607503e1d6fb6a7b658ef250e95a83d0c0176b82612fc7338af3c83e8ee7441538f36c7963c33fd2b5d793462b4902d1642e6d38c8e6babaac984ae8af
+DIST pandas-1.1.0.tar.gz 5211071 BLAKE2B 538e7579384dceb29f1761e00181fda4f07556ee15723a127966e47c317babead19b364943808d11f03007d5a48da3b28bf8fd9e5c1f40bb3285604307bff267 SHA512 496344967e6061ed451edfe2057d0b63d7277cdce0e12e2e2ce558aef2c23fa5d85daae239fcf88820196add3a928734f31af2734866da7b0385f363607e2885
+DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
+EBUILD pandas-1.0.5.ebuild 5703 BLAKE2B 8166d35533d3e445cc1a9cac416ad36e4218b2a7cc3482c158a18d646109752eee9c4f7fcc1f400e36b1021823adc2a4c5b9e8c71d9bed6c582d15cb4c9597e8 SHA512 4f71c014c4903b70971c14c77e1d1b2cc4901ebf941d95d7e62d691f469f28136a3b640ec6b91d7f93c06523cbfe7c262025822767db6b9ca6b0a46f8fdfcd22
+EBUILD pandas-1.1.0.ebuild 5746 BLAKE2B d0819597a8aaf55e162ac7b3667a4b9aa020520c79ab3b5c063a0bb06fafebb10f176fa56c2e3256029e8aa59f1252692da8143a3e25a2e515cdbddd84f552ad SHA512 3ca6b4e8753037479a9dc7d9e912418e3bc56cd55c96f5c85b0d82631aa9dd47c2ba56a9ed0723b4293e4cf426339103bd2bc2d0006e02d9ff537ac9e5a2d79d
+EBUILD pandas-1.1.1.ebuild 5936 BLAKE2B 6d263416a5ca5f2f57ae63a650212cae374c6bfc3da890239ed023caf189777254a14b34645ef80d3980ea7b50b308508817d6742e9a639061265363f9867ebe SHA512 dfe218d820824e65a1df1fba5d9e7133bf3f081745633687c69513b5a17c25080d990cf94739dc0c5a249039c04289775c44fcf8354a0c66be954f47f79bd05d
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch b/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch
deleted file mode 100644
index dcc61dc0cfd2..000000000000
--- a/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py
-index 63ba9bc0f..854afecab 100644
---- a/pandas/tests/io/json/test_ujson.py
-+++ b/pandas/tests/io/json/test_ujson.py
-@@ -841,7 +841,9 @@ class TestNumpyJSONTests(object):
-         arr_out = ujson.decode(ujson.encode(arr), numpy=True, dtype=dtype)
-         tm.assert_almost_equal(arr, arr_out)
- 
--    def test_0d_array(self):
-+    # Segfaulting on gentoo, not sure why. TODO: find why.
-+    # Clue: https://github.com/pandas-dev/pandas/issues/22718
-+    def xtest_0d_array(self):
-         with pytest.raises(TypeError):
-             ujson.encode(np.array(1))
- 
diff --git a/dev-python/pandas/pandas-0.24.2.ebuild b/dev-python/pandas/pandas-0.24.2.ebuild
deleted file mode 100644
index fd193a5c0249..000000000000
--- a/dev-python/pandas/pandas-0.24.2.ebuild
+++ /dev/null
@@ -1,166 +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(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-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 ~amd64-linux ~x86-linux"
-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/_/}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.24.2-skip-broken-test.patch"
-)
-
-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"
-	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/pandas/pandas-1.0.1.ebuild b/dev-python/pandas/pandas-1.0.1.ebuild
deleted file mode 100644
index c2bd75a1183a..000000000000
--- a/dev-python/pandas/pandas-1.0.1.ebuild
+++ /dev/null
@@ -1,164 +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(+)"
-
-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/pandas/pandas-1.0.4.ebuild b/dev-python/pandas/pandas-1.0.4.ebuild
deleted file mode 100644
index 979f4b8e0adf..000000000000
--- a/dev-python/pandas/pandas-1.0.4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-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"
-S="${WORKDIR}/${P/_/}"
-
-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}]
-	$(python_gen_cond_dep '
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${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-0.29.20-r1[${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} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e 's:test_register_entrypoint:_&:' \
-		-i pandas/tests/plotting/test_backend.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
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x LC_ALL=C.UTF-8
-	pushd  "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-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/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
index 979f4b8e0adf..18ac6398c79f 100644
--- a/dev-python/pandas/pandas-1.0.5.ebuild
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
new file mode 100644
index 000000000000..51acafe7c742
--- /dev/null
+++ b/dev-python/pandas/pandas-1.1.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+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"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~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}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${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.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.20-r1[${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} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.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
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+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/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
new file mode 100644
index 000000000000..28940d3da4de
--- /dev/null
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils flag-o-matic multiprocessing 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"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~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}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${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.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.20-r1[${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/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${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} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.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
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+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/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
deleted file mode 100644
index 5b361c58bd82..000000000000
--- a/dev-python/pandas/pandas-9999.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/pydata/pandas.git"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS=""
-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}]
-	$(python_gen_cond_dep '
-		dev-python/s3fs[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${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-0.29.20-r1[${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} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e 's:test_register_entrypoint:_&:' \
-		-i pandas/tests/plotting/test_backend.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
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x LC_ALL=C.UTF-8
-	pushd  "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-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 8daa4038b12b..0ace4908e19a 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,4 +1,3 @@
 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 416 BLAKE2B f7d8b43c3af1817d1766a0ed357e5d162d9acc0715466df225407fd7d1fcad5a92fc466a6cd9a1b1beaf665310d7bc85504b2915c56165be7d0c6d8ab1ea849f SHA512 d3dd2e7aa27f68ed6b880b6712fd9727b173fb1fe20119497038ed90e1cce87e3a9e65540f1d1930ec1b710df271451be32627e51598f1a269081891341f9689
+EBUILD pandocfilters-1.4.2-r2.ebuild 414 BLAKE2B ba1142f529fc5c3a94e240955b7e5b12a6c5e89bc53737818557f9e64cabd9fb032268a8d72dfc83c57b01bf563982e1ac91ac48a1b44734b8f76e659219751b SHA512 6e2b9d46ed90c64fc41e7ae19d0dcb4e97f61e512220a9b23bb26e21d29bab6be4e9602ec3e58fb2fed564a5d6a0621db18b907540212dd1613b166be596b73f
 MISC metadata.xml 505 BLAKE2B f15a208579a5dbc0a4552fcdb95eb47e454169bcd4596450e4ba40c016acf0c0718cfb1d7510c4d47d5964c4dd5bc38e9d67250355ef2c057b1d07e189ee6e03 SHA512 a70bcab9a4cf50dfb414d61844c258ee674c07f54fb63e238240f6ba75d9b9bac17f2c0008e09bf909a277da4501ce9f56ec66234216187497160c40fe90ade9
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
deleted file mode 100644
index a549b6eac542..000000000000
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.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
-
-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/pandocfilters/pandocfilters-1.4.2-r2.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
index f0ca1779097c..44c87fb3b60e 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
@@ -13,5 +13,5 @@ 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=""
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index fe92b30f966b..57f94c18ea4a 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,7 +1,3 @@
-DIST parameterized-0.7.0.tar.gz 20751 BLAKE2B d9ae50c8f3ad142fb18511aa151b386443d9100db69d5ac3c1256be98f6a5c669f1ae08172b13f8ab2441fcdafa548c42899178d737be1db9d65fa597322397b SHA512 b76e18a7eee62fcab4385fd5d053253c096d4c3fc3a6300e8539afc4d8decc995e533085297c52f8a26411d2591a326033a740cc30a250d510aa1c11ee904246
-DIST parameterized-0.7.3.tar.gz 22678 BLAKE2B a0332af2bd8c955993bd9520538efced1cdbd06c20c7f0b72a3bb2ec7d6b5a983578dd9621c8b3ee0d4c2aa85eb1f571ed0dcd98e36b8987fb2f3cf432002000 SHA512 ff4ce23356bbaa13bd92f41bb57b650cd1cf3074ac33116ccb88e37bfae8a1bf6ce7015246e0e7788b247fa8f8b3780cdc73e8760b252e8458e4e15719c14dda
 DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
-EBUILD parameterized-0.7.0.ebuild 578 BLAKE2B 3f191fa2d7a2cfbb0b654def88086d932c7bd0cc47c5e42768f43c8c04e55b36faf5f7ad68cbb025adbd5ad0981dad50a3768024495197e7f25ec3de074d5aa2 SHA512 6c92e567699a82d2c8fc1f857dd962c7692795171e6679b37a88fbdeedecf6112489ec627157221f60b82395b8c628189dbc6dd5a452feaf8382fdf9cbf888d8
-EBUILD parameterized-0.7.3.ebuild 417 BLAKE2B 554729276a8d12504841ada00a5386c08e427a6856eb65acc14074bf8d6e22fd4642c39f13853ad2466840c71d00871353c78e7ee3c69a64260aa5a368e4c09f SHA512 fc5fc89af92ddeb839ec9a21fe14b7f5a5f7027081c3032e006c9dd1d8266013ec12f54d2e4619d0edd7e790e7e6b2e35a82d3162212cce65afc4540b7c6ef87
-EBUILD parameterized-0.7.4.ebuild 416 BLAKE2B acf215fc68c23df5b53bb7ab7017a17907b0dffd9703952efd69096afd2f375b48f1c32dca88f53a823f29a76df50bd748d61d03acea3159cc4d51fccbfac65d SHA512 236ae742e49b52f0ca6dac4983d1b0cca57558d4e1b41790b542e686d8d21c8debb9fbfd577358c8d5f5f62bc4d0893c2f941d2335feeffc1849107cdeb11a1d
+EBUILD parameterized-0.7.4.ebuild 426 BLAKE2B 3aa972ab3197b3b627a53d9bdb71dea6f78da1eec57e17aecd578575bc3417f2c82cc3037814587851f8ad91734fcc5b1fd20459c83afd71c9938a86b13133a7 SHA512 d9a5f685635e68594f7e0bd6c2a366cd4ea25f25eb6173675e6e2d47dd26dcfda8643b044cd769218a970bac49d1a84ea393b226bddc65541569c1b24d1dfb13
 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
deleted file mode 100644
index c6236f6b3453..000000000000
--- a/dev-python/parameterized/parameterized-0.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/parameterized/parameterized-0.7.3.ebuild b/dev-python/parameterized/parameterized-0.7.3.ebuild
deleted file mode 100644
index 2fb854097678..000000000000
--- a/dev-python/parameterized/parameterized-0.7.3.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,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 31b1b638ad95..58a7aa748ee2 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 200fa5da6579..6d24b14fbfa3 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
-EBUILD paramiko-2.7.1.ebuild 1343 BLAKE2B 1927181f686232022c8a06a2d1033dcd0563c83ea5cbb8489827f83ea6f5c51ba6658c4017c66a95d762bac256051e9742929da69ef7e60f6fbf632749067004 SHA512 b7f64a23b0f6f22cd51ec6788129f559859763b11da2c83fd277e6260c3d4ab8c33beedb115cb27c0add06d7263a5eb2a6aff3c5fabbae1b7e8f90ba366c0321
+EBUILD paramiko-2.7.1.ebuild 1333 BLAKE2B 93de0faeea4ad477a36f05460bc6a477574580cfae2d91cb70a9b6b1d39a007a3304b15084db1498dd300f0bb647d3ccd2d04fd0080d79349e8819fce6d14849 SHA512 64d03a22accc103508a3fb98711c5c257d18274f25a212153fc73a8b3d92e6e3880238c930f114fae2eb30fa9fbce7f2af50e427f80c91998189e7629c91b797
 MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
index c2d84991da27..b5e4fbde4ab2 100644
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 01690bc48acb..0d600e39d7a8 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,9 +1,7 @@
-DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
-DIST parso-0.6.1.tar.gz 390866 BLAKE2B 3dbbef687f194f41bc7fdeb7c78930802ee5a97150d2585eb8949ac74ac640e897b8f04b29f2768df920aa5d54ec80f1aac3b84f996ef0ea957ddccf9da77cf0 SHA512 98cc20a3378c89b870df5e5df52f2c2091c1a133ea9701141ed90edbb05c5b8ddf30dcc19069cc19666f34e37f8ca64e37bfd701314adb24b0a10ab197862cf1
-DIST parso-0.6.2.tar.gz 391060 BLAKE2B 476b91286dc69161558dbb82f2e5eaf1b7f9ded6de467d97c74ec7e08a7e956cfbb67bd64e6ed975fddeaa64a616bf714f069e7185a3af8140aeaa2eda2de729 SHA512 da011c6fbab3ca2157c8934086cc0db0b7a37f5cd67debe70f56429f409de8762b124948ee75ac65779b806d8aaab759ee790eacb580910f3609ffd280dba2a8
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
-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 791 BLAKE2B ca877d9c7c064d69cf91d1df7669a500246e6d2c19bbafb735f25d914185ee8bc28fd8cdcb250f7503754de0dbcb4029f31a2d494f824406f0607022d94bb63b SHA512 ea7bb8306c569d8dd381b7e4f9e1f8baf9b9f29c5bcb6312d15899e8679d02492df6707eeb879b7614ba03461336904626a91f5fdc7b02c41fc1499bc98f22c7
-EBUILD parso-0.7.0.ebuild 746 BLAKE2B 62762737bedbd2583bd4f271bcf705f99e278fb651fb45f7f06f287dc835ffe45592a13e59a0d14b563107730db046059ca415a4379a559c1e4e450646a8d239 SHA512 a7be9ba693c72949014a780130a949d99e7e2db5099c13d106fe8ea8279efe43490bb3dd0e19ce26e8a2cec834fa94784825ba1b6eb0ce80f62e8871519b377c
+DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
+DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
+EBUILD parso-0.7.0.ebuild 745 BLAKE2B 46e9ec6bcb841cc3455ddf4d88168eeaa3eb75af8a52b8781390fdff83fbc0cfaebac1256b71d29481bd07250f0e75c7bc7da84c9e09c47c6b204a3f18d0bee2 SHA512 42c314ed631e7a57fcfb3759699d277f6d9821e8ddbc64a7d63e9a0aaafc1e6f6033df4f2de595c2bf7f781ef96eb77eac75b94a419d3f88cb367b58d8f0e95f
+EBUILD parso-0.7.1.ebuild 562 BLAKE2B c94515e599b4fdb6c249910f317fb514726c117c5492ad6bff82cf4ea20d264a63faf53073db078d33d12d7a4ae62f4f53a1944123148bd2c7afbdc086238400 SHA512 5f262af6404fd9256431fbb2c8009aa9a80e0acb139ee8c4d822d6dc8d66a48c21ed675f26ad7e0db7a144f8e37991274030e36739ed763c7e74f1859ce50906
+EBUILD parso-0.8.0.ebuild 552 BLAKE2B 5deb6f54cac8603aae1447e63ce9b7d4d7c7e2ae26f385ce2b90987adfe9f3613c0b4249f51cd88179ccd48f10a40abc46a90d25cf70cde962156d67f7ae0c4e SHA512 660631d957d0fd51b295c4a8831e0cc8735b1259326dd84d84254b7f6c05b16cb4c77ff01f524b88a90da012d748f92174aa67ebf43568d19b72731e92359800
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.5.2.ebuild b/dev-python/parso/parso-0.5.2.ebuild
deleted file mode 100644
index 74075aabd3a5..000000000000
--- a/dev-python/parso/parso-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,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"
-
-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.1.ebuild b/dev-python/parso/parso-0.6.1.ebuild
deleted file mode 100644
index 10c7b0e69627..000000000000
--- a/dev-python/parso/parso-0.6.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=( 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
-
-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.2.ebuild b/dev-python/parso/parso-0.6.2.ebuild
deleted file mode 100644
index 16043bc1e450..000000000000
--- a/dev-python/parso/parso-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=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
-
-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.7.0.ebuild b/dev-python/parso/parso-0.7.0.ebuild
index a6d051a7085b..8cf6c606a071 100644
--- a/dev-python/parso/parso-0.7.0.ebuild
+++ b/dev-python/parso/parso-0.7.0.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"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.7.1.ebuild b/dev-python/parso/parso-0.7.1.ebuild
new file mode 100644
index 000000000000..4e94bda1a652
--- /dev/null
+++ b/dev-python/parso/parso-0.7.1.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=( python2_7 python3_{6..9} 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"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.0.ebuild b/dev-python/parso/parso-0.8.0.ebuild
new file mode 100644
index 000000000000..e5da1da9a57f
--- /dev/null
+++ b/dev-python/parso/parso-0.8.0.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..9} 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"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index 7fe38226e79f..d9baa5987f30 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,5 +1,3 @@
-DIST partd-0.3.8.tar.gz 19171 BLAKE2B 1c96a3771ba8866ec1f8e8536909c433bc2cf914d0eee9ae01bd7d1255b44caed59b1dd71ff4f7c433c3429a86381757be1202dadd01cd65282687ddd0c1ad62 SHA512 3b7c642f7452a409eece356d2fe2e9430f6c5859b685c2ebe3d4cd8fbaa1c86e370174454f31b264ff8866ca9a9ab3bc0ca288f7ed123d8233ea3332f373d01d
 DIST partd-1.1.0.tar.gz 35497 BLAKE2B fb9461daccd5f3215471b201bd30be1fdd499f929490b1819899c7396d1d541fa46c629c26bcef5567df259ef0de1ec8effc3b7b498dec0235a4c0117a1c6014 SHA512 5e26c4a63fc2f9a290b211c1fce291da6b3354b4d0fdf941d29ddad1252629c94275ac360d33c88d11ff4e36a4f4d6bee42edd867c92eb7ef0d2697472c9a338
-EBUILD partd-0.3.8.ebuild 811 BLAKE2B b10cabf39cfbadb18eeda51853133cd055efbd9ba35679de868dfaa497861fe923df3fa7e86e23960837dc2f9753aeffe6503c25be7f1e88e93272272d9df926 SHA512 e9354160f8f560ff964b19a868f252407f8808bbd5f83bbc5358ecfebc398367bc5656707477399a10eb7fe61fdf64094e1d32e6f45f38702d5236a83f08e4fc
-EBUILD partd-1.1.0.ebuild 713 BLAKE2B 5ddba296f85f071302d45da21d300cc15b4861505aa1c614bdb5bb296339ef6684c14486702c61fa6ab8862138cc5544976c43ee267f3d554166b935115e8587 SHA512 dd843bf91a62bbae18a1a0d2f2d2f21c3d303e6ec9f7f08ecf4abc8e2a748b36f05a7b2b3062bd9aa934489125a8b6f864e2fda28fe6dce351c68e4ebab2a659
-MISC metadata.xml 668 BLAKE2B 5bee3dfee36d41021686daf6f8449311089503fafc31e9bc7a998bda70a5301e144fcb47925339f268f2caa27bfba06f3cea1e614d8d97b08ad611982ce712ec SHA512 30f9fb68a75ecadd72d03b01be181cc661ddc70b595fcef8cc5d9a98de089d585e2baa9615e9989af68cc4f1e520c8862b41ac769568c8a29a3c8877330fc52f
+EBUILD partd-1.1.0.ebuild 723 BLAKE2B cf691e494c557fa8196979b2f691096d7fafdf5b151ee914e3a31ee8075ea67426e9c7e14618cf25557242495b8bcac21ea67e99da9ddab7cc5a9322f2ae07f1 SHA512 9e9c3e8f6efc9c5c6a31bfabe1f11e912042af50cc9c7114c3e0b90294b117a3661ad69711574b185609620dfb7d4642fbf4ecdbc6464e0be3fb967c1ab747a0
+MISC metadata.xml 693 BLAKE2B 54359382c87dccb8adbac9fb9adb2d19a1f633f493c1931108b58143b7ed67ff8f0098d7dcd5d9d1582a99089d28cbe5c0f05412afd06d7365f8611256599412 SHA512 1adda1906f8aed4bcc47a385007dd9a8011ffd335fd0faa9f5fb30ea11ae2c547a941a2d1c1f3e3bfd34d16171ddacc651c0e0cacacd8079dc708e4cb3b9e8c3
diff --git a/dev-python/partd/metadata.xml b/dev-python/partd/metadata.xml
index 1f38ba605190..b784f51ba4a1 100644
--- a/dev-python/partd/metadata.xml
+++ b/dev-python/partd/metadata.xml
@@ -13,6 +13,7 @@
     Partd stores key-value pairs. Values are raw bytes. We append on old values.
     Partd excels at shuffling operations.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">partd</remote-id>
     <remote-id type="github">dask/partd</remote-id>
diff --git a/dev-python/partd/partd-0.3.8.ebuild b/dev-python/partd/partd-0.3.8.ebuild
deleted file mode 100644
index ac2be9a64b14..000000000000
--- a/dev-python/partd/partd-0.3.8.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Appendable key-value storage"
-HOMEPAGE="https://github.com/dask/partd/"
-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/locket[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/blosc[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test partd --verbose || die
-}
diff --git a/dev-python/partd/partd-1.1.0.ebuild b/dev-python/partd/partd-1.1.0.ebuild
index 84f60be5c684..22353870f99f 100644
--- a/dev-python/partd/partd-1.1.0.ebuild
+++ b/dev-python/partd/partd-1.1.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 2272a2f16ba8..5b9a76edbe2c 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,4 @@
 AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
 DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
-EBUILD parver-0.3.ebuild 892 BLAKE2B e1ebb523e895c6e94933cebc0569bd13804a9fe154a5220ff565801cb4b8a058a02f991375fd1b51ca6969b61e6bea28ce983651fb0f1aef72f58c195a80e5e2 SHA512 3a4c2dd56e0db206df68c5ff835dfbe64c949dc1cc17708f143145fd395cb4da1f5c05a3532df98e89ced7cf030998bc9aef9f9144f4f4da7f18339235da1dee
+EBUILD parver-0.3.ebuild 894 BLAKE2B c9e4a89ae9badb85b3ae97db8f92a2e71208b11b56bcdc67f733d4d8dcb7afd0eb31021e4c455b0ccb676020fc40bb01ce6f79c21b2cbdcb6e3584c42ef9aca4 SHA512 5447934cc17277e5354b3fa8b491d852163f72050b0d2a97abcc53c69ea4ddaf5360cd59bc16f0a59777d56bffa5828f77392471c6b88bea450e1366d7481952
 MISC metadata.xml 433 BLAKE2B 816ccc76bf4592a65bb9577c64a81ad4dd6643b8db012506a931ed8420d68d18426085f9c6f13f3bf82679ecdeda9967f612571d54c6c09c0ad795246e41cb04 SHA512 9f271e8d1fdeee78d5a3c8fefbd1f9e1dfb999fcead3ae86453f63d4d9d44d36951fd7342e1512483eabea11515c729beea1041c28cac6b7255ad33522bbe569
diff --git a/dev-python/parver/parver-0.3.ebuild b/dev-python/parver/parver-0.3.ebuild
index d2af95d88e83..af0d8b5a02d6 100644
--- a/dev-python/parver/parver-0.3.ebuild
+++ b/dev-python/parver/parver-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Parse and manipulate version numbers"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 5cc5f9a303c9..e3524c792242 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,5 @@
 AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.2.ebuild 1035 BLAKE2B 8186f3475fe121b6364cfe486f9b6078f6e039bf1dba9cfa122e36ce591234b451b898addf8842bf2736a10466df47416a05d3a822396efa4f7b3f839ef1255a SHA512 0820f44a42814955efb7db4469faaaea07df7e5f4269069cc81a1a5d33452346d655eaea4bbeeb4cf23423902b6cb77225086ce776aa299abe4a52b8f1a49c8b
+EBUILD passlib-1.7.2.ebuild 1025 BLAKE2B 4c85828eacc7f82d68ed6bc3e65b184aa7db65ed4875493c52a080eb36642fab3c4d30a1509e95be1f90d2ada2700a35d5ddc8279e66000affbc1fe6e2d8411d SHA512 650186ba94965305a4d5a3ae2087309a986aea413e7415e534e12091c5f63a07aee309bad6031dca399142598e4d798349e2823f071ccdcfbe2e42ca117cd71c
 MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index b73ac55fce4b..b54d3c320eb5 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.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,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index dfaeba1bfba9..77d187758572 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,7 +1,5 @@
-DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
-DIST Paste-3.4.0.tar.gz 630425 BLAKE2B a361450597e8dce1d9cb99ce2a723cb8feb08909975662e1fbe8b353c20900ac5d994e8373ea4db42776aee1901f51363f8338ba4e3c35462f3c3917161a02ef SHA512 fbe0d1f39d8147846b3a30f18e6776c31eb5bcd8f461c0bf7afc35533c65c2ddf74263807be1b73b76c49cd6cc73c210a37ca651ef1f34e727ccf0687478085a
 DIST Paste-3.4.1.tar.gz 633491 BLAKE2B be599b9385ecad754fc431a936ccd78ee088825c88040986ddd4ccb3ca81342d642a23699ca7ef9338be5360703ce5d5a2d966ff9e405744b286fa3fe69bce41 SHA512 90b6bd33e83fde70691be6206ad1de653603900b88fade79f6960df22bb84c6e82c9b6f4ddc11406f4e206273a2b5591b81ca034f8f42a3e993b85b16d07e3f0
-EBUILD paste-3.2.3.ebuild 1746 BLAKE2B 21bc0c5925223b5f3a46166f048b061e7f69dfed80e540f5adf3103bb3cac0cc6b0c767088f7b984a985a46081fb6499de86b3252fdbe162ce60fc8cec6b81c3 SHA512 965981d5831e50d140e2783aa17d1b8be51d6e90d1dc88210f6b1f70f66fb6bb33fb37e71b87fae377e9c999fc5a321b0cb03aea6d6391941e7c722901f7f7f0
-EBUILD paste-3.4.0.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
-EBUILD paste-3.4.1.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
-MISC metadata.xml 802 BLAKE2B cb355da6c4b803a1777a5fdffe5c262d65d8580a0ac902a79ff3f631037ec16a8865969e5a9ea663c97960e5e52370a438b700148c9813bcb535c8385f588fb1 SHA512 44f4ded1a14298d020ca255a48d26d63cd2c1915e537c45718f630710caaa00453059bfe0f615bf3217db7d2b81fcbd419fc67e8b56ce6096c5844d53c6ab94c
+DIST Paste-3.4.3.tar.gz 630569 BLAKE2B fa81b60ad048a2c999d4e57992f5a5603680bf7505f13a8618a55425b388ef906ceb2e118821d689905a20e7ec2b31d27a6aecd704f529540db6c4436f30268c SHA512 0869a3330a74cc14f88fb5ce24183328ec38fed1fc5cd669b428f09ee2fcafc770e95c2f4dc8de86dfce4d66861bad26c9502cccb81966c519ca4593ada094b1
+EBUILD paste-3.4.1.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
+EBUILD paste-3.4.3.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
+MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/metadata.xml b/dev-python/paste/metadata.xml
index 6d7a30fd293a..227fdfd6c368 100644
--- a/dev-python/paste/metadata.xml
+++ b/dev-python/paste/metadata.xml
@@ -5,11 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="flup">enable support for flup (and therefore for various
-		wgsi servers and middleware)</flag>
-		<flag name="openid">enable OpenID support</flag>
-	</use>
 	<longdescription lang="en">This package provides several pieces of "middleware" (or filters) that can
 	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
diff --git a/dev-python/paste/paste-3.2.3.ebuild b/dev-python/paste/paste-3.2.3.ebuild
deleted file mode 100644
index 796268808c79..000000000000
--- a/dev-python/paste/paste-3.2.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-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="~alpha amd64 arm arm64 ~hppa ~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}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	flup? (
-		$(python_gen_cond_dep 'dev-python/flup[${PYTHON_USEDEP}]' -2) )
-	openid? (
-		$(python_gen_cond_dep 'dev-python/python-openid[${PYTHON_USEDEP}]' -2) )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-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
-
-	# remove unnecessary dep
-	sed -i "s:'pytest-runner'::" setup.py || die
-
-	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_install() {
-#	distutils-r1_python_install egg_info --egg-base "${BUILD_DIR}/lib"
-#}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/paste/paste-3.4.0.ebuild b/dev-python/paste/paste-3.4.0.ebuild
deleted file mode 100644
index a86c3a7bb14d..000000000000
--- a/dev-python/paste/paste-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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# TODO: 'Address already in use'
-	sed -e 's:test_address_family_v4:_&:' \
-		-i tests/test_httpserver.py || die
-
-	# Remove a test that runs against the paste website.
-	rm -f tests/test_proxy.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/paste/paste-3.4.1.ebuild b/dev-python/paste/paste-3.4.1.ebuild
index a86c3a7bb14d..5015b7c191bc 100644
--- a/dev-python/paste/paste-3.4.1.ebuild
+++ b/dev-python/paste/paste-3.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/paste/paste-3.4.3.ebuild b/dev-python/paste/paste-3.4.3.ebuild
new file mode 100644
index 000000000000..5bbbe51a411a
--- /dev/null
+++ b/dev-python/paste/paste-3.4.3.ebuild
@@ -0,0 +1,42 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index ce1ba3f63dfe..23d1035eb682 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,5 +1,3 @@
-DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
 DIST pastedeploy-2.1.0.tar.gz 32240 BLAKE2B 1672e3b48a287f57e9e7fca082e4cd07cea770db1c2ae0012a83dc8ec927d83bf94461a69c7afdbed082c72506eb46c0c5db15e5f0bc24ad7a4212efb9f6696e SHA512 2c639b5ad07faee013ff3fe37d0e3c6ca7b56ed0960dbcaf133c05d51a7f29d6a2f35118bd8faea4d9aca90438c43d8046a340833878e4b925f32142df169c97
-EBUILD pastedeploy-2.0.1-r1.ebuild 990 BLAKE2B 673eeb039807627b3d51f82e373cdf270bd30c3a3068f9c876ccd48cda0c3d6fe49823170e7f5749cb9513ba8e77d28cd0d66cdfaa9be09d2d5881747bd3bd7c SHA512 ebedc4fd7715ee8c8922060d88395de237e4621c593daea95a358223562f47b530287bc623884c735b4a89c51e73332f40686db3b45b395de803a0b0811a21c4
-EBUILD pastedeploy-2.1.0.ebuild 999 BLAKE2B 8eeec1ec1509ca41faca4e60d797089b7ab6300fe01380f553dcafbda2ccab398c7ca6f41c5504c016f1fb03123292c3f952ba72534e70814ee105d21f862d0b SHA512 87ddfd458cf24432cef50441b182e8ad84d37b13e4b82469f0dff4be316dd05019c63d1d9eab931853c26ae31ca036a49573535193d06b241e5de1e4113b7b5c
-MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
+EBUILD pastedeploy-2.1.0.ebuild 980 BLAKE2B 23f2c9b950485d79c25ee54279daecb333e9a261d5ae3ba15b8f1ffa32041ab1b9c748bd3e53302188706633dd12cce5559d1dff1349eeb6399f6a10b2938ecf SHA512 f0a6870069da1e1969143480665aa26c250ecac74614e20e4f39f3d822f8374e3545904b2a6356e212004ef39ed2ccd737959410da3d132eee032199f19fa427
+MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/metadata.xml b/dev-python/pastedeploy/metadata.xml
index c40531961758..8c900f601b35 100644
--- a/dev-python/pastedeploy/metadata.xml
+++ b/dev-python/pastedeploy/metadata.xml
@@ -11,6 +11,7 @@
 	or a Python Egg. For WSGI application providers it only asks for a single,
 	simple entry point to your application, so that application users don't need
 	to be exposed to the implementation details of your application.</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PasteDeploy</remote-id>
 	</upstream>
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
deleted file mode 100644
index 69b46160987d..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-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"
-IUSE="doc"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i 's:"pytest-runner"::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
index fd89fee1c975..b3184cd1dd90 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 21255c174308..d0490b3187df 100644
--- a/dev-python/patch-ng/Manifest
+++ b/dev-python/patch-ng/Manifest
@@ -1,5 +1,3 @@
-DIST patch-ng-1.17.3.tar.gz 167588 BLAKE2B 970b136e8a17ea67e1c578292c19905fda0bf821f9ce89ea95a81af7e146f9d4e715937fc261c0e79854c2593bdfae95223b00c9a5eb4853059b9c9f582fcbac SHA512 1d1f9097fa16d3105b301d4f6d2e9661634a9aca42c1a5ae1f60c3aa6e66d4bdde82f53275d0c52ef2647f77d2dfab2cbb3df2a31c859eb18350267f2f5897e9
 DIST patch-ng-1.17.4.tar.gz 168306 BLAKE2B 78067e3c3d296a21f8fd4155fe770245ba4457cb9e37003f5e7667c30827878a8c06d62c77bb1fdaf61b96a813612a7c39800d7040b13a9d18f0baeccbd86ba1 SHA512 919c04c3adfa36672f3db5f1761a12ccbb08ccfb890015bb0d27b1801c8c7dba99c4da01674b269703a7cbf39df5889f5c446551bb4cf7039dc383c23d8a5db3
-EBUILD patch-ng-1.17.3.ebuild 704 BLAKE2B 9dc50f62b44440605b8f1ffc2172c2cab7dcf530d7b7ec8dbf7188de662dbadcb53e4799c15181acfea0507c97f63e7ac6986633192968c27020b9a3972e0009 SHA512 201e57b035cf73cbab7979b17d2d510d9ce124309516a782c094178f7c15577d7dce2263d25b5a8c41edcdbd9252976995a53ccc2a3cb38d1cd9b011319b72cf
 EBUILD patch-ng-1.17.4.ebuild 698 BLAKE2B 92669c533a6544866c149400386218980fb934b3e9c75ea2198989cb241663e4144c6b186259763c97a987d8fbf7b81c05d1d2a743e5d7da86e39020fc7d969a SHA512 547c3f6607e3846d476810f56923c57c99b01834153d07599618b2adff43a4406f826b3760dfb45eca076ef1d52ca52429562f932dae961b45357f15e73d6040
 MISC metadata.xml 525 BLAKE2B 26aa00d23b21fbe597d8f43c36dba421ed607b0da33cd59ffa0f38557b96c4c5edd531b68f164786c0d4459c8f59c0e18ba837e18211a712c65d20f2fc428a8e SHA512 eaafbe66708f645f59554b92bd6a9a84ea9b083d34ac6a5fb3146ee7d13ee13765f57c82d9a6bd97f11f479be25e42e080702ea89ca631e42adc2ec17949e3ed
diff --git a/dev-python/patch-ng/patch-ng-1.17.3.ebuild b/dev-python/patch-ng/patch-ng-1.17.3.ebuild
deleted file mode 100644
index c42f80532b01..000000000000
--- a/dev-python/patch-ng/patch-ng-1.17.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=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-py/Manifest b/dev-python/path-py/Manifest
index a8ad3f4e02b4..6687a696a461 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,9 +1,6 @@
-AUX path-py-11.5.2-tests.patch 498 BLAKE2B 45dac8c0907630552463e73257b29aa351e9d2dae7e05f83a40facc756c1b41698d4f380141da759e20b806afdbdc91657fd692a2e1749cddc35cc7e05ed3ad4 SHA512 0f735f27fc98a1ef42d1ac4b105b8d807a645cf836f9d1525d261f1c0fd12b39867d78a6ad0dde14cb83bbafdd21bed20f54fc8eb150cde91c20cf71a6fb8df6
 AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5cd15c06c1520df4b3034c5719233734233f73360baee5366ac8417f677cbba3adaff5e8d01f71b5bdcd5abb5be SHA512 291f8b80012c29cb2ff2d1ad00d14b6b137a9803073df03298415f81ccb2a960f1d376dd49dc527b9a78167e06b4ce300983557b7475ca75abe1d62630cd9959
 DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
-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
-EBUILD path-py-11.5.2-r1.ebuild 1594 BLAKE2B 7053427dafa0ba02665e7dc70905116f85a926c23e3fc2fa48f54595c025161ecbd81bbb2ae5ee1a9dfe4e05c150bb4491e4aa9c4948a5c9cab50cb1d1752307 SHA512 b3882b7b3282a352873c33acfd4eb2f44ece9b0f3f5a114c91be10b18cfb574c29df45fdc36f14464f021baad0bfabc774fb04f3869a0c972f98525fcac0794d
-EBUILD path-py-12.0.2-r2.ebuild 1554 BLAKE2B e107da833380acd00a56844fbdc4bd11ab3c18600b198092d5eba6e95ab140bf43a7b375de6c882a17adadf8314413090aba8000e8167d9af9eec0622910ebb4 SHA512 77de4282a51a84639e479a2c32074eba3b824fb35766a05fb4b8a024c61206819a3b15f0954ad28d738a7c17b348711e9e3f95d6dfaab4b0bf70090feefbc91a
-EBUILD path-py-14.0.1.ebuild 1425 BLAKE2B bb2aca0426da6b23489a896ee03332171f77c6c902304ece9b4348d12a9788937785a8aa117e5ce45bb4a973a41cac69962d6f1e5c6d28c0c13dde5ab1025600 SHA512 3564c5eb163852c60e4e536a1dda044e45e3159594b5d23750ea783f7ee9fd978166df2fc53816d038c3e29ce03b04e2a8b15a72e18b00b704c18d1fe94930d5
-MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
+DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
+EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
+EBUILD path-py-15.0.0.ebuild 1255 BLAKE2B 9cda1d2c1757437b7fe2504198427542a49c00b43b7981199ba6fdaa8fe7db5127f529ccfe2cd075bafbf2aed1481cb7ca711f3f52a558525acc826352509981 SHA512 90997341e5b1e20e18dd53d7cfe3c41c0ea60258f80c6fdf32169f26ae313ed31d9638d3f51709e5f55fbf6cd2f20f6c03b30cd8c6fbf3b0df4b9e7cf9615882
+MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/files/path-py-11.5.2-tests.patch b/dev-python/path-py/files/path-py-11.5.2-tests.patch
deleted file mode 100644
index 4760b20d3cb4..000000000000
--- a/dev-python/path-py/files/path-py-11.5.2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/test_path.py b/test_path.py
-index 2a7ddb8..cc7a58f 100644
---- a/test_path.py
-+++ b/test_path.py
-@@ -420,6 +420,10 @@ class TestScratchDir:
-         platform.system() == 'Windows' and path.PY3,
-         reason="Can't write latin characters. See #133",
-     )
-+    @pytest.mark.xfail(
-+        path.PY2,
-+        reason="Broken on python 2.7",
-+    )
-     def test_listdir_other_encoding(self, tmpdir):
-         """
-         Some filesystems allow non-character sequences in path names.
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path-py/metadata.xml
index e51461af9e0f..ca5305593200 100644
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path-py/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">path.py</remote-id>
     <remote-id type="github">jaraco/path.py</remote-id>
diff --git a/dev-python/path-py/path-py-11.5.2-r1.ebuild b/dev-python/path-py/path-py-11.5.2-r1.ebuild
deleted file mode 100644
index fe2a341258d2..000000000000
--- a/dev-python/path-py/path-py-11.5.2-r1.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=( python{2_7,3_{6,7,8,9}} 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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-os[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/path-py-11.5.2-tests.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-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
-
-	# disable flake8 tests
-	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
-		pytest.ini || die
-
-	# fragile test for import time
-	sed -i -e 's:test_import_time:_&:' test_path.py || die
-
-	# fails on py3.9
-	sed -i -e 's:test_version:_&:' test_path.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=. pytest -v || die
-}
diff --git a/dev-python/path-py/path-py-12.0.2-r2.ebuild b/dev-python/path-py/path-py-12.0.2-r2.ebuild
deleted file mode 100644
index 8a2bc901dae9..000000000000
--- a/dev-python/path-py/path-py-12.0.2-r2.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,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	!<dev-python/pytest-shutil-1.7.0-r1
-	!<dev-python/pytest-virtualenv-1.7.0-r1"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/path-py-12.0.2-py38.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-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
-
-	# disable flake8 tests
-	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
-		pytest.ini || die
-
-	# fragile test for import time
-	sed -i -e 's:test_import_time:_&:' test_path.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=. pytest -v || die
-}
diff --git a/dev-python/path-py/path-py-14.0.1.ebuild b/dev-python/path-py/path-py-14.0.1.ebuild
index a9be9a3f748e..13f0dc92d69e 100644
--- a/dev-python/path-py/path-py-14.0.1.ebuild
+++ b/dev-python/path-py/path-py-14.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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="
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
new file mode 100644
index 000000000000..4779263856c0
--- /dev/null
+++ b/dev-python/path-py/path-py-15.0.0.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..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P="path-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
+SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -e "s/setup_requires = setuptools_scm/version = '${PV}'/" \
+		-i setup.cfg || die
+
+	# disable fancy test deps
+	sed -e 's: --flake8:: ; s: --black:: ; s: --cov:: ; s: --mypy::' \
+		-i pytest.ini || die
+
+	# fragile test for import time
+	sed -i -e 's:test_import_time:_&:' test_path.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. pytest -vv || die
+}
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index 6d8b83b3399c..50e8f61ea115 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 521 BLAKE2B 14c376f0fc48f750858e4c519d3795414272a990fd50c7673dc6beb5566314300ec33433f67f8424f17bb9ec43f6e9f0678e554d7df1affd4ff612e515eef278 SHA512 d5bd766602861294ab9453ad9a10ecdf2996b2644eccd1ba7449d52cb1341f78a9507f135cbeba727a5d21b70cc0089f702147cb6cc45a2fd11aa217d8061e3e
+EBUILD pathlib-1.0.1-r1.ebuild 527 BLAKE2B 751cf793682177e7f8320474e9a3e26fe7fa0a0baf16cfd8a1f81ebc31298cb50fbd3237e8df2ea00ed286816eb394cf680ba08602e1cfbca3c228d6989616c2 SHA512 2ec3f7dab0bcdb3b4d3becdbfef2d23edb49da20d03d7cf0f8cd87eccf03b9044f1f5e9a7305fe3e898025a6f28762788bea070a20d45be2df3dbc7ae811454e
 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 84fa3d764c1a..2d31ebdb200a 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 111b2ab171d6..e17adc417e34 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,3 @@
-DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
-EBUILD pathspec-0.7.0.ebuild 592 BLAKE2B 6af70c12c31fe864c19efa8ad8b519cd4dd201d86d81624c2617b1ee962cfc75a33aa2008aa1bd1ca2aa83bf9ab8de06188e1df6c6af2123d1477d8363f9cba9 SHA512 864e76e69b755c6cd91754947da270f77808c6bd2bc679fc712bd1759ef651f95b316ca4f0d1469b16318dc8a3b4af65bdea49469eea4e434830c3160e0e7942
-EBUILD pathspec-0.8.0.ebuild 555 BLAKE2B f7a8350e4fab1e9bdc35e87a9a003d9eb05c905268c54c6ca3e92c13f6537703de2840e06ed79558c723b2170bb14a54e0f7d4312551a1e59a4c3473acf0fbe4 SHA512 b01b3d98a3e2aea29fd0c96f92db42c9b81bf30dcaec65c96ac7092b3096faf46143ffc3742a58c7aa36d9012ac6c4d1dd40e1dcb8a7ef6b37b3361101d5af0c
-MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
+EBUILD pathspec-0.8.0.ebuild 550 BLAKE2B a55d531c78e12204e966973d227ce30c3cbd7db5369e7c61ebb7fdb47815b4d54a194cc5ec60d1f4d25f8962bf6f8f5f24dedabc04bbbe8870bda6b225fbbb5f SHA512 971624edd8d3332441b24073c4d4d3b57548a269a428be583b948c12000df1b088a5593acfc386a0231bca353d703e7a5e6c86098a20262741140ebeea5b2cf4
+MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/metadata.xml b/dev-python/pathspec/metadata.xml
index a3135fd46ef2..d92a5fd71170 100644
--- a/dev-python/pathspec/metadata.xml
+++ b/dev-python/pathspec/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pathspec</remote-id>
     <remote-id type="github">cpburnz/python-path-specification</remote-id>
diff --git a/dev-python/pathspec/pathspec-0.7.0.ebuild b/dev-python/pathspec/pathspec-0.7.0.ebuild
deleted file mode 100644
index 1c32b12e6e0f..000000000000
--- a/dev-python/pathspec/pathspec-0.7.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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index 0e06f11927d2..cc0c5aa755e4 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,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 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index bbe24b00be79..6e328c0a9f2d 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,3 +1,3 @@
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.5.1.ebuild 927 BLAKE2B 31f455e275881efe10d14d6826f5a282a408679eafd99debbfbd2f72249dd86c64a7adae57e8fd1f8bf8ae6aca43b56ecf1dd07b41a5e3e3e46a0780cf4e0c47 SHA512 52ea024490a4b7536e382751c445c57f78109ad36ac8304eabc1248263725f1b44f0785998aeac80cdb86145564671e90b9c6d5fffe3aa01896a44392e2da19f
+EBUILD patsy-0.5.1.ebuild 939 BLAKE2B 8960bf0f97223ef765e5ad8d46b7e80bf018ae839c2f0b62e9f484af97712c4c5451a1907f8435a86c59e5c64a8a6a70682aebde12365ffb2eed9f589096e772 SHA512 ee9aa5789f340f63fd7a241c8979473373d9269f624a6275010db6bffe05bc22259a15de6d4652c5adba1d3908c1f101fe740157a452780d794f8e93aeecc954
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 55fef3e05212..e6498661a786 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
index 74efa2bec2df..33d4dd7c5fa6 100644
--- a/dev-python/paver/Manifest
+++ b/dev-python/paver/Manifest
@@ -1,3 +1,3 @@
 DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.3.4-r1.ebuild 1046 BLAKE2B d1590faeaaecd2d3f644b7f1519a8db521d45ed7a12c810df57431734ac868b78f0aee755ff753e5f51c09aec56bbd863ddbfd64e208d336529b7fff5d31d8a8 SHA512 5d3a389aa312f0a61d43abcb043f9441859e35beae0efe1f9ee79d1d593f81f808e3dc533ba200ac4dd3e6284a98020b0c69278ff507f279a3eddc240f899fa8
+EBUILD paver-1.3.4-r1.ebuild 1029 BLAKE2B 663d4cb4f532817a23c6ba8c5c7f4e57cd9a9eef46be191b081055aa7d4745852f3202a8a1611d601d57b8554d82de8099da0a7f1aa21c20e64473829e2f8b31 SHA512 6ccf7466cd5810473498e638e14b3f08af8d66482f8b4f3f2677c398f49ec3dbf626c46dbd26650ed04d5349a40b8feba49e710ce627c46a46d78583850da64b
 MISC metadata.xml 396 BLAKE2B 98b898d09add16cea57b4a09ed9789f019280c41c99e48933d23ddb32c79319526c7d7632c882158281a85810a6c3eb820eea10d7acfc8520253ae4c5673ee10 SHA512 2d2c5596ea93c7a16d517e69c0bc8650b16a0f19280b36be8b4ccf394c31d15234d27c0e52ad4c98ab5b964ed70138fc6a962aa70b337ac1f1fbab411580621d
diff --git a/dev-python/paver/paver-1.3.4-r1.ebuild b/dev-python/paver/paver-1.3.4-r1.ebuild
index f6905683aac0..a751a449de0a 100644
--- a/dev-python/paver/paver-1.3.4-r1.ebuild
+++ b/dev-python/paver/paver-1.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ 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"
+HOMEPAGE="https://pythonhosted.org/Paver/ https://github.com/paver/paver"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index d044fdea4e2f..0e35b476df41 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,4 +1,3 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 516 BLAKE2B f92a81aa2c15d54221bfbf7de7f3160d8303e6c57f46ef1bbdae3b859cdd5753d3ec76a89e0d2b883ebb4ba3d25061da9d988cb192ee29a333052e662cc61ea0 SHA512 7509f0b500a94f72b6a03030db54b1c1a7f486ebb9235b1a8002fb248790046d312a57a290fa999aac53e57bdb06623ff5a3f331497c77046cd09166de80f3cf
-EBUILD pbkdf2-1.3.ebuild 554 BLAKE2B fb57fca27f52f8083b0de8360858a5ab61aee0c02d0f7350e7e4a111f0d6664570e84371cae1b18eb0365927b1ae284ee0ef4a4020808c3b2272aced7d116916 SHA512 01bc93d2e57b5ac6277a504e36b2104c3f0e9b851f5c43480bf5948f3b16a0ee200306aebc3308c72296f33998b3f3265bf41554071d04602bdae506a2a4a64d
-MISC metadata.xml 459 BLAKE2B 965991be60210f9e930734bce65864e787ce89679cd3022cc4bf8b0fae52673d38a27c6e44b4f809df88eecf7408adb248cb232399e3377974e8af91184c206f SHA512 698082fce3b94481fefb400b8328018726c7c0151f088ead749fc0e25224852cdce344947b9f084011e216918237aed988f39f6ceefe60dc86ab6e1859583136
+EBUILD pbkdf2-1.3-r1.ebuild 513 BLAKE2B 4dc7a0726c72030ee1341fe6da907ed023837ed03ee5674e4a5b1f0f2f719b370db5e98e3e3a3987f2ad7e7f319b70e2506e785822b7cb1ef7211d9f0525a633 SHA512 1e7f80f3e2d988d385b0ea37c7bcc610348433164e7184cf9c21b79d0ca97b406c1d990916109e30582d75e2c3e419cf42426a1fd9e7e496282656bf2e121bc9
+MISC metadata.xml 484 BLAKE2B 4ce23d6736927047d0ee59c636e9604083c545fc1680ed90dde2465607a20993d17754025f4bd4349e290ba92a9ef34968014e68198342dba92a4cdece01f5cc SHA512 e54cdc2cc3594935b89509a992660df90735360bab5402e81169060e32ad90878d4b08adfa18694127b74970a25c011330215a0ee01eea57c0563c7fd9c02190
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index 81b5d33a3e1f..98439a9b8566 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pbkdf2</remote-id>
   </upstream>
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index 619eb7f07504..d36cbd940caa 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} 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 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
deleted file mode 100644
index 340f42749de4..000000000000
--- a/dev-python/pbkdf2/pbkdf2-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=5
-
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0"
-HOMEPAGE="https://www.dlitz.net/software/python-pbkdf2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-python_test() {
-	"${PYTHON}" test/test_pbkdf2.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index e0871cdd9ef2..818601205a08 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,13 +1,3 @@
-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
 DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
-DIST pbr-wheel.patch 2781 BLAKE2B f36ac5bfe22e97dd93735581461f5ac79753543e0e03bcf569d95a3bfac70362c50af8bfc745e5d29ff07092e9669782ddaf3f8edd70501966c4d4682a5bfa33 SHA512 3c89eb9ea617da1d3e2eca3fadff6f5be9f55e4a258e1fbcdd221f3c0ec3cbfd13abe401bdfdb4b464baf74b8111e981f2dab4fb2839a4b52aee65212d1589f5
-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-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
-EBUILD pbr-5.1.1.ebuild 3158 BLAKE2B fc0a90d48b599a09a6608fe273727068f21c13b7bc69a811a804b17d75fe7f6d185955e3f892b2415c1df8ec3d0941988b9575e4f39f62755c2fc034b3dd8d77 SHA512 5782d5e43c411507efd73de8db18088922f8c732e1a717b98991abf425c5f1ff2e10cfc7175fa72367cd4275a41c0f77df37817b4ebfad767b44ee2c144ba2fd
-EBUILD pbr-5.4.5.ebuild 2506 BLAKE2B 3beff550f3349560c83a865c9b7b8b392b5a6172cd3b31699d3e54d09ecc6128e32764015f75f0e2623f0ad16a75ff92440b3c0d67e0c99a93a5575d3c9667e5 SHA512 1feee555396315cdc6d0fa1089d1f05ba7951b9434968d4a610e935070f158157d45cd909511e4cc8dbad78e7ca050250baae9f36b067e61602441c42cd07987
+EBUILD pbr-5.4.5.ebuild 2497 BLAKE2B 1fdfe4a2af6eb1757f279127b6e02dc0bab35c32cbaf74b97145a4a15d15a057eda21ff65e4aff21d05e28d53cdf21e2a345a2c64273c28fbf7ac09601d1b6c0 SHA512 6c94faf041ac2cf9931753a3f2399ac27d52c939d2b151bdae36fb7a2724d2feb807d7e691a8634235fd700071873076a242498c9b22c0d97217e030f371e9df
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
deleted file mode 100644
index 75406d50940e..000000000000
--- a/dev-python/pbr/pbr-3.1.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=( 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 ~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 )"
-
-# 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? (
-		$(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=""
-
-# 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
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_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}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.1.1.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild
deleted file mode 100644
index f9fbfd117e8e..000000000000
--- a/dev-python/pbr/pbr-4.1.1.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=( python2_7 python3_{6,7} 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 ~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"
-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? (
-		$(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=""
-
-# 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
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_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}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
deleted file mode 100644
index 48528dd607dc..000000000000
--- a/dev-python/pbr/pbr-4.2.0-r1.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=( python2_7 python3_{6,7} 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="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"
-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? (
-		$(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=""
-
-# 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
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_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}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.2.0-r3.ebuild b/dev-python/pbr/pbr-4.2.0-r3.ebuild
deleted file mode 100644
index 3b838aa43596..000000000000
--- a/dev-python/pbr/pbr-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,86 +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="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
-	https://github.com/openstack/pbr/commit/f14a3b2b73c6c95edbea8de799cf1df07decdf0e.patch -> ${PN}-wheel.patch"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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"
-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? (
-		$(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=""
-
-PATCHES=("${DISTDIR}/${PN}-wheel.patch")
-
-# 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
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_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}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
deleted file mode 100644
index 2442fec934db..000000000000
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ /dev/null
@@ -1,86 +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 )
-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 ~mips ppc ppc64 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"
-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? (
-		$(python_gen_cond_dep '
-			>=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=""
-
-# 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
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_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}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5.ebuild
index 26c449ed139f..36454f258a7f 100644
--- a/dev-python/pbr/pbr-5.4.5.ebuild
+++ b/dev-python/pbr/pbr-5.4.5.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 ~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"
 #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"
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index 11b03327c5fa..fbe3c5805ee4 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,3 +1,3 @@
 DIST pcapy-0.11.2.tar.gz 32040 BLAKE2B 467d35dff94d2f32e66f9caae88bb43218f3391745230347c39e1db241543e4e9431cfe49185151025201d0913ca102d1f9567f4cf70a83d6fbbade76ec35ecf SHA512 353a2240a9b8541f30f9df472b6977664f94966fbda327aa72f73f26257086caf1db13d55c57859abf2237f5867c11b6ab582742e04d5c16184ea42dc547301c
-EBUILD pcapy-0.11.2.ebuild 607 BLAKE2B 0f9fe3e31c70052d76180a4203565f8835aaa8f7855b1f78c419068e57c91803f99a92d162251b01ec5d6a7ae7803d575192d3ba60f51782a24cacbc62e1d5cf SHA512 30be370ccc4cda32841e30f89d2db1c4d756788a8e6fe7340bad40b203dd5acacd95024019e1500a49bdf841c86b5347c1c048f54a661035892bc2ae112cfa53
+EBUILD pcapy-0.11.2.ebuild 601 BLAKE2B 83508f021677361417debb5e3967b4ced85291018eb013cbd29f615013f09d8ff405a70164bbfa7c2c36607dda29811811d0f379695c1c03bc684035dd330bb9 SHA512 eb6258ae34d274bd7961dca3120d5c50411e4ebfb2ecd63a63d1eb327eebc54ee4b3c1f5ca9c58e63906724a70f3d180175aaf6ab5c4f0cf7224f466656f01ae
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pcapy/pcapy-0.11.2.ebuild b/dev-python/pcapy/pcapy-0.11.2.ebuild
index 4380eb9cc544..47bb6f72e5c1 100644
--- a/dev-python/pcapy/pcapy-0.11.2.ebuild
+++ b/dev-python/pcapy/pcapy-0.11.2.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/pebble/Manifest b/dev-python/pebble/Manifest
index 988114f959e5..c230478ccdd3 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,5 +1,3 @@
-DIST Pebble-4.5.2.tar.gz 23719 BLAKE2B 62db1c273ca0d27ecd16a7dc2508d288ff95ed7f0f123d58e345fcf1d48eb17fd829f963be53e63b377c765548769654d695322e7ee8c8a13369b0e74eba0eb8 SHA512 83391dc29c98615e1308dff9e4619471c7407c2981421b00e77155042d41f4a19c819c2ba32103929333d71621be47fa2eb5fd9f36ae7580379789b2c870e59b
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
-EBUILD pebble-4.5.2.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
-EBUILD pebble-4.5.3.ebuild 507 BLAKE2B 418dcc35d202e93a4c25f5d0e4b94d723ba0b16e669b11df9b7c353ebcc87748ad8fb25d1eb3bf8b9a069d36e650ce57f25a734ba3eb68fea10bed4ee7b4d914 SHA512 404a5eaeee9487d4774d0e47736373f7a17516f21d01be0abc76367c280014e5ffab3d067c5f6f898512eb2ec40e617742aadcc18bed15c6c6012abc03de34cf
+EBUILD pebble-4.5.3.ebuild 505 BLAKE2B ee34fee546c5a8f32be5c4cd4dd088e92a23bbd6e6f6d4553b096493859c785161d0b09429020775b8bd0d34ce6367f5f1e96a5da85a209ff6ae3c82f57ef16b SHA512 bbf09e6ed81876e7f050e4b84cacb3b8895e2bfc1d60a88dbe0f4c396075273b4ced9f7fb62dbe324ade0f138b64d385b6e0d4661767d25fd36ec1566aa6217f
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pebble/pebble-4.5.2.ebuild b/dev-python/pebble/pebble-4.5.2.ebuild
deleted file mode 100644
index 23b80b0f697b..000000000000
--- a/dev-python/pebble/pebble-4.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-
-MY_P=${P^}
-DESCRIPTION="Threading and multiprocessing eye-candy"
-HOMEPAGE="
-	https://pypi.org/project/Pebble/
-	https://pebble.readthedocs.io/
-	https://github.com/noxdafox/pebble"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.5.3.ebuild b/dev-python/pebble/pebble-4.5.3.ebuild
index 85f87286314e..b6c7ddd95a74 100644
--- a/dev-python/pebble/pebble-4.5.3.ebuild
+++ b/dev-python/pebble/pebble-4.5.3.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 0d64962043fc..a2b8b6f24c8f 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,3 @@
-DIST peewee-3.1.0.tar.gz 705099 BLAKE2B 1dc528082337ae509fc9f91c521d7bf036179ad6b1a5a93e113d594ce819d3a9cdbb7e687b51acacdaf242d542dad138ce2a21f9dcc19483c7361788329a53ed SHA512 628eea27d51017a6ab87aae9ae851d749b0f437fe1806957b23408ad3c97bbb93e5b84c66c5e70bfb7b55c9f29a0c517b84e65adc0f979da450987d670661e84
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
-EBUILD peewee-3.1.0.ebuild 1267 BLAKE2B 76a05179c1e6a643ce481d55f42eed67eede342a713e1f17aaf73651e432920691ef4c7585a1bdd53df6b0bdda0476b8d0e087f3b2f8d19f85d90035d8f389fc SHA512 00b639532ccff586496e8273bae51007ccf3ac9150366e56fbe559cba54247e543b59148246e7e847036409959fdef4a7aba2f52f879c0700a5ee34a038517f6
-EBUILD peewee-3.13.2.ebuild 758 BLAKE2B 7cbcf63dcfe86da18979d1cd0a65c3ca72af56c405c113d8be1865c68555d6f7da80f29b8f9e46e5db5efa82e89abc9aed2ed6b45dc8f31c21c0a6559982dd65 SHA512 fbc9acf13b3e7fb9b003f68732b080d1f041026f46eeba7318b751bbb4f5a80054dc2cdd32b09ef3ea14890add586858b9020a09df1dae9fe27398b98df93e2a
+EBUILD peewee-3.13.2.ebuild 757 BLAKE2B c9df37e300014ba2926e1e33b6e4e5b8d50b04bb31687ff4dfd21d84da7faa0d7cb843970ccbc817ea52750e97cd8a351ce7c56d6fe0c003312a8a9c53d39004 SHA512 8255962995c158f633702a8d661c80adb7a71e03f630cd39c6297ac863833f2b87649e2fee6a10146e799ced0040fdc9746640d1dc79e8a186c68782f83ef0c6
 MISC metadata.xml 330 BLAKE2B 744abc7ba6933e67a2e85359c870e51ed2e5b39cde3adf64a4e92860805eefc37e8035000b1728a921816e0713c8757f0fbcb40206b72505117b2bead9ed2642 SHA512 a75ad6963c2dd0a763e7f11b42a5f92d536a7b4daf59acea56a91b49c11996d316d3fc27b04fcba9c4e7556305543eb44d87ac909a65f937faaf8fd8c57110b2
diff --git a/dev-python/peewee/peewee-3.1.0.ebuild b/dev-python/peewee/peewee-3.1.0.ebuild
deleted file mode 100644
index 78dda8ee3b05..000000000000
--- a/dev-python/peewee/peewee-3.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=( python{2_7,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.13.2.ebuild b/dev-python/peewee/peewee-3.13.2.ebuild
index d1d51cbabc26..e05e6b58b532 100644
--- a/dev-python/peewee/peewee-3.13.2.ebuild
+++ b/dev-python/peewee/peewee-3.13.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index edf5d3ca048e..d4e73f2c4141 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,3 +1,3 @@
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.7.1.ebuild 1072 BLAKE2B 58ed1820653b2065e71cbcf0cb2b93471d31ff19eda3135450e9eb4e7773e7e86fe1c475e4d7658bf42d42ba12350cda0c2d68ed717c798410a91d16bbaa6e41 SHA512 10ea17efdb7bdc0082fc9a906d8d9918141322ef981149576ba484cfe693528ff6eb2d0cf4cda5e16f9e31c2ede8b6e18d0ee5d30594ae6c829608d895bd1c5c
+EBUILD pep8-1.7.1.ebuild 857 BLAKE2B 92d49caea55f426384f0ed3ee81cfe5629826e6e82ee2b2e2851fd827b6369ccd9fe0761f7c19e704798367f03ef45cd7bfe111cfaa1bdf3e321368295b25976 SHA512 620d9fa6d68448cde82f658d70454b710e56ada6dcb46e2d2b93b34946162eb0cccf8c28b3c1893a7bc58f30b5f49b14c59eec967d046ef21328cc3597b2e368
 MISC metadata.xml 398 BLAKE2B 36900845777c438858178ad562d5da58efd9e2e39b6ce3a062cb6bdfb48f970dbe6d18e57dce711b4dbf1efa6c65fd4b52329b4a2a293bfc21661670a7c1daf5 SHA512 e700e6ff7cf5fb6e85874a2ef1c07d35b635ae55ba0d9e346b4fa9fe2928691203571a85d2a9f63ddbdb3d51904b4503ec046adf4e732c18e825b005dd7c2125
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index f149f5a45665..b8c60182e655 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -15,23 +15,14 @@ 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
 
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
 
-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_prepare_all() {
+	# AssertionError: 7 is not false : 7 failure(s)
+	sed -i -e 's:test_checkers_testsuite:_&:' \
+		testsuite/test_all.py || die
 
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 099c6a3290c6..5ee3a50ec02d 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,6 +1,4 @@
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
-DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.6.0.ebuild 1035 BLAKE2B 96382c648071656d317e9a12a6c75c2290d6753b9bb1166f2f1c3005b10ec13eed9dece1fdb4d67369aebb2d4441e27261d417750d93a668a527b1ab241e6c82 SHA512 cd2feb6f32b22c1125cd7c58e21b5ac3ddfe953d73eb0d3ca6dd98df768257c60afc2bc1519a5468137c2c44e58a50b444c9d13850273434304d163ee5cfbd33
-EBUILD pexpect-4.8.0.ebuild 1271 BLAKE2B 4affd57d4cb12cfd3a42d314ccaed5e39079e5e9d3077a6fb33e12da3c886d949cc635cea9fdbe12e375e28f59cb9f362ef5569dfceb7944e324d12773a7aaaf SHA512 cb61f5152a7aa163f4af3d7ff898048e0a9eaf967f11ccac5112ef5e7e40bd85f2d03db8054183231fc54becdcab4bb7b93d5217b70831eebe845ec62b73adbc
-MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
+EBUILD pexpect-4.8.0.ebuild 1263 BLAKE2B ea4c0b893f71ede8947e157a1b4b2a4cba7adf00b973e3026d1929a63a5b6526ea92b3ad3fab8b2f0782a0d149f365120f27b28c80b537a884f0579b0f18f6f8 SHA512 a5ee13a3e56daf6eaaaf6d430282d3da5b40cc406ea3a40c839d9c8ee66ca7bcf5e1718a09347c95cc8541cce1b88a0904d107c49991105c3843e38f48635522
+MISC metadata.xml 402 BLAKE2B e6c1f9d8cc5397177b54d7bda059a281267e005b9391e6d18e3b70ec3e6fd09bbdf1d214a105e608e3a43f34f0f6e5d7e924366e33647fdfc7d68283c8749d06 SHA512 bd48e666243651d02523b111ee7d8073ed10b8813765f19c7d17e12b7b84bf58be03a157486fcaa65f34866a983d46885723d944348a0cc16b9bb05cc474ffaa
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
index 311134caccb6..67e271d5d377 100644
--- a/dev-python/pexpect/metadata.xml
+++ b/dev-python/pexpect/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pexpect</remote-id>
     <remote-id type="github">pexpect/pexpect</remote-id>
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
deleted file mode 100644
index 1a9596c349d0..000000000000
--- a/dev-python/pexpect/pexpect-4.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,8} 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( dev-python/sphinx )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-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.8.0.ebuild b/dev-python/pexpect/pexpect-4.8.0.ebuild
index ecae148b976a..4ae04af473c4 100644
--- a/dev-python/pexpect/pexpect-4.8.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.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 ~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/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index dae6a7b2994d..b8a729cb2435 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5
-DIST phonenumbers-8.12.2.tar.gz 2397674 BLAKE2B 8101aa4e42d53d9c4734f0e3e1085ba814d75b53228a5da3efd7310faa0c5e0da419b5a9f127e4ed2554fa06db5007ec7eb430800ec7cbde69c3c8944e45a99f SHA512 16b8562afe94fb14104c266b12db063cf6c9dbda9ae2301a044cfb2e708845f1857b5ecb986e409c67c16e2fb7e4df527906c4d43c302e14df698607deb078a3
-DIST phonenumbers-8.12.4.tar.gz 2269009 BLAKE2B 102630893595fa34f8e5bf3dc5122f43393e26ada216df02e843a40345aa40df83aa6fbf115d71e986a7e57e6a55bd6fd4eb4af14c4872bfe717cb0ec5be604c SHA512 5d93de2b7b6e974593659fb8909c05f2f6f8c29766deea914472b01dde38abdfc9f4f6ee8c718e2ad11e840070b350b623cb9ca58368f24cf1e03804712fa38d
-EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
-EBUILD phonenumbers-8.12.2.ebuild 524 BLAKE2B a9a7d4c6f0046715d87196a67d8bcebeb4f97235d084adb01f48bf5b2cd6d6d34046c2bfd351c891da4951f04b692598f9b70bd856d77f3a7490da8bfbf0b6f6 SHA512 c493ec11d4b19df796fa5b33d099ddec6ffdf4965d1cb8da4e203470d44c5070fd8ad46f3ec8771730a391f970d702e883397eabac5b36fca5ef54dddf98f91b
-EBUILD phonenumbers-8.12.4.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
-MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
+DIST phonenumbers-8.12.6.tar.gz 2249614 BLAKE2B 5dd062cecf424bba0263e92c847161069e998e1b1ee26e273939996dadc1cca302ee4b567f083d58791717633db2ddd6263e625db01639e7fdb61187092f26d2 SHA512 1f79e7bd469861c6100ab4ea88f0b20cb5534e97a8da39f8681b4d201d21d2bbac1948bd49c08c474cb0b129a2c1228f7c5b664dc6033e6f4d2dd79d130897d2
+DIST phonenumbers-8.12.8.tar.gz 2249617 BLAKE2B e02f851774bee9806f01b0359ea4e159c8c890a815edf45f19162dc35972aaa3c84f9e2e19a51ef3efb053d4e307a4d3a31b664a7fffc7c4ffe9a7c6c281ae86 SHA512 0897a5298b5aaee7c0775e12cbe35a6e25b85a1836d8302abc5eee7e327fc559bc06f3130c63ac5aa14207900d1615f3a7cd4137d6561855e4ad38b6e4af220f
+EBUILD phonenumbers-8.12.6.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
+EBUILD phonenumbers-8.12.8.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/metadata.xml b/dev-python/phonenumbers/metadata.xml
index 39e65b3ef9f0..b711c3b2e0e1 100644
--- a/dev-python/phonenumbers/metadata.xml
+++ b/dev-python/phonenumbers/metadata.xml
@@ -5,6 +5,11 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">phonenumbers</remote-id>
 		<remote-id type="github">daviddrysdale/python-phonenumbers</remote-id>
diff --git a/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
deleted file mode 100644
index a220686c780e..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.10.22.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 port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.md"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
deleted file mode 100644
index ddeb720dd441..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.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=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.md"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.4.ebuild
deleted file mode 100644
index 3665d14f2c2a..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.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=( python3_{6..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.md"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.6.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.6.ebuild
new file mode 100644
index 000000000000..edac4c6caf91
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.6.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.8.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.8.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.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=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/picklemagic/Manifest b/dev-python/picklemagic/Manifest
index 1ceca7e19bfd..ce008411a940 100644
--- a/dev-python/picklemagic/Manifest
+++ b/dev-python/picklemagic/Manifest
@@ -1,3 +1,3 @@
 DIST picklemagic-0.0_pre20160415.tar.xz 23364 BLAKE2B 07104393d41c68fabb26d642b6a78b5b5506322edc1322f6a0957c485c2681aafb388488b4d65d920102fb56839ebdeb82cbde909dae3d982311a3d776ca8aca SHA512 0b0866895df5f5f49462d75ad6a435f93796c60eae2442350ea0768872cc1938406b68f5ecb54e1583c245c6ac6d4feada32469184e24186adf78d002adfcd76
-EBUILD picklemagic-0.0_pre20160415.ebuild 691 BLAKE2B bddcc9abc86b0440f5ce1241ba24ed9a2b22baf12e7b77a3f953491705b5193da44bd945013ef82d634274f0fa4f1d59d941fd56ab6ce7c8c78586418c0c9bd9 SHA512 2bb379b51a18e1ce030990847c21a9a03d9c7872a5af684fa78876026283e0d712db6f4bb85fe6fb8e5838abadb658d229a64fc3fd2ea9b5edda5c7a2abc52be
+EBUILD picklemagic-0.0_pre20160415.ebuild 685 BLAKE2B e72bf693228e753d09b9c5e229ae23dbae5630b9e421e27ccfb456820092e9c0c524ccac23755019e59cdc5983eab34e8c6c32ee314d5e8664036013c39df845 SHA512 d69ff13f0f5fd503c188eed3df4444c39e3d8ab9af91822541d2bcee1174cc0535988937f4f0f594992a565b9cafce8ea098ef469387cbb9aaa74edd181ebb61
 MISC metadata.xml 1089 BLAKE2B b649f7de5cb150c5f7e5d81b16d42f20ed9f5b94a4b071d788a7caf9d484c9fa1eef38fd6d0dcdac4b0399b7acd557b779ee263b9d22ec081d8845b5d3ce9d6b SHA512 02633df935ed2172dc10ebbc189bfc4385789520900d2147f7ae3a7ec10951f450cc720e487af93b85236548ad93f9402f4b36470ea1322ed15fab1c4efd3685
diff --git a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
index 66c0a794e6ba..b21a49749ade 100644
--- a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
+++ b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-r1
 
 SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index c60ed43edf13..ff6a67fd7b77 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,3 @@
-DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 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 498 BLAKE2B dc184d4b69d0fac1fd46bae93ca3aca4294458fd12db6404c5a25d62a784dbcdfd775614a2a13b21b94f6751900df0e4ba87bc881db9063b5307f2a80c31c906 SHA512 5fc2ee872627ae0b84c9c7d09bbade62c41e6afabf4cd1da5a56dcddddf0ffe4ffdedda4faf63210bdf360ad0fe8a456234a5bc9b471c2ba1aa5dfa2db89f6cd
 MISC metadata.xml 969 BLAKE2B 7bbecd2168cada8eeb3db63f3b7799e0ea6b87ad9c8d976a16f731102079b5e57e83d420a05a7ad7824316b2af96a89d16308bf3f7260bd8063978186d95f495 SHA512 331d094592a66da7b84c3361dcd88455897a6d77385f82b42521980fac07d2b5e86937df52cdfcf39b29c4be779e8d9ca81f2523607ec88573a176b368914f1f
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
deleted file mode 100644
index 9561e746628b..000000000000
--- a/dev-python/pickleshare/pickleshare-0.7.4-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="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"
-
-RDEPEND="
-	>=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/piexif/Manifest b/dev-python/piexif/Manifest
index 2545b0c1b7ee..7acd80cec411 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,5 +1,3 @@
-DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9248104927974b4f7d2b82435da8fb0d8345ac23bd724606e0cefc2594ba9fa49c58d0f4f00219c1a4ed6cce SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63
 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.1.3.ebuild 603 BLAKE2B 8fc5282011f24ea27096c492b2f2be47f87065c9ebc0e79ded616903eec90af0b1aafe2f0abe39a8bc416863183569c84f442fc901902694f44a0b9b863d68fe SHA512 64e98f3d62a54fafed1b2b04e91cc2518b08c08a2439bafa55cea8fca3487fdb94bea972009eeb8acdcbfd0db1f12b70db73e264e08b7c558d69ad24809589d5
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
deleted file mode 100644
index 7eb0debff4f2..000000000000
--- a/dev-python/piexif/piexif-1.0.12.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/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 75c3e617e48d..ead94f028b18 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,10 +1,4 @@
 AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
-DIST pikepdf-1.13.0.tar.gz 2140229 BLAKE2B 886bb9395e8fa1105385908a06d076f78bb1712186a8cb0eafbe54d22a0c95fa2bc8eba8f2e3d60ec3b1392d550cd38c6486c601eba2ef167c718fa26b472f9e SHA512 48304f85e73148dbcfae50ecc5767686b46ce9d44b13eb3f991ab3b358b99208383627abdb5ef3c17cf31a422872ea0bae7560e9c7c36130c6009563b6169f4d
-DIST pikepdf-1.14.0.tar.gz 2140844 BLAKE2B 75a408ded51e82cd7970eb94214d2e4f40ea0fa0a4915d83caace9b1fcad75fe2d7f7f1917e307d5ba8f2107dc1ae4fd46125b05d7ea175444c479945293d5a7 SHA512 bbd6a024324812f2ecee7c424fe53a2e32a6534c909cef60661faea40e58bfc067017f26d8676fb336e618e6cd7b008729cb6753202a18ed6fd86bbfbb36662b
-DIST pikepdf-1.16.1.tar.gz 2227178 BLAKE2B b872c3ecfb6ea2b26dd5a1a3135aa1ca4ce5fd373a89f48fc6fa281144d1eb98256175ed2518ce33c703bc7b14ac960a27d7f1debb8e0ca5942a5ac236de2c53 SHA512 8560153eb70e426d70c57e0980f989fd2ddf3756bbd4b10a810f47081dd69cbb34941a29ea95f332390a25f2e4a66ff716f4ee933d3a538101154f5d7bdc506d
-DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
-EBUILD pikepdf-1.13.0.ebuild 1485 BLAKE2B 617c0d51888b58058446013d346f15eb1169a3b3bf90afbac3d6d6814766d5ae3416eebf24ad13470bc10c64269c9d35ce6dfd216e668d447339eaf57bbde637 SHA512 f9fa0b061e0801a0321edd80f4a7ab28305dfaa687fedfe0f559cf96a0edbbb06b50751a32093a0712446c76eaccffd9d38a672d3b9018cf71410593c802047f
-EBUILD pikepdf-1.14.0.ebuild 1486 BLAKE2B a806be77b6a9aae8daddeca01f045c58ec97694850a2bc375e9e32179292c401c090c710465c129c72bb199faa0aeb75ef2fbd672a3416ba5635e2528b8f5d45 SHA512 7e2eee7072ea8fbfcd3090bbbe452516bb1db4eac0abc3b821fc44a97a1fd7e74b2aacc5cd6a3128163c16d7f62ce393001758a2864ad8182704e63b98d15630
-EBUILD pikepdf-1.16.1.ebuild 1486 BLAKE2B a806be77b6a9aae8daddeca01f045c58ec97694850a2bc375e9e32179292c401c090c710465c129c72bb199faa0aeb75ef2fbd672a3416ba5635e2528b8f5d45 SHA512 7e2eee7072ea8fbfcd3090bbbe452516bb1db4eac0abc3b821fc44a97a1fd7e74b2aacc5cd6a3128163c16d7f62ce393001758a2864ad8182704e63b98d15630
-EBUILD pikepdf-1.8.3.ebuild 1476 BLAKE2B a8b6d92586c808f85d173962fd138d70a0f4385ba6227ad1e679bbbaee5929c035c4f9b22b821fe7113910ee056c28ef8c96b3272edf984b51ec54d57c3ebcf1 SHA512 54281c35dedb20e9e17716d27f49690baafae3f32cbb15f35d20acb09b2e3618d7cc457bc4f46755bc6519ee946ecbe0f90515007cd71834db9580d70e915ecd
+DIST pikepdf-1.18.0.tar.gz 2351789 BLAKE2B b33b69f57fcd5293814ac880376627b7184ca632e09f668fd274eae6b3640d97699681597470c17abe00ec334ec894a073cc1a1eff91ffa7df572ef78542b429 SHA512 9a04fe6ce145a6f28a180261ac004fc0ce3c525c4e9e7c5eb4bb7dbf8aaa6d3e6f726cec5d20033a5aaa60b793666df52c20f13c8ee7c0c3266fb8e557d69c18
+EBUILD pikepdf-1.18.0.ebuild 1523 BLAKE2B f8f6fc655068e411e21ae4dd2f77e99e5949a9c3d6e50227ea6e48101e5453ba5e2266d261ded3b7dd7d3cad8861c912127c5b80978287505e6d885cc01ed8af SHA512 6c38de65f8d9b7c18edbd664f428ed67a3db2ab64cf30f1a624db1b79c368459b6d230452289cbc18bf9db69ba03da84568c838bec38b221b9ed3f972a4729c2
 MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/pikepdf-1.13.0.ebuild b/dev-python/pikepdf/pikepdf-1.13.0.ebuild
deleted file mode 100644
index 2a6d6256b508..000000000000
--- a/dev-python/pikepdf/pikepdf-1.13.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/qpdf
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? ( >=dev-python/attrs-19.1.0
-		>=dev-python/hypothesis-4.24
-		<dev-python/hypothesis-5.3.5
-		>=dev-python/pillow-5.0.0
-		>=dev-python/pytest-4.4.0
-		<dev-python/pytest-5.3.5
-		>=dev-python/pytest-xdist-1.28
-		<dev-python/pytest-xdist-2.0
-		>=dev-python/pytest-helpers-namespace-2019.1.8
-		>=dev-python/pytest-timeout-1.3.3
-		>=dev-python/python-xmp-toolkit-2.0.1 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
-
-python_test() {
-	pytest
-}
-
-# When ipython and matplotlib will get python3_8 support, we'll be able to add
-#
-#IUSE="doc"
-#DEPEND="doc? ( dev-python/ipython
-#		dev-python/matplotlib
-#		dev-python/sphinx-1.4
-#		dev-python/sphinx_rtd_theme )"
-#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/pikepdf/pikepdf-1.14.0.ebuild b/dev-python/pikepdf/pikepdf-1.14.0.ebuild
deleted file mode 100644
index ea2da43b0439..000000000000
--- a/dev-python/pikepdf/pikepdf-1.14.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/qpdf:0=
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? ( >=dev-python/attrs-19.1.0
-		>=dev-python/hypothesis-4.24
-		<dev-python/hypothesis-6.0
-		>=dev-python/pillow-5.0.0
-		>=dev-python/pytest-4.4.0
-		<dev-python/pytest-5.3.5
-		>=dev-python/pytest-xdist-1.28
-		<dev-python/pytest-xdist-2.0
-		>=dev-python/pytest-helpers-namespace-2019.1.8
-		>=dev-python/pytest-timeout-1.3.3
-		>=dev-python/python-xmp-toolkit-2.0.1 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
-
-python_test() {
-	pytest
-}
-
-# When ipython and matplotlib will get python3_8 support, we'll be able to add
-#
-#IUSE="doc"
-#DEPEND="doc? ( dev-python/ipython
-#		dev-python/matplotlib
-#		dev-python/sphinx-1.4
-#		dev-python/sphinx_rtd_theme )"
-#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/pikepdf/pikepdf-1.16.1.ebuild b/dev-python/pikepdf/pikepdf-1.16.1.ebuild
deleted file mode 100644
index ea2da43b0439..000000000000
--- a/dev-python/pikepdf/pikepdf-1.16.1.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="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/qpdf:0=
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? ( >=dev-python/attrs-19.1.0
-		>=dev-python/hypothesis-4.24
-		<dev-python/hypothesis-6.0
-		>=dev-python/pillow-5.0.0
-		>=dev-python/pytest-4.4.0
-		<dev-python/pytest-5.3.5
-		>=dev-python/pytest-xdist-1.28
-		<dev-python/pytest-xdist-2.0
-		>=dev-python/pytest-helpers-namespace-2019.1.8
-		>=dev-python/pytest-timeout-1.3.3
-		>=dev-python/python-xmp-toolkit-2.0.1 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
-
-python_test() {
-	pytest
-}
-
-# When ipython and matplotlib will get python3_8 support, we'll be able to add
-#
-#IUSE="doc"
-#DEPEND="doc? ( dev-python/ipython
-#		dev-python/matplotlib
-#		dev-python/sphinx-1.4
-#		dev-python/sphinx_rtd_theme )"
-#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/pikepdf/pikepdf-1.18.0.ebuild b/dev-python/pikepdf/pikepdf-1.18.0.ebuild
new file mode 100644
index 000000000000..20c1611bdfb3
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-1.18.0.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=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-19.1.0
+		>=dev-python/hypothesis-4.24
+		<dev-python/hypothesis-6.0
+		>=dev-python/pillow-5.0.0
+		>=dev-python/pytest-4.4.0
+		<dev-python/pytest-5.3.5
+		>=dev-python/pytest-xdist-1.28
+		<dev-python/pytest-xdist-2.0
+		>=dev-python/pytest-helpers-namespace-2019.1.8
+		>=dev-python/pytest-timeout-1.3.3
+		>=dev-python/python-xmp-toolkit-2.0.1 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#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/pikepdf/pikepdf-1.8.3.ebuild b/dev-python/pikepdf/pikepdf-1.8.3.ebuild
deleted file mode 100644
index c6e26c941e09..000000000000
--- a/dev-python/pikepdf/pikepdf-1.8.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="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/qpdf
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? ( >=dev-python/attrs-19.1.0
-		>=dev-python/hypothesis-4.24
-		<dev-python/hypothesis-5.0
-		>=dev-python/pillow-5.0.0
-		>=dev-python/pytest-4.4.0
-		<dev-python/pytest-5.0.0
-		>=dev-python/pytest-xdist-1.28
-		<dev-python/pytest-xdist-2.0
-		>=dev-python/pytest-helpers-namespace-2019.1.8
-		>=dev-python/pytest-timeout-1.3.3
-		>=dev-python/python-xmp-toolkit-2.0.1 )"
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-python_test() {
-	pytest
-}
-
-# When ipythom and matplotlib will get python3_8 support, we'll be able to add
-#
-#IUSE="doc"
-#DEPEND="doc? ( dev-python/ipython
-#		dev-python/matplotlib
-#		dev-python/sphinx-1.4
-#		dev-python/sphinx_rtd_theme )"
-#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/pillow/Manifest b/dev-python/pillow/Manifest
index 275b59d8f442..7e858f4a0ecf 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5e
 DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
 EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
-EBUILD pillow-7.1.2.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
-EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
+EBUILD pillow-7.1.2.ebuild 2691 BLAKE2B 942d0ce65a6668f64fe150a0e45d41697a3b7cefab69c0accd2e431afd554a45d8aa79aab8c021af29b240ea6c48e075ddcbd06fddea43b54f63583d05727816 SHA512 b660e43ba44341ac0af2e99d2416348a1f85373a5f45b5bc4b87a99f83bb2029858c41e31236fedc56c601032bce1e9c62efb64f5b1b750c5bc818b89871a821
+EBUILD pillow-7.2.0.ebuild 2700 BLAKE2B 56f8080f2c77ad48d8d9e97a043e0be600f0c7aac4321a34c6a2084177c04ab4cc7d615b7031371b813c99e7957819938ac7d4126cd589bdc3b444e60f9a6007 SHA512 afb654f288949831bf8cb466070ee63ba9408e8b20d0dcb1cee5ef72b55c2dd51d6b23c52900d75ed626aabf931be8ad82fecb0db947b3595070b998cd1aa3de
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 71526b251ea9..06dd83d419de 100644
--- a/dev-python/pillow/pillow-7.1.2.ebuild
+++ b/dev-python/pillow/pillow-7.1.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 xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
index 71526b251ea9..aa9699f8eaf4 100644
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ b/dev-python/pillow/pillow-7.2.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 ~ia64 ~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 )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 9a593abc8290..7656342b5861 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,22 +1,13 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
-AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b
-AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e6f02c0e623f33e2bbae6b5b16acebc34c9205c53d8221ec98e99167e26eb789d3fbf075406bbdba6dc74c120288fea2d0bcd98beeec SHA512 eb2fb10828aca4a1179f8763c63d861f547e2d92da32c7fd697863e26583eba4f1b0d76a820a82afe3803a6ea22c61b01d3fd98291ec5cff4700855294b19286
-AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104
+AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-20.1.1-test-endian.patch 2779 BLAKE2B 63fd87aed4edb8c9cf5c64b3055c345234602a9dafd0b58b501bd30f5026ebd683720a9ad2931bbb9db2c35841fe6cac19a88a5181b195c9f0a4e4e590b18094 SHA512 21f52dc64746e5d8e5c0d92c3f9b6a75da0316eeafad49fccdbd92c8b560e083d4ffedf148590c6f4265cc367a67b8e70890c14d0f718934f4ca4ddea82bdf50
-AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
-AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
-DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
+AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
 DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
 DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
-DIST pip-20.1.tar.gz 6500955 BLAKE2B 81ab806fce4ae3d9aeab34fe8781c13507252ef0325abb35dd739f3eaf0e648866b052d2adb8b187974ae784f493dbb83f684c464da8f9079f66fe8c4fa2d61d SHA512 19cc1172540bec4b0c6facf55fa9c463bf8f4391dd1a643ac208c8e0b787950b2d72a6ec8f0772c7e6582c6b6a4a103f31ad58ffa2119fb574c174e5ec77b0c1
-DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
-DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
+DIST pip-20.2.2.tar.gz 8719081 BLAKE2B 642a8e9b2f7c3dc08b7e8f7874b7d1d988622f50b9430939060c3b9c086ae7bdaf4a58e9709376e0d36411fb2b492d4e44ddb6282f1fe12d7c8b9ecfdb1c0482 SHA512 0b000977f169900eebd4afeabfc7bd59b104246bbb048ce5b4db7f701e20ef1caef22c7ca2311843eafc4a37abbb81a74beddddf655eeaf2e33e3949d5a811e6
 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-r2.ebuild 3968 BLAKE2B 6c0e2c5daeee3afa0c575e0f3a54600bd16f5bef748800a17fa05f444818e3fdb28a9825f1c89d0052a01555ebc623fb8c1f16f74cfef5fed1085ea3bd1dedb1 SHA512 8202150be54533c2420909fc339c2c53b8ddd93733cbfd9b9070034bbef2ea02335ca519f15d39a1e6e77de39a17833fde7c92b765edffde270eff56bd3d16a1
-EBUILD pip-20.0.2.ebuild 4028 BLAKE2B 3a3ff94b364fcffe375f1844ecb0229a6680187397947b7bb523b97342287b81c4ac7b5f38cc142e4f1312f560c9446187a2228946f69310f939e4f544b8c64a SHA512 b534a5277ff82e3ce2c62b5a7c0c07591879a4786e025583a292d57d9a8e90f91f7f230fef05221f8f097ffcef4afcf72c298ad6c3848ace4ba930af1b216d5f
-EBUILD pip-20.1.1.ebuild 4159 BLAKE2B 35aa594ade5d4af7c460bd1f6ef358ff580ed9dcd89624573e2d81487b9c4da4e16024774a6efd74f1a463b0685532a764bff599802ec92add8ee2388695b01e SHA512 1de3aa6d9a5136297b7564c3d9ac0c88692ddd9f67f540b4022ecb53069b6b668449bd55cd64db257572d8e1c2221f52a8f4eb422fc7074924ebfb13d4578c79
-EBUILD pip-20.1.ebuild 4111 BLAKE2B a5f9d7975ab43e27a5a8a4c1359702809137989c57f9f7ac318323d01f6b8c47af58bd8eb3437a0be9b60b0c028917216196fbfb9ef8b68239a3425bf0a2d61f SHA512 938e39e722e149e12d853da0e023219caca3d2c936555e92a34645e3d378a37af6546f553c0fe6b2653e5ee3990ae5ca7fc3008c3de6e67877e53f800ee536f4
-EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B 7d6eba7ecf7279234a820a90edf51e2c2aceecd06ae212e1fda4912fa8a265c8217c27c90bb0f6e112fd53f766dc4e926371f11408d20f41004a60e24ee83a46 SHA512 5fd2425d32692d483814dd03f80ba634f2612e3e5fe1ffe8d043d717064483eaf01b76b053e383dd34bcf1bd2792346d0ed1648461f9414093dd082c13b61d88
+EBUILD pip-20.0.2.ebuild 4027 BLAKE2B 2694a675757d8f34c8d0188021c6fe16e9f5574954fd17665158ea53f0f7ebd03cbbaf5d9773d31433b06e2cb9dd8e0549b4e4bd1f120f36c6eaa6e16d2991d7 SHA512 b83221a980e5ba8b7451dd00bc610827b4541dd0549096d5c70adb5cebe1aadab77b362583e62cbe427a174e67819c88762d3a3467e198f3b500649c0824fdb5
+EBUILD pip-20.1.1.ebuild 4154 BLAKE2B d3779d260da376b29f09d37150ed34a50e771332ed7044255f918713d203c4ff9c6ffcde71051e9f8c87f2a75111e5700ef09070abbfe10b6d98a1ded0118abb SHA512 8bf788208e7bfd044c4b362ed29b65da300b9996694e33dd9bb6146fc686b5de3a1df14abfdffc70dbe36f8c60e74de1f4d58f6be9245446f08a7ef09ab86dce
+EBUILD pip-20.2.2.ebuild 4229 BLAKE2B c5b6a4071e909aa5eed3316624bf8d3f0cd41d57aaa622228ddcc0fa06ff781a8f0aec860e995e2bca855d0072c000114794d00fcbcdb4a79ed11af7198d9005 SHA512 81337ccec86e9ca492e77e2676d03ad3e8d2325b6a30ff49d24ed52ad2c9c88b96b12f740bbd6b531681361518e257ed4bfd487703cd46269ea93a9151422712
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-19.3.1-network-tests.patch b/dev-python/pip/files/pip-19.3.1-network-tests.patch
deleted file mode 100644
index f194a7b34a90..000000000000
--- a/dev-python/pip/files/pip-19.3.1-network-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/news/7359.trivial b/news/7359.trivial
-new file mode 100644
-index 000000000..e69de29bb
-diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
-index d13c931d0..2e35de3e6 100644
---- a/tests/functional/test_freeze.py
-+++ b/tests/functional/test_freeze.py
-@@ -721,6 +721,7 @@ def test_freeze_user(script, virtualenv, data):
-     assert 'simple2' not in result.stdout
-
-
-+@pytest.mark.network
- def test_freeze_path(tmpdir, script, data):
-     """
-     Test freeze with --path.
-@@ -734,5 +735,6 @@ def test_freeze_path(tmpdir, script, data):
-     _check_output(result.stdout, expected)
-
-
-+@pytest.mark.network
- def test_freeze_path_exclude_user(tmpdir, script, data):
-     """
-@@ -756,6 +758,7 @@ def test_freeze_path_exclude_user(tmpdir, script, data):
-     _check_output(result.stdout, expected)
-
-
-+@pytest.mark.network
- def test_freeze_path_multiple(tmpdir, script, data):
-     """
-     Test freeze with multiple --path arguments.
-diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
-index a9eff081d..ba7a0a55c 100644
---- a/tests/functional/test_install.py
-+++ b/tests/functional/test_install.py
-@@ -1325,6 +1325,7 @@ def test_install_no_binary_disables_building_wheels(script, data, with_wheel):
-     assert "Running setup.py install for upper" in str(res), str(res)
-
-
-+@pytest.mark.network
- def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
-     to_install = data.packages.joinpath('pep517_setup_and_pyproject')
-     res = script.pip(
-diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
-index 176976c4e..308263928 100644
---- a/tests/functional/test_install_config.py
-+++ b/tests/functional/test_install_config.py
-@@ -133,6 +133,7 @@ def test_command_line_appends_correctly(script, data):
-     ), 'stdout: {}'.format(result.stdout)
-
-
-+@pytest.mark.network
- def test_config_file_override_stack(script, virtualenv):
-     """
-     Test config files (global, overriding a global config with a
-diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
-index 6d2eeb5dc..0024de4d4 100644
---- a/tests/functional/test_install_upgrade.py
-+++ b/tests/functional/test_install_upgrade.py
-@@ -8,6 +8,7 @@
- from tests.lib.local_repos import local_checkout
-
-
-+@pytest.mark.network
- def test_no_upgrade_unless_requested(script):
-     """
-     No upgrade if not specifically requested.
diff --git a/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch b/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch
deleted file mode 100644
index 8486c37f0c73..000000000000
--- a/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-19.1/src/pip/_internal/commands/install.py
-+++ pip-19.1/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
-
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
index c6b5354bc68f..e0b0034e407a 100644
--- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
+++ b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
@@ -1,29 +1,29 @@
-From 57d610bbcc721c2e58fd2e9f3197bb3e3acbd935 Mon Sep 17 00:00:00 2001
+From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 1 Feb 2020 09:14:46 +0100
 Subject: [PATCH] install: Raise an error to avoid breaking python-exec
 
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
+Running pip without --target, --prefix, --root, or --user will result
+in packages being installed systemwide. This has a tendency to break
+python-exec if setuptools gets installed or upgraded.
 ---
  src/pip/_internal/commands/install.py | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 02a187c8..025b824b 100644
+index 8c2c32fd..41bac878 100644
 --- a/src/pip/_internal/commands/install.py
 +++ b/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+@@ -238,6 +238,9 @@ class InstallCommand(RequirementCommand):
          if options.upgrade:
              upgrade_strategy = options.upgrade_strategy
  
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
++        if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'):
 +            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
 +
          cmdoptions.check_dist_restriction(options, check_target=True)
  
          install_options = options.install_options or []
 -- 
-2.25.0
+2.28.0
 
diff --git a/dev-python/pip/files/pip-20.2-no-coverage.patch b/dev-python/pip/files/pip-20.2-no-coverage.patch
new file mode 100644
index 000000000000..55be5b8c9712
--- /dev/null
+++ b/dev-python/pip/files/pip-20.2-no-coverage.patch
@@ -0,0 +1,163 @@
+From 43389903a55a5432ca8556f42fb2252c91c7ca45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 29 Jul 2020 07:42:25 +0200
+Subject: [PATCH] Revert "Add basic test coverage configuration"
+
+This is just PITA since coverage uses native C extensions.
+---
+ .coveragerc                                |  4 +++
+ setup.cfg                                  | 38 ----------------------
+ tests/conftest.py                          | 16 +--------
+ tools/requirements/tests-common_wheels.txt |  2 --
+ tox.ini                                    | 16 ++-------
+ 5 files changed, 7 insertions(+), 69 deletions(-)
+ create mode 100644 .coveragerc
+
+diff --git a/.coveragerc b/.coveragerc
+new file mode 100644
+index 00000000..5f833c94
+--- /dev/null
++++ b/.coveragerc
+@@ -0,0 +1,4 @@
++[run]
++branch = True
++omit =
++  src/pip/_vendor/*
+diff --git a/setup.cfg b/setup.cfg
+index 45fd58a3..e40596e9 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -67,44 +67,6 @@ markers =
+     yaml: yaml based tests
+     fails_on_new_resolver: Does not yet work on the new resolver
+ 
+-[coverage:run]
+-branch = True
+-# Do not gather coverage for vendored libraries.
+-omit = */_vendor/*
+-# Centralized absolute file prefix for coverage files.
+-data_file = ${COVERAGE_OUTPUT_DIR}/.coverage
+-# By default, each covered process will try to truncate and then write to
+-# `data_file`, but with `parallel`, they will write to separate files suffixed
+-# with hostname, pid, and a timestamp.
+-parallel = True
+-# If not set, then at the termination of each worker (when using pytest-xdist),
+-# the following is traced: "Coverage.py warning: Module pip was previously
+-# imported, but not measured (module-not-measured)"
+-disable_warnings = module-not-measured
+-
+-[coverage:paths]
+-# We intentionally use "source0" here because pytest-cov unconditionally sets
+-# "source" after loading the config.
+-source0 =
+-    # The primary source code path which other paths will be combined into.
+-    src/pip/
+-    # Unit test source directory e.g.
+-    # `.tox/coverage-py3/lib/pythonX.Y/site-packages/pip/...`
+-    */site-packages/pip/
+-    # Functional test virtual environment directories, which look like
+-    # `tmpdir/pip0/pip/src/pip/...`
+-    */pip/src/pip/
+-
+-[coverage:report]
+-exclude_lines =
+-    # We must re-state the default because the `exclude_lines` option overrides
+-    # it.
+-    pragma: no cover
+-    # This excludes typing-specific code, which will be validated by mypy anyway.
+-    if MYPY_CHECK_RUNNING
+-    # Can be set to exclude e.g. `if PY2:` on Python 3
+-    ${PIP_CI_COVERAGE_EXCLUDES}
+-
+ [bdist_wheel]
+ universal = 1
+ 
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 2aab5020..0db6d967 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -294,13 +294,6 @@ def wheel_install(tmpdir_factory, common_wheels):
+                                           'wheel')
+ 
+ 
+-@pytest.fixture(scope='session')
+-def coverage_install(tmpdir_factory, common_wheels):
+-    return _common_wheel_editable_install(tmpdir_factory,
+-                                          common_wheels,
+-                                          'coverage')
+-
+-
+ def install_egg_link(venv, project_name, egg_info_dir):
+     with open(venv.site / 'easy-install.pth', 'a') as fp:
+         fp.write(str(egg_info_dir.resolve()) + '\n')
+@@ -310,7 +303,7 @@ def install_egg_link(venv, project_name, egg_info_dir):
+ 
+ @pytest.fixture(scope='session')
+ def virtualenv_template(request, tmpdir_factory, pip_src,
+-                        setuptools_install, coverage_install):
++                        setuptools_install, common_wheels):
+ 
+     if six.PY3 and request.config.getoption('--use-venv'):
+         venv_type = 'venv'
+@@ -334,13 +327,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src,
+     subprocess.check_call([venv.bin / 'python', 'setup.py', '-q', 'develop'],
+                           cwd=pip_editable)
+ 
+-    # Install coverage and pth file for executing it in any spawned processes
+-    # in this virtual environment.
+-    install_egg_link(venv, 'coverage', coverage_install)
+-    # zz prefix ensures the file is after easy-install.pth.
+-    with open(venv.site / 'zz-coverage-helper.pth', 'a') as f:
+-        f.write('import coverage; coverage.process_startup()')
+-
+     # Drop (non-relocatable) launchers.
+     for exe in os.listdir(venv.bin):
+         if not (
+diff --git a/tools/requirements/tests-common_wheels.txt b/tools/requirements/tests-common_wheels.txt
+index f0edf0b0..6703d606 100644
+--- a/tools/requirements/tests-common_wheels.txt
++++ b/tools/requirements/tests-common_wheels.txt
+@@ -7,5 +7,3 @@
+ 
+ setuptools >= 40.8.0
+ wheel
+-# As required by pytest-cov.
+-coverage >= 4.4
+diff --git a/tox.ini b/tox.ini
+index 82e9abc6..7a19ca61 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -8,7 +8,6 @@ envlist =
+ # Wrapper for calls to pip that make sure the version being used is the
+ # original virtualenv (stable) version, and not the code being tested.
+ pip = python {toxinidir}/tools/tox_pip.py
+-mkdirp = python -c 'import os, sys; os.path.exists(sys.argv[1]) or os.mkdir(sys.argv[1])'
+ 
+ [testenv]
+ # Remove USERNAME once we drop PY2.
+@@ -31,20 +30,9 @@ commands = pytest --timeout 300 []
+ install_command = {[helpers]pip} install {opts} {packages}
+ list_dependencies_command = {[helpers]pip} freeze --all
+ 
+-[testenv:coverage]
++[testenv:coverage-py3]
+ basepython = python3
+-commands =
+-    {[helpers]mkdirp} {toxinidir}/.coverage-output
+-    pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg []
+-
+-setenv =
+-    # Used in coverage configuration in setup.cfg.
+-    COVERAGE_OUTPUT_DIR = {toxinidir}/.coverage-output
+-    # Ensure coverage is enabled in child processes in virtual environments
+-    # since they won't already have been enabled by pytest-cov.
+-    COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
+-    # Used in coverage configuration in setup.cfg.
+-    PIP_CI_COVERAGE_EXCLUDES = if PY2
++commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report=xml --cov-report=html tests/unit {posargs}
+ 
+ [testenv:docs]
+ # Don't skip install here since pip_sphinxext uses pip's internals.
+-- 
+2.28.0
+
diff --git a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch b/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
deleted file mode 100644
index 7334380c1e1d..000000000000
--- a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 890a1c26018752f2c57c7800968e4b8d1e0987f9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 20 Nov 2016 19:52:40 +0100
-Subject: [PATCH] Stop checking for new versions
-
----
- pip/basecommand.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/pip/basecommand.py b/pip/basecommand.py
-index 54c6706..3cffe86 100644
---- a/pip/basecommand.py
-+++ b/pip/basecommand.py
-@@ -241,15 +241,6 @@ class Command(object):
-             logger.critical('Exception:', exc_info=True)
- 
-             return UNKNOWN_ERROR
--        finally:
--            # Check if we're using the latest version of pip available
--            if (not options.disable_pip_version_check and not
--                    getattr(options, "no_index", False)):
--                with self._build_session(
--                        options,
--                        retries=0,
--                        timeout=min(5, options.timeout)) as session:
--                    pip_version_check(session)
- 
-         return SUCCESS
- 
--- 
-2.10.2
-
diff --git a/dev-python/pip/files/pip-disable-system-install.patch b/dev-python/pip/files/pip-disable-system-install.patch
deleted file mode 100644
index 9e572454315e..000000000000
--- a/dev-python/pip/files/pip-disable-system-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 27 Oct 2015 12:20:44 -0400
-Subject: [PATCH] install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
----
- pip/commands/install.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index 46cd9f2..36b72f2 100644
---- a/pip/commands/install.py
-+++ b/pip/commands/install.py
-@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand):
-             )
-             options.ignore_installed = True
- 
-+        if not options.use_user_site and not options.target_dir and not options.root_path:
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
- 
--- 
-2.6.2
-
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
deleted file mode 100644
index 17ca2852b9eb..000000000000
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ /dev/null
@@ -1,138 +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(+),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="!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"
-
-		# these are from upstream git
-		"${FILESDIR}/pip-19.3.1-network-tests.patch"
-		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-19.3.1-r2-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		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() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-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-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index fcb8d78d31a7..90db22a8b7b5 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index c6e2c880ab95..4366b9350805 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.1.ebuild b/dev-python/pip/pip-20.1.ebuild
deleted file mode 100644
index 9da532f79f0e..000000000000
--- a/dev-python/pip/pip-20.1.ebuild
+++ /dev/null
@@ -1,141 +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="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="44.0.0"
-WHEEL_PV="0.34.2"
-
-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 ~x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		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/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		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() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-		user_config_accepted
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-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-20.2.2.ebuild b/dev-python/pip/pip-20.2.2.ebuild
new file mode 100644
index 000000000000..8da2d952643e
--- /dev/null
+++ b/dev-python/pip/pip-20.2.2.ebuild
@@ -0,0 +1,145 @@
+# 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,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/csv23[${PYTHON_USEDEP}]
+		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-20[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+		"${FILESDIR}/${PN}-20.2-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	# TODO
+	rm tests/functional/test_new_resolver_user.py || die
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		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() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local -a exclude_tests
+
+	# these will be built in to an expression passed to pytest to exclude
+	exclude_tests=(
+		git
+		svn
+		bazaar
+		mercurial
+		version_check
+		uninstall_non_local_distutils
+		pep518_uses_build_env
+		install_package_with_root
+		install_editable_with_prefix
+		install_user_wheel
+		install_from_current_directory_into_usersite
+		uninstall_editable_from_usersite
+		uninstall_from_usersite_with_dist_in_global_site
+		build_env_isolation
+		user_config_accepted
+	)
+
+	distutils_install_for_testing
+
+	# generate the expression to exclude failing tests
+	local exclude_expr
+	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
+	exclude_expr="not (${exclude_expr#or })" || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+
+	pytest -vv \
+		-k "${exclude_expr}" \
+		-m "not network" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+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-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
deleted file mode 100644
index 792b91c4cefa..000000000000
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ /dev/null
@@ -1,84 +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 eutils bash-completion-r1 distutils-r1
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-IUSE="-vanilla"
-
-# Check pip/_vendor/vendor.txt for this
-#VENDOR_DEPEND="
-#	>=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
-#	>=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0${PYTHON_USEDEP}]
-#	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
-#	>=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
-#	>=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
-#	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
-#	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-#	>=dev-python/packaging-16.5[${PYTHON_USEDEP}]
-#	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-#	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-#	virtual/python-ipaddress[${PYTHON_USEDEP}]
-#"
-# https://github.com/pypa/pip/issues/3057
-#RDEPEND="${VENDOR_DEPEND}
-#	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
-#	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
-#"
-#DEPEND="${RDEPEND}"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-#	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
-#	)
-
-#python_prepare_all() {
-#	mv pip/_vendor/__init__.py "${T}" || die
-#	rm -r pip/_vendor/* || die
-#	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
-#
-#	distutils-r1_python_prepare_all
-#}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 105b614cbbba..7bb44b61d47d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,6 +1,3 @@
-AUX pipenv-2020.4.1_beta1-disable-networked-tests.patch 1326 BLAKE2B 35d6850eaff8346016fb8ad2d847466185e92a6cd1879a8bcc8cfed6cfbb97b43ff976b0bb400891287720e2cce3df9cf19472acd5df85d2df6b331046ea01f7 SHA512 1a19a0c19e2cc6bf4c017a17c588a8d3685003a01f2621d9ddf87938935fd76a8f9d8ffd36efc70dbfc3323c739561a67941e10b22f032f4c2020f3ba8cfaf10
-DIST pipenv-2018.11.26.tar.gz 6560580 BLAKE2B a3846de696733b5f3f393163999d7f333b52accdcebadfd800507defd1108ac4ccb288b39fb805ecf03e417cfe0d1a8b2fc714a95e8ee4485f8622ff8fe4a1ca SHA512 59582ad4a0730083ea58867f7a5d9714290d62947f56bec80e154d4359fe1dff16e44974a7fba3841e5f2516f2ce9709baf9954c9fc40fd66ebc46c3060d4dea
-DIST pipenv-2020.4.1_beta1.tar.gz 11331009 BLAKE2B 55ac81238b885bdf0293199ca1caf44a78f3cdbec75c9df259411b949dec8b385161e7ef46160ca099ef51041410d8c5d1274ad200eba5c2a9d06c8a5f61c5f1 SHA512 a5de90ae9910a30666ac7323ccf83b78ee11d8993aef1a2108a44f4256d365d0c1abfff72c83748ef82215914931090c670a10eeb511cb48483762b54c80e5c7
-EBUILD pipenv-2018.11.26.ebuild 975 BLAKE2B 8fa22f7dd1b7408096ae96ce93051e3b5ddc72438a1e398ef6c7df11447fa7998b633c3df52ba75ce15fb4623aa0f69fdc48c9b5a199429eb56b9dc8a419b6f2 SHA512 55feb0ce1250ca45e4aa63a0a4c88d410f8ac219c1db07f51ad6ccc1279b8c3267d4f2f0cea586539da55bdb7935509ea505da243d1d7dac71ed9715e2138efc
-EBUILD pipenv-2020.4.1_beta1.ebuild 1192 BLAKE2B 65a48723db56713ecdfd3b1f9f2474aded7d188bb3c2ee56353d6a041b1ab132b38d530a5db73eb6c6b3d31358152a83d9542995ef5006725208e0621dd01b9a SHA512 e152dc3cc59d1deef7ef10e8499ac610607e238af6dfd400dbc710f8b23abdffd23995c2adc8d59b22a11fbeaba7ec7e15e31d43791ad0efa78685d14a4cd3d9
-MISC metadata.xml 365 BLAKE2B 9be07839eb6a0126b586877cbe691e906850e5310535e7d3ce91bfad2ebcb4c28d9071a6b131d99310b6802ba6ebe026c90d1e94ac3f2f189d775181aea5b997 SHA512 dd94c56de88065dca0d2f49493b25b5fec1d9eb19e3dd8475b4213f6f3af3f7163535430fd6098dca78ba00c2deae2db454774797b4babe3d72ded3a1258cd0a
+DIST pipenv-2020.6.2.tar.gz 11571734 BLAKE2B bc50535f215b11d284eeec546722a144cfdfeeab6abab8eae51c727c054865f274ac970dc61c23cce7db19ac28a77e44a84453743ba2dc75068feb3a47a19190 SHA512 671765b9e77a18039668eb500989de45c8bd4f15948ee914eb241985098562ebd382168a535a449ac5d216f07327b6787eb8f828b5a6499ef6e77fe5a036441e
+EBUILD pipenv-2020.6.2.ebuild 1346 BLAKE2B c546dcb33a2b6d51054c9f79473bf4f141ab4d07e78663871baba96811cf93dc9db48793e542cf63932258bb10d180bd42aa6bb28573d9f67486d968d674e0b6 SHA512 4ac51e70b7e9c2ca15c2623b19d46de8c74fb198ceb7d8bb7ccd1ab9dc07ca0ebc5a095a7997888e80ec8569de5a5abd3055d92eb83db0c7683ad04275ee5b45
+MISC metadata.xml 587 BLAKE2B 1e496afc6cd4106ead561a0becf969fb53c85b1b874f161e94c4292b4a749ee412333ad3f148d1fd490b71ad5ac23dee363ed8533f72df4444b9928e725a8aa9 SHA512 61da4c2a68ea2727787337ba59a0a1029dec322336c174bbc1697d033ae79f67ea1f3cf694acc18c50d40e5d9807245847d92dc6c9adca1d9b80d23894af9620
diff --git a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch b/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
deleted file mode 100644
index f3ba4ff6502f..000000000000
--- a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7cf8c7ee7eaba1b5a11562a7ef656b0606383fe8 Mon Sep 17 00:00:00 2001
-From: Oz Tiram <oz.tiram@gmail.com>
-Date: Mon, 4 May 2020 21:52:09 +0000
-Subject: [PATCH] Disable test cases that requires network
-
----
- tests/unit/test_utils.py | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 4b9cd75c..1c73964b 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -47,16 +47,6 @@ DEP_PIP_PAIRS = [
-         },
-         "-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject",
-     ),
--    (
--        # Extras in url
--        {
--            "discord.py": {
--                "file": "https://github.com/Rapptz/discord.py/archive/async.zip",
--                "extras": ["voice"],
--            }
--        },
--        "https://github.com/Rapptz/discord.py/archive/async.zip#egg=discord.py[voice]",
--    ),
-     (
-         {
-             "requests": {
-@@ -222,6 +212,7 @@ class TestUtils:
-         assert pipenv.utils.is_valid_url(url)
-         assert pipenv.utils.is_valid_url(not_url) is False
- 
-+    @pytest.mark.skip("Network required. Gentoo tests run in a sendbox without network")
-     @pytest.mark.utils
-     def test_download_file(self):
-         url = "https://github.com/pypa/pipenv/blob/master/README.md"
--- 
-2.26.2
-
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index e34e2c7e0ac9..912ba1f0a50b 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>oz.tiram@gmail.com</email>
+    <name>Oz Tiram</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pipenv</remote-id>
-    <maintainer status="unknown">
-      <email>me@kennethreitz.org</email>
-      <name>Kenneth Reitz</name>
+    <maintainer status="active">
+      <email>distutils-sig@python.org</email>
+      <name>Python Packaging Authority</name>
     </maintainer>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pipenv/pipenv-2018.11.26.ebuild b/dev-python/pipenv/pipenv-2018.11.26.ebuild
deleted file mode 100644
index 9e1ef31da4a4..000000000000
--- a/dev-python/pipenv/pipenv-2018.11.26.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="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/certifi[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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="
-	>=dev-python/parver-0.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		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-2020.4.1_beta1.ebuild b/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
deleted file mode 100644
index 8182443641be..000000000000
--- a/dev-python/pipenv/pipenv-2020.4.1_beta1.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=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36.2.1[${PYTHON_USEDEP}]"
-DEPEND="test? (
-		${RDEPEND}
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		<dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.4.1_beta1-disable-networked-tests.patch"
-)
-
-python_test() {
-	pytest -m "not cli" -vv tests/unit || die
-}
diff --git a/dev-python/pipenv/pipenv-2020.6.2.ebuild b/dev-python/pipenv/pipenv-2020.6.2.ebuild
new file mode 100644
index 000000000000..49b5811f9f01
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2020.6.2.ebuild
@@ -0,0 +1,50 @@
+# 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_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
+	"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		<dev-python/pytest-5[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	# remove vendored version of PyYAML that is backported to Python2
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -m "not cli and not needs_internet" -vv tests/unit || die
+}
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 6a361ef7507c..7c9ad273c8ed 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 695 BLAKE2B c12aa9ad85a596d63334ff990e902d14ca0d6fd906f331df9acbc49ff775769a41b097a28d66a467e8422a53c2e8b7497a56596b43d2bebbe18f4fa109631ea5 SHA512 97258793c32771bfce845158ce002c8cd624dc45af68b60f69f6553441b7c5aa08dce10eacfe1a5b58a3d10846309e674191184b825d4c591dc17fe0665ac780
+EBUILD pipfile-0.0.2.ebuild 683 BLAKE2B 1351f993994f9be71d81bde4242ae44fd59d7e903cb42a6eb65a8c92bd2cedf2594c340399423023e1bd327411405a2285fcced2067189bcaad1132d17e0f66e SHA512 ebe2077b57c8a2a309f0543f2558913330f890de093adf5a458ac3a026b91ecf341ebc8d6e9feeabf14a0808c6be7f0a28e52b167693e807a059a415e48d6ca6
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 9845ba0ce4a8..5ce953f15094 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.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
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 8bef808c452a..349ae54efe7e 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,3 @@
 DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
-EBUILD pkgconfig-1.5.1.ebuild 574 BLAKE2B 95abdfdd6016fae1174e5c3b8881e0d559460952d99e24131879a4d2458da7b521d70ffb13d4d1688bfdc7c02862379ba5d139d8a7fcd1b9a76c37c36652e5bb SHA512 342f8b131c0e4d0017c7253a864afcee2d3a1469ef922714ca942380596b167b1c8b74e0df00232c386df1c6546fb6e150e59b5237a5bb8cb87da083a8c894fe
+EBUILD pkgconfig-1.5.1.ebuild 571 BLAKE2B b72f2f3d73afc9f5ca6db0afdbfc0e83df1f6294bce0642898035d98b326a22b5389563c801f38fec7d7bec0a3daa8ecfe8b8dd7e53661bf58b1ec46692d6686 SHA512 93a184aa5d85ff2608df5bc1fd1dfd250fb12d850ea4f2cf847412cb60bc413de537a4b14823af44b0ec0cc72f8b5dabda6fd3bdb5446e0cc19e971089bac988
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
index 364f79d56b63..6f8ab6c3d424 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
@@ -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 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/pkgconfig"
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 1631b7e12869..846acfdcab8d 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.5.0.1.ebuild 717 BLAKE2B fc44d2fc324dd78e1a6170d93ce5c04d267abffedd7601dc75ed9974382551da8d4096d61f38bcc1f623f25b76f4e7db88f7c61fa2b52d6074d20312e44acbd1 SHA512 3ae7087a6ea69e31ff7aa8647057d264bd3f0239608504a2110945dec7fe43147dc16eac6f6c74056553434b5bbf717a74d0e846f4b0b50e55287d28973ff62b
+EBUILD pkginfo-1.5.0.1.ebuild 716 BLAKE2B 7d3e9ddf436889ff2a1b86cd4756f481f1424f77c8d57b1f85e918266844d713d77cdb1314381df3955e7404db933213ffff2e01dbdc17b974e766bcb593bdd0 SHA512 6048c77a85dd7a66bee67a5ea75142466ed4a0726f5c34160c3310f5b4636f1835ecd6badedbc9df14291c0435e51ec5adb70f55b9b02186ccd865d6854830e1
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index d53afeb7c882..691b93ab8084 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.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 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index ad6f46742f3f..6dd26c07311e 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,5 +2,5 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 EBUILD pluggy-0.11.0.ebuild 849 BLAKE2B ccf14580737128928dc9bb67d0bee729829e40da6d629ee35605d11664b2df6e55ac933da779c385821342f8ebc76319b2a01371ddf0502346d839400c9aee36 SHA512 3d20936b6a60e9a834448c9714615378dabfa6634538778d0f609a54eae1273041d9ff27cb27579933968561a05b30df1fb41a72028e3f9711dac5d02c5f2694
-EBUILD pluggy-0.13.1.ebuild 726 BLAKE2B 12900bc94302e1b8b46080e2185155cf2ca5d8dee130c6dbc735c88bc792a9ec9d14b369175d72b4b83f23a1ea2631bf6d33ea76ed039e4b9716aea88a8c2d29 SHA512 066c23da4a72160cb6cb6bd91629846cea91d7a6950e4b704635ebdd92846b8d1bffac2c162b278d3f90f371a62d0faa94198d35e65d1ef4bcc3fd56f9c409ec
+EBUILD pluggy-0.13.1.ebuild 732 BLAKE2B 6ed2aa59edb374605500fbfbe64dc7d2fcedd88afd63d357a4611bbb784b64a0b10e9eec23ac845fca54aecacc84367a4a9cc0559064f223cc16d5aeb875c547 SHA512 925b658a1a29443f7dc9c44355e2de0291217124d35074ac5220eeb8221629dafc54fc03e8c252845b9fd83f86278bc5f7940352402cddeba1cebc7f26c558aa
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index f0141a9595e6..4efc417a5ce3 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index b559a6180f5e..f93a8b876d4c 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,5 +1,3 @@
-DIST pluginbase-0.5.tar.gz 41964 BLAKE2B 84fc187b60182f100a9016ac663856b29587e60b5ef5ac9c51fb4ed99666908a77c9817c2dc5fb64e82b807e635bd10beb5ce7644e31e63262736cc667a7b8c2 SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455
 DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
-EBUILD pluginbase-0.5.ebuild 935 BLAKE2B 27bf1cfdd73c8264d07f7a4934ca521699192b8908335201a87eb56a12d3b9230f5eb4df407bb69621b24ee21fe02d6ecb72c63c7c9a4c631fb6801ca6d4b3e3 SHA512 1150ca5bcc39e7ff05ab78687417663ae1ba13fcba7f701479605da0162ba84508205e2c89bc50a9298c0c06c0adab1578cbee914532ae2d62555b1a0875699c
 EBUILD pluginbase-1.0.0.ebuild 931 BLAKE2B 6ee3880edfb0760347a590982827f5c1c3335c34256875424cd18a2a2f0da2b5ba409c447a65968c742fe394e32b1c7536cd114cc5c91d890f076d08bf73768f SHA512 f32fa8efdb45e93ba0391001eef6ce4e858e51018f74d9cbbcfb3702b5d7780f0f2b9b8ffef378dc72822ef0e40d879782d11a815a1a40759cb424e405c8f512
 MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
diff --git a/dev-python/pluginbase/pluginbase-0.5.ebuild b/dev-python/pluginbase/pluginbase-0.5.ebuild
deleted file mode 100644
index 1269425a52e6..000000000000
--- a/dev-python/pluginbase/pluginbase-0.5.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 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Support library for building plugins sytems in Python"
-HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
-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="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -e "s/, 'sphinx.ext.intersphinx'//" \
-		-i docs/conf.py || 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 tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index f371e17ce79c..6d53ac8c450e 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,6 +1,3 @@
-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-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/files/pmw-1.3.3-install-no-docs.patch b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
deleted file mode 100644
index bbfd0f35f1c4..000000000000
--- a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- src/setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index a5f9039..cfcf8a2 100755
---- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,7 @@ setup(name="Pmw",
- 		'Pmw.Pmw_1_3_3.lib',],
- 
-       package_data={'Pmw': ['Pmw_1_3_3/lib/Pmw.def',
--			    'Pmw_1_3_3/doc/*',
- 	                    'Pmw_1_3_3/contrib/*',
--	                    'Pmw_1_3_3/demos/*',
- 	                    'Pmw_1_3_3/tests/*',
-                             'Pmw_1_3_3/bin/*',
- 			   ]
diff --git a/dev-python/pmw/pmw-1.3.3-r3.ebuild b/dev-python/pmw/pmw-1.3.3-r3.ebuild
deleted file mode 100644
index 882fea57a9a2..000000000000
--- a/dev-python/pmw/pmw-1.3.3-r3.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=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Pmw.${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound Python widgets 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
-		dodoc -r ${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/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 36edf6113d2b..524ebcf7e653 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,5 +1,3 @@
-DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
-EBUILD pocketlint-0.17.ebuild 478 BLAKE2B a2bc81998644c7cd671a21fcfa043a16ea9ea958678578ca257b161e56c731df40396b5a82936b77da0f6be8a2756bb76cfa1028981cbf37bf6453b3fadeef19 SHA512 e7f54bd33bdd4401fcc92f09d9c7af04669ac352c6a2a790f78cc73d6663a20ccb5f2e0d1505f96e81abafe0a5b11fd7e5c87d1eadfc150d3787b843d919f33d
 EBUILD pocketlint-0.20.ebuild 480 BLAKE2B a832e848eafcf61a36920601194b978ec33c14c15fd99cd1a2e6e2ebb19dba2f4cffd1d402f5eb1297422a0cf8b672a7fbe8581e9eeb4a000e7d0b298e18d4b7 SHA512 e8878b8497548a6f2a1d85dca5c7d789127e101d0cdbf278a5bb90ff424beee59adf123745f8c8d2a868d73a12f85de4a528e06b46d05ae91b99090682dcb794
 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
deleted file mode 100644
index 75fa73ab5580..000000000000
--- a/dev-python/pocketlint/pocketlint-0.17.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 b91a21f37b6d..fc7473ff0d93 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 835 BLAKE2B 25bd425d2dfd2a6a54637a9d964411d8f6f8aa75789125ad1700727b008086b0768c6336c7f5395fde57418b4c3a893d8fb5c241d104656b07dd29a94ec2979c SHA512 a7abbcabf59f2abd3b9bfe9875ad162a329f97bb5823967863babf4f4034ba60d2dcc2827c217f17434cdf1054c926a490add14b074c998a6f5bb149634fa4fb
-MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
+EBUILD polib-1.1.0-r1.ebuild 861 BLAKE2B f70568e0abb4276a7c25360d0ab5356c1f6ee484026d31ca2ee143ee43ede09567c1c971eed6c37bc5d4cd2fda60455028b94ed411240ddf548d2c8841e18352 SHA512 95477d149837b14de87de797e3c21d8765095b83dd6b5e56aaf7ce4532ad6514657f16583e80c88fb6734464bc81a6a5fe31ca111ecc9ebde1bc5ef5f1e2014b
+MISC metadata.xml 296 BLAKE2B 74a3738e9d8bcdab47a9aa6564618afdb05aaf42b94fbb9412e77f3e6866eddabcb9adee127b8012c73025c1f85aab1c527a7814ea59b3b42178f4d78d730fe8 SHA512 7d4781dac33b824e67769ddf71dc061e212bfa0013517bc34c24902e48e71048146d36ac1a7f984f6c9662bc2fbb0abec8a8df0f2ffd9045a7f8463f21f5328c
diff --git a/dev-python/polib/metadata.xml b/dev-python/polib/metadata.xml
index c9e9163b81eb..8b160640a11f 100644
--- a/dev-python/polib/metadata.xml
+++ b/dev-python/polib/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="bitbucket">izi/polib</remote-id>
+    <remote-id type="github">izimobil/polib</remote-id>
     <remote-id type="pypi">polib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
index 213c0a8cf06e..3d13a4e48dd6 100644
--- a/dev-python/polib/polib-1.1.0-r1.ebuild
+++ b/dev-python/polib/polib-1.1.0-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
-HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
+HOMEPAGE="https://github.com/izimobil/polib https://polib.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
new file mode 100644
index 000000000000..02c0a4164ab5
--- /dev/null
+++ b/dev-python/pony/Manifest
@@ -0,0 +1,3 @@
+DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad3498a75a5ce4c3b8a4511e6d1fbfdd39a239f0462458ae1d64dc9446b338bbaea33d6bbdd861c8d0738e50d58a717 SHA512 431d19e3297ba1cdae5313948123d8b8cd71ee8ad5868b8cc2f5447eb435875fdbcdc3768834b9afe22ce8e4c1abaabeb597f3e6974b00aab33aa61e497d6390
+EBUILD pony-0.7.13.ebuild 549 BLAKE2B 5a7fdeb57931b5e3b0869809ab212b4ec6fe1a5ae4bf8f717c1dde806fb4d81cd0e4934f1cc692ee9b30ef618fa69b4403fd0ebe37f3a91ca8ff8cfe7b35d6d6 SHA512 86fddc0b251162f6f87e5bed7f5f75003d7345528d1cda877cff954336bc88bd6f486c2fae38b139e14525b789c8c96cb4b1afde4af3566e9721ff0fecf7cf47
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pony/metadata.xml b/dev-python/pony/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/pony/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
new file mode 100644
index 000000000000..f5db45c4fdd2
--- /dev/null
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="Python ORM with beautiful query syntax"
+HOMEPAGE="
+	https://ponyorm.org/
+	https://github.com/ponyorm/pony/"
+SRC_URI="
+	https://github.com/ponyorm/pony/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( $(python_gen_impl_dep sqlite) )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index a1321b9dfed6..934e66f32da8 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.6.ebuild 934 BLAKE2B a05c558881d592ba1cde8960bb846e672db63985da5995fa914869a1d2890003b3c44607da5b84f7c57dd5127ae4bcbf247476546f681389c2c1fd766c871d27 SHA512 4790e5c5954242b80af7138b10c6ed632a80ee99caf4756e1101e6c3ecaac91fa3e3243ef4244dff249edc32ea45c57182a34fa4fce2103720eb7ce24e5d0f85
+EBUILD portend-2.6.ebuild 932 BLAKE2B d7f8da8dec13f4193e45d12f545da0ac11f140e6b072e776c1d0f6e5e94b5e4ae9f2d78072d31d95bdedcad51a909a2160ed85c18a78708dc98b1d7add00e961 SHA512 60a85154d51027fa8914fd63f1f29c416fa1ff29caf4b23d4cd3b203337aa349c4e20461261b13bafcb7691d2e6cdfe10e8ad2e4aee4bf859e607791fc3ddadc
 MISC metadata.xml 469 BLAKE2B d4b527da8fd402a1f9099000265ed003555c4a6f492a5d9c0ee5c350af1a044fae6505b6f847d55f45eb4551c1dc6f1ac8b946c6ab5b68768bc583521fc4a485 SHA512 3ab794a7c4545b3d5a5281499ae87a0ed377bf7f83acd0ab8bb2eedddc3005f03d793837ef9aa8e681374357067a5edf7bcf50da48c0b5d36bf0696d8bd2353f
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 0e7cb595daac..32b39420da25 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="~alpha 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/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 707214004888..4402ac4ecc34 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST pyaml-15.8.2.tar.gz 16544 BLAKE2B 1e9820c172bb0c2e05c78f5dee3299c6bb0d83e2c658f3cd45322abac3404af1c9dd1f3b00e2c7b285cbd00c17d382c82cbb16b96bbac10021a0ca1a008d0287 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64
 DIST pyaml-20.4.0.tar.gz 21176 BLAKE2B 0aac0250d610d7b2ef042e251142de4520e7db96073d46bde0dcb37ad43d9c278cbdfc7ab247b4d41c7c30e893306aa47b25a584a2aa4c157d66203b8e140895 SHA512 432fd215e034beafc07270a6aa8b726d5a16ef8946a95c1db9a34b4f492bbe2089dffbb1ce856d3e8153ec18ac943973a23e3aa9283d53ee0b2e7ba5dcd3d317
-EBUILD pretty-yaml-15.8.2.ebuild 767 BLAKE2B d7d607bdbeef29d67ecff12eeae5482d241f52160f985994a5b588d62aa35142b0f01b1d7c13280d0d917297ef826f7a4be7f4ca6209ce4bb8e74e1569678266 SHA512 0831b756090da15e9169d107005838709a82c2de712bf2b3f0321ad839aed059f0fc703cfdc2a0ebb6cdbd51fbb94f6d06f08317b66df88e3ce327293f0116f2
-EBUILD pretty-yaml-20.4.0.ebuild 718 BLAKE2B 53b9721e44ab77f07e61301a711489633deff6830204b04760a2c83982e56694146be3f4bac05c5749824759e2932f8c1d1cc49c5767c82c56a2b821d4c9ff91 SHA512 295d7cd6914dc97c4846299d8d801849030f70ed45cefed81699583ebbefd316b3ccffa61bbd61b4080f95bd4513c2d73b4e6c5e44b48c28ac7c9e0410bb1eba
-MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
+EBUILD pretty-yaml-20.4.0.ebuild 722 BLAKE2B 55107785821bd62c0fd43f23103d312bc1ef1707639257643272c59d83a0fa059d94959b9dcced21a4fd8f4934936d3fe74d13595b1e09bd2d466312acbddeca SHA512 e059939e3fe4f2d484f515c0dab6b7ecc68483ecf838805c033d51e19a19fb5ccf078e647e87bcb602fa84827017c3b977f7c3f45cd05488176164e17e918a23
+MISC metadata.xml 469 BLAKE2B 9a5eb78ddd20825b189c9d6e95c35dd9ef7772a42f5a68d48fd2ee5ff54c906dd0268e03e33ffbd0c77eccc188538597d61445c648de9408813093405f2f063a SHA512 45ce0035cfd63132fd0eb7f7684b4099216d6f6d9ab9101c66c5a031e51d4a80013ed3bcb7e95654e3cd6046a97e3db41bf09ad209e45f2034b5d9ff02d6ed43
diff --git a/dev-python/pretty-yaml/metadata.xml b/dev-python/pretty-yaml/metadata.xml
index c3f03708b939..b4865611177b 100644
--- a/dev-python/pretty-yaml/metadata.xml
+++ b/dev-python/pretty-yaml/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyaml</remote-id>
     <remote-id type="github">mk-fg/pretty-yaml</remote-id>
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
deleted file mode 100644
index 0a7759c45374..000000000000
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN//retty-}"
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	"${PYTHON}" pyaml/tests/dump.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
index 9135bdefe03d..0d97d771f4d1 100644
--- a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index f05fcdfafc51..ffab6dc3942e 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,3 +1,3 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-EBUILD prettytable-0.7.2-r1.ebuild 603 BLAKE2B 9e39af9f3948dd40770a721d904a5e6b279db3966e147a6e4724237b4363fe0100710ffeb6ca2d6e5ad9b4ea2c7e51e2ea82d725d47aecc2f87194b069a67290 SHA512 173b0b05cf870890013dbc16bdd749f9b1f7e2db0c89c32689bc02ac87accdf48d18abc6430bd9703dbe2543a06834c4e3b8603229d19ed923d2a4fde2c428ca
+EBUILD prettytable-0.7.2-r1.ebuild 593 BLAKE2B b2dc0968e6362b62e7dc57adaa63ce07f916f2aefcbe9275a69ea92ddb50f8214a20354d9222b6a5b9046cde19f8381ff38e9405bfab57be7528faba74f2755a SHA512 7154946690ed4bb294a84e52a84865c49eb45907c416713292cef9f2f11d2f003c8a26d7883263a34c5c41335a596d09e98653140472a5deda8d220f051c7599
 MISC metadata.xml 495 BLAKE2B 9c3e9523d22d7e5ad09e055282736a197e28df220f1c4cda5cec07e7f2ed05902e295ba20f8b1babb31a2fba802ef59b7e61f40b8b3b5487bc51edbc4730733f SHA512 3f8252016bd7e13eab68e5bbff995607aeeb5b02fdea7ed189026670548370d5d124145034e571ec6f03e30e8947923abf8e9d4546de0f28819ea78ec0cce341
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 007312c8738d..24736c304290 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index d17357e4410b..462e9260cb32 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 700 BLAKE2B b3501fe09a8ab77ba6323998c0a74c411d160f2f01a40040a5dacd06d0fac16fb87010bdd6f9490ca9ca5f75ab64073c1e05a69858c5a548b73bbce588db1b29 SHA512 8742397898ecf0cd587d7071805144bb63e9f3f43eb01bbe26c03aeeb0c2af3a1d615c6d5e7159f463957435fb9f8c66b269325f5035389ecfa5946e1d616203
+EBUILD priority-1.3.0.ebuild 690 BLAKE2B cc5072e240c801c21e1fe1b478398624a44498b340a8e9b18db175038877c05030a2c102ba394b695d9a56763e2e64d1cb10f49f5324e6e13a49680b79fecc83 SHA512 086d9bf4e2f8a271f899a549ac609818ab9d6d397b1d1485f9bdd24e2c545b90f8f7953695fc793be5b593a01b0ddc8ee005c433eba745a671a6413ab95967c1
 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 5ed8bbaa6c9c..f90fc1f1b489 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.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,8,9})
+PYTHON_COMPAT=( python3_{6,7,8,9})
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 5b45add75590..4e7f2ef2fc8b 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,5 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
-EBUILD process-tests-2.0.2.ebuild 638 BLAKE2B e0b8cfc8997e79f6c45d86a617f6e3c9b8725c070fe2c0d837a5de093bb3892d9f8a4778c3caa74a78d1c142854a71d632b9709684b67c6c7911b7d9651a165f SHA512 ac7ea0b9445637cf77156d8cf30ec4c5470f5b200f22dad869fb1a5d9a1984f7b21a0cb821fe75c8126a51be44e693a5917cbbd1e2275e02ba2d38ded8510f38
-MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
+DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
+EBUILD process-tests-2.0.2.ebuild 628 BLAKE2B 7c365f149c1bc8ca2df6440a9651fd7df2764962289f40a3f7459b2b8774be5398b94cea0a5df633528d3995d7a0f7823c44eb4b9a917a9a0589a34c05c4647f SHA512 5a106c5d5295afe8b283dce39c44222351100cbff55f4696b1e7af3db802170ba84800577360f5bdff262dc11527d4bde545ddd33055c0b14847c34cf755efe9
+EBUILD process-tests-2.1.1.ebuild 637 BLAKE2B 185230ae7c1de695d3d0d00db0632d6ea424594bf1c0ad13e9acdd2515867a894452ad62c8e0718ffdc71184c2b29cb11d532df666dc8a3aafe2e489a60baf38 SHA512 51e9a0e5158116aabb5aed37031a9da8585affce380e90839b748a1b1c3fdbff8c6f3af7c25550421c8863616593d10a5ed373ed8c711dcd1cd3465dd47615ac
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
index cde5814fe74f..7f4f33c6dbc9 100644
--- a/dev-python/process-tests/metadata.xml
+++ b/dev-python/process-tests/metadata.xml
@@ -5,8 +5,4 @@
 		<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/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
index 0a4a499d8299..71d5a7a42405 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
new file mode 100644
index 000000000000..d9912175eee2
--- /dev/null
+++ b/dev-python/process-tests/process-tests-2.1.1.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..9} 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# There are no tests at all, under TODO
+# see https://pypi.org/project/process-tests/2.0.2/
+RESTRICT="test"
+
+DOCS=( README.rst )
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 17baf11b8789..f963cbe1dc7f 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
 DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd450cf933ab7c8b6af74ff56414045f4d845c4a74f60d60e8b29f868801de12ebe2d39b5ac11701071c4998aec66719581b3f SHA512 a9d49bc4dac77168f94edf51344042bc5210b07ed01031dc50e323f86ea8292df7370956a4fbd9d9f85a0857a8ec9abaef30c0c2cd4dc5502df7264816eecc8f
-EBUILD prometheus_client-0.7.1-r1.ebuild 586 BLAKE2B a2a898d7983cc0018093183c90d6d250c9367a2c813b6519655174e19466de00286da1e515b663e935dea29d76ec0fe3db5cff5c4bfcc6efff27e5cfc608855b SHA512 e6401c2e0d5b988bab586e76af007ebc101dec0fcad76cd0a90b4d104beda97005ae0e17e71a7009e059677232cc68bd105ea607198ab9f1ba82ebeecc093a16
-EBUILD prometheus_client-0.8.0.ebuild 599 BLAKE2B f5a6f288ec77ead44ff5943e439ea33e7b680a4b255ed9c9637b8c00ca367bae521dd8ef292c3d33bf05bc39fe1f1352f36ac9f3d75a64a5051cf14e5173d8aa SHA512 9e431d87b41a9866a9be4a54b0def909cf71542ec9d197fae8340efe2cfde82e343361a17794ec984eaa254a9f3e2ad456be0f5e7d88db8624ec507db40fdd6e
+EBUILD prometheus_client-0.8.0.ebuild 597 BLAKE2B 5ccbb036c4946393245e4efdd4e872c96425bb9d6e6ee45bc000bb7a4ad1a8bc3bd2af2e2e4f31385f9ff7f8511beaccbac06142ba7b911fadf6eb9215136086 SHA512 ba372c21521071a7d45fd71e1e1b24268a68e95250a83bd02e22ab08600623696393a0f68ed415c853a0d17952bb08c0d229a214ff92442c687d8b58e36f0656
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
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
deleted file mode 100644
index f97aa000cb03..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.7.1-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..9} )
-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.8.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
index 173bdca64c55..cbe011826f5f 100644
--- a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index ce0e8b151f37..ec8fcaad4178 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,8 +1,8 @@
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
-DIST prompt_toolkit-3.0.3.tar.gz 2997855 BLAKE2B e4fe0d6b43443fd541a5cd2a38c6bb503cd86a6d222e2d0ea692496ca9591ee7ea2147618a224ee4e86d69e74c8bf95c7c408d592e94895d5d6d985e721f26e6 SHA512 4fde083359445c6195c4f15d69e380a3454147e41aaa022cb237734896be191102de92509c011b39d6b31304b6443e8ba0092874fb90db911081f90e9e53b66a
 DIST prompt_toolkit-3.0.5.tar.gz 2999763 BLAKE2B 6c4c32583a363daf562d4fa29f697c3d38db1b84130f26167cae52ae90f5b34111a9785ed569d3bdb4c185271ef1a075144d1c53b46184c136e5f1af4713ecce SHA512 fe6cfc7223529b77bdfa34dbebc8f5690ac6a1d0082cbf3f03f49598408bcff082697df1bd7ee427c796fe0c8d73126a965269e77ed0e6f1519b338b464995a7
-EBUILD prompt_toolkit-2.0.10-r1.ebuild 599 BLAKE2B 1f0a4107ffb2aa869633c5ccb66cb72980e3b6e722ec893360483713fbcb657ef11187bac2aedfdbc8927acc541882d9a06529718df501236ddac3516caa4074 SHA512 361aa178206c3e57f38fe65e07f519a2e8577dd0069a50ff8f3cce634572510e3cc7ab15ccde8ef5b4ee8901ddab7deb5f7bf7414815bc764208e54703f47233
+DIST prompt_toolkit-3.0.6.tar.gz 369730 BLAKE2B 84f5f578a6ae5b8dbbf0ca244a2d3dcb9ecc858ffce3ca5e657f85705c9090d32abbdddcadbb8e139d980d87f279d998db874551be93c47b4a740cc3d2e99c5b SHA512 44c47f8f331b7fca3fb9449cbb9ad6b2703fa83bff30274cabfd888c1d149b1f2305f3a08cf53143c86d9889096775e776272ee56aeb1f3664a8399a4eecae08
+EBUILD prompt_toolkit-2.0.10-r1.ebuild 595 BLAKE2B c30f5cbd5592319af4dfa452e8c7e54dea3996375710d0c63cabe9788728d2f641e815f89671ca8cd465a8c97cecc07b8cc446c6762fb1411347aec37eddd05c SHA512 f720ff243b56d393ae3e04c02375f4c5b9a25c2a0f0db3dea33938fcc1f30f83fcf467b33626a70f67ed3f85519d22f7030dd13a6d9a01d331b7ee554ae36109
 EBUILD prompt_toolkit-2.0.10.ebuild 594 BLAKE2B f754b76d11c1ee8b0919afe8da1d5ac2c0945cf710ae3946fdaf0be40901a60b37d66731b662474db8344cc6c1a52dbfa733ae66937a27ea24c12194d5650a0c SHA512 13c1ea9b04779452608c589e5f0a9201d8b0c1524f0bd0274763e54b40e3b0a4ed4383a3054a2f0ff501521440b8460ad934e8b7726292ee24a065a7cb2901f4
-EBUILD prompt_toolkit-3.0.3.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
-EBUILD prompt_toolkit-3.0.5.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
-MISC metadata.xml 405 BLAKE2B df7ed8f078fe07004e09438bdc172fe1b24c4d8c06a82828a59aefc1466675de75bf7e96aa9a2012e912d3568ac87ccd4f7580cb4e56b6652d1228eccb6bec47 SHA512 31fd338e542e320ea3e089f13ce179af94777688d86f49ae68be12b6cb2463e6a5b5ff5270c5bd81d2b6fb76e834f0213a06e5daa3327d0b032a68de5f9da4d1
+EBUILD prompt_toolkit-3.0.5.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
+EBUILD prompt_toolkit-3.0.6.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
+MISC metadata.xml 430 BLAKE2B d305130506a3f60dc1310ad008708b382100142ea6cbb50003b627858b85c86c151d2ba37e32b81f228c4e666be9b6a5d6ce499ac43a3776b113cec43c6c8470 SHA512 8b7f1d7f5a4b9bbbed80f1db3e4d79a7c9142e73790b4723d4ac4000eb3601f75310bc80436b4d1fe898e3468c6f695dc6d88b6570068e7fcdbfd00d19195d17
diff --git a/dev-python/prompt_toolkit/metadata.xml b/dev-python/prompt_toolkit/metadata.xml
index 3ff66414d0a8..2156f3c87442 100644
--- a/dev-python/prompt_toolkit/metadata.xml
+++ b/dev-python/prompt_toolkit/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">prompt_toolkit</remote-id>
     <remote-id type="github">prompt-toolkit/python-prompt-toolkit</remote-id>
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
index 12a2ac5b83b7..7b528c8cdbaa 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
@@ -11,7 +11,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-3.0.3.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
deleted file mode 100644
index a280a736898f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.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..9} )
-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-3.0.5.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild
index ecc349bd3526..a280a736898f 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild
@@ -11,7 +11,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-3.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild
new file mode 100644
index 000000000000..ecc349bd3526
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.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..9} )
+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 ee9b878dc332..ec2b46195a0c 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,4 +1,6 @@
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 EBUILD protobuf-python-3.11.4.ebuild 1557 BLAKE2B 4a81edccba9763452cec9166535bda9bfdef9b65d044d4151eb8f48bda036cbeef61a81cf7ae8dcb35a7df5bc031c5bc169fbf972098aec7f792c8db8e1964a9 SHA512 c3581654a93005e894d071a30a197358fe0643ff0a462a8fe2b21ceb6b27b208099251a3ff61af617c5ff443d0d090c9f2e8744c4eae6d9c8b542465ab4850c6
-EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B c8b0e26305ad406209daa373b09cdefa9755ce3f72e2fba51d24114566519fa7ecad38f1d321b542fef6541e4ebaa74b4eaace6376f72be963b183e4cc28be58 SHA512 080b3321bd3ecbdc7a468d33f04bf24e556cc712e6d7dd2faf1912b1366c2d8fd62f2014dd394706f8c7b7eba654ae1e7baca111b3cd74b1412363d64ad2296b
+EBUILD protobuf-python-3.12.2.ebuild 1559 BLAKE2B cbf8fe7187083fcd94ae6cd1b91dfeecc2462e1a863bf7b227569fb6433de9ac2288017de69747b703f6b7ba339910a59105409f5bb1623d6a34bdbec4e15a70 SHA512 af881934dca2db4fbcd4834621f7e218ab94d33e500f5e3874b014114b43d8fe46c3b40ce5bdce20f1844e8d30853788b56814d32c2dc7e1c539fa7330b917c1
+EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B d3ca882213c7df008b5955062f8ccbdf1a1f4f06ccc4743d6509390cd75bfcf7dc4291357fd8f869d6c141412236befd06ea76e082e46a0e6cad182c58a45d7a SHA512 90e479adde363fbdf6823de5d6efd3709056ae11d9f298f7f1becb6b88bb180569c101ea22d3f75a6eaa5ad7dbfbb90494d325b495a989ce7e6e9cee582eba24
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
new file mode 100644
index 000000000000..83308900416f
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2.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..9}})
+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/23"
+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-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 5fddaadfdf53..f47c4a98916d 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/22"
+SLOT="0/23"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index cff75861d33a..4984711d91b4 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,7 @@
 AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
+AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
+DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
+EBUILD psutil-5.7.2.ebuild 1304 BLAKE2B 850eb9dee1c36230987f69683545c48410e71d81ee48c768248cbe828241c768998032dc31d7ab29a64abc333fee1c57655a50e450199eb23d7ccad2fcbf720f SHA512 fd3f9267611bb3c4e270e1938ffab8ee09e169324e2ab64e7ef682598418574735d40241a21e34047d7bf93d80fec9ec5c46b960391625b5925255143c9761ef
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch
new file mode 100644
index 000000000000..3faaedad6661
--- /dev/null
+++ b/dev-python/psutil/files/psutil-5.7.2-tests.patch
@@ -0,0 +1,112 @@
+From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Feb 2020 07:27:32 +0100
+Subject: [PATCH] Skip broken tests on Gentoo
+
+---
+ psutil/tests/test_linux.py   | 8 ++++++++
+ psutil/tests/test_posix.py   | 1 +
+ psutil/tests/test_process.py | 2 ++
+ psutil/tests/test_system.py  | 1 +
+ 4 files changed, 12 insertions(+)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index e51f8bd5..48527ccb 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -17,5 +17,6 @@ import re
+ import shutil
+ import socket
+ import struct
++import sys
+ import textwrap
+ import time
+@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                 ret = psutil.virtual_memory()
+             assert m.called
+             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
++            if sys.version_info < (3,):
++                return
+             w = ws[0]
+             self.assertIn(
+                 "inactive memory stats couldn't be determined", str(w.message))
+@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                     ret = psutil.virtual_memory()
+                     self.assertEqual(
+                         ret.available, 2057400 * 1024 + 4818144 * 1024)
++                    if sys.version_info < (3,):
++                        return
+                     w = ws[0]
+                     self.assertIn(
+                         "inactive memory stats couldn't be determined",
+@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemNetIfAddrs(unittest.TestCase):
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_ips(self):
+         for name, addrs in psutil.net_if_addrs().items():
+             for addr in addrs:
+@@ -1364,7 +1370,8 @@ class TestMisc(unittest.TestCase):
+             psutil.PROCFS_PATH = "/proc"
+             os.rmdir(tdir)
+ 
+     @retry_on_failure()
++    @unittest.skip("broken on Gentoo")
+     def test_issue_687(self):
+         # In case of thread ID:
+         # - pid_exists() is supposed to return False
+@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase):
+         value = self.read_status_file("nonvoluntary_ctxt_switches:")
+         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_cpu_affinity(self):
+         value = self.read_status_file("Cpus_allowed_list:")
+         if '-' in str(value):
+diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
+index a96b310f..70199203 100755
+--- a/psutil/tests/test_posix.py
++++ b/psutil/tests/test_posix.py
+@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase):
+                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
+                         nic, output))
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     @retry_on_failure()
+     def test_users(self):
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index 987bdf38..cb04f3ef 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase):
+             self.assertGreaterEqual(io2[i], 0)
+             self.assertGreaterEqual(io2[i], 0)
+ 
++    @unittest.skip("fails if builder is ioniced already")
+     @unittest.skipIf(not HAS_IONICE, "not supported")
+     @unittest.skipIf(not LINUX, "linux only")
+     def test_ionice_linux(self):
+@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase):
+         d2 = clean_dict(os.environ.copy())
+         self.assertEqual(d1, d2)
+ 
++    @unittest.skip("broken by sandbox")
+     @unittest.skipIf(not HAS_ENVIRON, "not supported")
+     @unittest.skipIf(not POSIX, "POSIX only")
+     def test_weird_environ(self):
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 3834209f..b07b5883 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase):
+         self.assertGreater(bt, 0)
+         self.assertLess(bt, time.time())
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     def test_users(self):
+         users = psutil.users()
+-- 
+2.25.1
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2.ebuild
new file mode 100644
index 000000000000..9fd49a5a2ae5
--- /dev/null
+++ b/dev-python/psutil/psutil-5.7.2.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=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/ipaddress[${PYTHON_USEDEP}]
+		' -2)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/psutil-5.7.2-tests.patch"
+)
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Not running tests on ${EPYTHON} since they are broken"
+		return 0
+	fi
+
+	# since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disable for CI
+	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index b4778095eb35..948be0c8d3a9 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,9 +1,7 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
 AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
-DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e SHA512 d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
-EBUILD psycopg-2.7.7.ebuild 1543 BLAKE2B 0c39cf7c409657c2954e72456892b53fd0b3714dca06c0527ae24a799955f2641d6bbb190df3457391044520f92955f57b086f6c879a7d57808f5616577a8b6f SHA512 b62576ef8bcbb5dbf863f16d3c4322d938b0ec0d3a43fef70b39177e7a11f9fe07e78229e41caa35976131e93c928c62dd196faf641cde5006e3db829260d5dd
-EBUILD psycopg-2.8.4.ebuild 1825 BLAKE2B 16bb7de2454e41381ce67a522c2efb8e857fb45ec582c7c1f5693fbea4e5fc7c9fee011fe5ca540e14cc008fd9f0f32ecec3126eb2343861728e46d2081ff596 SHA512 939e698018e2444ee896e1454d0705b3295541ae983c11134e8702faf0b06935fce2286b19a05859c27f199576562dbe631f727f2ed0f4ac322742f1622419b6
-EBUILD psycopg-2.8.5.ebuild 1534 BLAKE2B e946a1df34822648f9db4ebe591d4323771d467c38c6914e49be46de198673eb87f14c183e8e6fc75c937e2f8e0a9c9ec650d2c6e626a01a45333a22af70f7ed SHA512 c6a1083e7e0c2b96675a4b66a1428e331330052f76f0ec85747188efc374cb7e3b57314d3d561506264fb183b6567c5d5d86aad8659f7502310c79f3d5d66227
+EBUILD psycopg-2.7.7.ebuild 1541 BLAKE2B 6388fff673f66631cdba8911a16e36e3bd575d2a88c85704297ac7fc6ba4a3c351e54625f459e89f287a44171ea9d1c15f456d55c68e29a30b24c4784e2be1d8 SHA512 b420616a1edc69f2a181651d2e11cffa0dd5896bb239d2e5c9e642540fd9eccc70a764c3048d432c0971f751c8b3f29f92ce86358995614af4ea02d371502851
+EBUILD psycopg-2.8.5.ebuild 1524 BLAKE2B 1402eecade47b0ef53252a7a00b282f8bbac55956b858e0625a5784b71e19a7eeea2ffd40ba87aee963c89437b7413644b719faaf983e1fb83eb351bedd55562 SHA512 25d3d9113ecc63762a1c1916511760d3c9059a1af35aebc533942fcbd0aeae8109c6e46f21da7c641c1c0e1e492f0795b4403563f7c9344bb3ed0eac18546cbc
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index 47078b85fccd..0603fb1b1779 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
deleted file mode 100644
index 0552c717acc9..000000000000
--- a/dev-python/psycopg/psycopg-2.8.4.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=( python2_7 python3_{6..9} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-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:*"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6
-	)"
-
-# Avoid using mxdatetime: https://bugs.gentoo.org/452028
-PATCHES=(
-	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
-)
-
-python_compile() {
-	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-	! python_is_python3 && append-flags -fno-strict-aliasing
-
-	distutils-r1_python_compile
-}
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc/src -j1 html text
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r doc/src/_build/html
-		dodoc doc/src/_build/text/*
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/psycopg/psycopg-2.8.5.ebuild b/dev-python/psycopg/psycopg-2.8.5.ebuild
index 418f438ce30f..7f3c1c0073fd 100644
--- a/dev-python/psycopg/psycopg-2.8.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5.ebuild
@@ -11,13 +11,13 @@ MY_PN="${PN}2"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 7d42915b30a6..cf52953456fb 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,3 @@
-DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
 DIST pudb-2019.2.tar.gz 59548 BLAKE2B 2df98688948ea79b8bbe125735aef04b3ea5d6db4adba503610c3fc88201cd0ae6da3249371f9ef78d1f4650901a02cc25738201e4891695f7726c919dcdd702 SHA512 231663b404e0e7d35f32235c02d4878b41a043054821c3d39d4a05d45c1e45aff0eaffb0a6d96669676b52538ca99a69de64014f922e3c80405d34198c6d4812
-EBUILD pudb-2018.1.ebuild 539 BLAKE2B ec979d5c3967cba0e7cf8a24e2dd611e0251c0729b168ee80737c0c813165e072a029942b86cb3f222f760aaaf4fb323255eaa5b719fa01c7d69e3117cc218d9 SHA512 27eddcff1341b0c5e3a3558bcf2c0a08805cbbab7e4545e5da51a4b40453a2815a51fd0257b9e134c897a30838e98c08a007908393477bbd31ec8f4496f8c55b
-EBUILD pudb-2019.2.ebuild 576 BLAKE2B c297570675de6ddb82781f4f855ab934d39b5b4b439e80b4a8a46115025618f95b968b00561d6b40817a4e698720c87b26d30bdfb08df96c8a1e1127fd733147 SHA512 5ce49e3062e596bb9d5a83631683092f60ed065205433f9c3f2c2ee6b874e900d7ee795519e947dd65a3b367a5b7a84d4f6ef7358e33e6d8971423099c423b0d
+EBUILD pudb-2019.2.ebuild 583 BLAKE2B 39a1ca4bcc2f2fca9ff7347585aade0e39bcacff62d8226131f34c24e5c85534bcf477e060c70e6c70f61913b939c3b1732221b9a89c7e063b007f20ea925d4e SHA512 6a16afc0893e9069127b56b76a3ad60962a9512f81bcacd767e1be40767ceba362ec8cdafc97e5ee2cd3801a233cc9ff56ad19db206c9163645b413efd536f9e
 MISC metadata.xml 414 BLAKE2B 1abe543a64e7bbe606dac8849179cdcfb7320ef31a7af659f0deef09cf34a75ee2c72f208637adc20c41fbfe5103bcb3e917d249db77abc62fb8c0bcb8a168c4 SHA512 a9655f42b68e2268f8e54d6a02bf94206ade7251f30ae35a1d9ed4b466901c3a06fc00178b325f2e8fe26e413c27326b826316b78da62ae6c1c0a256a4a12ff3
diff --git a/dev-python/pudb/pudb-2018.1.ebuild b/dev-python/pudb/pudb-2018.1.ebuild
deleted file mode 100644
index 3218f0008438..000000000000
--- a/dev-python/pudb/pudb-2018.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,7} )
-
-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/pudb/pudb-2019.2.ebuild b/dev-python/pudb/pudb-2019.2.ebuild
index 53fee37bef92..d2037818942b 100644
--- a/dev-python/pudb/pudb-2019.2.ebuild
+++ b/dev-python/pudb/pudb-2019.2.ebuild
@@ -14,7 +14,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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
index 37361424b883..3abc2ef5b27f 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,4 +1,3 @@
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
 EBUILD pushbullet-py-0.11.0-r1.ebuild 1141 BLAKE2B 8cd7760e7d8191d6851d6ba7d0e50c5a622ba11c3b41b4f3b70afef7d60d7c773dcb8f4ba7a95f89eb35ec47094b67fb5a6cf408a822d13adc3308e89a1b5394 SHA512 c4c4bec26bd661aa8be271b22d9f74560175e492e6bdfe5a259a2c17d4abe73ad41acdd8f56bfcc0b9aa0ce6e124f641228b5361f12cbbb0d8c3140ceefd7663
-EBUILD pushbullet-py-0.11.0.ebuild 1130 BLAKE2B 614cf6a5ea5661cfb8748fc1376775c27e8d4d776229e38f2c0f26379fa33e2c5d937d7e31a18b9018ab6a65c4745a6b4e09a60cec7a8f37685a47c981be24b3 SHA512 a017d3919983d68b71b092dbb88311f27cd12fdd590afd36ec17dc45a0af7ebbcaf6ae0d1509a53df42b62f744d71569db99bc94c44a9894e3a81a5f435380a4
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
deleted file mode 100644
index 267422432286..000000000000
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.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=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="A simple python client for pushbullet.com"
-HOMEPAGE="https://github.com/randomchars/pushbullet.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	# skip tests which require network access
-	PUSHBULLET_API_KEY= py.test \
-		-k "not (test_auth or test_decryption)" \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r example/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index cac92d5e2054..9cd4c0996ac1 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,3 @@
-DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
 DIST amqp-2.5.2.tar.gz 117788 BLAKE2B 6a6990aca0a43a0c546198b999d0d3680d6c44908e144f81bd8266abac4d2d9b7ea4c65bbf969310f1236970ebe0ef5ed44cc558109ba1f680348e3ba2789e83 SHA512 c540ce39c06bb947e55b4afc56567d5fc5a82b65a2f7e2cc1f769f96da74f788d14e1e9c02852a259a4980c36a4524f07166686c0357f96219fd9f8612a6159a
-EBUILD py-amqp-2.5.0.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
 EBUILD py-amqp-2.5.2.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.5.0.ebuild b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
deleted file mode 100644
index 22fd77713035..000000000000
--- a/dev-python/py-amqp/py-amqp-2.5.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
-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}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# pytest-sugar is not packaged
-	sed -e '/pytest-sugar/d' -i requirements/test.txt || die
-
-	# requires a rabbitmq instance
-	rm t/integration/test_rmq.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/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index f46d3166039d..b9d6c0463fc2 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,3 @@
-DIST py-cpuinfo-5.0.0.tar.gz 82118 BLAKE2B 94df998e053de04cf7b470799eb7595b5a398bf7d2da6417e3f5f6313a3e1152adfa5ef6a67461cd10d521be88d0a9ccf9495715a23cefb557f673f10dec7468 SHA512 d3a22ffdc4d1668a58330016e3297e57c07f6380e544497b1ad9dfcf0410b000f69418bf1cb9a434a2ffdbc8f17be89a25d33c65817913a823c6e181df6b760e
-EBUILD py-cpuinfo-5.0.0-r1.ebuild 530 BLAKE2B e754b8e37910a0518280b6a5023a46c2da6de338e28e0a3164a86516a25a4f5b5d444e5c08b668dd60430b77d87915d1df2100d2672ca9444cc73299376ae712 SHA512 d159b906e76a897f208569eaf7374b83a25caee689e389ce90ce21bd5e2e7bff6f553e4d74aab7baddc2f4800b2d49843851a9f906d6fece7cbbc037ad5ed162
+DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e387f6e66fffe853ab633e438b4b893489c097211a20ece597a06d3c0cf89d285b5ab34e80029510e86b1a322ff1f06 SHA512 4941a5193cc376a44e99bc82644ec9d7e8f9f11b4e5fb1ad22a71c959959dde7f67290b436dfad2f26c68ef17d08e33538cf80443f763268c503af17b8479438
+EBUILD py-cpuinfo-6.0.0.ebuild 530 BLAKE2B e754b8e37910a0518280b6a5023a46c2da6de338e28e0a3164a86516a25a4f5b5d444e5c08b668dd60430b77d87915d1df2100d2672ca9444cc73299376ae712 SHA512 d159b906e76a897f208569eaf7374b83a25caee689e389ce90ce21bd5e2e7bff6f553e4d74aab7baddc2f4800b2d49843851a9f906d6fece7cbbc037ad5ed162
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0-r1.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
index 5c322340dc0b..5c322340dc0b 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0-r1.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 1f120b3dd067..33afd3c2ef83 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,5 +1,3 @@
-DIST py-ubjson-0.15.0.tar.gz 50111 BLAKE2B e4f248935778f7d0802b5bace155409e47609b18fa21792a8eb16ef24e3ee2eb59d143b039994b4342bb47c20da4539f4d83307f4afb4aeced5c238ea6c7f7cb SHA512 daeb50dfdccf1479a62ad653aaa37cdb0784ff22397e466f7a9af42a1af3165ddd11308b0d8917b96d8a8d4b87040d0789b28223838df826e953acb2e59d3a1c
 DIST py-ubjson-0.16.1.tar.gz 50316 BLAKE2B 442894a7c010d1ba4a836827ca17e7cb10b34a6f5488851ce13a3c3ab02d8173250a664da4504bca9fd2d9377631e249127c789a4824930f8b35db2225902e9d SHA512 5c5e48fa236571832fbcd100ebe0efd7522a8f5773b74475e7b102fadc4e2917549640d12c5afb2aadbe65a6973b75540681da1df8febbf47f84844bc9337fb0
-EBUILD py-ubjson-0.15.0.ebuild 581 BLAKE2B 64437df28e91f93b9de8920cbcb6207fdbc7c9574bd896d5370df2d0d5d92baa1fd39a5ba838939f1dfed7d39e197f601a6c414265703f19cddcc7218363078f SHA512 eb03912e1fce1026ec67750e8d089dc424ff3fe0ef5ec97ff537692588d963b8406a903eb2ce2811266988211434bd2e2bd157cd5f022404ee05100e70763c5a
-EBUILD py-ubjson-0.16.1.ebuild 584 BLAKE2B 2d3e5a8bcda7d6e14b1de75d22c22c38c70e407dbd70893757f7d885194c0da40f9b9a383bca5af2478a3cd4e9ce9f63cc051fd3b4c20f4e7be9580e30148fac SHA512 2ad06c5b56aae40f3e51718905f0a9ed7e5d213891e3606720c70b6d0f4e39128ad3218c08ff25416b4730834148ee2daea505149db3c2e1e1af1ce07f9b23e2
+EBUILD py-ubjson-0.16.1.ebuild 580 BLAKE2B 95a6a69d7cfbddfca08d4dce2a1e38b5136b7d22c8af8fc5ea4a55affd7a237dd73bbe591b384eb08d72f841d23090db1ec05e8d168207572963393b445fb19c SHA512 34008e6cfb2a204b5f62d70b65c9c47726c8c6735ba688877e022880873f766a2d0217770518651b6e551cc473a2e72af151ed703139f5420938715e3cbd6115
 MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/py-ubjson-0.15.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.15.0.ebuild
deleted file mode 100644
index 12d10808c3c0..000000000000
--- a/dev-python/py-ubjson/py-ubjson-0.15.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,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-ubjson/py-ubjson-0.16.1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
index 5afc56e7348d..97aee4ce58bb 100644
--- a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.16.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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 37166487efc3..2203934f3ffc 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,5 +1,7 @@
 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
+AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ede3659c19c08f1c273e3204278620770051603e0c7bffbb47a6b9ecb438f5b7744c0c5894512b0f50877188a6e0 SHA512 ade290d37af218077100f03da5c8ce6e77b93e79317405b9e62059a2c97e14e21e56a11dec7d031f6f2deeff05ce0d6c0c3488535a6d117a02cacc1e18da46e3
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
+DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
 EBUILD py-1.8.0.ebuild 1708 BLAKE2B bf4579b20c2b98910f611fa6c12ae64083e1e274a1062aff8ba528697a16b536e91189cee78ef9add278ff90005dbc7b638f599fe012a6263e1431c05473ca13 SHA512 65bee22f4d16768e8403cf46fa90e93347e29b9850b5a966a437693b2aa26be42140562d6f38a6bab501cd957835293bb0aa88caf5dc64ca68bb06f46770871f
+EBUILD py-1.9.0.ebuild 1279 BLAKE2B b593b7c7e87195d71f9d8dc8f67522a67a8d74d4a84d74559cdaea2530c7e2bc735a1def19cec5f3147d1acb183a3ccd07e5bb5bdc3f85d07f6b22b8a4a7ad36 SHA512 f125cb91420fe2770a5e285c8a0f174ba04ae07e07b891d54a01c29d5a3acf8b4ac7119f88106d759886efb4913da587f4c73fce6f2bfa1ce241b1df6d3c6e30
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/files/py-1.8.0-pytest-4.patch b/dev-python/py/files/py-1.8.0-pytest-4.patch
index d9d5cfa5b650..7d4de73ba776 100644
--- a/dev-python/py/files/py-1.8.0-pytest-4.patch
+++ b/dev-python/py/files/py-1.8.0-pytest-4.patch
@@ -38,31 +38,6 @@ Signed-off-by: Stanislav Levin <slev@altlinux.org>
  testing/root/test_std.py                     |  3 ++-
  17 files changed, 100 insertions(+), 82 deletions(-)
 
-diff --git a/doc/faq.txt b/doc/faq.txt
-index 52cb4b3f..cac83b2c 100644
---- a/doc/faq.txt
-+++ b/doc/faq.txt
-@@ -98,20 +98,6 @@ in a managed class/module/function scope.
- .. _`xUnit style setup`: test/xunit_setup.html
- .. _`pytest_nose`: test/plugin/nose.html
- 
--.. _`why pytest_pyfuncarg__ methods?`:
--
--Why the ``pytest_funcarg__*`` name for funcarg factories?
-----------------------------------------------------------------
--
--When experimenting with funcargs an explicit registration mechanism
--was considered.  But lacking a good use case for this indirection and
--flexibility we decided to go for `Convention over Configuration`_ and
--allow to directly specify the factory.  Besides removing the need
--for an indirection it allows to "grep" for ``pytest_funcarg__MYARG``
--and will safely find all factory functions for the ``MYARG`` function
--argument.  It helps to alleviate the de-coupling of function
--argument usage and creation.
--
- .. _`Convention over Configuration`: http://en.wikipedia.org/wiki/Convention_over_Configuration
- 
- Can I yield multiple values from a factory function?
 diff --git a/testing/code/test_assertion.py b/testing/code/test_assertion.py
 index e2a7f903..4cb39fe2 100644
 --- a/testing/code/test_assertion.py
diff --git a/dev-python/py/py-1.9.0.ebuild b/dev-python/py/py-1.9.0.ebuild
new file mode 100644
index 000000000000..958ce68bf629
--- /dev/null
+++ b/dev-python/py/py-1.9.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=( python2_7 python3_{6..9} 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
+	"${FILESDIR}"/${PN}-1.8.0-pytest-4.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# broken on py3.8, don't seem important
+	sed -i -e 's:test_syntaxerror_rerepresentation:_&:' \
+		-e 's:test_comments:_&:' \
+		testing/code/test_source.py || die
+	# broken on py3.9, this package is just dead
+	sed -i -e 's:test_getfslineno:_&:' \
+		testing/code/test_source.py || die
+
+	distutils-r1_src_prepare
+
+	# broken, and relying on exact assertion strings
+	rm testing/code/test_assertion.py || die
+}
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 9a0635f60c36..6522b4cdcd83 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,5 +1,3 @@
-DIST pyTenable-0.3.20.tar.gz 117381 BLAKE2B 7d2259ffdd16a2eb5a536e13a09920f67316f336712f07ea2b797016caaa14ab05686b75349aa99e0b794e922b87cfbb58806511c05a65a43d6e5adb27133ad4 SHA512 5e610fe3c450de6614d3e3483bf1c8e866f497b1d4bdeefed2854f23ded4707981750a0a3f3571f8bda6cf93b129e62f0bad6d55cd0dc58339dfa2429f57d9ea
 DIST pyTenable-1.1.3.tar.gz 139494 BLAKE2B 292b5f8a4da5a88e0b0f6be8d3dc72601e7218361fabf31afcfd229c1448f82b85b4911f93e34523ea03b69f2d932f03febf0084861d72e37e5c2f2b6ec49f67 SHA512 1998c1d58edcdc75983deef083b9c6d382f144aadc87a5e4be287712a8e07751fcb43ac697c5c7df56b671aa23c769db45d362247eea9456e24b7fa0a1241b9d
-EBUILD pyTenable-0.3.20.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
 EBUILD pyTenable-1.1.3.ebuild 718 BLAKE2B ff9e8b35ed30d21f50676a2b5b89efa5a596b4500d104df29ce2611516a804f3cb2547c320442728596d3d09b60e04b7e886c4bbde2c3acc3e0fcbb6917bfb22 SHA512 eb9938f84132962593db2df9179d3eedd7a8fcb033f22aabc56df199eebd668ba21700b980d92a68e6955b22d28a590e487085052025d9aa8a1619871ca5753c
 MISC metadata.xml 380 BLAKE2B 051d5d76aa2da7bc57d1382fc596b4f061f1c028414038a73ffa977279dd9592c581fb8877e49e8848bc8d44d473f32bd548007b91b259e407e642c5a965e1a4 SHA512 513a84951b784b1c14391c1a283a5d9796d9cb56e178c9ad58f9dbaff3e285c48d45dab6b9fe0fa531cc358a4454e35348c8472e986a43259bef784eb565d065
diff --git a/dev-python/pyTenable/pyTenable-0.3.20.ebuild b/dev-python/pyTenable/pyTenable-0.3.20.ebuild
deleted file mode 100644
index 9218d826d205..000000000000
--- a/dev-python/pyTenable/pyTenable-0.3.20.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/pyaes/Manifest b/dev-python/pyaes/Manifest
index 065c9a5674c5..129af12ef930 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,4 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r1.ebuild 634 BLAKE2B 8acd0c9f3006ef236c9a6fd919613977d3df457bd578f42c2661e5054bb6218892c64af8d505803a7ac336fae223d0ed0dd5ad298123fac2dbea5b51ce4093c9 SHA512 87ab6faefb09b458a3b7ee21452e2f99132dff66f56ee0d3347df35bafb7c8ab410559fb739c1adebc62ca654f202cbf1525dfe3b594885aed5b862766e4d836
-EBUILD pyaes-1.6.1-r2.ebuild 754 BLAKE2B dcf54c8a4858fccf507e13e92890058f16969f9cf06bc95308ded9d44f23348c17823cf8035ed8687912492ae5f2cb61b9915de954af8d5823701692750820b0 SHA512 2edf0733723c2f88ae01989f17b57de1c2cd46bf0b2e03509fe2cf3c79b86b867b5cf4743d3bb1844713af97b9206d53574838061bfce0ea252250793d06dde1
-MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
+EBUILD pyaes-1.6.1-r2.ebuild 751 BLAKE2B ec51320b30099eb2e262dbaa84c5e9c548b72c852d804f0f6e9fe2834205bd7f80fa94f96d3920020f98157aa906e114e8ce7664e087be849e7ebefb644d6bb0 SHA512 3892ef17f16ca33aaaf872614e829fc96c6f8dee96a8521950c8b9e09057da221b0a43aa004fc59ac5715615404fc8b09e6e50de69b3029da3cc2b9893fa7bee
+MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
diff --git a/dev-python/pyaes/metadata.xml b/dev-python/pyaes/metadata.xml
index 0da1301d49a1..c3e1100bcd68 100644
--- a/dev-python/pyaes/metadata.xml
+++ b/dev-python/pyaes/metadata.xml
@@ -8,6 +8,7 @@
   <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyaes</remote-id>
   </upstream>
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
deleted file mode 100644
index c7f7ffbcb3f8..000000000000
--- a/dev-python/pyaes/pyaes-1.6.1-r1.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
-
-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 x86"
-IUSE=""
-
-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/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 0e64197b7170..fb6cd9538fa0 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,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 ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 40396e646dd2..af2c6f72a3de 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,5 +1,4 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 EBUILD pyalsa-1.1.6-r1.ebuild 635 BLAKE2B 4db5cbd9be0c8284c8630d7a787c13789e0ad2eb67801dbdc48a2956e9c6bdc1171027cecac79feaf5589ced5197623fdbf89f06e647856adc16e0558fdeb661 SHA512 ff301a493810864a723ae32ef25df51a8044d3913361a49f587a75dda942eb5668e40becdc905d3613dd56df35395e7c07de6a6021efc6e5e64ff03f040133cc
-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.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
deleted file mode 100644
index ec712e155458..000000000000
--- a/dev-python/pyalsa/pyalsa-1.1.6.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=( python{2_7,3_6} )
-
-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/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 21dedf3146f0..6471ba1e3712 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,5 +1,3 @@
-DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.1.ebuild 818 BLAKE2B 8af7817a881c79f9126e3ea0c03e90d864999474ea747b853d3c35d0d3575506206d90330831e36c1f6771fdd15947056844704f224589dc9f1d5d036379d341 SHA512 0a2db7b9db522249b36c2b9e22dd50d450a73e731d62c3679cb69392991870a6b4dae8ff2f018ee2aeaf11fe768a08eb2148bf71ec5ca8e9b262bd86eb69f5f8
-EBUILD pyasn1-modules-0.2.8.ebuild 786 BLAKE2B 1598c534e74a0067502d2a8420120c82480edaa12123a31cf904f1a53b376d48f4643450ffd1f162829e0757b0ab31efb12d4ba8d50a868737040dfd266826b8 SHA512 9fbe15423db7135d46c22cdd6004f8a0e24fc37630bf5203368a07239464cc0055fea58ec18a9df54a816e60b42aa27b0df10bbcfd227b4e33e2dbb296e5f1e7
+EBUILD pyasn1-modules-0.2.8.ebuild 777 BLAKE2B 664a6c0aa856cf5795ee6af36dc2b4167b3bd7edaa6cf8b500a3f2f7b18b0dbfd205ac0d6305d110ed5b652ed1112b2a377dc15b925198f6991be3ce45622453 SHA512 470a607a82c5bd105470c9568eefdfff71ec9f73b6d0760b6c22854daaec9188c00447976ac02cced7bded32ade6f91a72b46e562d2bf9fb5cb7dead45d113ab
 MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
deleted file mode 100644
index 2d92c5a8f760..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.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,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://snmplabs.com/pyasn1/ https://github.com/etingof/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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/pyasn1-0.4.1[${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.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
index bb803bdb113d..c50ac1108988 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8.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 ~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/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 118d55b0509c..215cbd3d5eaf 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,8 +1,5 @@
-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 1237 BLAKE2B a38fc79ed6a72966f011a7a6f7c9c18f95c8dd5d4457d08a41033a342defbe9683f3d8e8e006daf32d3ae38f2385b6066c08e8c6cd03900023427eb4cd592823 SHA512 71e9d3afa08515d0cb35fc85df73fb8a02ed136956f7b81e290c8f9ddccc52cf76b87d8b492a0a2eceb0fdc2aeb070029ff0362910f64808b8be7fdd5bf5704b
-EBUILD pyatspi-2.36.0.ebuild 1239 BLAKE2B df692da1cb826147401e5673fd3b1fdab3ba497ce21444871e0dee54b934bb1ecb1cc0ca3f44ea58cfa3711ff214f4f4b93c7eb434675e4497c9e537a2020b65 SHA512 0022a6e95ddd89bb28126f65d2ce7c9c799bb61ff9ada9c98f357eed7e4bca4ef21974c0a172eede13f7592c3643c7cee347aa377e8ca2d9a3a6b65db1f5b89d
+EBUILD pyatspi-2.34.0.ebuild 1232 BLAKE2B 43516e905b00fbf3686785c5f92c7f6687e8ad7675a81b515a34ef32c4aad5778c8caf28f4eaaaf1b0bbf56eb1c71517ce274254ec574c46d9c4d2e5cf57bec1 SHA512 fac094885ab5740b5dd759cd0fb32e98d412074df535797877ef09d884865e0c58eff5d454144d30fed4a0711d99bbb6d6de918590751ec7c68230654c457bd3
+EBUILD pyatspi-2.36.0.ebuild 1364 BLAKE2B 32d21c209bab222a89310ba3913d13f31637f3d50fe64ad1834e9c02bbbbce870b2f0337c97460aea5cca535fc3f4461b0c57d2ee37712362f4aca30eb867e6e SHA512 79b4200a1494060b2678c87347cc68d3d69b1513760a814f7bba0b90c63e0f7ba35587bbabe4fd49d445167129308ce2e137acf2979e2a6de768cf597c0dc710
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch b/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
deleted file mode 100644
index 423cd644073c..000000000000
--- a/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4f10a696002179082e41568b5109400ac8478a96 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 10 Dec 2012 04:52:03 -0500
-Subject: [PATCH] examples: support python2 and python3 syntax
-
-https://bugzilla.gnome.org/show_bug.cgi?id=689957
----
- examples/magFocusTracker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/magFocusTracker.py b/examples/magFocusTracker.py
-index 47efe00..7ca3b67 100755
---- a/examples/magFocusTracker.py
-+++ b/examples/magFocusTracker.py
-@@ -282,7 +282,7 @@ def main():
-             startTracking()
-         pyatspi.Registry.start()
-     else:
--        print 'Magnification service not available. Exiting.'
-+        print('Magnification service not available. Exiting.')
- 
-     return 0
- 
--- 
-1.8.0
-
diff --git a/dev-python/pyatspi/pyatspi-2.32.1.ebuild b/dev-python/pyatspi/pyatspi-2.32.1.ebuild
deleted file mode 100644
index b50265f49f9a..000000000000
--- a/dev-python/pyatspi/pyatspi-2.32.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=( python{2_7,3_6} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-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.32[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-)
-
-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() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.34.0.ebuild b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
index 61f12303c971..911087e56693 100644
--- a/dev-python/pyatspi/pyatspi-2.34.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.34.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 gnome2 python-r1
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 0b7083708f43..3e2dd64de8ae 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2 python-r1
+inherit gnome2 python-r1 virtualx
 
 DESCRIPTION="Python client bindings for D-Bus AT-SPI"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
@@ -14,7 +14,7 @@ LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="" # test
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}
@@ -29,6 +29,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	test? ( sys-apps/dbus )
 "
 
 src_prepare() {
@@ -37,13 +38,17 @@ src_prepare() {
 }
 
 src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
 }
 
 src_compile() {
 	python_foreach_impl run_in_build_dir gnome2_src_compile
 }
 
+src_test() {
+	python_foreach_impl run_in_build_dir virtx dbus-run-session emake check
+}
+
 src_install() {
 	installing() {
 		gnome2_src_install
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 69f79577b9bc..b498db221376 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,4 +1,3 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
-EBUILD pyaudio-0.2.11-r1.ebuild 1093 BLAKE2B ca1c3c159c394ecfe93e5745087e29945dec0eb50c7ec1b4abd1b985c3695a3a5a3afcf267ccd7cdcf03af1e2d95b10150ffcb5ae9db823f3cd13e94f62d0a85 SHA512 5d88f5670e4a07c53a54a2cd0d055834c4aa12342bcf82404cb1fda2911770e6caeb30e4b1177436eabbdd96ea0d69b7c0e6bca5d02eb95a7627c14cbb804199
-EBUILD pyaudio-0.2.11.ebuild 714 BLAKE2B e85bec919b9580f89a925ca7d6d8a75a64880cd2e02f51e40a4e4245e636d325bcb5db482e8cccee94138f8e3ac9f5d05b67fe614237c170ed8d91f1268bf7e3 SHA512 2e8fb5536930ce0bdf888b54c3e12f0758aca3aaec1969a5c47868ae360a91afb61de16e228dcaf70994ea7fc71cbe10cc3380e1a7d00ed2c662669535bc1ff7
+EBUILD pyaudio-0.2.11-r1.ebuild 1091 BLAKE2B 84643d1d5b90ae8f00930ba915ada845dfff31b4ec522eacf4b0d76dbcee124f0920bdd19f35a85fd1cfc56975db19529f982eb5a2038ffdd08444945b461532 SHA512 6c02a34d317368e5a84e7fc37366a5f8917f4398f71c74fdf690beab72682255199fd3d2333ac3cbb8ce66f6484699a34f01a81b4e3f2a80f9b6ebde557f0593
 MISC metadata.xml 598 BLAKE2B 21f9980ccef4c432d1191c9917405468d75b0e9a18895e70dd7c9abd8db14fae0142ef359e63816d6ff7bfad9a054118142d1b5e0a540a4a0c04e795ba290a93 SHA512 d6d33616d6f1dc38e6504807d9b4040d052e4c96099276dd8b6b5c456dca4a7dcf24f25f13813625a4ae139ab2fee68156cff696ec5658753bb282a260f17955
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
index ec8e831d71f5..e7b0381def76 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
 RESTRICT="test"
diff --git a/dev-python/pyaudio/pyaudio-0.2.11.ebuild b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
deleted file mode 100644
index 248a4891ebc4..000000000000
--- a/dev-python/pyaudio/pyaudio-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,7,8} )
-
-inherit distutils-r1
-
-MY_PN="PyAudio"
-
-DESCRIPTION="Python bindings for PortAudio"
-HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="media-libs/portaudio"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-S=${WORKDIR}/PyAudio-${PV}
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 9f54a6a6301d..79f912d8e8c6 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,3 @@
-DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
 DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
-EBUILD pybind11-2.4.3.ebuild 478 BLAKE2B 67d1ceb0003ce620d43f0a33800d5b9718a1a48d00eec456e88b63134df36dca5ab246e08efeb8ee1991f30dd3a6ff0c12a4f35fd156cf92326954448ad83c22 SHA512 4f8965e2cd685936d76ec5e131af307a919e72ba1e8d845993b3c5c6d1f203927bc2127a389658715d88fb208f5b3f5ddc7b574272cbf0e3130e3a80e1930e7e
-EBUILD pybind11-2.5.0.ebuild 1305 BLAKE2B 65b14a85077c4c3254f497380a59ee8fa3ecc2e995f214d3aa57754e68d7f67ddfcf94f2be5df6638504bd81d71257acb719346dede21c63c0da846ec4f00a33 SHA512 a1514c9d8f8b3d041cae951ef8acf8e1c3c9c35ffedf071ca8a04d63a64a7fde2e94ee5215e18f618b6539cbbf225309a4623e75bd255eb8c04cfc1b7dbd9fb2
+EBUILD pybind11-2.5.0.ebuild 1303 BLAKE2B 8de7024e7289b6b0f087d832152f4cc0b733d8e445d7c587f4ac366185ed59aca45d76d4a0fef53262234e002c2cc0564339f512aa940afbd8812c60cea2929c SHA512 29de39860e46956b71ef265207ae197608f7a6d867ecee3c75300b0bb13df58acb84253d7885102d0eaceb278d330aecf745a080f9f9e664e4de46d6975e0530
 MISC metadata.xml 348 BLAKE2B 06ae224547d14422e51d6e07615adf51fee22afcde2391a4483a8e1937b932a4268f0b31b94d4df12bb06804101b0e6b51614f0ffcb601a4fa34616dcc939377 SHA512 02a7f6afd867bf9f7832a9c8b2d1470be6b1fd537ae8f9509143bb6acb3af75c1eefa38b330bad6aa5e2c37a1158b4b0260277c6307a9b97d144d6c3695a855b
diff --git a/dev-python/pybind11/pybind11-2.4.3.ebuild b/dev-python/pybind11/pybind11-2.4.3.ebuild
deleted file mode 100644
index 44b91dbec22b..000000000000
--- a/dev-python/pybind11/pybind11-2.4.3.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=( python{3_6,3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://github.com/pybind/pybind11"
-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 ~ppc-macos ~x86-macos"
-IUSE=""
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
index 338584b79ec7..60f04a27366c 100644
--- a/dev-python/pybind11/pybind11-2.5.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index a14ab2f3a958..66143383a86d 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 835 BLAKE2B 2bf5a8e3923698bd73c4a09abb0308e5d15591ed032c56bbf3c5003acefc6b65d13d373b91f94491c9a2b91b415a60ee968face27ac5c0b2cb2ac4084128b2d4 SHA512 9efcd673ea2c063adbd36cedc1d1e34c18bab7054803b1c46977ff88b368f22fcf8a908071f33aa6e168c8289598f1a95a3110d2499b07689df7a25eb1920ffb
+EBUILD pyblake2-1.1.2.ebuild 831 BLAKE2B 30dfa5c89a8a1af2b98e4a764b4a801c85cffe4d9ebdcf9283e1db320053380af34abc6f665b5606c22cfd498869308faeb2200029f3cd116a982c5933462bb4 SHA512 4bfc69c337d924a17021e0fae9d0bdc6a870d63d52dae54b1eab1688e6eb6479a01a5b98acb42a21c5aacb5d9e06fc9d98f78a66222eadd4ca4342825974b523
 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 579d3650468c..6c3037293320 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index fd56b81dc16f..c0d3dc763287 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,5 +1,3 @@
-DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69d2eb596161a3c52764dad64ec2e3f6c5b8c1eedf2bcc463de781e60bcea84413866d10e47e742851bb23f43 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da
 DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
-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
deleted file mode 100644
index 6aa45aad474e..000000000000
--- a/dev-python/pybluez/pybluez-0.18-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=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="PyBluez-${PV}"
-
-DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
-HOMEPAGE="https://github.com/karulis/pybluez"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-DEPEND="net-wireless/bluez"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-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/pycairo/Manifest b/dev-python/pycairo/Manifest
index e2ba5db8f984..4131d734efaa 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,5 +2,5 @@ AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb9048
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
 EBUILD pycairo-1.18.2.ebuild 1170 BLAKE2B 417a4ef2d7d9d89b9c39931007a9b41eebe49f1184f967c536d2816847c521523659ceaf02865b0093b02c09109586213e9fd8ef21fc234f291c6fff51ca895b SHA512 e9aa24118efe4d0d8b456e7c8a7bff9cf7408a23bff1559f2c44f463ad97ceecfed5c39af90397ebbaed5de430f8fab3cec02d9d06319960349068cc38001840
-EBUILD pycairo-1.19.1.ebuild 1167 BLAKE2B ec7f7443d44d189c15c8bac9cb19c3e74fcd6ac765833734078a1050ebb14774179b60a5dd92b326ea74fff6626c062fb7afe076dd0b0fb36112ab6e34fc149e SHA512 41f22e0c13532bf8ee42c62efedc29ef3a6dbe1f71c3149a32fdb37012a385e72a9632a4fac6e2d16935ad3bc9fdec346148c8776360c4d460cd654983a5efc6
+EBUILD pycairo-1.19.1.ebuild 1159 BLAKE2B 54c569d55ff94e0af8d810e1eb23acb9b1618efeb9a67bace79688920ebdc98d6ae01ff7170e67327f9e44f1d8bdd6a37bb009c72954475d627bb25e371a27ea SHA512 8612efb9fbb3e0b37a467748ba6063ec502e493d3a3b93bedf96c3f8ddb175180a09615fe53c90d48bf6130eba9dd1077144e849645232453148b754450103dc
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.19.1.ebuild b/dev-python/pycairo/pycairo-1.19.1.ebuild
index b05ecffc14d0..8891e2387526 100644
--- a/dev-python/pycairo/pycairo-1.19.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.19.1.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 ~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="examples"
 
 BDEPEND="
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 886bced18d7c..9d9c5f4cd74a 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,3 @@
 DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
-EBUILD pycares-3.1.1.ebuild 667 BLAKE2B 78994dea8d648e35d75b259f373ec0546a5ac7dcf9cce683eaac173455900ec7f9ba5f819481ab25835cf2f35468e809134d12490923f3a9ffc9d830c244ea14 SHA512 d5d868966d477db694aa9c21bddac7352e253ed912c54246bfeb70e713eee43becda041232c66f8c4874ba900a5a43eb18e3a05b7a42ff2ac74e9f11ddacc724
+EBUILD pycares-3.1.1.ebuild 666 BLAKE2B 89610536a1ab137b9a558d1e7e9402da1ae0913eb38d9d99ff7fa61d4cea2006542e6d404b59c86614678bc5d54baac44d5f5b135ff47eb55b1bf81ac74d9422 SHA512 b8d0e5da76dd8c322c505a603a29844a7465e2506c5f7b5e1fe7e49d8d557e40633fb5af1bd041c86b4152b986adb505786eb5959e0d6d85823350540507f6fe
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-3.1.1.ebuild b/dev-python/pycares/pycares-3.1.1.ebuild
index ea6355aa885a..89c387112e43 100644
--- a/dev-python/pycares/pycares-3.1.1.ebuild
+++ b/dev-python/pycares/pycares-3.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index c12ebf944cfc..8579b0f5c8e5 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,3 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6.ebuild 491 BLAKE2B 5c6ad932465542e8f7475fdb400e31be972d10eb3dedc3d15f54d25a7c55c01134843fee997d21f0f58e22fddae032b100c11639e2b9ea1b0a7ef7a1e819109c SHA512 417ef241a053dc4220003d40da47e2ff0796fb8059cbe90abafcc63393477236b7b7315649cf0206aba4190b46643cf137c59acfdc34bb5c0b64381266e3e9e1
+EBUILD pychm-0.8.6.ebuild 485 BLAKE2B cb4ac224b69437c755c9b5ea10be2b7996f3e4bf0624d4923701f98380d62aae88bfb4ef8a8fba37fb5305f6192f19626bda1bd28abd8a24af244e6c222e6759 SHA512 fe6f5f874bf081984594ed8368fe798674c4fee2d9744531ed30c64a1d3a4a40b9aa29775a53f5544b0731948d70ff8b736124d80b10d49ae463d0ad5aa62572
 MISC metadata.xml 981 BLAKE2B 94814a08cf697f65b50efcb43de52d9271f75bda4b058cfc6b5010cf5a159f1d48add1c305ca4318aeb7993c9e689ebe09ad0c1fbc0eb485ad58868fe427428e SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 0a1ff711e519..7857355b68a8 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.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/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 9a6c36cc65f3..a629212a0677 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,7 +1,3 @@
-DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
-DIST pyclipper-1.1.0_p3.tar.gz 53353 BLAKE2B 1e510ab97ef98b83c763d4bc1154eb32f94bb035823ddcffef09fe32861c2384ccd6ffd29e5a31c0cabf71c801dd90d0176a68e93c6c2e2c9bff03c2be3fff33 SHA512 0b3c3f18593bafedaedf8a91411ba5d3d1c2ac55c949bca21e3a527ca0930eae5ea033a0f57337573a1106e2871a50dcb0176b959b98ad8ac58636c6d45f94a9
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
-EBUILD pyclipper-1.1.0.ebuild 697 BLAKE2B eb94f08accf6b67bd82bcde3b794e49daaec73c905937bea4f31ec03446b8b4d3f72298ab1e891d79fbc260588ec47eb3e629774cb875868c22dd88688cf1355 SHA512 fd81e4272d19c9b9b67a3cd74a216ef84e9af8150b176235bfa320cca385fc9603e143b9f079591943cfd222e679d1207a11012cb6397732c8e9577ecf3dec4c
-EBUILD pyclipper-1.1.0_p3-r1.ebuild 787 BLAKE2B 467902dc039d84eda5ea972da3476ee3e7d87cee5a870cdf7b1911241ab20694ccb3d15cc83740e0baa1b88543028d0477a523ef8e03148e7e3a17f235ad90ee SHA512 e887c57691cb41f3866d7401667b6ef5a5a158d14f38ae58863d9938224e1f1bc158c1dbcc981e739380238d07e9f443fe9cb264f1ac7681ad7c2037a12e7b5a
-EBUILD pyclipper-1.2.0.ebuild 787 BLAKE2B dc824b271b64d1b045c81e8639f5a814d14c847dfaa6c5461f218fbdd6b5a8fd7fca17284f2b380a38b08e70a07637c5c40a31315e4c5da0e2df02d9306623b9 SHA512 0ff63d3385d381168d90c0641ac56e64a599b049a4c52ed0550f5a69ec72cde7477ecce0153ed88c8110ddafd66563f8d9f18d2bbbff4d67224562ad8a6a1d21
+EBUILD pyclipper-1.2.0.ebuild 785 BLAKE2B 67f03202582d1a1ac8ca2c5c3c362a3b2f95b7e5a908cb95487819b86fadf005644594d125e24688298045248718c0ea457e3d49a4077d7e7a9e4e9b6e534cf4 SHA512 662fb5a0965b70505ae34f04425a626835865a5da79743147e7637128f1a96651a3ef668ef9406906d85b0f1c836230da594c26df12b70ea5bfd0cbba81c7609
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.1.0.ebuild b/dev-python/pyclipper/pyclipper-1.1.0.ebuild
deleted file mode 100644
index 6790a573079a..000000000000
--- a/dev-python/pyclipper/pyclipper-1.1.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=( python2_7 python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="https://github.com/fonttools/pyclipper"
-SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-RDEPEND=""
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild b/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
deleted file mode 100644
index 9ba221fb3ab1..000000000000
--- a/dev-python/pyclipper/pyclipper-1.1.0_p3-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,8} )
-inherit distutils-r1
-
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="https://github.com/fonttools/pyclipper"
-SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/.post}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
-}
diff --git a/dev-python/pyclipper/pyclipper-1.2.0.ebuild b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
index 3efd8d8de2fc..a22373180237 100644
--- a/dev-python/pyclipper/pyclipper-1.2.0.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 2fb0a0cbaafa..d204cda8e33c 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,3 @@
-DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
-EBUILD pycodestyle-2.5.0-r1.ebuild 1130 BLAKE2B 130e4b41354b1a24331e91b9406a47752a3c8466973bc90cec38973fee2e235f41d7f9abc86907b723898a72b5676709f1bb204bc6da845f0ce78fb508f21560 SHA512 df471dddd80d5b9a4f63f0e5a0c29167be7956f51448b73d0f88946c690315c0757d09b5ef6c684a366444723a94be9dbd9d66eced6e1ad079a492a5d8a71be4
-EBUILD pycodestyle-2.6.0.ebuild 917 BLAKE2B 1ac03da246e02b994e95d30c7dbe5587f946a30cb58df71ead85edd15418e0d7db5e1fa81b553419698216d73522fa32b54166b21a301d2971c6372d537d248c SHA512 140bee85417c6a1fa0a5eaf524cfffdf717792e45b79364da3b4f39d1ad481e3ff93ef6937d4d43f0aafe9c69c013aad0728989db8c680425d7d02b25ba96b98
-MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
+EBUILD pycodestyle-2.6.0.ebuild 908 BLAKE2B b576b89f64d10a9ccd97da866076b13c45cae967160fba572812d9b7fa88a53a5d68551828da56415fe9afe3b0a6c7c5bb4caac33dc66b9b668d358e12964ec7 SHA512 1f8db0996c51ef2df5f24b708bdfd7628c7ef73d3b8c135cbbc1933cd69a4d390320c08234759a14b9d4eb837916951f99689372f3fb77099cb223e6b7d736b2
+MISC metadata.xml 360 BLAKE2B f3f8ecb3bc2ed8eab2e2283967a5a7a94a5149302e8651e819204810bfc7fe43689f0b1c35824a737fbffbd5967845ca089a539dcd0b50704b6d5a219e3406a6 SHA512 2364901eb99136d33c8343c14fdd7d0f83e6328c311a5a8395068724a2d15d8dc6c6ade8026336ee92cf105e589d7fc960780f70c938f67f48c797503a956e5a
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index 9771dbcade91..27bc28dc8541 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -5,6 +5,7 @@
     <email>klausman@gentoo.org</email>
     <name>Tobias Klausmann</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pycodestyle</remote-id>
   </upstream>
diff --git a/dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild b/dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
deleted file mode 100644
index 930d7e76b424..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.5.0-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=( pypy3 python2_7 python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-"
-
-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 --max-doc-length=72 --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.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
index 686651f93a4a..6c0936b68e1a 100644
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.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 ~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"
 
 distutils_enable_tests setup.py
 distutils_enable_sphinx docs
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 49a0a5208eff..b378811ced69 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,3 +1,3 @@
 DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669
-EBUILD pycountry-19.8.18.ebuild 903 BLAKE2B 66186f5d369ebe4785d73c89313f17f1cb3a1748cc8e561ca16399313a90fc79a59782ff1738b09be252c5187eb80f18c6524e0fbc6a1ae499ee98b51b536650 SHA512 8059d73a4624e61fda29fbb72d12d35e5ff6d73f787be7b01fcb8d5bbb0c01470f753b7883cf5b7012f23bd147f87e23d21220ccceb4037bda86d266200cf3ee
-MISC metadata.xml 516 BLAKE2B 8e3dabec1ed6b181d44db184d87d2a7b05bef670aae39e71bc35c8d3fbd8e606c929b4b7abe5b8d6d8faa69ca373238fbb8c31d40334ef87d8ff6f07ea1c6f53 SHA512 901c2f02b6dcaacbaae30e82fe886b104051a434ed4c079443a77f5b474cef24f16f658cbe7c01a30966126af78d7950f65207bb8b16e2e1c9bfc71bc05d0c3a
+EBUILD pycountry-19.8.18.ebuild 902 BLAKE2B 80b782a69ee57cbd3aa573eb92ffc7addb6f9e793c32870b7e8a61543a78a9542264f7672b0b2fd3db9dfec58856dea5e8a0936cbb1f7206f01c660ff99107b8 SHA512 0e5b22e1fad3d0ba447ff6596c549c3e6270cab301b53b42df8ce34e80e4af12264f6e4189af68fef36920464c0017689b916d27231b4d721f1fb888693f8b6f
+MISC metadata.xml 515 BLAKE2B b39316b60d9676dc4fa8aca9dee6234fd8544ccc98799c66b62d3f238bb3a54e18ec723b4f3dab7b6b075175f864793e79d761362c83fc99a3ba3160214d6611 SHA512 850daa7c8f083a51f534d898469cc6166f632c5081d4a8e1988787b2f562465464dddeb349c67294b22858e517a1766dca60c14bf1df4ef7c488ad59b913756c
diff --git a/dev-python/pycountry/metadata.xml b/dev-python/pycountry/metadata.xml
index d3c69a8b0ffa..f046b0f72b6c 100644
--- a/dev-python/pycountry/metadata.xml
+++ b/dev-python/pycountry/metadata.xml
@@ -9,6 +9,6 @@
 		their translations</longdescription>
 	<upstream>
 		<remote-id type="pypi">pycountry</remote-id>
-		<remote-id type="bitbucket">flyingcircus/pycountry</remote-id>
+		<remote-id type="github">flyingcircusio/pycountry</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild
index 0ce91bc3e4d6..e57b6a53ee05 100644
--- a/dev-python/pycountry/pycountry-19.8.18.ebuild
+++ b/dev-python/pycountry/pycountry-19.8.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
+HOMEPAGE="https://github.com/flyingcircusio/pycountry"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 71b023a8a6e9..5aaae98b8eb8 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,9 +1,4 @@
 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.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
-DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
-EBUILD pycryptodome-3.9.4.ebuild 1476 BLAKE2B 9cab4ddf6853756aa114c6ced6037c135320169548c7605e33c2adfb865bed5d72b8e81345dcfde5817922d037001b98fb181c011c9d2e011f3e6f6e153aaad3 SHA512 a7bf5e4dfd64cb10a5dfebd1695d015c56fcb602f6a5a8ce80ba43f036e4f0df02d8c871fb7766e77dd844c223e734a973cdb8bd5b7c5a35c7d68264188c2f8c
-EBUILD pycryptodome-3.9.7.ebuild 1332 BLAKE2B 919318590a20e2cf4127ac509611c7ad41c8a569341eff817e54f240694aa263ec26b995bff9c2d25a25761e371055a8854f63b0aa24aa90b3a9b31033cb6ebd SHA512 0cae21615849248874f83f36d6bc55354d0c2ecba39d20a30c3488c37ffcf84c11807bbca64faa871b8a5c0bcf6402045f0332d53bcd48d41ea5dd3bd2a7506a
-EBUILD pycryptodome-3.9.8.ebuild 1339 BLAKE2B f179600a7b4cacb2ea5ea1f6f55466b548bb163ef9ca532f9fe67c359ebd3dc8b0d2b94b5f6b5c56e52184b0a2e8c18f28f3c868189e11dd963d7be1679d83b9 SHA512 af9134a206c03537c43ad478b25103e870e81f82fab1a67a36f8f41a37e20aa0df1a44ba195a9a4bd9d1cbf9ca31bce5cf2a54c90ad966e34ebd7696d9bba367
+EBUILD pycryptodome-3.9.8.ebuild 1330 BLAKE2B 97e78373d4e5d2d7065d0ca60fa8374d225c48ccf89b51fd51d8bbd68897d5ed37ba237f346bd9347a6cdb3204b5b7b43a28426fa593e3d039259a4664ac4e60 SHA512 3596bf56db6f47c1e9c0ce9568988566a858541128e2962af886d1260f059a6542ec5588bf651c343db73a42e483b64e44ab8fdafacfdd6aa6f53cd46dc1df4f
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
deleted file mode 100644
index 2cfcaec127de..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-index a2109891..44d2e532 100644
---- a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-@@ -626,6 +626,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-     def __init__(self, wycheproof_warnings):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_EAX.py b/lib/Crypto/SelfTest/Cipher/test_EAX.py
-index cdd0e85a..546186d1 100644
---- a/lib/Crypto/SelfTest/Cipher/test_EAX.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_EAX.py
-@@ -656,6 +656,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-     def __init__(self, wycheproof_warnings):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_GCM.py b/lib/Crypto/SelfTest/Cipher/test_GCM.py
-index e3a7a3da..71ea0d18 100644
---- a/lib/Crypto/SelfTest/Cipher/test_GCM.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_GCM.py
-@@ -828,6 +828,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-         self._extra_params = extra_params
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_SIV.py b/lib/Crypto/SelfTest/Cipher/test_SIV.py
-index 38341e14..ab588adc 100644
---- a/lib/Crypto/SelfTest/Cipher/test_SIV.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_SIV.py
-@@ -456,6 +456,7 @@ class TestVectorsWycheproof(unittest.TestCase):
- 
-     def __init__(self):
-         unittest.TestCase.__init__(self)
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
deleted file mode 100644
index 9f5c1a64a108..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.4.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,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}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-	# https://github.com/Legrandin/pycryptodome/pull/351
-	"${FILESDIR}/pycryptodome-3.9.4-tests.patch"
-)
-
-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
-}
-
-python_test() {
-	esetup.py test -vv
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
deleted file mode 100644
index bf92dd941db7..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.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=( python2_7 python3_{6,7,8,9} 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/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
index 43e92f7ffb38..fc32975c8f9e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.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/pycuda/Manifest b/dev-python/pycuda/Manifest
index 0965c15c71b0..64f1a8db6757 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,4 +1,3 @@
-DIST pycuda-2018.1.1.tar.gz 1612853 BLAKE2B 7afbcc33891da96d726f07f1686bfb9a28b4a5ce3dfc754707166556153f91a0fbc3454d50ca678ac56b71e8dc15e8f7b797e8ff025e42aa9eed2eaaa797d952 SHA512 cb93855cf3cee6650ba0564bccce73c2f59ecbd579235eb3623ec32dde8d9247216e756b1342a876fc7d37c0159e741f5f626a86f2e7ab11c4b03c7a4e581a28
-EBUILD pycuda-2018.1.1.ebuild 2341 BLAKE2B 771004c137981e41e4b154b4ab085456e27e8e0b8cc91087ab88e7ef35bbdebcf8016266bbc13542a8af70855a92d2e568b3927e7e3e8b52eb18e26b41a9ab29 SHA512 27f3e4ea5ecbe0c79e2a9c3b2997f6604f09148394572e5e553450ea806d48e810a34dae6f74f7b62319b0a042dcac3c40d18b9d1e8b34e9809b94a18f79237f
-EBUILD pycuda-9999.ebuild 2389 BLAKE2B 23251e6d3c82c83551cd5544dcfe85141095ce2b873f9172dc49b0d5ae1b3e1e3919710bf92d62bcd6319ef28a0fbc85ee59d98525da29f9e1ef1f76e7f6959b SHA512 d4112f21be7938a65d8017e15f0242f491fb63460743c450b5fabc3e5e061db1700d74f3c383459032284f73a42dfc07ae0bb96d63b5f49a251c110ec47f031c
+DIST pycuda-2019.1.2.tar.gz 1584807 BLAKE2B 3250430ad626b28242ff44ab9576cf1f5ecf77530e789470dfebab324de95a735c0f56e67134891bace44b1f9b7a25133ffcb74c652c6568c5afedce26907fdb SHA512 22829daa5923342eec400a24342b1d738226073bb676476e4af97629d9311426b5d2465e60811696e55401568b90e152ac96d877c6262c416099a609862db742
+EBUILD pycuda-2019.1.2.ebuild 2218 BLAKE2B 62f3873bbe41dd71244c6e932d456a8d1d639d329eaca98bdc1f56b950709adf1c15ba8cebe591c2d6e0b0aa616e1fd073df6f4f550489ce7a29e61226361e23 SHA512 937aa73edb46c0ca3654396a81b672c9e726f11150fed17abd0ff011628dae286224e4aead5636fac9cd5d9dfc564c5f4cfa56cb911145c2bb1520eba75d31a5
 MISC metadata.xml 332 BLAKE2B f880a8d2cdbe4271dc2f1e91c32419420b22e00c0d358832614aa970e95d979b10661953b35dda0b30a23d36b995364464ebd3bb1a862a34f33e7a84fa9b8e84 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c
diff --git a/dev-python/pycuda/pycuda-2018.1.1.ebuild b/dev-python/pycuda/pycuda-2018.1.1.ebuild
deleted file mode 100644
index ddf5f6037bc1..000000000000
--- a/dev-python/pycuda/pycuda-2018.1.1.ebuild
+++ /dev/null
@@ -1,83 +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 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
-	"${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
-	addwrite /dev/nvidia-uvm
-	addwrite /dev/nvidia-uvm-tools
-	python_test() {
-		pytest -vv || 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/pycuda/pycuda-2019.1.2.ebuild b/dev-python/pycuda/pycuda-2019.1.2.ebuild
new file mode 100644
index 000000000000..054b9a6a5165
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2019.1.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+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}"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv !test? ( test )"
+
+distutils_enable_tests pytest
+
+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
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}"/usr/include \
+		--boost-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
+		--boost-python-libname=boost_${EPYTHON/./}.so \
+		--boost-thread-libname=boost_thread \
+		--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
+	addwrite /dev/nvidia-uvm
+	addwrite /dev/nvidia-uvm-tools
+
+	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/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
deleted file mode 100644
index 9e930995b6dd..000000000000
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ /dev/null
@@ -1,88 +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 cuda distutils-r1 git-r3 multilib
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.tiker.net/trees/pycuda.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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() {
-	local myopts=()
-	use opengl && myopts+=( --cuda-enable-gl )
-
-	mkdir "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
-	"${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 \
-		"${myopts[@]}"
-}
-
-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
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 0dd1e0e30aed..9944a805d213 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,5 @@
 AUX pycurl-7.43.0.5-cc-cflags.patch 1145 BLAKE2B c67a94b7ee13c784d8ddd3870e00e5b0963228a0ce0080b6dae0b0919ff5cdf17b2c51112586e9e7ff1731862cb40a040edd158f551d4278a286b2af7895641d SHA512 b082f1987ffe6cd61b17fed260dd039acad446b597eb43d060cc9115c36fe38e0b1e61e69e81d725061f589c2f9aae76a4bf68f07c68bebd99d4b5c2cbe9d530
 AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c6699127d8492f0e5ab3a9b8d540b458416a095b474cc84e7ed2068a15e20860e5f7becfe42f010747a8c2a5fa551300e4082db SHA512 58046c87e42ea6f86ee3b23f541e616b33be5f09ee5a2d3d1fd6bce717f59dc52a56a3cd5dc3aaebc9aa5948e4dcad91c1841bf1e1b66f31e66f04d095820cef
-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
-EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3
-EBUILD pycurl-7.43.0.5.ebuild 3017 BLAKE2B 36400d03b1621720dfe4d5d3d7234b6c15272ffa8fcc8473014b3026d69407672963398ce1a7043af09c7caa6c44e08adea62ba04b42057a36ca90c4b09d82d7 SHA512 2534b4900f0b18ab352a49b7c11735c0973d9e91d93f98d3c03471ca00384d00e4c52b7fd493fc758dc5d9f7652525bf2a034a79845583b0051f0151013160b9
+EBUILD pycurl-7.43.0.5.ebuild 3136 BLAKE2B c8529f93479c72e9a8908288448a827922a4e0b1a6f70858bea0d97c40bb40a67d5c027e72db318258b740837680d0102abddeec393c1be12713c3de716cf761 SHA512 422ad568a23dd20a72ae2e69ada8704802eede3e04ddeaebb451b930583a5cf05769b298b7045eb3dad572126c0fdfea8a3687c861cc41630f894ce6aa24f8ef
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
deleted file mode 100644
index 20694a2260f7..000000000000
--- a/dev-python/pycurl/pycurl-7.43.0.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
-
-# 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 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.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index 046812098a77..208be0af1b8f 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=manual
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -17,7 +18,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 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 )"
 
@@ -54,6 +55,8 @@ PATCHES=(
 
 python_prepare_all() {
 	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	# disable automagic use of setuptools
+	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
 	# these tests are broken with newer versions of bottle
 	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index f583a94e5488..b27182f37a5e 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,6 +1,3 @@
-AUX pycxx-6.2.3-installation.patch 1248 BLAKE2B 8f91ad3bec34739bf3e23efda7b671d8be12a2fb6c9920b89f7ed582c81e9230475281efbd69361a9d1d862804144a4bc779caa01bf303c35d7d7e8b0ca60df7 SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81
-DIST pycxx-6.2.6.tar.gz 141547 BLAKE2B e067d2a3f7ce58200c3b97f971692f64545f224929308c6e9a668a15eb775580060e860cf8ba1f894ae61320aa3454622f15fcc6fbdc601251c9b9ce576b611d SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c
 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 923 BLAKE2B efb45f153e05a8f3be3169ee227c871636060b5b0c5bc05cdfbb7085fb868f97a81eefdd59727f44d66c295943d70b88413cfd163ee0a6f8e3868404271a3887 SHA512 b56d2b467506f817629ed3037978bbc2a933f9c1dc9c7fc5c0814283448b9ffe8123a26e078ffc9431e6314488b21158e81e7f6f611c96968cec799b1559cf05
 MISC metadata.xml 623 BLAKE2B f58248b0fd25b697209c0dd07cefd240cc2bee7eb7ae8b76d3d2e7fa26ce9036e9478b8f07781821fbd2c666ebb4edc09c618d20cceb045acc5e21aac41b0658 SHA512 fbe60226b2e1a989e27652d9449105c6a188bf39ed07e0511901050752d1cd51d74a18fae9f794a341a3f6d772957757275b973a87cd49bf4745a87a509beb50
diff --git a/dev-python/pycxx/files/pycxx-6.2.3-installation.patch b/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
deleted file mode 100644
index 5f6bfa74f4be..000000000000
--- a/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -3,10 +3,18 @@
- from distutils.command.install import install
- from distutils.core import setup
- 
--headers = (glob( os.path.join( "CXX","*.hxx" ) )
--          +glob( os.path.join( "CXX","*.h" ) ))
--sources = (glob( os.path.join( "Src", "*.cxx" ) )
--          +glob( os.path.join( "Src", "*.c" ) ))
-+headers = (glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.hxx" ) )
-+          +glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.h" ) ))
-+headers += [header for header in
-+            glob( os.path.join( "CXX", "*.hxx" ) ) +
-+            glob( os.path.join( "CXX", "*.h" ) )
-+            if os.path.sep.join((os.path.split(header)[0], "Python%s" % sys.version_info[0], os.path.split(header)[1])) not in headers]
-+sources = (glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.cxx" ) )
-+          +glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.c" ) ))
-+sources += [source for source in
-+            glob( os.path.join( "Src", "*.cxx" ) ) +
-+            glob( os.path.join( "Src", "*.c" ) )
-+            if os.path.sep.join((os.path.split(source)[0], "Python%s" % sys.version_info[0], os.path.split(source)[1])) not in sources]
- 
- 
- class my_install (install):
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
deleted file mode 100644
index 1baa0be8acc3..000000000000
--- a/dev-python/pycxx/pycxx-6.2.6.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 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.
-	# CXX/Python2/Config.hxx: No such file or directory
-	sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed"
-
-	# Remove python2 print statement
-	echo > Lib/__init__.py || die
-
-	local PATCHES=(
-		"${FILESDIR}/${PN}-6.2.3-installation.patch"
-	)
-	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/pydiff/Manifest b/dev-python/pydiff/Manifest
index 3bed4ae73434..9d62967d7401 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 532 BLAKE2B 1e99b4f14692761c232a2ea23c0204a27fdafea61b3a4ce5c420b10880103db0005de235b6e9eb29b33cc141cfe845d3916df3ef515e0bc3b6928ab721c35e27 SHA512 f2669189edfad5221e016c01c1f4108f453e8b0a3a086047a0f4e7c962a92883f344e9ba842842aa8c374eaa02593feb70f9a6012fb1df958874e3fc1f707544
+EBUILD pydiff-0.2-r1.ebuild 522 BLAKE2B e17edff19ac86c0847aac7772b93489a3f29aa56440aa1fa98939e53c32d81776ba5b69789d10ee1fa2409a4211786beda2f217c4d12c594710a28d3cd7bef9b SHA512 d146669bc0450acd7ca2ab555756286a59275c04627a0fda2d129c42f083f11e12c31a251189e943200f3b658c3b57339985558389006a908efafe865fc62369
 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 32ddd1bc3ffc..9883f81d1deb 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.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
 
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index cdd284a3146c..8ead0d8fe0ca 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,5 +1,3 @@
-DIST py3dns-3.1.1.tar.gz 29981 BLAKE2B b8f1aaeb95764f4d332ec05a367557a24fdd9171e98349668995687052cbd392169a76aaf24e3d29c94ca1c232f04842b84a2320eab5e553de12c278af23975c SHA512 5f22ba12db502f997be4c2479697cc21fe15aac218da1d347bd400a3ab73d86ad32b57740292a10eacb73e07eba977f67b881e59be16f902afab47053efd6c6e
 DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8f24c433dbc6754ea32a7284ce0463c392c1392538eed9d8bf9ea3f09400bc08f1970a7c96c52bf072606718 SHA512 22f16c571f9fad02a70a8e0bbbfd802f4f9af23946edb78e15f69f23e57411369274945a1dea5603acae1fc1eb404e5445207c541afb7864a60b92dc4d5477b3
-EBUILD pydns-3.1.1.ebuild 851 BLAKE2B 37571b62035bd609f1741a5b44968d0898e9076badd60d71e6b3bbb8364d13171ed0fd5fcdd172d381596cd85d1943bb848f498227ad85e014fc178a2cf9b06b SHA512 261ec06fba2111eb45e63dc2762cb46f459f28f726f582f3b86fa7dddd495f1bbfad303bdfac8a06c878346a2470ce533e665daba2da790641fcc6ef7cbb0086
 EBUILD pydns-3.2.1.ebuild 756 BLAKE2B c5778de45438146309d7c1f6630db9493972db23d2811c53a703a5b924a77e0ea3c4870303078f93c456623df5dae01344151a3a3c2698ac03cb76c05a527c7b SHA512 bbbd42c42203e03c1410f27ecda618013d35ea2456d80ba441c2ba4059a7346fb7dc180c09204d6d493a6bbc43febd20196c81702b003d70956affabb386a782
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-3.1.1.ebuild b/dev-python/pydns/pydns-3.1.1.ebuild
deleted file mode 100644
index 6e9838a3e2ae..000000000000
--- a/dev-python/pydns/pydns-3.1.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 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/py/py3}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Python DNS (Domain Name System) library"
-HOMEPAGE="https://launchpad.net/py3dns"
-SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="3"
-KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Tests require network access
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${EPYTHON}" -m unittest || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	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 cd8ff41d4ff4..24b66d8f0227 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,3 @@
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
-EBUILD pydocstyle-5.0.2.ebuild 907 BLAKE2B 90267da429cbb2ca73745f1fcef6571f6b7b35cda0c2440acc62a640ad17c2d2a98d03684c28f777a37114b29fe58c77645c0ff89b8fbbe977185bfec300a229 SHA512 acc11f13453bafc2494c3a522a4e11c5d3b973951b67fa23bcd5032bef59a05f3227e2dd4a5e95b973b950b8530124369537123c1bfda586f9694766b6f8f3c0
+EBUILD pydocstyle-5.0.2.ebuild 955 BLAKE2B c2f040156346bcb23a85f42b6b7ff3ed0d8d59321b5da4fb8fb8f5c4ab795b4cea15b9547324ea3e920f3525aeb2f8bbc69653928233e51fcc85cfcabe96c72b SHA512 9f401abfdf48c389747a92b2a84668fced98e6cb624d8dd2fddc472bbbe5c0428e291c43437220adc7630917b81ec6cf109e789e676f89c979f98622a6143792
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
index 5d439c03ab4f..42c63035e5e5 100644
--- a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -22,15 +22,17 @@ RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 DEPEND="test? (
 	dev-python/pytest-pep8[${PYTHON_USEDEP}]
 	dev-python/mypy[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}] )"
+	dev-python/tox[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
 
 src_prepare() {
 	default
 
 	# These tests call pip.
 	# pip install fails because we are not allowed to do that inside an ebuild.
-	rm ${S}/src/tests/test_integration.py || die
+	rm "${S}/src/tests/test_integration.py" || die
 }
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index f4affdc3013e..b77dd57884cc 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,5 +1,3 @@
-DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
 DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
-EBUILD pyelftools-0.25.ebuild 866 BLAKE2B 6a9de0acfe09bf1c83d524856e43c4362d432d5158cd6d5f4db9e0f4b59698a50f65e202d025a97039f3ad6b3652f388403fe2e1707fe8d486265c028cbfac2c SHA512 0562a0927f8a04a85f35211ae3ac9c4f4b15c533a9d08e4d116ae19f2a159539d000e9b81d0bb606d6a89c0c0712f0dd79c14ddd97438b1c69b3a671e0cfa1ec
-EBUILD pyelftools-0.26.ebuild 944 BLAKE2B 248199e2b02ae0dd058d2069a54c218cd8386e1235cefb17091e22cf63700b1f7db320296122ab2c045c40255f6ea9d4b7c79fa91e7ea0dbaa2109f0c2b6b53d SHA512 aa315734b9de7cdce36aaa90addc0262e952e3ca269295a7fee7d0b1d617bb301067968d04f918b6b932b76c10f29a2b5687de337398dc5d6ef93f2e3fbee082
+EBUILD pyelftools-0.26.ebuild 935 BLAKE2B b81988c3108d6522e4537c9da2e5d952e6ee2895ea1c10518da45c86aaf398a34146495adac696ca72f1b0ff9930d17bcf0c932454750f547df3916e22e18a15 SHA512 91c387234c22803395dfe2005473c2220c334dabf6a138bddd89a512c35e98daa6b7d5e1b9e389eb1486aff92ac075bfb584de5fe7d875c6676f0ed646cb295d
 MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
deleted file mode 100644
index d64d60761c8a..000000000000
--- a/dev-python/pyelftools/pyelftools-0.25.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,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"
-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 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.26.ebuild b/dev-python/pyelftools/pyelftools-0.26.ebuild
index ba7b7d895acf..9a5e25ae8155 100644
--- a/dev-python/pyelftools/pyelftools-0.26.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 8aee2367e33a..1a4d1c862a15 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,3 @@
-DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-DIST pyenchant-3.0.1.gh.tar.gz 75730 BLAKE2B 499638a238fa00510c9fcd3bc3d91c6486af8476b857781e70c142bbabac3933611d96f745bd44cbf707a4051ea0b83534bfe1da78b9a5631dbd52c157f6b4c2 SHA512 61ab856071bb2c49b31f4f10562c0f6c2d1812537de927905427d61b9b183f8e25eb1ae01ca5655812512d9634be0e5fa7df8b393f9080e2ddd6700ccd049287
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
-EBUILD pyenchant-2.0.0.ebuild 928 BLAKE2B f717a3d03275b4bf1ca21da816bf36e2361c57dd2ce4e8f5d643151ff14c46a72a1ebc08e9727b27d585dbcc57896b31579cf7b8bb4b1913970ec0d20cf663bb SHA512 fac06375830e23c7066a18926ef9218fcada08014a4f5b55ac2853c3540ebc98791132db9cc68049bcb503804f0e9816c689aaaff890d09e2dbf770c7e17374d
-EBUILD pyenchant-3.0.1-r1.ebuild 619 BLAKE2B 7e1dcc4f68806f428e5aa93efd61f68fbc45a372524c820148751ca2701634e509068adfa8bbec70778cf14c6549e72ad62ba13afa988d186308424a614bd67e SHA512 dc3d9ef9d67b4ee82eaa00be5d4db5cc9f84f399a0db8faf379c7a1e377eda8d060b97b88ef2deb04abf6384c7c5c5b379cad683610df0bd06b417f9ed378200
-EBUILD pyenchant-3.1.0.ebuild 618 BLAKE2B ce211a41b53a873ad0a33b963116aa09c9bd8b6ec8a2cf630005d0deedcd8d6ebdb796f4606fd51be05b951485d3dfa6face6b8d02546a6f6f84759d32dd2f18 SHA512 0453edd22dbd75912a79318b742aad166ab9af039dfa80e7a86f9a208617d5a375df01cb0d2b96b0428e2b906213621a840125afd1b11e7daa6e795e352b22b3
+EBUILD pyenchant-3.1.0.ebuild 698 BLAKE2B 6d1296b826fb1e8723ea71c47757c59de9bb713e23c5d853d500a2e3537e90ca9f00a89448e93febdf6152a2d0c07e98e0c5e888abf3dc4e3c7632c0ffea6fac SHA512 07f561c6bdebd804f05aec76505a497da725ef5fd816b90ea39852f4a14a00a26ae11fae35fd5a40c2188df145cefc5ed4d465499bb6d1169d69771822d947ec
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
deleted file mode 100644
index 3c17fb97e4be..000000000000
--- a/dev-python/pyenchant/pyenchant-2.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 python{2_7,3_{6,7,8}} )
-
-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:0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		app-dicts/myspell-en
-	)"
-
-python_prepare_all() {
-	# Avoid a test failure when there is no dictionary
-	# matching the available locales
-	# https://github.com/rfk/pyenchant/issues/134
-	sed -i 's/test_default_language/_&/' enchant/checker/tests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyenchant/pyenchant-3.0.1-r1.ebuild b/dev-python/pyenchant/pyenchant-3.0.1-r1.ebuild
deleted file mode 100644
index 466fac197d5c..000000000000
--- a/dev-python/pyenchant/pyenchant-3.0.1-r1.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 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/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index ec2269fe01ab..164782e1d371 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
@@ -25,3 +25,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	rm tests/test_docstrings.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index f09cae341a8e..3b5c13855517 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,7 +1,6 @@
-DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
+AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15a81a229d8cbc32fbfa08f97a71dd1bc558cf984bb5d5a2627ee3e71cfd6dcd1197815195bb6cdb9956b7d82ba61bbdf SHA512 985d3020b7f768723634b0b5ac6f55ec8ee524ec1d7c14fa594a5be7e3dba674e65785f498b36d20b554f9b187fb381e50abd00ed75c070444682ca8fb85e2cb
 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 893 BLAKE2B 689b0b8470e1652b2a4a8b07fd4b653114fe06dd27d5c6cbf92a9884ddea12e9369c540445034cac8a992603f486d40ef111e949709c14ab0c578928bec1b8cd SHA512 68f886b385e8a9539e48c55f0113490504f03dfad5990a17165e6ddd676d92145798a2ed67645a947e8fd2cf8cc5ba9506bd4b13fd4a4617084dbc3874dc5c96
-EBUILD pyfakefs-4.0.2.ebuild 883 BLAKE2B c2f8841919d18ee508576c6220cffd28aae9850940e34f22558edee2ae0d05aa625c23481cca23f0a308d2a88f7354d06ad937b5cbba7fc23b5b849f4727ca55 SHA512 e39a85618b8cd7d063e5d2a7a61d924bf8cca756d281fb7a21bd14797b4d8405f5e307bdabf526eb5eb8d4e705ba0182d5c4129c1606c26a907f4571c6d44082
-MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
+DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
+EBUILD pyfakefs-3.7.2.ebuild 891 BLAKE2B 78f7762db59798dc284049bb9155f89bce96ee625bc2b97b20f4e1640252897c914840f72b984cb8ff5ead1ada6bee4d77566ea207be4684653438870aab6607 SHA512 c48e7fd77ea469d9bde01754b86839b7897d4a5208bb8559c5481eff3f01c401788a064fed506a8ed9a0af364fb993d8f7559eb34ad202300b5c6fbd9c6e5ec1
+EBUILD pyfakefs-4.1.0.ebuild 764 BLAKE2B b9b5af3324a385608892207630e44ca6ec2776e109fe7e06436800b1c2b68ab31b043b397148917ba9c9e3135b283f0f18a6bd29388b143346aa699c3d5200a3 SHA512 463931a17f23eb9f30ccf3f36c49230f3c2a61c9340e849114fa5fbea25108d350168ceac3ed0458ed2e5a0d153741805bc2d6749aa9327cd210df937a2b0a0a
+MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
new file mode 100644
index 000000000000..44b76b0132bf
--- /dev/null
+++ b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
@@ -0,0 +1,38 @@
+From 1d6fabcaccf8dc716f7a49a67f5342d83ef37976 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 12 Jul 2020 21:26:33 +0200
+Subject: [PATCH] Skip test_write_excel if openpyxl is not installed
+
+test_write_excel fails if pandas are installed but openpyxl is not.
+Adjust the condition around the case appropriately.
+---
+ pyfakefs/tests/patched_packages_test.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pyfakefs/tests/patched_packages_test.py b/pyfakefs/tests/patched_packages_test.py
+index 05ed7ef..f8d8a1a 100644
+--- a/pyfakefs/tests/patched_packages_test.py
++++ b/pyfakefs/tests/patched_packages_test.py
+@@ -28,6 +28,11 @@ try:
+ except ImportError:
+     xlrd = None
+ 
++try:
++    import openpyxl
++except ImportError:
++    openpyxl = None
++
+ 
+ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
+     def setUp(self):
+@@ -57,6 +62,7 @@ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
+             df = pd.read_excel(path)
+             assert (df.columns == [1, 2, 3, 4]).all()
+ 
++    if pd is not None and openpyxl is not None:
+         def test_write_excel(self):
+             self.fs.create_dir('/foo')
+             path = '/foo/bar.xlsx'
+-- 
+2.27.0
+
diff --git a/dev-python/pyfakefs/metadata.xml b/dev-python/pyfakefs/metadata.xml
index 0a79b8f3f70d..4c153f30ad75 100644
--- a/dev-python/pyfakefs/metadata.xml
+++ b/dev-python/pyfakefs/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyfakefs</remote-id>
 		<remote-id type="github">jmcgeheeiv/pyfakefs</remote-id>
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
deleted file mode 100644
index c0436c536db7..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.7.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{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-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index f2c68f229024..46549c155c2c 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
deleted file mode 100644
index f23510b3baab..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.0.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=( python3_{6..9} 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
new file mode 100644
index 000000000000..b51d5b7e0bf1
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.1.0.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..9} 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 arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openpyxl.patch
+)
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 8d3008de3db6..f66cc6d4a148 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -3,5 +3,5 @@ AUX pyflakes-2.1.1-tests.patch 7973 BLAKE2B d0b6663e9bb17e301e78104c08440a9bc749
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 EBUILD pyflakes-2.1.1.ebuild 783 BLAKE2B 01cd89e87b0672a234a24fad49758b3d391e015bd299aa01f5b33eab2e80b448506d28a44dbcad683138738610cce62f602c4b4eedeba02b8e17d82531b2f7ed SHA512 82b30b8e7347b0487961945619a09eea21a2f6c4ab3e21fc2ee817b5aa05d197b4e78d2b5b2e68a2a39811d9c7138402ed0c99a61d687f2b9a09f0173a144ce0
-EBUILD pyflakes-2.2.0.ebuild 636 BLAKE2B 0180c1457065505ecff3ddc7e946a71dddd6473fafabcb0e5126c638a0d07a48f56b1a823bda3c54c7c468864025186c64a0d3efa0376e78027244c860ed9531 SHA512 2e15aaf48f0014aee36fdef2efd34a98959c63ffbbbfafe0f193f38b77e9f1ee4f44bbea74a99207a45b6d79d196d7074891c9f49ffe071a1d5f0cf1afd9a5af
-MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
+EBUILD pyflakes-2.2.0.ebuild 627 BLAKE2B 0d662e047b103e6671f1979ce2d995b00cc36ca7f37caa6e2b50c1234c64c6f6fcc48a68546425f42123684e5ca6c108261ced6fb88e8a58a3af2f89a82cec9d SHA512 6611e6f369b1307f25ef4c14015bfeeb227833c4ec9c427012325f3adcdb9fb264eb202fe1a86857f765b5fb96fdb99e2ae52887b71cda9276df2b5c46c34e34
+MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/metadata.xml b/dev-python/pyflakes/metadata.xml
index e863869c3e50..3444cce75ae7 100644
--- a/dev-python/pyflakes/metadata.xml
+++ b/dev-python/pyflakes/metadata.xml
@@ -13,6 +13,7 @@
 		to sit around for minutes waiting for the checker to run; it runs on
 		most large projects in only a few seconds.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyflakes</remote-id>
 		<remote-id type="github">PyCQA/pyflakes</remote-id>
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index cc7b91a291fb..c9d537394f5b 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.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 ~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"
 
 RDEPEND="${BDEPEND}"
 
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 488ffd73f09b..be3f50e8654c 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,5 @@
 AUX fltk_wrap.patch 247 BLAKE2B c6f16fb2c87265c7b1b9d869d9b92454eeab50f6cc8830b3946a2cc2949a3a17a9a160ffaff66f60f875674dca51e1a4aa905f15047607e64b2f4791ae027f61 SHA512 4097f9a657f0cb96e37620b939edb35f4cfcb28b2be643b87f85e5dde8ff9a4f316052cbd5403396698de3e2034bafd164c7111c890a5b6d6bcf818185342bcb
 AUX ignore-func.patch 250 BLAKE2B 3d2a979b2580881ee1fa1a6e30b2afd639974d00ec7475c005d8ca967a599ef6858d158d2de95501d7397c1cf8c5e68c0bd0a72da5fbf037bf1fdfd0e8e04600 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419
 DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
-EBUILD pyfltk-1.3.3.ebuild 1088 BLAKE2B 3de42e6c2bdd9314eb2ee6bdf26dc1ac01c2492dbe977536506ad205d999bb5aa453dcbc3d10b8a602a9fb4779470be862f7f0bf6cf05c4a7a801de094d5b920 SHA512 d26d075db5d9a41150438090f05fa9a9f1af2ca9cf0701b7514b5012ee7eeffb887bace443ae2ccbff574478d1c7746805b0b0934ff0c10d1ee26deb6e13b065
+EBUILD pyfltk-1.3.3.ebuild 1078 BLAKE2B 3419f4a40638605ac63592b3c8c7042644b8975d0c01110ff2ff2b03e8064a74babf9e476bda65b95e0f084baa109cc05854e0291f7b32be9872730324e80456 SHA512 2f66d1e7f55f4a3bc3e5bc6385d7e8276917514b9a8f9687f568ff78902fe512126ff239d0df3f8a1eeadc62818c6c933cae36b06d3abd19c52809537baf0a75
 MISC metadata.xml 473 BLAKE2B 0e5625017dc5f5196012da6388fd6f7ef598c005cdf6dcb358a230f7b15014f6e77666772bb351862f2e2ac8690d77132b269e9988ea63662855a85a720b321c SHA512 b6f4d80dd9e608ec2b4b1a8d799c5cf0d238a7d908de0b79d30da2d9b60f6745aa1595256e59867774814114ac0abd5dbaf8456c9f0a17f7fbcddb6d8354b4a6
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c200006f0e99..5491e5461839 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -5,7 +5,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index f995c0ed3014..16a37c1a5f89 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,3 @@
-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 3093 BLAKE2B 296add54d215a296aa27c692e70e0f0b0cd8e9e6c411ab8ca571499eedbac04ded46b286637e3f747ecb299ec373c477eae2babc551b8b23b604f41496784b02 SHA512 5598e1ac7690aa5431fac4af0bb0f0fc759de7e9cf13af86cb81c15484f485ae0e2321a31c16f8cd56fb8d61b19f18d99e30153b864dc69a41bc10bebcf4c4ca
-EBUILD pyftpdlib-1.5.6.ebuild 3088 BLAKE2B 088796539713ca97bb705e9726f313e9f422c9125610ea683eadda1229a71a344b9860fac9f18f8ffc8fe230d1d91941191f1468d09f3400f33910e99be346d4 SHA512 0e89b4fc541d53c959dc6ea8fb2894e93c8b20c61fdae8a682587b1922ae1f829177faea8a05206e939d85b022804b46b0f41c144f7c336052bf106d90ec7886
+EBUILD pyftpdlib-1.5.6.ebuild 3087 BLAKE2B 59afa5e6d8c19a08011642bf1e2c3ec4226e95d9e9a579f577470a2bd829f01a0e806f786989ee317f93dd69730866122703d63112fd74b529a8f9aa042b5703 SHA512 85a508dc09f2b4050fac49d473e1027671a8d60b24e6f7a33d5b85fd247d8d59dd279fbf5d0f5aab47eb7ba10242fad01894a22619dbb73dec578872618a5c05
 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
deleted file mode 100644
index 845efe957de4..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,86 +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}} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	dev-python/pysendfile[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_test() {
-	# These tests fail when passing additional options to pytest
-	# so we need to run them separately and not pass any args to pytest
-	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
-	# Some of these tests tend to fail
-	local skipped_tests=(
-		# https://github.com/giampaolo/pyftpdlib/issues/470
-		# https://bugs.gentoo.org/659108
-		pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2
-		pyftpdlib/test/test_functional_ssl.py::TestTimeoutsTLSMixin::test_idle_data_timeout2
-		# https://github.com/giampaolo/pyftpdlib/issues/471
-		# https://bugs.gentoo.org/636410
-		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/466
-		# https://bugs.gentoo.org/659786
-		pyftpdlib/test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-		# https://github.com/giampaolo/pyftpdlib/issues/512
-		# https://bugs.gentoo.org/701146
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_stor_ascii
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/676232
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_anon_auth
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/702578
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	TZ=UTC+1 pytest -vv \
-		--ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \
-			|| 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
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
index 7e1111868d9e..ef5525f50ada 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 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/pygame/Manifest b/dev-python/pygame/Manifest
index 33d61950cf15..7a08fac61cc0 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,8 +1,7 @@
 AUX pygame-2.0.0_pre10-py39.patch 1174 BLAKE2B dda7880b7a57e62612f072ed25c9c661ca63665d94d3a8fd9bcb2d95683da80d215067e63925eb65d98b4bf13c53845b7093011da42c4403c65bb95253a6fecf SHA512 91900ab98546a5339fcf4d204e3d049de9ad9bcc929dd75fc39629d873532d9e486f35ba0236e74185e1b7298016cc419c5ca1d463af80ee7f425244b7f51ade
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
-EBUILD pygame-1.9.6-r1.ebuild 2117 BLAKE2B d9635c59a2064809e8e8e4a6ffe2f0fecded0b3a8d49439210dbc01aa9f3fadd582fcefab30af5ec9818be34d3269c82f84553a0be94cc22a5d17739dcb98588 SHA512 8aa1b69e1faa035bc37b1ad57bff067f27c51d3ce7bac19a83d3c8c65075c956ee58547287e14c14c3745b3a232ebd0b8c8f845392ff6d4e8100225dc145a825
-EBUILD pygame-1.9.6.ebuild 1764 BLAKE2B c70233d00aed5294fa88da407f836ee06093009855a7165fd735a9f260e4f588339c0e56f9c934f0d74b14d65e703c491c21de481fbceb3402ecedc677e21c5d SHA512 50423f254afef8348078a141e2ceef4e3032343face6695be6d37d815026fc1e99c09c86448636ad29389b174f36560aa9e1ee58269e6a28fb1c01c4a979bc03
-EBUILD pygame-2.0.0_pre10.ebuild 1834 BLAKE2B cc73979a27f3af53130c184958147015db1b769b8f2ddb97dd3921c4aae9e72b65a0f125a246d00df870119020fc6fde1c89f017f7d72ca4de5dc0eec1e19585 SHA512 84b0fb7c2bba04335f33c86cddb4cca6941db0a8a4834bb428389884e3e00423d36161d2fac0d3d5f2b83e72d8d39c26e9354b038af6e895bf8411ad1fe12127
-EBUILD pygame-9999.ebuild 1638 BLAKE2B fe75a0c2d94974980b1b6462c8a3e5bd08b881606a541666ba6642304634d8a688a2dcb746d92854c1e68164b9cc07e904f454bcb87eff7315ae25f8767f72a4 SHA512 d5be31c553fd9bb1f4fab7084ea7553466086a6f4f68322797fc62c573bf562dd055bf9f33cb2deee614061224f39ac8e02343dfbce52c84b4abc204dee058ab
+EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
+EBUILD pygame-2.0.0_pre10.ebuild 1916 BLAKE2B 48980667d10d35d8ecccab3338f3c6090f25911289a3dda92ecc11b810afdfa297b574c63a4ddd4ca6e4d5c4e688cfe49d1786f2b38865738d81d9582f120f5c SHA512 5d8d2f7679f69ead0f7070be482ddfa68aafe42be4ece4ca902489511211a6603068d4791007fb8ae238c45803dc6286ac90878e5c33f558f74364e74b1fbccb
+EBUILD pygame-9999.ebuild 1720 BLAKE2B c08896002640462a1fa0976d69e4d1e287701d8df12a2c878062ca740138568bcff58e93813d182912a838a5a97701f178f8066030e548de3cbd7fd8ae9d563a SHA512 ac2fde281f74e87da86e1bdbc33c7f3e7c308cac506452014650d0cebc6f6f9a84d011efd6fc98c6fa204d7c148d28b23be85c1da1f0e8e8221a1fd1347175a7
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index e47cb5f359bc..6cda47383f18 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,11 +12,11 @@ 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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+RDEPEND="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
@@ -24,10 +24,20 @@ DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	midi? ( media-libs/portmidi )
 	X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] )
 	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl-image[gif,png,jpeg]
+		media-libs/sdl-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 src_prepare() {
 	# segfaults on Xvfb
diff --git a/dev-python/pygame/pygame-1.9.6.ebuild b/dev-python/pygame/pygame-1.9.6.ebuild
deleted file mode 100644
index d02e84e0e696..000000000000
--- a/dev-python/pygame/pygame-1.9.6.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=( python{2_7,3_6,3_7} )
-
-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 opengl 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[opengl?,video,X] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-# various module import and data path issues
-RESTRICT=test
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/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-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index e0019d48ec64..f1da10c2c2c8 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -22,7 +22,7 @@ IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-image-1.2.2
 	>=media-libs/sdl2-mixer-1.2.4
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
@@ -34,9 +34,15 @@ DEPEND="${RDEPEND}
 		media-libs/sdl2-image[gif,jpeg,png]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py39.patch
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
index 9a1c6f7040a3..1023f6136c34 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-image-1.2.2
 	>=media-libs/sdl2-mixer-1.2.4
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
@@ -29,9 +29,15 @@ DEPEND="${RDEPEND}
 		media-libs/sdl2-image[gif,jpeg,png]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
 # util-linux provides script
 BDEPEND="
-	test? ( sys-apps/util-linux )"
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
 
 python_configure() {
 	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index d748741d916c..c1fd35178e7f 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
 DIST pygit2-1.2.1.tar.gz 235852 BLAKE2B 997c54359c87bdbb5338d6524ca119a058a2dfa9ec5079abfeac5e3f1312e7fe0b6a532cf3dcea6a2b317124337746b9e4fbaa71585bc88a8afa37f8b74a7f97 SHA512 2491892e50d9298d68c2f90b3c4b23c87e51995ccc29e285eb2f868f5e34d2568d5f554818203bf2c735179aeb197e3b7aba1be88e72a6526812e3ee2e0b4348
-EBUILD pygit2-1.0.3.ebuild 962 BLAKE2B 6e16fd3bdba8102c51de84d67c050d074842c458e6c15424d8d7c847cee5d889fbe26935f35a4c10572f5eae0cff02d782c1716e454f66a37d17f00afe97b85d SHA512 d6dfefa43f8a0c38334fd7192fb1e27f2649967cd278e008c9a046797149f9c97afa1c6a7e616d4871887efdafbeff03db67998cf600a9e673d95110d620f868
 EBUILD pygit2-1.2.1.ebuild 1007 BLAKE2B 15edcce1e650b95e0d035f927c4532d25dcfdc7c34543815ed28c33e129b581c10c6d740a4e685f5eb483d5f751dcc545cbf64f82cd9c802b655d2b1b8f15201 SHA512 fdbcc70a204200c2515ba9cfe7f163f06453c4cbe9557acd87bdb3b4538dac0e30efbb16ba0dde654f1b380b2e0c1e151caf44a3b86a784396592063775fe2b5
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.0.3.ebuild b/dev-python/pygit2/pygit2-1.0.3.ebuild
deleted file mode 100644
index e2804c5c9368..000000000000
--- a/dev-python/pygit2/pygit2-1.0.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,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/pyglet/Manifest b/dev-python/pyglet/Manifest
index 47177a432490..0d4283afa062 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
 DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
 DIST pyglet-1.5.3.tar.gz 6356079 BLAKE2B 517b196eff334d572d4db181ce0480c3af8e2bc4a92e23e1fd7c335aedebe3afa493eb3f4745d8daffc3c7d930b9e333075014d2ba5d4303f4691c490a09f252 SHA512 12e7189272b9ab3b4bd3d713d0e979cfc1d76200fc8454b31573fca29b179f99242c34a1adb7a1c2fabb7b950cc3006cfcd8b188eb2c50ae95cca95b0e15582c
+DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
 EBUILD pyglet-1.2.4.ebuild 1033 BLAKE2B 4f8c751ac08ea2d5d6fc1ebe1d74143311a2fe8834c7ab447f9fd42e606371f463f39b7b6e37e2b3767213b2bd1455cdfe06c66c2020946a656fe00312d2d4db SHA512 1bfb9ffc5e0db92f8b01288989ba8726a27e1316168a3e8d836a601e379ac4c5d57665e002863da205ed1e7768b24987423ac24c88dab3b34082a6d5aa1e3169
-EBUILD pyglet-1.5.3.ebuild 1246 BLAKE2B 5beebbbfde2a30bb8e1fa10a06b9ecc2521be8786bf0c3d43ca6c6d03b0872995a4cfd8eee1b0594c5fdf22f149bbf9741fe5cde7cc06e3ad74ce66e1af8983c SHA512 d497a9119656bf33d013a2b7fdd0b7646ecf63f267f8b046a5d436d672bff01a9be76a57d55060ddd6080c90bf2b44aea7cd48e7c067722a605e253b4efa9a09
+EBUILD pyglet-1.5.3.ebuild 1244 BLAKE2B 1c6b0c6025fc9ed2783d6f914a42e99b99dbea3370e2dbacce7f9d3e1cf4a0909ad99f1c44fa3a84baf474066b74f460fe141e8c374170cde1b284e981304d4b SHA512 0cdb680fc9b01eb2245ecfb8ec197d95f129a86f68f466aff99b8db453c6f70d0dc9a3770f10d06286a8b45cbd6d0be6d22269dd58f0e63c20214a24117ad53b
+EBUILD pyglet-1.5.7.ebuild 1272 BLAKE2B 55eb532479c81a520105ebd9d89072bf43f5b8cc92e5d51d092174ba54662e1a3979a64a2d495b57ae8ffa7e42ad95cc3ac27373772c545a51c00c1dedfd3595 SHA512 61499f10a820ede251828fb79b70de115c9b88737760c7516a7f28ee7fc52392a642a5dfaca2b41314ec302cb15bcd7aa90a0cb8cb677f6617b99b1d1a285e25
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.3.ebuild b/dev-python/pyglet/pyglet-1.5.3.ebuild
index c583e7548a71..88a341edfa21 100644
--- a/dev-python/pyglet/pyglet-1.5.3.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyglet/pyglet-1.5.7.ebuild b/dev-python/pyglet/pyglet-1.5.7.ebuild
new file mode 100644
index 000000000000..c9b51798015c
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.7.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_{7,8,9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${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/pygobject/Manifest b/dev-python/pygobject/Manifest
index c47618f57478..85904d8a2239 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -7,9 +7,9 @@ AUX pygobject-2.28.6-glib-2.36-class_init.patch 11038 BLAKE2B d610454930cf4a568f
 AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 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 3539 BLAKE2B 872ca364cdb0a63ffdaaf22fbb61720b5b12d74b794d8ce33a844ce533d6ffe8960ba5f27cdc17cbdc8243a16ba7878431a22821adfc957975594de0742a21ab SHA512 793f82faae740fa25d871283a7ea83b1c2ac6913bce191a616bd66c8d142d2c0568c6f9499f301ea48086d3811b0efd277b7e010a83e5d9c6b9c640ea6dff825
-EBUILD pygobject-3.32.1.ebuild 1773 BLAKE2B e8255cf6550b6a7d8f8dd9533871befc6de86713dc9c52b767ee3b9d609944244c3b9f8ced5a8d3621673cf37a3e357d2bbea7c05b967f3ea85b20fadf7d234f SHA512 47cd7b27fdc1cb596f8bb59bd231f7cddf08df5519f1efd9a7bdb3de679c10ee7f7454e0ffc4786c0073865029a97fc1932c201ba127d0c573375e1120b63a53
-EBUILD pygobject-3.34.0.ebuild 1765 BLAKE2B 442607ee78e22ade2a763135bb16a3f4499aadbd85470a3f3ec6ab74c76a0cde149fbb971069caa8530a84cc6a2a9ca75b9c9b240e0888a3790d96a7bba743ae SHA512 8969a808777fb6654c54b4e0ee1a4c3b8c4cd8423ad54c2806ffcece2455389de60811245e05d76153c2708a2d0274e28e27b0f44554db228d1fca2856304c6c
+DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
+EBUILD pygobject-2.28.6-r55.ebuild 3540 BLAKE2B d719fe69f2e35d2e77700f478230336ccaae8875b7b82ed65172bf236b0abf96cf47a67aaee844353d7719c03cf6f634b1b19da7950807a8233a191f6da6c309 SHA512 e62dd5e5c9228ce363385c4991a20264d1569c1f7640dc3564667d1d121123d1605bd9c617fb2fd8961d7b9de8b09e6a8833f94f77c679e2a44aa0203111e029
+EBUILD pygobject-3.34.0.ebuild 1765 BLAKE2B 970cf7614f18e3f4e1b227d06e135d86f26ae2d526468389d7275f9185688cfcdcaa6fb2b39932062e4bca6d04d610598e26d67555c45c48c6dac940e17f323c SHA512 890d6a11e87b2dc7e39aaa923f833fc9890323abeb8698692a6f78b532164c7c7d424b1520f96f4fede63f3deb3d35f7e15c2196aa4edd6edce1b02455575b97
+EBUILD pygobject-3.36.1.ebuild 1772 BLAKE2B 0477cb7e67110fc168fede7474a21279c914eb2a1debbe29ffc5532c0d5243546a293ab2bb620a7fe404b9880ea285f758065e4c3da8ff863b0ff609d8f2fb5d SHA512 fff445e106da763f40fba695e85e35ce633ab798e45a311c2e3ec6672825ecd8257d3925700e379ee69744394b1d268afb3e383d0f2c85d2d81d98717bc25373
 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 e16425d228cd..ba3458372f25 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
 	dev-lang/python-exec:2
-	libffi? ( virtual/libffi:= )
+	libffi? ( dev-libs/libffi:= )
 	${PYTHON_DEPS}
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
deleted file mode 100644
index 8a77fbea46a3..000000000000
--- a/dev-python/pygobject/pygobject-3.32.1.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=( python2_7 python3_{6,7,8} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-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}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_use cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index ddf1ed706bce..d7583e57c7bb 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 ~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}"
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.48:2
 	>=dev-libs/gobject-introspection-1.54:=
-	virtual/libffi:=
+	dev-libs/libffi:=
 	cairo? (
 		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
 		x11-libs/cairo[glib] )
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
new file mode 100644
index 000000000000..8f9b561a5731
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.36.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+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}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/gobject-introspection-1.54:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_use cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 3754c7ec85fa..46e315cc8faa 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,4 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r1.ebuild 531 BLAKE2B 95cab4d72b72ad217b3b1986214bcb5d88f8ae3da0228612912dfbb91e750b5625c902bb6e6bb9fea8cb595159625abe22742d63d26abbd361eaf1046a152b61 SHA512 77e3857e7a98e45751dc4a6ce06610f7e5460893666a7147b20db357732f146f9a1f355984f2403ab709d7d7152fbb3192b9b40016f5fdf6036c89742bce2689
-EBUILD pygpgme-0.3-r2.ebuild 535 BLAKE2B fae960c24cb94955f392f7831855912617ead0836f81efe3a9b9ed792ae9c18bd0e3d0ed87153511885042bcfd3c6995bc8714b7ec1f4239010e3d410823f7a8 SHA512 87c8d3d11c4b88d3fdfe072409e60cafdc04149f9a7b6eb3e7728e13e399887cf18f135a1e0b7d70214f26138fb1b306cff82e0dc64c743937e8f1691fa75f53
+EBUILD pygpgme-0.3-r2.ebuild 531 BLAKE2B a59443b7ec04bb558e9391f5eb7c9949c925cd04ade0da00118eb641720d6dd156c2921772182de78cabf33b8242c18384cbfc65970b32ec48e868763fc3e5d1 SHA512 9219b539befa434ae9f32113f687d4ebf39c2baba95b1558281653407299d02da10b7a49ffeb26a5f3539f1498ed3fd2d9ea6b7c697161dbff2033755c5338b5
 MISC metadata.xml 550 BLAKE2B 93d93ed6170da174718a86d4f2afbe0f1b39d51fe49393ed45b0956ef4c55ee7b74d2376612dd3dd3fd839692bf80e6006cfc87cf68ccf155dea5b6e62cf744b SHA512 aa2f009654855d7bd18be6f2d7f7228bf4b7b532fded48d03173324d26394a1342f0392a373680364387c403210871675763c06e9bbc76e9837f620434dd4030
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
deleted file mode 100644
index 6b8e974c31e2..000000000000
--- a/dev-python/pygpgme/pygpgme-0.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=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Python wrapper for the GPGME library"
-HOMEPAGE="https://launchpad.net/pygpgme"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="app-crypt/gpgme"
-RDEPEND="${DEPEND}"
-
-python_configure_all() {
-	append-cflags $(gpgme-config --cflags)
-}
diff --git a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
index 35ee8e0e45e4..b4c69ce17e94 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index c318c469b104..877fffc6ddfe 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,4 +1,6 @@
 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 1124 BLAKE2B 00760ad0153f1655e8fac9b531826bd6f182f1cc7b24939066d42a3d8e13b3d735ade9bc7ad8164b2b6491be73fab903c5a65fc17ad7c4f5314fbd1b0aa484cf SHA512 fb182c8cb78ff74128e2191db0294889077e88f718417c5e905fbf589cdc37737ad4d95d627ed709c4e81c73b5ad1b437014d2dc5795fc7a29b73d1d1a39d692
+DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
+EBUILD pygraphviz-1.5.ebuild 1137 BLAKE2B 14afc237c4da126b7ac30e6176892fad3c46d0716e167c3d7c6f0a431d70f25b730194688db0e0c25948a4a6eef478260863c9a78a7f30fd1c15851e9108254d SHA512 1143108fdef556d65d181214ab4fa188dc1a6e656a39d79ff07dbda07ef2b5467e7a0edab56670ae884ebfa539ce1da9e4e8ceab7ba41be645c399e52c4fea63
+EBUILD pygraphviz-1.6.ebuild 1055 BLAKE2B 7be6e7da4dc808a7dbb249bb98471f0c52841ffebb555b8b36361b60856054895fd1d7efdf3c036b22e284b2a52453fdf68fe550db9549f15d73e4de3fcfba88 SHA512 a75cc3044e1715e7b102e2a791dba007931602608edfb7e7c231751869310e04f5654e55a52d7c702dcb13646aa7a5e7d6b9ab1f5fc7f1da056c7e95ddd0043d
 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 e13abbc3ce6d..d87dcfbc259a 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://pygraphviz.github.io/"
+HOMEPAGE="https://pygraphviz.github.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
new file mode 100644
index 000000000000..e53d8c412382
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.6.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="https://pygraphviz.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-lang/swig:0
+	test? ( dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5-docs.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+	nosetests -c setup.cfg -x -v "${BUILD_DIR}"/lib/pygraphviz || die
+}
+
+python_install_all() {
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 46c6c41b8034..511cadfc9a41 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,6 @@
-DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
+AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
-EBUILD pygresql-5.0.6.ebuild 672 BLAKE2B 23245d199f0fb9d527bc487eb4fbb54b5eaa485407bbd5595eaca529a09b153f95838c9a8f456505377166363c0cf458273426bea69ec09a488633cccc752069 SHA512 18907e31423f99b8a74a1c7d816159192eb060667cfdbe9c301264ad48aa2a388981a877366cf0f086530964fa084de943c8f6e5865f94b5bfdab4d3878d7cd1
-EBUILD pygresql-5.1.ebuild 737 BLAKE2B 7807f7c3b1e1fd40aa061b718aad43d2bd0339a2ae0e7b14aae473a986923acc295bdb42b33ffd4953815c939d15763b4abc8161d7aa55e888603e7d6f254757 SHA512 a027a473d4e158ea1892baf74e1a45aff2d32f561ebae0ea02ab758fef16e86430529d30b3deaee2b05380259f194cbec9ede579e3e8a370c88afd02ff0d65d9
+DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
+EBUILD pygresql-5.1.ebuild 734 BLAKE2B 4ac66942fcb27dfd9790f82f8474b228ad36e9bd73fb4ec153ec1032a845aaf3d3dadfb6852be67db2aacaf7c18af6d0ec375a323745bedd83e5094f3d7bd2bf SHA512 660943ae719d760b0f7a6ec71b6762206da18dd68ff46b120d2339f6785e420b9ff0575280652a390588b8d4b98ef7ab7765869cab24e37d05c6f0939af5869a
+EBUILD pygresql-5.2.ebuild 719 BLAKE2B d521f3ad487c1b6d07385746ff3f8f3d9febbb32b8f95dcbe1f67facaec1a4eec26b3a40e281fa08682ad8a3d124b5f4e48038d74a1378ff1de9d93d3c49582d SHA512 27965b13f17276d7a2d031fe252bad47f090cfbed7400a00987257d48f1b2b2e0f0f23ef4517c987ea3c3969800fd3aaca2d3a2fdbcfb827eae36642795cad43
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
new file mode 100644
index 000000000000..24b9da21d165
--- /dev/null
+++ b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,7 @@
+ library_dirs = [get_python_lib(), pg_config('libdir')]
+ define_macros = [('PYGRESQL_VERSION', version)]
+ undef_macros = []
+-extra_compile_args = ['-O2', '-funsigned-char', '-Wall', '-Wconversion']
++extra_compile_args = ['-funsigned-char', '-Wall']
+ 
+ 
+ class build_pg_ext(build_ext):
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
deleted file mode 100644
index 5dee6b2e5d31..000000000000
--- a/dev-python/pygresql/pygresql-5.0.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=6
-
-POSTGRES_COMPAT=( 9.{4..6} 10 )
-PYTHON_COMPAT=( python3_{6..7} )
-
-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=""
-
-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.1.ebuild b/dev-python/pygresql/pygresql-5.1.ebuild
index 36e8b55fb190..d8a5320c8815 100644
--- a/dev-python/pygresql/pygresql-5.1.ebuild
+++ b/dev-python/pygresql/pygresql-5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{4..6} {10..11} )
+POSTGRES_COMPAT=( 9.{5..6} {10..11} )
 PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1 postgres
@@ -11,7 +11,7 @@ inherit distutils-r1 postgres
 MY_P="PyGreSQL-${PV}"
 
 DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="http://www.pygresql.org/"
+HOMEPAGE="https://pygresql.org/"
 SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
diff --git a/dev-python/pygresql/pygresql-5.2.ebuild b/dev-python/pygresql/pygresql-5.2.ebuild
new file mode 100644
index 000000000000..849038866a69
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 5c944a1a042b..981de324e817 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,7 +1,3 @@
-DIST PyHamcrest-1.10.1.gh.tar.gz 59019 BLAKE2B 1a090533ea8fe2dff9ad232b2e6dbf82841c38f3699e57750e2309b06a46e70ae5a9c7d087baf06de53e17323a5e36edee1a01d7a4442374d15b76a7723c2031 SHA512 f7e79f7d26c4c6add042052e451898bbf5adf21b05a234cc62bce890d68f5997693b042a9daf136f7026040a8ab7bf28b829288417b947973dcb959bf613a37b
-DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
-EBUILD pyhamcrest-1.10.1.ebuild 905 BLAKE2B 503de3051f8cb82d602a0c193661fa6a6e5d5fac4913e92370504fea9522a80af5fa3c64f2e6ce6a81a0f6b9076bf3ee4a05acdcc1c0fc5cba39527a6b15e519 SHA512 aa475c5f14a7de091b2f3ea7883a7276621a59fd5d85c9447d2165a1b6b7716f9a2e50976ff1cc53e0c9c4568eec2fb937d82b186899d4d8d8331edfda7ecc58
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1732 BLAKE2B 1462d6b579517b98dba0b0cbbba8794586ae6350f389f8c50bea47eaf43d3c34ec59407e6da42aecb4c40e88892236c9ba77dfe47b13c86624643f810f655905 SHA512 604cbaaf356da559abc145c90649ab0ab5e52c6c8fd19852bf8ea57e08c7e3b531580b7a2970681c61cd5159a08b57a82e58518e8a12b16682b688855f1175ce
-EBUILD pyhamcrest-2.0.2.ebuild 754 BLAKE2B 3bcc31478f8459da9dd0eddfd8cc393a17b8444e3cb572a4a78d00fb11b32aeb6209d3abbdc8cba10832290e63601620e37a5b4ef7426666f1876313fa71f624 SHA512 02cf49fc3ec5b4f93e3182008bd16794bc727020fb65809fc06f91cffe692d655689e070d2bd935cbe94441cbf8ead69633a1e9e8186ea1ae40fcad2036771a3
-MISC metadata.xml 372 BLAKE2B 73836583934bf3547c74ffa03d6187a30d71b50e6ad9d7b8c25a5f2fdbd276c735c3d3c39636aaa3e48c84daa0d559ee70621331c211a259148a771a7dc4f9b7 SHA512 7b8e3214627548449a3f0c6d70120978fd2afa5636db2cdfe0bfe71d5a2c46aa33975e29661afd851ce920508559c98d98285265297425b2ca7de043b887ac6f
+EBUILD pyhamcrest-2.0.2.ebuild 745 BLAKE2B 3b59e7a9ebf959a03278f4f1440de3715913ff9b60f3176be3c8cae2a105721e035cebd5e04494537a7e2d4f7378c928478d1905044f9fba004b0850572d274f SHA512 3a9bd0abd01d03493936c9f382727c549c341f8fdca375a891bf68b4fe6fb96158cd15e8c26ceef040bf804431c553b580fd1cf5e2d32422f845704c0ef848b1
+MISC metadata.xml 396 BLAKE2B 1086960a423e348fa862f395703ef468c4e2a5a362e8fa78d15cf8c2c0e56f8bc21627688c1295dc57014cdd91644ddd81037fb0505ef1f43e2e8c93bd9774a0 SHA512 cb07fb7bf1b7af660af9ab2cbba7f87a51afd254fbb5896bed0dfa07f98dc2a6d0361e567eb9cd240291cffcabc8eb3f3427809e1ce8b95b1de36d964d8262a5
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
index bb75201b6495..5eb981bffdbb 100644
--- a/dev-python/pyhamcrest/metadata.xml
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyHamcrest</remote-id>
 		<remote-id type="github">hamcrest/PyHamcrest</remote-id>
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
deleted file mode 100644
index 85ed0b0e2a84..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.10.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..9} )
-
-inherit distutils-r1
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
deleted file mode 100644
index 6c7080cb324b..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.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..9} )
-
-inherit distutils-r1
-
-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 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# enables coverage testing which we don't want
-	rm pytest.ini || die
-
-	# Known test failures. Remove them for now.
-	rm tests/hamcrest_unit_test/base_description_test.py || die "removing test #1 failed"
-	rm tests/hamcrest_unit_test/core/is_test.py || die "removing test #2 failed"
-	rm tests/hamcrest_unit_test/core/isinstanceof_test.py || die "removing test #3 failed"
-
-	# These fail on HPPA. Drop them too.
-	if use hppa; then
-		rm tests/hamcrest_unit_test/base_matcher_test.py || die "removing test #4 failed"
-		rm tests/hamcrest_unit_test/core/described_as_test.py || die "removing test #5 failed"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-	"${EPYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index ec73612b5ef1..0b57b1bb6ce0 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 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="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
deleted file mode 100644
index 067ccd0da9ec..000000000000
--- a/dev-python/pyicu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af SHA512 77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
-DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
-EBUILD pyicu-2.4.3.ebuild 541 BLAKE2B aeff740a3137edc2947e797c527e52b6306c283aa6610f23a827f3a77f47f7801922416d7b48c2aa79032f02eb6e254663507f5470a05201d99ae76a8bedb8c1 SHA512 d9d12f2f1a1982026b2955ce9bda2b687360176e3d2ebb1d6209689964d3d6f12532957973e7ca6ea057d16a3a6ed761e5fe6e8eeb9e7af282e0837e20b8d967
-EBUILD pyicu-2.5.ebuild 542 BLAKE2B aebd7778668b85f90007d78c4100adaf69af61fc89c80653dfb2ed616628b7b5fc8287ab62031bb793d4c261efea73c901d274ece4e805a194fb85eb0496c9d2 SHA512 ab4e7f228c8cfa8290742720ae84c4d78cd4cac54108ff3c3b5534f8906703c3280b558e9dab6fe173f73b83053b180d09aa3d7d39bc46f73c2e8980af8d72ea
-MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.4.3.ebuild b/dev-python/pyicu/pyicu-2.4.3.ebuild
deleted file mode 100644
index 62d9421eee78..000000000000
--- a/dev-python/pyicu/pyicu-2.4.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,8} )
-
-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"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.5.ebuild b/dev-python/pyicu/pyicu-2.5.ebuild
deleted file mode 100644
index 9c7ec0357142..000000000000
--- a/dev-python/pyicu/pyicu-2.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-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"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 2af84a496c1d..54860e1954ea 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,5 +1,8 @@
 AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
 AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
+AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
+DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD pyilmbase-2.3.0-r2.ebuild 1563 BLAKE2B e13ceefe8eaf32d75d8ea61372cebc26f057dad652f76660300d149016aa7c6820a51e64a3b01d688d973f41631d1e18641e82edf045b1573320546e2dfa8aee SHA512 2c2e81c0530ceef420aa1aa7f0ca8cd3a0ffff251a47b12d9b141111339fa8a4894478b0650acc056bc016220e14392e59309b18155361a38b533e0ec9b1d3ec
-MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
+EBUILD pyilmbase-2.5.2-r1.ebuild 1484 BLAKE2B 9808e56335ef42c9bc1bfb17e6629b0643ddbecbd5e51068fe56a114146e9a21f0f9ce73410fd5af03001902d649389007e5dd63a5b60044164d94dc3073d403 SHA512 d8c8139249f34803b50a7dc0407dee68518f353bf6b2da9430d15c6c7e1821fcd2b384c0bbb375c9aadbba94731bbb139edda5a80358c49829cf39268e89069d
+MISC metadata.xml 747 BLAKE2B ab28da77947c2bc358815f40f597f5a9973a97be33f5b29910bcd395ed6b722d383dac53ba3083d75077cc1899286d6b9505eb6b0d574035d38b357697926ffd SHA512 a2c785799d3ca82acd3a3d8e8296f09fd63108a318fb64a95ef58a60d7f63a8b6dbaea2793451b47a94400a66d9f491ebe39893ede68f0c896a47dc199d86ff8
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
new file mode 100644
index 000000000000..6e8eb30cc474
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
@@ -0,0 +1,30 @@
+From 34b8fd05781b61ce06263cdd22866a8bfc4be5b5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 3 Jul 2020 22:01:18 +0200
+Subject: [PATCH] Fix pkgconfig file for PyIlmBase to include prefixes
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ config/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index 1872c89..44a9f2f 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(pyilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix "\${prefix}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(includedir "\${exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
+     string(REPLACE ".in" "" pcout ${pcinfile})
+     configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
+-- 
+2.27.0
+
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
index 73126d2e6640..6cc59a0acbc2 100644
--- a/dev-python/pyilmbase/metadata.xml
+++ b/dev-python/pyilmbase/metadata.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>waebbl@gmail.com</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>Provides python bindings for <pkg>media-libs/ilmbase</pkg></longdescription>
-<use>
-	<flag name="numpy">Add bindings for <pkg>dev-python/numpy</pkg> use.</flag>
-</use>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Provides python bindings for <pkg>media-libs/ilmbase</pkg></longdescription>
+	<use>
+		<flag name="exceptions">
+			Enable runtime floating point exceptions in PyIMath.
+		</flag>
+		<flag name="numpy">
+			Add bindings for <pkg>dev-python/numpy</pkg> use.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..a5049ff6409f
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# boost is lacking py39 support as of 20200605
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch"
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 9feae0d92d2d..5b6f75f2561a 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 773 BLAKE2B d78d5bf6c51b47bb3b5dc4d3ec87d4bcf7c93139725587c0fe51d3cdf165a0f13a21e7384ebcbc8c3b5f3d417d65263d0a2b44ac0f3484c2b67efd875081075b SHA512 1c91176a0671f9d99bad023d228eae67d127cfc24e493c93f2c5db6cd1ce52f1240fce86e2b994f87d9b28f5cb82eddfb4cf35ba95d2c087d58daa706914642b
+EBUILD pyinotify-0.9.6.ebuild 767 BLAKE2B ae63262f3844340c16bce4df36500eeea7c93505c7629d78a608b4ac5a33ecba6750abff76bf33b070fcc570416f9633f85c7bfdecf16235f2631c9dd396aae9 SHA512 1471ffc5f22e05c0884cda7b3bc69ed0a0400250d64d16ef007e2f1aaf24cd0e5ab4835e097b55d60e2db704b13f8250546fc2ab49153960cd50132fe8e1e42c
 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 5221c9f20f1f..0fad415c410c 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 330c6982b6dc..d111e7ae26d0 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,4 +1,4 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.7.1-r1.ebuild 1394 BLAKE2B 2c6d93b766bdce0211c6c8ce3294e397b4d16d690969070e6836e6a4685731d6c26f985cec79f3319b1502d3419a099787e55bbe047cc2cb2c7bf9d47983a2bc SHA512 4629c9014f05956f860d373522dacdf1cef940d9e476358539457b29bbcc0e97cfb15aaa411558e6f4e7da41fcf072cf4d31ccbca0a450d5967d6bf85be228a9
+EBUILD pyjwt-1.7.1-r1.ebuild 1405 BLAKE2B 8c63157a91842304c5ccd1c17b444c79a1196b8e28f47ba6a5aa27cc05a45431ec798b135c4147c120e44d0936ea999abae1ad4dc86079d7fb31c68bbede4627 SHA512 96755f3bdc9ccdfef6a90029481851e219c867e6fd8e26e6677dcc66cc37c14f3b989b5d95e180b3ad9f976b3bfc7a191d5970bdd529778a5f1931696ce28f7d
 MISC metadata.xml 439 BLAKE2B 33beede4418baa6979f4d9c56ebf114e4de4e36f7fdacab5b7948c5a500121a0d1590aeef3ebbb6b86127bde04b0663e3cff53d669b570034fbb32d6aa44f950 SHA512 5bb236a696e0ad2f4f0fc39ff651fa6c1c2764fe777fd5c6be29b0610c1de9c85bdb72594f56b903b7c646014d10ddcf772bd49595581f0b67b183bbe361bdd2
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 27e9e851d9e3..0cb072fed98d 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 12245c273ff1..504e2e4a3063 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,3 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
-DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
-EBUILD pykerberos-1.2.1.ebuild 538 BLAKE2B b91efdf6339c059e478a0933d84d2ea2e2bf185e6ef6e251c7bffa988464c5e7cc5b59cc4a05d178e6090de3650dc9bd8c45d2d08afa9e1d9bee17b01f5b06cd SHA512 3dd103eefc57a1a8f1c9d01f996639ca17300b2020627d6291589ad30e37837a1a237b74ba556360ad983b48b85d419f8c5f27b49ba9c689256f181ef4f216a2
-EBUILD pykerberos-1.3.0.ebuild 1322 BLAKE2B c9966a85e9bbf2ca2494b04e90922d64f9924b383c44e5a717cbb6a922cb8a8e813080d5f19fbc474720846b2141979f427bd55a5bcee2acc618f474a5207f88 SHA512 f007f8269effa9ba8591c5eced37a1409e133db97897519e273e22289ba9829c4a4da1961dc4f2378ed307d11a1c695721dd4e66474561803cfd5fb4a8165e46
+EBUILD pykerberos-1.3.0.ebuild 1319 BLAKE2B 04348fe54a9b06dadf14693e784d1b652317124a81b111b5239cab4420c888fc72aac1323b1da1f9d5f14433a9fdccb7c0e4e45e88492452ad6caa27ecb1ec09 SHA512 46b623a0288cec6f1acec781f62e1bf2ddf3998605999db9c0ce5cd1510f07bdb8b388f04f9efd9f72f7a58a618365f66371aac1d4013dca984ca1f92f326d66
 MISC metadata.xml 423 BLAKE2B bc74606c5e0d18c76749904da2d388a2be603d2aad92538dbc0ab92974903a24a78788094eb6da7775028b8cd178334b243246fb0f4ba85f90f74fa31bd74f35 SHA512 c84e39a4e84b841aed995cd47aa349df5c4d3ec32757e826a7194c7f629e5f109e30c841f4f4bdf949e966937cde58ee555d6dbe02496baecc25937f06244950
diff --git a/dev-python/pykerberos/pykerberos-1.2.1.ebuild b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
deleted file mode 100644
index ce8ce457faae..000000000000
--- a/dev-python/pykerberos/pykerberos-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=( python2_7 python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/mit-krb5
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pykerberos/pykerberos-1.3.0.ebuild b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
index 1a5dbde1c25e..3dfef376e5b4 100644
--- a/dev-python/pykerberos/pykerberos-1.3.0.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 43a1d53572a7..a9b78a021ac6 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,6 +1,6 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 AUX pykwalify-1.7.0-test.patch 1873 BLAKE2B a95d46378faa7ef87db078d44fdc5b3121bff303cbdd682907a764b7a142a8813366547731cce54424a1900b9c3ae3184f3b98a1519687063e8cdcf69c953457 SHA512 6b22feff5efbfce01f46791a8676d39839e5e3c5498253dfb2b80ddf7f96d3f83978cbd7378c15bdf9a9a69b4143a5643e034156d66d134dd962dde6de7b8023
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
-EBUILD pykwalify-1.7.0.ebuild 804 BLAKE2B 0daa8d0b24f01cb511ee8f554e322e72af2c5a221e296951a26e4c42760251899e4b17bb1d3b404d07e802e41f7e8735571f76e08a733e1549ced415429f8c65 SHA512 0967f99de317e2af6653717c3cc675b9f979bbf4682f71f9295e8a85f79ea3c976ec94e03a7a80883983478e8866b5307efef51a8c0a70667995d92a110ac0de
+EBUILD pykwalify-1.7.0.ebuild 802 BLAKE2B 1b2545835c4f7ca844a978dc521d83baac76a2788d2eb7b65544f2e77123d06fb2bbc15056f5d73564677b878cac23f5cc8da9a07aaf9bec120404da8952cbf5 SHA512 d79cfdcb7689f9444d317e055c49bde31afc4dca09e7429a350787d225bdb39d6b27cb65c01810f452de7db0c651f2652197d7f7798b2c063d65a96ff8429d2a
 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.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
index 1bd14f741442..357a50ad9e8d 100644
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -14,7 +14,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"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 7328b33eea83..cee20568d572 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,5 @@
-DIST pylast-1.9.0.tar.gz 42584 BLAKE2B b479fe5b780f6dbd30f20c0e183205ffe87703f26fe8ff04170c7f906705bfe737e965c2a7ebc562943c96a8f9bf7710e84999656d1ff22820254e4f4573f0e2 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
-EBUILD pylast-1.9.0.ebuild 601 BLAKE2B cfc5c3b25a62a2ed1842ebd0f0b62047d75b4c9b2b94b1dc2ecbaa6488a89f34f12a6d584b32d6b7dc037daded5acb184f294a563da0a00b7cf5a636c74eba1b SHA512 caca82e19581396e4f666542458c79a42a536ae3d97cb12fbe082fbc57ff96e7a99ac86ae99e4f22f0ad114afa85ee7547ff863854a3930c8679d575cd952fd7
-EBUILD pylast-3.2.1.ebuild 862 BLAKE2B 4c07d4609a4030d54b93beb3ec6845846a5405af154813bb09186c739204e7dff02466cb8d5eb7abad51791c781392928bb89b5b57e6e61aacdd9b61a11f1475 SHA512 9ff138e601d565c19a101240a1bc5492c4ef68c56c270532cf521b38bb52f1c8465b48c3af263ddfd361483ac26036f9b59f574bd3581e712b44f583ef025567
+DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
+EBUILD pylast-3.2.1.ebuild 867 BLAKE2B e3284a7c05c7ad2f7b9392360b79b8050d4961f254fa41abf94c466df0aba4cd3cb82d1aec912e8819b6e6389911ef5df6092bc67029d7dbce300a73ec52ba6a SHA512 86f2b4271a5d371048e82fe0e8e7a50523c273170bc06b37780b202e676a5ee7d13b71010be81b2f08abb15105ffeb211cd2bb84f3aa3fda5903bb626ee7ecb3
+EBUILD pylast-3.3.0.ebuild 783 BLAKE2B cfab283c777a3b6ac3bee72c69209356e175de67601404be1f2a2f44bb076914b1c26182cd74e8aee1dd37a434fe56d9bb5076ebc1e92642504ea97491352d34 SHA512 e022d6cf349cb94cb9c699d7460976676d9b2bf559fedd283fdf86f1049c4daa2e032cc398a95049fbd182d83b1bc7f369dad4e2473de2eb8241573618f449e9
 MISC metadata.xml 838 BLAKE2B 6e7565ee2b6821052c09371d7cd6dd33964010c15ef8cb7b7a4a4570628683ed16510385f2a54c084ee605c590132a4bb4926510b9805ac7fd7238bb8d571537 SHA512 e0ed92b884e1a5be485ce44bf08fcb6c38068134e083423bde3e4a2f2180d0cb14f76bf9f154f69247a8008e5a952021925110cf1d0985a7a7d15f082150fad0
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
deleted file mode 100644
index e253a50464de..000000000000
--- a/dev-python/pylast/pylast-1.9.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=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pylast/pylast-3.2.1.ebuild b/dev-python/pylast/pylast-3.2.1.ebuild
index dd510e891907..bb2a7dcd9a56 100644
--- a/dev-python/pylast/pylast-3.2.1.ebuild
+++ b/dev-python/pylast/pylast-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
new file mode 100644
index 000000000000..126f06114b29
--- /dev/null
+++ b/dev-python/pylast/pylast-3.3.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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
new file mode 100644
index 000000000000..173408f8f1a6
--- /dev/null
+++ b/dev-python/pylatex/Manifest
@@ -0,0 +1,3 @@
+DIST pylatex-1.3.3.tar.gz 300639 BLAKE2B ac8fad8fa7e6e821cda168f3ae8ffb5acec21d688761b153ef2f9383b6a2f2ac7daea65f04389eb1ba3152fc50176d73cb814a78d2b5250ead2c6647eb96635a SHA512 12f51805996d84840f68844b79384ce4d2c29dde4db06f73b8887fe012abeaa4b9c5cf5e449132e626132b50ba26f014a899d548e3c0def25289671fd92e41a6
+EBUILD pylatex-1.3.3.ebuild 1262 BLAKE2B 7b6c7583e4b81b109de7dfb65798ac5ff29f706e79845926cd19fad434882b58a9869ead24cbb8b95427349fe189cb4bd0e57f6125fd76a7fe44ad4f8bc398f4 SHA512 4ed3ce684cc483caeed7158aaf23e0899c7e20c91d5e556cd5f3cc9de3bc3816217d802f25853b38cc8904e7656330aed7ea2e74ca3d83c628432c5c2aed62b5
+MISC metadata.xml 719 BLAKE2B 783c71b21422f66a2f58b8afe718d9029f9b5fc4b4b7b82a1e4e94fc4d5c3a7a13bf55a116591352a6bc48ad5a2249bfca32b60c45d319d79a420a109203b1f0 SHA512 c3c7d820a541708fd78cdda73c425e491b5d527742ff641d9291ecbc107d79cf870cc2150e72f45cfaaf2de8f678b9b54ed041611caaed8538f21615e5fbc374
diff --git a/dev-python/pylatex/metadata.xml b/dev-python/pylatex/metadata.xml
new file mode 100644
index 000000000000..e2160561b195
--- /dev/null
+++ b/dev-python/pylatex/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	PyLaTeX is a Python library for creating and compiling LaTeX 
+	files or snippets. The goal of this library is being an easy, 
+	but extensible interface between Python and LaTeX.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">JelteF/PyLaTeX</remote-id>
+		<remote-id type="pypi">pylatex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylatex/pylatex-1.3.3.ebuild b/dev-python/pylatex/pylatex-1.3.3.ebuild
new file mode 100644
index 000000000000..624ebdd6af61
--- /dev/null
+++ b/dev-python/pylatex/pylatex-1.3.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="PyLaTeX"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A Python library for creating LaTeX files and snippets"
+HOMEPAGE="https://github.com/JelteF/PyLaTeX"
+SRC_URI="https://github.com/JelteF/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/ordered-set[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+BDEPEND+="
+	test? (
+		dev-python/quantities[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		app-text/texlive
+		dev-texlive/texlive-latexextra
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/"${PF}"/examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "compiling generated files" "app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience"
+	optfeature "matplotlib support" dev-python/matplotlib
+	optfeature "numpy support" dev-python/numpy
+	optfeature "quantities support" dev-python/quantities
+}
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index c5421271ad25..60c5310a26c8 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r1.ebuild 1532 BLAKE2B 5a85fa2b61ec982f5acb2892ba7391db378165c2f63d54bcbd59a3c88e4c12d2b43b5863176c552e1fd5b2f8694a91ec3aa6434e43e4a163526ca75bcbcb51c7 SHA512 e19f0d6484914db391a626a92659d5cf9552578127fc62813f746093f9bdc681ff367cad882d7f3655f28464d58bece934c59748eed0fecaf400e937fb333e17
+EBUILD pylibmc-1.6.1-r1.ebuild 1530 BLAKE2B d2f2726064ae10694ab6313fb8c8bac73cf8947b0dd5aa2578a5023055d046adc035029578275bd3ac99d3b1eac5d4dd74974a0fb4ec8a47d8e46a5c0f9689f4 SHA512 c802ede17c265a997149501e61d6ec9c64b8ae3edb425120252a05ac73f10675b9827d291cf163bdff761041130383cea5c086cd180e3efbc598801eaf51f460
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 42c032a8b630..814e53f0f98e 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index bf83aa0a835d..5b6051616d9d 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,10 +1,6 @@
-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
 AUX pylint-2.5.3-no-pytest-runner.patch 533 BLAKE2B 0882d3b057cd214ac04645c3992585e9550624f551206d863817940846fc6bd7d863431c33df46f0a83379fdc3ab411949b73f0475e08fd7debd465d83e848eb SHA512 9ed1784e83693b2aeff1862f9592fa574f20bb2d513f3bdef34b895263a31d6d747b4c76d09e6d48e15031388cd70b01caabfd84628ca98e1634fa42b6988eae
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
-DIST pylint-2.4.4.tar.gz 646113 BLAKE2B d62b66b056e01cc13e90f45ff4a11f94983e0b9b42b9a05e5c7b7385280000d15ead9a282e7eea31a8ee6a24ffe539576a6e9bd40dc4d89093263da99029123b SHA512 835e0687ebc76c530e0042c5a5188b8aedab446531f621627e990cbeb37ab6ecc8de0f8c6ab171abaa63488e049e8d7782958461421f9a4127435f56b6d2ed0b
 DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
-EBUILD pylint-2.4.4-r1.ebuild 1439 BLAKE2B bc1fa51468b6a549822af2ce99167ae59eac62aea5b1467e438644d2104ae794b66d5705903f024e4bf90ac4a85cfb5f1e9cfe108c67b855aed588039d1ea1f3 SHA512 fc5a9a05f628bf64833e9975a3e9d6a18772c18b450a3f464fe7a9643780bcbb7c7b8320767e7f853329c5d187de6d0a6c6612cf6ce4b611347f17887fcb4277
-EBUILD pylint-2.5.3.ebuild 1611 BLAKE2B 0542a405a65a115dffa3103208fc486461c10a5f0f452adfbcae8ed1943e821e3a879a9a0450a6b6e90e4d49a3e5f731f1eb6f953d28d5a4f7c3f708268badb0 SHA512 f82e640ca05771b6827e951d9b1cb30e07230a8f5ee329b3030df31ded627a53cd8585e89d048c8ba9a9f9d6cfaf69ce9c3101d56eef61ec85327520688bf75e
-MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
+EBUILD pylint-2.5.3.ebuild 1604 BLAKE2B 36455c4999d1e54ea89fea6359b654226ce7ea9df5e21e03c201de7daf7155b886ff6d669bb3e7e09c0aafd3bc5d6d338e9f4a12c5fb3e4b51a727a62ca00e59 SHA512 ca7e95401d063fbae9f2de19fd40fba53b3771ddbe02acfb45e71577d916cf0d76a9c67c83fbd2960603d9e002ff5edfccb2755f0cd3621150a131837b7038b2
+MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
diff --git a/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch
deleted file mode 100644
index 0d668d01cdc9..000000000000
--- a/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 4d16b79b..b2a1b9e9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -143,7 +143,6 @@ def install(**kwargs):
-         extras_require=extras_require,
-         test_suite="test",
-         python_requires=">=3.5.*",
--        setup_requires=["pytest-runner"],
-         tests_require=["pytest"],
-         **kwargs
-     )
diff --git a/dev-python/pylint/files/pylint-2.4.4-tests.patch b/dev-python/pylint/files/pylint-2.4.4-tests.patch
deleted file mode 100644
index b11ecb7c505b..000000000000
--- a/dev-python/pylint/files/pylint-2.4.4-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/unittest_lint.py b/tests/unittest_lint.py
-index 4f942cd0..d54008bf 100644
---- a/tests/unittest_lint.py
-+++ b/tests/unittest_lint.py
-@@ -792,7 +792,7 @@ def test_filename_with__init__(init_linter):
-     messages = reporter.messages
-     assert len(messages) == 0
- 
--
-+@pytest.mark.skip("known failure, see https://github.com/PyCQA/pylint/issues/3198")
- def test_by_module_statement_value(init_linter):
-     """Test "statement" for each module analized of computed correctly."""
-     linter = init_linter
diff --git a/dev-python/pylint/metadata.xml b/dev-python/pylint/metadata.xml
index 4fd10546d5c7..49c908e83e85 100644
--- a/dev-python/pylint/metadata.xml
+++ b/dev-python/pylint/metadata.xml
@@ -16,6 +16,7 @@
     interfaces are truly implemented, and much more. Additionally, it is
     possible to write plugins to add your own checks.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pylint</remote-id>
     <remote-id type="github">pycqa/pylint</remote-id>
diff --git a/dev-python/pylint/pylint-2.4.4-r1.ebuild b/dev-python/pylint/pylint-2.4.4-r1.ebuild
deleted file mode 100644
index dea212ba1bc5..000000000000
--- a/dev-python/pylint/pylint-2.4.4-r1.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.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.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
index d2d671ed0622..4dec5c52ccde 100644
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ b/dev-python/pylint/pylint-2.5.3.ebuild
@@ -19,7 +19,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="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 59a5cdb2981e..614f838463e1 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST pymediainfo-4.1.tar.gz 432848 BLAKE2B e4bac2b43ee7c6ecb978bb08eb5c7070f458b7a00607c0a1d68a5e74d4f6393d7bb44d7e3471a4ab83bc45e19e4f3ab6b7779c28c16845c27a4895d76fa34d64 SHA512 08ffca0c3179aa6dff5b3007faaec1f1a2f372b2995824039021f41b2c772a2a13370c1dbd37d2408d023be497cff71dd6f46b09c8989f168976d75723cd7722
 DIST pymediainfo-4.2.1.tar.gz 434723 BLAKE2B 9dc9754fe8b993b9674da1a02150addb2f7eecfb38e60914e0644fddc1de564e8e0a81260c999f8ae3379d484e26786d0e67ed8aa0e3cc17b70066edf3e75b9c SHA512 33343838312ce240a23fa3856d808bf4b1346a1c65ed99c0405664aceaf452df610144114c228ad43e525f7abc9609420071bc6960f92b68ed7abe5dae8764aa
-EBUILD pymediainfo-4.1.ebuild 1068 BLAKE2B 6825b82ea1f443d0e8f189c59fa1961c45b8983ec22e7c63d43101b014ef49a0ffa24f600dae7fc4bfaae42b738fbc7fd9e36c31179dfa3674001896017be445 SHA512 559b5519b73dc1319d7f288d26aed009a573846e56f6511c8d8f885cccc3fd2b145098d095e223ee180aabe92e74d7d2c84c282d81abdf538e75ca0d3fc18ccb
 EBUILD pymediainfo-4.2.1.ebuild 944 BLAKE2B f2c71f7524d4069caef8866b7e008427f846ebef7105de8ba52a2149998cb1b4c52bdf40dda8ceaf798bd618f793041f3bc95339062ba1f28d21768dec2d6571 SHA512 cd604ff86a4208bd2817dc74122e83f71d4e84109073d8e5479d538ca941921b1a779ee8eee9ca99267aa96a34f61549c613fe3aa3165dd05eceea54222c9b45
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-4.1.ebuild b/dev-python/pymediainfo/pymediainfo-4.1.ebuild
deleted file mode 100644
index d65479d3514f..000000000000
--- a/dev-python/pymediainfo/pymediainfo-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=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/pymilter/Manifest b/dev-python/pymilter/Manifest
index f4acdb2f7600..b29ae2d6e23d 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
-EBUILD pymilter-1.0.4-r1.ebuild 555 BLAKE2B a2f50ff93af91c0b596abda5c7f7a07a6f77cc0315670860b07b65448077341557ecf6f946dc3d6c727c6d9711a83fc676e485750ebeb229f0a2aa0bd6c50d02 SHA512 b4cce6d41334ef3605a03fc50d2d1de5ffa4e95ac5d6201bcd800dcba2c6aabc79a7f7642a8dae2f6200b87ff7ce572856eb12d9c90721c060b3dfda67eec5e8
+EBUILD pymilter-1.0.4-r1.ebuild 631 BLAKE2B f896e486d50ad8af296d1e82afdfdb758eb1ac0ce6b63e50a73a4a926f21beaefe654eea6bb82e789981141aa52ab999b6e2ca9c343a2b3054e02d7768de9101 SHA512 8ad124725c096844d883f3f0f438d79da4a537d2173ec92a7535750a06b1da9a701bb858975a4ef21bdc88dabb90f6619a291ab11ee6cdbe26be78dfc39229d2
 MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
diff --git a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
index ab1081c7100a..5a706a8fdf00 100644
--- a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
+++ b/dev-python/pymilter/pymilter-1.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,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -13,9 +13,11 @@ SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	test? ( $(python_gen_impl_dep sqlite) )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 4d18b67b434d..df35e7437ba3 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,5 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
+DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517c512bbfdb0df2c4569ec5060fa9623a23f48ffcf0c6ab2cdc69f6534f36ef18c929047bbb22cfbe9055a0881b7 SHA512 4f8a185013cbb3c07774d3c6aecc9e97dabb4ba55176fa8a51e17bcdb7cbbebaacd16304e580b4c6aeb26aad964401249313b59dde3c5c248c4496d64d18b22c
 EBUILD pymongo-3.10.1.ebuild 2854 BLAKE2B 70c1f06d278465491dab6c124629c0ab7a2310e5521b8357a57e4db6bfe3c4347c55744f7c205256088b04b3f65402482b50292ac73d4ea7335bfff80e91fc65 SHA512 0b4185f73dbd81b07ae04e54cdcccba08dfeac591c3780e8a1572de7d0fe2971dd482492372525ee6d324fa38804847cead63c9ef2748251084163b71d900b41
+EBUILD pymongo-3.11.0.ebuild 2655 BLAKE2B 758d685f59e3b27b1f2a42a550d00f928a944e5a99d378ed87221d27a7a85d1f61a4f22ff149e8cc046ccb18d97d1ea57e80b93183d19eb30548d4d8e8d8955d SHA512 0ec79eece31d3e61aad54b1a6b8d99c8505a1324be0ab08c96caca38c5ed39e68b4d4a43d9e01e5717526acfe39f36003a00eef7de131cea97c1358021cd0ae3
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.0.ebuild b/dev-python/pymongo/pymongo-3.11.0.ebuild
new file mode 100644
index 000000000000..9c6cc95462f0
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.11.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+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}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+
+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
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+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}" --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
+	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
+}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index f67c8cde1b32..3318abb9c918 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,6 +1,4 @@
-DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
 DIST pymountboot-0.2.3.tar.gz 4065 BLAKE2B 81ef6c967a2e8eaa76155446e0c59208ee10e5e3b40fbe9d910d5e4faf3ac1963146ef1df634c4795b56e709b90fb92edb57916586c8a1e5fa14ad92e1721f42 SHA512 fee4c8444b89ff0375c75eb44ec396d1c1e65d4bb08ff230ae0fdb1f822115ed44bf9904c284d3623768df0b4041ef7ab4cf9717596148d3df76badd0a3aa92a
-EBUILD pymountboot-0.2.2.ebuild 513 BLAKE2B de470a0cc808589f36080ae6084a21060f8f1c41b9f77b8819540d4f89a4ea4218533ea8f675ef13558c047c2cc3c79843c4d2cf9aba55ff5742e1332eeeb42c SHA512 1b825d040a06986c839e15ed7c1132bde9a83d4a410f862d663c795f093843364a03425ce227e9ade1cdb62dfe059832aa14f32a66e78de331e16e4ebcbc8465
-EBUILD pymountboot-0.2.3.ebuild 511 BLAKE2B 63efbf7e8c221a824a803ff882235bff95c42119e1aa109fb6403066b19a8af9d56c0b5fd5f07041cd0195a009a78589b4e51c5932b51841c7b599816b1d63e0 SHA512 7637b3ca4a1d2e3498405db19bc507f7f8980100f16933fc90de010be162b36665f78565ad2f1b74ebfe7258c7a49e4e17ba80da73d4bf66a643df751d16ae64
+EBUILD pymountboot-0.2.3.ebuild 509 BLAKE2B 998c83593fe665178e0fcd200eba7420342f82054a57724ac7ce4aa3f277a0ddd93346555b322fc02fe2fccf4826917c7f984ed67397313a4193c281e2185824 SHA512 0d2b31dc308d2944fa9e95d9d7e2a7c6b1473512b0cd1f3b53cedf9da5ed250d024032ed9ffa48d6e41a06053e67320e672185a9e1cdefccc938451bcbe45599
 EBUILD pymountboot-9999.ebuild 470 BLAKE2B 03c4de0bc0a5934f2081bcd9ffd77a49b61b054ec4afaa64dd9b0cd395c12cc1568cbaf716c55a04a1f7a2efd65f35247cd9ba7a21da8e75936b65417b9a9498 SHA512 21887d274fcbbb4b43920352a76f70451a239fc525235b3789530deadd9fffce3a25d5a8ab50fbafdbab584121b1d59e85af413f013c535d82fe78f86a582caf
 MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
deleted file mode 100644
index c5007a5efda2..000000000000
--- a/dev-python/pymountboot/pymountboot-0.2.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=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension module to (re)mount /boot"
-HOMEPAGE="https://github.com/mgorny/pymountboot/"
-SRC_URI="https://github.com/mgorny/pymountboot/releases/download/pymount-${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.20"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pymountboot/pymountboot-0.2.3.ebuild b/dev-python/pymountboot/pymountboot-0.2.3.ebuild
index 4d0cc67eb79d..c55bd7d4f1d3 100644
--- a/dev-python/pymountboot/pymountboot-0.2.3.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/util-linux-2.20"
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 7a5b51267af5..995e30eb28a0 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,5 +1,5 @@
 AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-2.1.3.ebuild 1091 BLAKE2B 00fd70adfe26046eb057c8e0ef8cebddc0f2f6a734dde458bdf16cbde5aa1dfc5c76e38d93eb9a9326945f683dd305c3e1cf19d189ca6dd23827c8ac84bfa7e1 SHA512 b84bd95cbc802fdcd5be854032ed8274956bbaee09e7ee66ef8bd6071f82e8b3542c7448c1b205d278ecceedc97e3331ea7bea50247e4e7930040eae35a388b8
+EBUILD pymssql-2.1.3.ebuild 1081 BLAKE2B 16cd75e938c7979ea847d9d62d5143be08f310e34b11ff2108e9b189f55466a950e6f28d0f34a674d99446976737e0f3de87faf5d74ee60fbd336a09e234dc83 SHA512 888ce0adeb628130a2dbf2eac7386cdbb4151adf267bc4313590d919799d50be821cd3d00e4b0517f05c64c25e849f83b2ec3877c85ea37df956ef29d394c75d
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index 12bc9a3b73da..a7756b26df62 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.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/pymysql/Manifest b/dev-python/pymysql/Manifest
index 6736de148533..ad05b9332bc4 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,7 @@
+AUX pymysql-0.10.0-add-missing-import.patch 536 BLAKE2B 664c1c93cef8d2cfe810a5afa517f1f755b854ecc2997000aace64bc890fbee1b877a81efb877aa668f99dec67ad8cb453f428639828ade322d51ecfeca7c07d SHA512 1b08d846495879eb17fdf5274b47cbb39beac2416a0120b81fc01f0ec908e92c2898d30ad1225f950d0c22341807bc45347384d5faed6ae52bc31954a38e1771
+AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36
+DIST pymysql-0.10.0.tar.gz 86137 BLAKE2B bcd4746d3e3947c2598b875d46678984beedfa0d9161a1aefb1f7f4b5314e084f5292206435b0a2621fb100744194fd1e2963228e37b41c289c5c4021f475371 SHA512 7d322c526634380cf4d3216f666a7d1f38e120390aab525cb8806bcea3f2fd7eab82e744a0be7270eae47ab1f79be5b5f7409e7e5dc9aaabf1e3c0c8853f578f
 DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
+EBUILD pymysql-0.10.0.ebuild 3630 BLAKE2B 2964ad45547b3a7416d182cc3acc75d7ea4a0499969c94cf7781bae7a938e34988552baf1c05bba5a677b7fcadcf7b8f0aad066d69b966f166ed6f282cfdbe47 SHA512 7aae18dc645baa1e241f64d05318a157c9c9110090651a1a6e1be0d2d4628f54c1a344ca8e3b10ac18bcbd4e57c2f0b28114ed6a63d99e74579615dc874a379b
 EBUILD pymysql-0.9.3.ebuild 2141 BLAKE2B 53cd7fa1adf3224e595e841339296441f31df2261fce0fbd1955bc903444eb218b89a2b8845ebaff4d9cd75bcd2fd29733d20cd16f68aed710e097c26922787b SHA512 3b854cd5af1502d81e6157f20044311152da0d2cd7fa471d88e68bdd284a380caad920f89594eb085f52da07d3e03d11a3a78fa7888d54e54263fbc8fdec7443
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
new file mode 100644
index 000000000000..f850c9be7262
--- /dev/null
+++ b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
@@ -0,0 +1,22 @@
+From 3e71dd32e8ce868b090c282759eebdeabc960f58 Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Tue, 28 Jul 2020 13:06:07 +0900
+Subject: [PATCH] Add missing import (#879)
+
+Fixes #878
+---
+ pymysql/converters.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pymysql/converters.py b/pymysql/converters.py
+index b084ed2f..1b582904 100644
+--- a/pymysql/converters.py
++++ b/pymysql/converters.py
+@@ -5,6 +5,7 @@
+ import re
+ import time
+ 
++from .err import ProgrammingError
+ from .constants import FIELD_TYPE
+ 
+ 
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch b/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch
new file mode 100644
index 000000000000..aa9bc53b0358
--- /dev/null
+++ b/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch
@@ -0,0 +1,30 @@
+--- a/pymysql/tests/test_connection.py
++++ b/pymysql/tests/test_connection.py
+@@ -70,6 +70,9 @@ class TestAuthentication(base.PyMySQLTestCase):
+     for r in cur:
+         if (r[1], r[2]) !=  (u'ACTIVE', u'AUTHENTICATION'):
+             continue
++        if r[0] == u'unix_socket':
++            socket_plugin_name = r[0]
++            socket_found = True
+         if r[3] ==  u'auth_socket.so':
+             socket_plugin_name = r[0]
+             socket_found = True
+@@ -188,7 +191,7 @@ class TestAuthentication(base.PyMySQLTestCase):
+             cur.execute("install plugin two_questions soname 'dialog_examples.so'")
+             TestAuthentication.two_questions_found = True
+             self.realTestDialogAuthTwoQuestions()
+-        except pymysql.err.InternalError:
++        except pymysql.err.OperationalError:
+             pytest.skip('we couldn\'t install the two_questions plugin')
+         finally:
+             if TestAuthentication.two_questions_found:
+@@ -218,7 +221,7 @@ class TestAuthentication(base.PyMySQLTestCase):
+             cur.execute("install plugin three_attempts soname 'dialog_examples.so'")
+             TestAuthentication.three_attempts_found = True
+             self.realTestDialogAuthThreeAttempts()
+-        except pymysql.err.InternalError:
++        except pymysql.err.OperationalError:
+             pytest.skip('we couldn\'t install the three_attempts plugin')
+         finally:
+             if TestAuthentication.three_attempts_found:
diff --git a/dev-python/pymysql/pymysql-0.10.0.ebuild b/dev-python/pymysql/pymysql-0.10.0.ebuild
new file mode 100644
index 000000000000..059a093ed9bd
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.10.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? ( dev-db/mariadb[server] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-fix-tests.patch
+	"${FILESDIR}"/${PN}-0.10.0-add-missing-import.patch
+)
+
+src_prepare() {
+	find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
+
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	if [[ -z "${USER}" ]] ; then
+		# Tests require system user
+		local -x USER="$(whoami)"
+		einfo "USER set to '${USER}'"
+	fi
+
+	local PIDFILE="${T}/mysqld.pid"
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Killing already running mysqld process ..."
+		pkill -F "${PIDFILE}"
+	fi
+
+	if [[ -d "${T}/mysql" ]] ; then
+		einfo "Removing already existing mysqld data dir ..."
+		rm -rf "${T}/mysql" || die
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${BROOT}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+		|| die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+	einfo "Preparing test mysql instance ..."
+
+	# create test user for auth tests
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		INSTALL SONAME "auth_ed25519";
+		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+	' || die "Failed to set up auth_ed25519"
+
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+	" || die "Failed to create ed25519 test users"
+
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"passwd": "",
+			"db": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"passwd": "",
+			"db": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Stopping mysql test instance ..."
+		pkill -F "${PIDFILE}"
+	fi
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 8004b0baeff5..9b1f1dc8389c 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,8 +1,3 @@
-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
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
-EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 00a0f5cb11a1e542bebb1cb0a0257902afaa91108c061aaf06b49482c838e94688ccc1dc9f477acfb6490208a562c9740e90fb6bd8ca351665e3bba6750cd797 SHA512 43ce2fbd3fcaba0e8607d454d1196e840528899670b90fdb8ffe6405a1abc508648bbeaa6ddfc5b92ea9b9e8fc4c88ebb9d52359cf90742dd6f3f88c30314af5
-EBUILD pynacl-1.3.0.ebuild 975 BLAKE2B f1466ee9c913c90b85b02055fb4d8d36e12529cf1399fb774161be152be82890736c920ba54ba3cb14d10f3bc192d1e5c28b396cd8c1be20454b6134105b26b2 SHA512 5b8a64705801c43e89100e04922f8cc1aa554428f1f17cd71ab7567c837fc9a04494d091069d26785e440a58684ba87ca3cf8aa86fa6442c89bb886b7a3850fd
-EBUILD pynacl-1.4.0.ebuild 973 BLAKE2B 21cc174bc442b444c91fe035635040379edf1d715a8f3d702d9129d0e2bbe420a9c2af0554a4ada10d1ae41fcf63c541eb2b50a1568ba8c2b5a96964be40eea6 SHA512 d6f7f2880f6654e9cfac6c7c6f098e8ca37256e06d9b0bfae32178cd655f13e1c790495ebbc11747c464bbd716e0b6e1d534fdf2ec36cea4f162cfbe7cbe9576
+EBUILD pynacl-1.4.0.ebuild 955 BLAKE2B e20e1d8a026cfb118e890715de6cf2f6c3dfa77b2a236f7928172110c9ee179563d12d0dbd8ab2165a4051b46588ed45fe704818d7f255bde3eed7735443c47e SHA512 428a21a64ffafc3d402c38705c97efef46f160eef8d091ee9805cb04253bc4e19d7193917b2f48753ce7e7e016244e64df61feeec6ae7e8e9b7b34e73da0f18f
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch b/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
deleted file mode 100644
index 9b7a5a905d41..000000000000
--- a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af2d8c241872318baba42d7f5fbfb1869de91baa Mon Sep 17 00:00:00 2001
-From: Valentin Heidelberger <github@valentinsblog.com>
-Date: Thu, 27 Sep 2018 22:36:34 +0200
-Subject: [PATCH] Remove average_size hypothesis setting from test_bindings.py
-
----
- tests/test_bindings.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/test_bindings.py b/tests/test_bindings.py
-index 22930cc7..d7951a21 100644
---- a/tests/test_bindings.py
-+++ b/tests/test_bindings.py
-@@ -306,7 +306,6 @@ def test_unpad_not_padded():
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
-@@ -320,7 +319,6 @@ def test_pad_sizes(msg, bl_sz):
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
deleted file mode 100644
index 9c06b3ad7e23..000000000000
--- a/dev-python/pynacl/pynacl-1.2.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=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
deleted file mode 100644
index dfc8f7da7cdf..000000000000
--- a/dev-python/pynacl/pynacl-1.3.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..9})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-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"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${P}-hypothesis-4.patch" )
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index 6f73a99639f2..7a7a44ef1cf0 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9})
+PYTHON_COMPAT=( python3_{6..9})
 
 inherit distutils-r1
 
@@ -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"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index c4fac8adaffc..95c4773026e8 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
-DIST pyopencl-2019.1.2.tar.gz 343805 BLAKE2B 027b231231532403a5e18249bd438e1a5a67805a685e46fd9506f7286957b14068540f93a3733149aeba2a720f6c71e91db74351916ca974739374a05f2d2c74 SHA512 b2850622253f480cafacadbb9d13afea801af9d4dd52679f132fc0e5f1d4c2f4d3bdf83c9ed64c14c19ead75e6d36afa8b57ff52bbea135fc02291b1fe7b8636
+DIST pyopencl-2020.2.1.tar.gz 352160 BLAKE2B 2258c050bb8b279e3bcf563d805e36032d2f74c6b960e1453608ba1bbcf9b677c056eca5f5dde73ab2a45c13dd4653715682d83251954ee0aa841f4b65461d92 SHA512 5d74c61ec56c9893f8419e386e4ea16f3e1d20a922e0d7de6bf167fcd54cfac1715289bbf41af793f73c66e9738f63cd2f4a705d5addfd2e3ae2373ff3ed4866
 DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
-EBUILD pyopencl-2019.1.2.ebuild 1471 BLAKE2B 5ba33cfae14074859d9e442ec35634fd250f52c56842130cf4b6abc5bff58c944983f13052b4a30537a289cbefe0691050e871a41640cbaa2a33c84703c7c180 SHA512 90d989e8b904f2c317350817dae1c5951ae494a644741eb4cd6c532217873697c09c5a7f00f3628cc9b74ea4f6b44c13280058837cf9c07acfce97937cd9c949
-EBUILD pyopencl-2020.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
+EBUILD pyopencl-2020.2.1.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
+EBUILD pyopencl-2020.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
deleted file mode 100644
index 2f72469ccad5..000000000000
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ /dev/null
@@ -1,57 +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 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"
-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}"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		--cl-pretend-version=1.2 \
-		"${myconf[@]}"
-}
-
-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/pyopencl/pyopencl-2020.2.1.ebuild b/dev-python/pyopencl/pyopencl-2020.2.1.ebuild
new file mode 100644
index 000000000000..e5fbb9b9f447
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2020.2.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_{7..9} )
+
+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"
+IUSE="examples opengl"
+
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+DEPEND="${COMMON}
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+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/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
index e5fbb9b9f447..862f4155cff8 100644
--- a/dev-python/pyopencl/pyopencl-2020.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 9cf53d32bd72..ca188b2c4e43 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
 EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
-EBUILD pyopengl-3.1.5.ebuild 1225 BLAKE2B 3fddc932bf75a5b55e0f48352ed0067fe1355c882238d3dbc7ba7ee0ebaa64ca0bbafd1c067368f113571a8ffb68a63965c5464d70d6e9295202a628b600e56f SHA512 37d3d9456fb7845fa3890aa122b056450b39f4b85746f2e44d3cfcd49296bbbae140cf4735a3d9369afd180dbe86e042df8334a5cef6bdc9e6c8a85daacbd70c
+EBUILD pyopengl-3.1.5.ebuild 1224 BLAKE2B 6f5c4df5e4316651712d5263f434dc61a1e2b79dc901a2b8d2b003862c055cb27bc49801e3f258e6b54500a0a19f9a9b7076e77e255b65a16b5078f3112c51cf SHA512 a564f63316f4bdc3af64b7eb939afdb7f0f50be2be1f9a2cdb14502e86a67d917cd4bb60cbbb44f855bfe4ccd9b3ecc285120e990591147a8bb388132ff882a5
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 2f737d1e5709..39847d05e9c9 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 virtualx
 
@@ -14,12 +14,13 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 #	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
 LICENSE="BSD"
-
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test tk"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
 
 RDEPEND="
 	media-libs/freeglut
@@ -46,8 +47,8 @@ BDEPEND="
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
+distutils_enable_tests pytest
 
-python_test() {
-	run_in_build_dir virtx pytest -vv "${S}"/tests
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 0cd5884209a0..3bd66f068c7d 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,5 +1,3 @@
-DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
 DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8 SHA512 66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d
-EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 725 BLAKE2B c49fdfd3c6865a898bb3cf3e3054ae64276f0543cb4080a7972db2cf69a0f867f46504691e9f02cbb672fdf11dc4df536f343392b52006cbc64898dc4293c2a6 SHA512 266622db995831b00d9cbc47d4ed8b1bc8b6f46766ce73377042e6dc5727103ddbec82fcee350a1588488e98b6b31ea81d0d3feb4a7f78b30b5e5ea10eb22788
-EBUILD pyopengl_accelerate-3.1.5.ebuild 817 BLAKE2B c46499868e7fd8319de33466160167ba085c48acfdc59883e048696f43bfeb44abe7fafa569def8a3ce962e4e8e756689d65773d439c4457b1aafd00a4207eda SHA512 e8bfb0dcef3448dc93669ea406d4680ef7d516bb4bf6b7a1580c940d6533086bc1078873c6788181d75ada10eefaec2fb238c73eac82013e3b53803ec098159e
+EBUILD pyopengl_accelerate-3.1.5.ebuild 815 BLAKE2B 6f3a1500bc67744976637b031e92d8e3a62a9616a6a96eefd978801ab1a0c3bdd6209ff229883674cdbf7a5b3f0f4f1cc07dc3719f3ed0c5a7199a3622c789b1 SHA512 ba0340df0601d2d0f881555a35b2a15001efbac4a29fbc6d613cc171063310f737b7c0626f96f3e839ce3a6ac10e2323744c76f61196b694e6224fba4a2f4956
 MISC metadata.xml 375 BLAKE2B 91123ef3cc783612271173e626b10dbe2a0e4095d0d4d18d6ce506ab1986f41c6db068734187223e1a4f412396e2d7f5d17f3138d2c75066e7d6d869e0d7f774 SHA512 9e5aa22c4fe794cbd2df7dad59135ebf36deeb609b294db54339daa5791765c06bb8c8e99bfc8d85b7104a05ab98370c93fcfe81ea2e0257e20001be0240d967
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
deleted file mode 100644
index 65fad24ae3f3..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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}"
-
-src_prepare() {
-	sed -e 's:>exc_:>curexc_:g' -i src/*.c || die "sed failed" # bug 691520
-	default
-}
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
index 2f5bcacd5318..7bc77557d381 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
@@ -20,7 +20,7 @@ S=${WORKDIR}/pyopengl-${EGIT_COMMIT}/accelerate
 
 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/pyotp/Manifest b/dev-python/pyotp/Manifest
index 6fe985b1cf2b..4acaa7fc9d35 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1,3 @@
-DIST pyotp-2.3.0.tar.gz 11672 BLAKE2B a3d8ca5296b5a8a7aa053b0a0556285c19f335cb1dfb4f892d40fe2d79cc52313af7b31c6ee4afc4eb8c1cd8cb8248442bd1a4868e2bb921a552332a0a283a44 SHA512 4a7a4206134e9a370f7f3c3a9b7e755b75a84e30a320084faf91af5607c4262a6aa76d7b8cefaf284e4cf01faea1df4ca92d871644a14ab56f04693b227485cf
-EBUILD pyotp-2.3.0.ebuild 466 BLAKE2B 249e83ffa800f5381058fac73312e83ff6d13c4d20162d541ea1a13bf727fe9f8def78042b9b43d9f83546c011d84b1b83361437a56f58f626725ad008b16f32 SHA512 dcca2ffbb90c625044b3211ff2e33ae45d5cd2821b2f6c3e9ce0799e407227b1f79b8e37d8ba8d032429554f8988ebbaecd7b12fc039c68e5ed1c2b80197c850
+DIST pyotp-2.4.0.tar.gz 14789 BLAKE2B 3c228f0e8271aa0c6692000ae2b2a6407afe015a4a91851509d8878f325277c055e52e3f3385cf0139678406a1e09c0230743e6a09c2d64c291df6b770508d7c SHA512 cb6d49d0b6880c6d7c5ef6337d1f0085609e1b66c693b1a9cf6604334af6456cd67dd0278836211edb91a81b5340cab51499cd47b2013d291c9cc9d59e4f31a5
+EBUILD pyotp-2.4.0.ebuild 466 BLAKE2B 249e83ffa800f5381058fac73312e83ff6d13c4d20162d541ea1a13bf727fe9f8def78042b9b43d9f83546c011d84b1b83361437a56f58f626725ad008b16f32 SHA512 dcca2ffbb90c625044b3211ff2e33ae45d5cd2821b2f6c3e9ce0799e407227b1f79b8e37d8ba8d032429554f8988ebbaecd7b12fc039c68e5ed1c2b80197c850
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyotp/pyotp-2.3.0.ebuild b/dev-python/pyotp/pyotp-2.4.0.ebuild
index 5334f2e81f8a..5334f2e81f8a 100644
--- a/dev-python/pyotp/pyotp-2.3.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.4.0.ebuild
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index 4a91631a637a..949b6c7e3829 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -6,4 +6,5 @@ AUX PyPAM-python3-support.patch 5987 BLAKE2B 3c3723c0c3c121d6341aae48b1b8a47c2ed
 AUX pypam-0.5.0-stricter.patch 335 BLAKE2B ac348ae8ae8db84a5e5b92c3dc842bc843e28af23c34e929b63fbe029f70233689efd6974a65e3dce48f0ce28ec4195698566268972f895106d96d796647116c SHA512 6cb56d4610fab8f14af83d64215de24b38c820c61099054c0c02bcc831b0f50dee5746def85e2ae669b8657dce2fe31fcc93f07a93e3b49f0c7a78f48acd74c7
 DIST PyPAM-0.5.0.tar.gz 105206 BLAKE2B 7778275cae11606ca8e522d2f99fb0558c55545cdaedb3ff7c55b4bb693ed3429e22566912f53c7795f73316bc45f1bfbdf5a53daec234dba87e1c141e2410f2 SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0
 EBUILD pypam-0.5.0-r4.ebuild 1036 BLAKE2B 9c4ab6d52d6d3cb75462a2db2560fc5ef8315dec6b9d83fe9221ae6aa3797ce4cb2b3e3bae71903bcb48411d8e7b52c7b1d8ad0b1e17c8669566f0f1a9d74a99 SHA512 dd09e672f343152ec527f019abb7d16ccd28514c627e7638ba79db5dd8c3983a983d5deb864b424d07bd1433f3b0b7235e5dae16dfeb882fbe30536dd6efdb4e
+EBUILD pypam-0.5.0-r5.ebuild 1037 BLAKE2B 3a8daa16065ae83d783f688e52854f625ab5d39357b2572996572e1c9987691b4d0291c72befebd3fc69007b978d0a855fe353b822a5141ea281aef6155f5f96 SHA512 f67d881c21cef40d3929206aebee0d6fd0b68f566b1f8e4f0a3cb7ee9aa9da6ffa2d70092065e994203aa7bf63dd831bac93ac6f03f0b43c133226cca5912e40
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/dev-python/pypam/pypam-0.5.0-r5.ebuild b/dev-python/pypam/pypam-0.5.0-r5.ebuild
new file mode 100644
index 000000000000..d2e07613cfd6
--- /dev/null
+++ b/dev-python/pypam/pypam-0.5.0-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="PyPAM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
+HOMEPAGE="http://www.pangalactic.org/PyPAM"
+SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/pam-0.64"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS examples/pamtest.py )
+
+PATCHES=(
+	# Pull patches from fedora.
+	"${FILESDIR}/PyPAM-${PV}-dealloc.patch"
+	"${FILESDIR}/PyPAM-${PV}-nofree.patch"
+	"${FILESDIR}/PyPAM-${PV}-memory-errors.patch"
+	"${FILESDIR}/PyPAM-${PV}-return-value.patch"
+	"${FILESDIR}/PyPAM-python3-support.patch"
+	# Fix a missing include.
+	"${FILESDIR}/${P}-stricter.patch"
+)
+
+src_compile() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_src_compile
+}
+
+python_test() {
+	"${PYTHON}" tests/PamTest.py
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index d86d9d0beb63..01e3acc7258e 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,5 +1,3 @@
-DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
 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 1016 BLAKE2B 1f63ed74a3de89f066687ce8507dc90ce58fa5e4cb788505546b8794e0f7587f1fd9f1c7e4460d055b08b3215b218094b0a1ec13c1b3f824a31ac93b359b3e25 SHA512 c7cb0930c1de7aa02174f436e082086bd856009d8d860e08fe40b2b5b061ab4a60ed3903b036a1389ecf7f65db7c3f18a392fe4f4bb2345b6436319467449e20
+EBUILD pyparsing-2.4.7.ebuild 1007 BLAKE2B e5f921041df7b76129ee3a4f27b16bf6f79120d8dd046ccbbe3238e6b05783e1e73cdcc7e866da5ebd639eab4ec19cdf733f3eb3b10a7db2196d1ee5f0875c17 SHA512 8df4a7f9eebe49308a375f8ef16f455ed7a73a03326bcd0b75c475d67b09fd032a0127cbffd331b7a7acde5f1f70d220f3e1200b84e825bdeb12033986b6b996
 MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
deleted file mode 100644
index 02bfc28f1b87..000000000000
--- a/dev-python/pyparsing/pyparsing-2.4.6.ebuild
+++ /dev/null
@@ -1,32 +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 )
-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/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
index 66f7c8b3d850..0e591f5e691d 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7.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 ~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/pyparted/Manifest b/dev-python/pyparted/Manifest
index 1efb58550173..81dd08262397 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,7 +1,4 @@
-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.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-3.11.6.ebuild 636 BLAKE2B df3d93677ae29972992284b7b3b336b75299dfc41dae1f793db4ac65d4e89641f01646111a61dfff7fa60c301e53d90f2c5e7bf134175d2810b094e9ac25d63d SHA512 5b4ff71690e7576cee912b9a45e109bb3fdbb654ea53f4b147950bb2f35b1a441f8c546c5311657f10ea7e84cb79c158a613735ce6feb63819cc1be8c230d7ec
 EBUILD pyparted-999999.ebuild 591 BLAKE2B b723b15e1d8f84ce455925fbb289d7a1d46577f0797d21c146319a9704adaedce7dd3683ec0685df23c2205286010e651ce137ff565843553e8724e8aaec1f4e SHA512 def1ed802ca8daa42a40b232d0d61fbfa33dc6f98200cc365c087485ee942422f8b061f27032c733edcaa377b7a13e6cc06c350b05259ea03f0aba1d5b72a1f5
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
deleted file mode 100644
index 53af4fe34e59..000000000000
--- a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/test__ped_ped.py
-+++ b/tests/test__ped_ped.py
-@@ -228,7 +228,7 @@
- 
-         self.assertGreater(len(lst), 0)
-         self.assertGreater(
--            len([e for e in lst if e.path.startswith("/tmp/temp-device-")]), 0)
-+            len([e for e in lst]), 0)
- 
- class DeviceFreeAllTestCase(RequiresDevice):
-     def runTest(self):
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
deleted file mode 100644
index 3f2af33a2dc7..000000000000
--- a/dev-python/pyparted/pyparted-3.10.7.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="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.6.ebuild b/dev-python/pyparted/pyparted-3.11.6.ebuild
index 0d86d2409a49..4f6bdef24634 100644
--- a/dev-python/pyparted/pyparted-3.11.6.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.6.ebuild
@@ -11,7 +11,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"
 
 RDEPEND="
 	>=sys-block/parted-3.2
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index 3f1f50f4fcaa..ce9db91759be 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,4 +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
-MISC metadata.xml 362 BLAKE2B c34e5f667750e99f16f44361c62c79d138767c94e664be039f81f7b7fb6f295e6610aeca962ece7097dfbc1372e92e697ad99572c036910352362379eb3ab4cc SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7
+EBUILD pypeg2-2.15.2-r1.ebuild 619 BLAKE2B 2738424b0783d4d648fa064b5bef3b6a0170e4ed18a7b3db618d55f27aec75bcbc7d038c677a5df6c7566bc107c745fb64d92514912589f6e44d9bee6615354f SHA512 48692461fe83d05d7a052bddfa18af31a47278115dfd3e5882cecd4f06ce7dcf3b26af6d38784d718537ffbac780f4410c81af5cb75156ea1283ec8478fc46ef
+MISC metadata.xml 309 BLAKE2B 75ffd7baef25545d1992191ab4a1ee3bbf3108c30e0846e6410bc944a63c8ea0183c06cd6b004daa6e28556128f487f20d1a9a4105d832b7adbe3c837c17771f SHA512 b769260312197387a90d9fca69aaac96085eb36a84b66ff0ffedd4c4e7f1c7744a10048564a20eefe5a58f5de7a7ec8e6e7447eb20bc3d1cdc74a999a62005f5
diff --git a/dev-python/pypeg2/metadata.xml b/dev-python/pypeg2/metadata.xml
index 1194ecffea20..6472ec1d6511 100644
--- a/dev-python/pypeg2/metadata.xml
+++ b/dev-python/pypeg2/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyPEG2</remote-id>
-		<remote-id type="bitbucket">fdik/pypeg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
index f4105ac5d90f..3e14ba6c846e 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
@@ -13,7 +13,6 @@ 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"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index d86417b89115..f1ceadb33b28 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,6 +1,4 @@
 AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
-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 639 BLAKE2B 950a102de841fd8b94f9feae7d5dd0630de289dbda78210c01175ead24a45ad66c9a7a10420c6d3ef65e4a0ae3ab0fda23f8e1121bc331daadf22e5f3acb4b39 SHA512 48d1c73cb76d1029ccae18255f733efbaa009a17866b7a88b31f2b5b3cd9f11080932779520d9191416615b1ecc8fca923694b1bbe1d2761d0c099dbc9b1de5a
 EBUILD pyperclip-1.7.0.ebuild 1223 BLAKE2B 299fede05e15289a8cbe50859862e5a6cc1e10114e554cb184c554416107a91bbfe100797f7f4bb0558c9b0a0049c317741c2a387d49e39680db47eece5d0385 SHA512 d94bac216d464a6f886444d325eaf3e88d0369036c389938228f9db2893d2ebf381fb97d547306465e0c378be65f6b1c7258275cc2ecaed5e5a7f895531d379c
 MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
deleted file mode 100644
index f1298bc162c6..000000000000
--- a/dev-python/pyperclip/pyperclip-1.5.27.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..8} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	|| (
-		x11-misc/xclip
-		x11-misc/xsel
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_copy_paste.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 1da03ccd7d2f..dfece56646c3 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,3 @@
-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
 EBUILD pyphen-0.9.5.ebuild 675 BLAKE2B 66b6f629cbec9c907a437d5ffff78ddbf1a9979e612181f0a4cf7c548fb822dda019803141e883f67489dcb764d145e2055c5744244d8f3d9dc852f69b849230 SHA512 3829045d3e715e7929fd171eac870c6d476bd21962f5ffeb0346a161ac991d70074085b2eeb64f6a9b26632d44fd3f46e0d37cb9b5fbb49dd8adef5a5cf67d04
 MISC metadata.xml 384 BLAKE2B 420bdcd5d54a1d049e16700ef9a7f2457a88fe8e5f5883c1905f2309197390803f6a58afd4d2678f563441839f7c8067410f00994134217883efd240359b868b SHA512 b07060cd3359359498cf6bd51151eb0874f2c65d0174df993d1041408c394d12cbf188f0f929e41364e9116a9d98804a0536685bcb232561706dff5e626e47f4
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
deleted file mode 100644
index 117bacd40662..000000000000
--- a/dev-python/pyphen/pyphen-0.9.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="Python module for hyphenation using hunspell dictionaries"
-MY_PN="Pyphen"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_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="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index cb7afcfe64d0..e3cee37aadd7 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,6 +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
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
-EBUILD pypiserver-1.3.1-r1.ebuild 1110 BLAKE2B e403bad0f7cbec9f698509783fecefed3306064f1c51958891770b6eefdf7f79c314434c11e31fe4a3dea886f7c5b9b3247b694cf6e6f6de35992de7cdfdfa3b SHA512 9a35625332e2e1e33830912e339e22e2ec72bb958d9727a80c095e20f3513362b17b91f68f11c9322c931ed6ee52be73d7da3e2ab77b76a75236c641273b56f7
-EBUILD pypiserver-1.3.2.ebuild 1287 BLAKE2B e6f7b4882004471150436ca12d5596be9249e239fa659a64fad56e1a1e2bb80979532a28d98e873ca61e32f748c61155f7f7c45e8515eb7fea92f60d4abc05e8 SHA512 3a08723d219e8e6b024fbc5c1d2c65b2436a884f3a507b16acfd86f6c93207e2071144ca64a9e70337b1cd2cc20df2db5076a2f20a36d4b2e687ec39a7f08c80
+EBUILD pypiserver-1.3.2.ebuild 1210 BLAKE2B fce159dbde950c324a3a547e2f16bf8faa0e38c09aa219f60feb8262afe0bbfe287439a00c5d8f72a94dbe0d4095af4c5d8b5c6ed0ffa219f22b5992fd99791a SHA512 013d17c06d4d3ae3f78b093e4fce404726a0090cea4cb7346fd8fb5696df297f84bb1c295042ec6804389f68fb19543cceb080ca1fc3616c6d1d3e27a2063420
 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
deleted file mode 100644
index 3c550ec559af..000000000000
--- a/dev-python/pypiserver/pypiserver-1.3.1-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=( python{2_7,3_{6,7,8}} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="https://github.com/pypiserver/pypiserver"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		dev-python/passlib[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pypiserver-1.3.1-no-internet.patch"
-)
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e "s:[\"']tox[\"'](,|$)::" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index 58fe52472db6..cb7e56092aea 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Minimal PyPI server"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 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="test"
 
 RDEPEND="
@@ -27,7 +27,6 @@ BDEPEND="
 		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
 		dev-python/twine[${PYTHON_USEDEP}]
 		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
 	)"
 
 DOCS=( README.rst )
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 25ea3bc6d548..a410e6c78398 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,4 @@
+AUX pypng-0.0.20-py39.patch 1171 BLAKE2B e84a74ab9a783bca54d198a3d1ac9eda54e2c1229969c4a6d4b19ace752a50f9aa2b09d59ad15048db08a894290788978d6022fcb890f15ba6fea0e0bac6cea5 SHA512 c3a162e77a0d3ff9b153ba26379fffacf0e1683c5e4230af1c8a1c5392889e68d74334661cb19b6076fb7cf3ce48b1d1f1339d02b7167bff42bba44097d2155e
 DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
-EBUILD pypng-0.0.20.ebuild 520 BLAKE2B 0cd2ca27817f973f2540843063556aa040d51671752f3d901582d4ce957fb92b4fae032ab009299898dc0ed87bc3f10a3486fdf83005886c5ee7f33cf5b9bc62 SHA512 b172eb0d257baaa478908436887e9bf2420de5c0a67e050ffb929e273b35d0ccedcbf92af3b32f54bd0b642634b75333fd30f1d6b4896c9573a2f8fa54b07d8b
+EBUILD pypng-0.0.20.ebuild 562 BLAKE2B 8f0ee6c3e447cc0a3f232ae49491ab2fd6e51f23eff3d9835ee6043c47385a097f4e1f324311af676320029e35a9e48ef1dd127b68aab255554a7d31a3ce1246 SHA512 7d9cbff5314f75d39790e115a86760abb46ec6a1bac4710b6cdd709ea171c5d1a1f89876b51c5122d0ea0d42c75b873f6f6d68604171fbb8c539873f8d53ac39
 MISC metadata.xml 450 BLAKE2B 55c7ff0eef56a99bcb89587d9b3eb025d10855ed7015fb178d11e01e23d285e8f26c813db383e5022505f53761f4382c7631d8e7c9174486c00dd9ee2ba8c457 SHA512 3644b23663aa1d89f579ea60463044c901f60e25fe6ad42c5f144d15d559491858f0ef844209cf15bc890eb8cdca6342ea9d070f12776dce21ce30c76dc532d2
diff --git a/dev-python/pypng/files/pypng-0.0.20-py39.patch b/dev-python/pypng/files/pypng-0.0.20-py39.patch
new file mode 100644
index 000000000000..e4c738ee3137
--- /dev/null
+++ b/dev-python/pypng/files/pypng-0.0.20-py39.patch
@@ -0,0 +1,34 @@
+From fe9c973c5e92f24746dfa1be8796c14a2befec4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Jul 2020 07:54:53 +0200
+Subject: [PATCH] test_png: Use array.tobytes to fix py3.9 compatibility
+
+The deprecated array.tostring() method has been removed in Python 3.9.
+Use .tobytes() instead.
+---
+ code/test_png.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/code/test_png.py b/code/test_png.py
+index c858d18..447c314 100644
+--- a/code/test_png.py
++++ b/code/test_png.py
+@@ -448,13 +448,13 @@ class Test(unittest.TestCase):
+     def test_interlaced_array(self):
+         """Reading an interlaced PNG yields each row as an array."""
+         r = png.Reader(bytes=pngsuite.basi0g08)
+-        list(r.read()[2])[0].tostring
++        list(r.read()[2])[0].tobytes
+ 
+     def test_trns_array(self):
+         """A type 2 PNG with tRNS chunk yields each row
+         as an array (using asDirect)."""
+         r = png.Reader(bytes=pngsuite.tbrn2c08)
+-        list(r.asDirect()[2])[0].tostring
++        list(r.asDirect()[2])[0].tobytes
+ 
+     def test_flat(self):
+         """Test read_flat."""
+-- 
+2.27.0
+
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
index 9bb9cf785ed9..9592e0db7268 100644
--- a/dev-python/pypng/pypng-0.0.20.ebuild
+++ b/dev-python/pypng/pypng-0.0.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 23a0dee1f42d..ff7d3b131bf6 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,7 +1,3 @@
-DIST pyproject2setuppy-4.tar.gz 7947 BLAKE2B 882aaf98c37560c9dff577cd7392830a0fc3a4bb9a1ed774037582c3c9bf2e74d15bc2fcb9fe1eea221dc65b9d0f8f6c9d677fca1a2045214440818712d7802e SHA512 1721ea0ba9bbd579af88543e2487863803eb002ba2eacd7db7b7dfad663a87a1f8248afff92964fedc0d5edffa92929dfb3e613f8ba0ec884ee98e44fb38544d
-DIST pyproject2setuppy-5.tar.gz 8314 BLAKE2B 7cb93fc0d427603adb8439d7549c276e8792d5a555f0ed229114e1083e6d741493938fc03507f60eb6bf9809a65d578099a20b1c779d817f396bceea418874ac SHA512 b32d9f5eac6df24c3eb10878c7cf7c2b7945471d2f221877572a98d1b06cd28d3a61ed250e3724619e1afbffe86f02e23452e7eee85bd702c0a64d32e36d0367
 DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
-EBUILD pyproject2setuppy-4.ebuild 667 BLAKE2B 10460232046081050716f4f181e5be8b862e5215dcfb0851e02596281f9b34f642d8216964731d7663730a58d2dd70a9934e7704f034a303788d5d8793e968fc SHA512 ada71311857f532cc1a28a7a22e2847eb891698e0711b6deedb5f3c9cbe080b2c754ce1dad75f2dfde48e3eab6a5a9e58f32885975fcd5c9e5e5af8c63ea5804
-EBUILD pyproject2setuppy-5.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
-EBUILD pyproject2setuppy-7.ebuild 672 BLAKE2B 9128e6fcd656a7c8536359e8cbdd25da81f4cde711dedb4eb367f46ca111f7440c2d8ad24eec37f2108f4be46cc436734b09db01142101134df6e904a7b2376b SHA512 3b4b1609714c519b43434d42c4510be8599197c71ae334bc0c501904b49a804b03905e4689b169a03c36e536d10a4ca85ee27990c38bb528f34312b03fd703ea
-MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
+EBUILD pyproject2setuppy-7.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
+MISC metadata.xml 350 BLAKE2B 6308462418044a7972e38f09900037e4557be4e76a371b358a2000784e2f44f2f9ed5ce56be11ffc198003c3acbfb29a268372a33618c3453d3e01b33a83dbe0 SHA512 ca89ff54a01f7de3850201545f1964d19d4b909a9d0867178d9f39b180aa159d4f6aa5cc3483aef9358eff116d577d0c0a1c15f74d51f2253cf96e991d40e43d
diff --git a/dev-python/pyproject2setuppy/metadata.xml b/dev-python/pyproject2setuppy/metadata.xml
index 22e0d6d87f61..5eeef57d0718 100644
--- a/dev-python/pyproject2setuppy/metadata.xml
+++ b/dev-python/pyproject2setuppy/metadata.xml
@@ -8,4 +8,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
deleted file mode 100644
index d95e0231a086..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
deleted file mode 100644
index b8ca661b51cc..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
index 346f6735e4f7..c406e09e27ae 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 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 9045f46c8477..ff155233afd9 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -3,5 +3,5 @@ DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f58
 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
+EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1087 BLAKE2B ecff1b13e5e122491c4693bd61e9695616d5c19e398c13a00bb14f5a4bd5a617ca4fee9664b3b76dc94f9693f4c539d8709f35d414f149ff8bae4233c731acba SHA512 394eac2883d5a944f994dcfee56ef1fdb17db94229cc263e2d7f0b5e7894f9f0589f0660bbb6b0269f8c165d8b613ac7d9b6c49dec80b8b4c38804525dda000d
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
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
index b919b943ebe5..f173ae174f81 100644
--- 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
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 5162e8b1060f..73a0bf44f2e1 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD pypy-exe-7.3.0.ebuild 3899 BLAKE2B f8d1cb668f31ad5ef2a8529c0bbad3a6b608d45f49d089e33e4295752cf9df7293364c0d5f9829cd17c89d424fa28bad564fa0e7bbc91154f57657f97dcdd482 SHA512 f82913f0a1d98466f543a9bdd2da627ed4cd3299ac8c9c6031ffc3c87cca08b436e4634a0234d67b5b4313371483b47b2b22d06b8516b566ddbad428cb825d7b
-EBUILD pypy-exe-7.3.1.ebuild 3901 BLAKE2B 8d8f81464e12d96cbebb256f866b57b1c0220eadc6e96fab1780619ade1e5658b278e7a20d21628548571cd04a4e5d6851a6956a0585373e1419954b8142cb53 SHA512 57cb9f7921dd98b5eb59c8b31b220e701c872be4700f2d3bb2a02f62f24514e95ad206a42e88a3e7a0cb44c276dccb053734e9006d0ebed0856a3c3482fdbbce
+EBUILD pypy-exe-7.3.1.ebuild 3900 BLAKE2B 13cf54a9e1ea29486986261765d440c2c9a7fc031c4650cc8b498ee4e1aa8c274d93b2b9e857fa377900b5589a64fce45f5d13d4fac189efe202b11b0e5a03a2 SHA512 cf1c39a51272491416eac0f11f6b479f9caa487b589ac0169987306340d6a7c0d8e6574086fc937e5b9fbf09656764711c87c49629cf63686cfef1d2a56f3c6b
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
index 6e5327623d00..e85da8422899 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 21408b9a2d7c..66e84382a435 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,10 +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 1569 BLAKE2B a4dace1ba796c984b57c50c2103649a10ca4c3e18065a5fed2851746dbef410f8b401e0c759c69199a64d087524ca9e74921711e46ea155c18eacfbe9540eb9c SHA512 8b7c7e70896305a13ae26143bfe7a46880b708b70b65338d252ee06093da0d0cca10976cf01c6d819e0e0981cf450213e09927efb602c5a60fc0336e2ccc7afd
+AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 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 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c
-EBUILD pypy-7.3.1-r1.ebuild 5682 BLAKE2B 741c6d99f26fc870a1d07f5b6d0328367e83e5cab4ea98e67166b6edb93fd545cb5960660d4971dc2507d398d11edf1b849447b1f3ca3f7fb3db0b3552a4ca56 SHA512 cdc7777ffcb59cbb5dd6fe28a1e3a070fe90135c4926e789c10becfd66a0623da7ad06798045c447046986fd1b8094d40c8a769b94a25392a7e5abb4bd664b0d
+EBUILD pypy-7.3.1-r2.ebuild 5681 BLAKE2B ffa54784b90b85e4550c576c4223f2b54bb84e5238ad5449e1ccd479b9ed708f501c7a39cb521d622501aec9726bf131b548961739e3b6bebfd2a7769e56a039 SHA512 6982bbca50872a6008cd008cba24db2142b6a9baacfe61b46c0e9f049b9cefebe09455cf17568a367b34fe5525f1e51c6582fbfe07e865c4dc1ac3d643ffe775
 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
index 5281781865ae..74ca86a84ac9 100644
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644
          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'):
++            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            elif os.name == 'nt':
diff --git a/dev-python/pypy/pypy-7.3.1-r1.ebuild b/dev-python/pypy/pypy-7.3.1-r1.ebuild
deleted file mode 100644
index 1f32cc41d4b1..000000000000
--- a/dev-python/pypy/pypy-7.3.1-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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
-	# broken upstream
-	# see http://buildbot.pypy.org/summary?branch=%3Ctrunk%3E
-	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
-
-	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/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r2.ebuild
new file mode 100644
index 000000000000..ad8c9e1d85ce
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.1-r2.ebuild
@@ -0,0 +1,177 @@
+# 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
+	# broken upstream
+	# see http://buildbot.pypy.org/summary?branch=%3Ctrunk%3E
+	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
+
+	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 6e98f894a178..2be6b9797cd1 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -3,5 +3,5 @@ DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a7
 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
+EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1094 BLAKE2B 7e59bf1d1079c0587f35b8428622586cb9066888203290fbe99839d8958814d01c36ed8deefdd03308f13d2be9e669170ba4116d16dec34b954b3508e395d3ed SHA512 59f76e0c65d771a5031df942512989f4324d00218cdb88667e413053d02dadcd6cdc0914df6f0b8851e27d8f7188abdb6d1f33a2ebba1b8120754da32010f3d0
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
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
index 91320dbb5af3..6d652e6df6f7 100644
--- 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
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 2b106cfed467..1e8e8bf530c7 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -2,5 +2,5 @@ AUX pypy3-exe-7.3.0-gcc10-fno-common.patch 1083 BLAKE2B c0601013dd4eb62df0eaef45
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 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
+EBUILD pypy3-exe-7.3.1.ebuild 3467 BLAKE2B e4a47cc1f6c3ae1e20e9b7e966307a3c86ba7690d37691b9b65be7786ad84c3294947ced5f001477089c750ceba0dc68ae088c55c1562d137d928d3f85cb64b7 SHA512 7c2cdc856e7bd52e5b2b154c4abf93a534c561a201023be813b3c226ab36686a73462fad24faf8484ded90d092319b4e9ebbe91e426916f57187543859b60b6d
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
index 776d2ad9ed16..98ede03bf607 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 647893dc23ee..745bba22e460 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,10 +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 1559 BLAKE2B 1c2fc14aa2b0ac65db0931b4e197ecaa4d9985e7b9fcc840858204d5b3711691493cd45120b05ab598664ebbceb52f303d0c98af5fdb5d1a0f7e6409d298784d SHA512 62043704d36b489ab99adf4ace31d12329835d15d8181d4ee2e2b69a0e53fa78019a6b78a11f4badff7f51d310fee09a116120eefd30a0e1e6d4149e77c44c69
+AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
 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
 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-r1.ebuild 6881 BLAKE2B 62979b0d96d7c36744b53ac4324317dca1ed319891307a9163bc4e1fb69021d7fab4b14d39d3fc6c36bf9f34d920c12243c0209db1596703502677279f632bde SHA512 9d66b9bb635f000e369b249c2e03592f26db3f611beeb34f5296090d413d2ddefb56130d94b925af009d164af190090226fd9868edd207561fb016c6e8c4845c
+EBUILD pypy3-7.3.1-r2.ebuild 6880 BLAKE2B e41f5bcd08e80672b3e37bfbca12bf69e7e3a9dbc61b129d9313d162d992d6d676e783da88977fc8974b9543cf17715a2888d41f9b234cffa24993e01e09f4d6 SHA512 763db108e3d29d905ee1867ec960aa92e49a348c4229d0c22c32608f1020284388ae38a6fcffdc1b18360dd727563da60ec1ffde8fa326062f8e4c7a84eeae96
 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
index c9809f89b880..fba00b9fcac3 100644
--- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644
          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'):
++            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            elif os.name == 'nt':
diff --git a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
deleted file mode 100644
index 023f8e46c876..000000000000
--- a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
+++ /dev/null
@@ -1,215 +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 pax-utils python-any-r1 toolchain-funcs
-
-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
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_runeval_step:_&:' \
-		lib-python/3/test/test_bdb.py || die
-	sed -i -e 's:test_crashing_decode_handler:_&:' \
-		lib-python/3/test/test_codeccallbacks.py || die
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.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_listdir_bytes_like:_&:' \
-		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: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
-	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
-
-	# fixed in git
-	sed -i -e 's:test_SOCK_CLOEXEC:_&:' \
-		lib-python/3/test/test_socket.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
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-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/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
new file mode 100644
index 000000000000..5b7b8f814b77
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
@@ -0,0 +1,215 @@
+# 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 toolchain-funcs
+
+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
+
+	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
+	sed -i -e 's:test_runeval_step:_&:' \
+		lib-python/3/test/test_bdb.py || die
+	sed -i -e 's:test_crashing_decode_handler:_&:' \
+		lib-python/3/test/test_codeccallbacks.py || die
+	sed -i -e 's:test_jumpy:_&:' \
+		lib-python/3/test/test_dis.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_listdir_bytes_like:_&:' \
+		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: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
+	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
+
+	# fixed in git
+	sed -i -e 's:test_SOCK_CLOEXEC:_&:' \
+		lib-python/3/test/test_socket.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
+
+	# XXX
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+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 8ed4cf983126..946075bf0b7d 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 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
+EBUILD pyqrcode-1.2.1-r1.ebuild 941 BLAKE2B 181489d5a143765c050eac3ac882888e125bc7092ace5aa9e6d9b290bce920f9b5923c726e817b811e93932f39557518fb6eba192e0492a8a9cab3c52b0b1114 SHA512 817804da06b153af66174d9aa812647a5fdae4177f84557a4b69076210f223de5324c69c7512938123c9445323151cc85acb7a4243b388304e703098c44eea69
 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
index 50803e75ddd8..7454348c4fcd 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 # upstream doesn't do tags
@@ -16,7 +16,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="png"
 
 RDEPEND="
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index db7ab7937198..f2833bec8e1e 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,7 +1,5 @@
 AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a623400015b1ebe4cac8b797a50478e75c82ac964cb05ca4c67dfa73332528e4f232f612d2f9a9bf439dbaf63765fb1f6d650bd77 SHA512 34600cdbb1e361288393fecfd8740b147ef16dfcd0719f0eed62a93201eb5fd54b09aebb86201effe6a791a6b5be934ece07a07756284ae0b2bbde4aaee137dd
-DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
-EBUILD pyqtgraph-0.10.0-r2.ebuild 1219 BLAKE2B 6eeeeb6d25de6d0d791b760569eceafb34b5a0fa65af24a100cf9540ae45e0d8df327787f80581ac31504f6be32b5695a03e0238c290cdef6b62774ab5ad03fd SHA512 b5742c766f27a517867fbbe1b1b95204c984636f52975a47a070f00c739e3b4c300d7c160bb1558fcc8865b72e6c64de05ab4007b859634c432ccf1b7df2bf39
 EBUILD pyqtgraph-0.11.0_rc0.ebuild 1072 BLAKE2B f62759d444f186d3cab758d8df0539a70d90011eebcfc3e4bb892d5fb13fca6705b99390cda6ae6b9e07370d84355bd639e0f08687385b7ddc6ed25f79d4dc66 SHA512 6524de9e2864b59ebbcdc34cbed34e128e285b6861f96c8f0dd43e9a8956a1bb7e636e6c97813e61e57c820822fd2f82b69e83ce2e66209afdf3f8d59ca7b5d0
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild
deleted file mode 100644
index b3db85104e1f..000000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-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=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
-SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples opengl svg"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
-S=${WORKDIR}/${PN}-${P}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# fix distutils warning
-	sed -i 's/install_requires/requires/' setup.py || die
-
-	if ! use opengl; then
-		rm -r pyqtgraph/opengl || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 36fb2820ffa5..1b7bd6f2d077 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 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.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.4.1-r1.ebuild 1174 BLAKE2B 2146e438d5aa7534e3cb2c4da4dcb4b1b9946e835f2079a0a97aaea8ec1597f1a7cbcd00d9e843f34684261c11825ade779da04163881d3333cd061753fbae84 SHA512 9aabb84383c860f350fb0e81872946c3eb8581eb7f9c8445272ac76ce7d068459200beddf052c721b2844dd1c01481d9d10591f8ec00bb094dea8af1a0d0b31a
+EBUILD pyquery-1.4.1-r1.ebuild 1162 BLAKE2B e0d1d10a476292323129b5569c135e7b7be5387267172d8c812f4da8dfd9712405fb9d093d96b4f37220dfe31016c1a6aea37343cf5dcf09105403e1096566f1 SHA512 7540ddfcfa3379c81feb52971a57e776e5f2043cd0a694b5866d1d4d6b3dfb8cce7f1dbda13d3ec00d1b42a7846926319588995d72002e5c19a621c7e8883090
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index 8e7fb742bda8..564d4dcd2f3c 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1 eutils
 
@@ -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 ~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/pyre2/Manifest b/dev-python/pyre2/Manifest
new file mode 100644
index 000000000000..5035c01c2b66
--- /dev/null
+++ b/dev-python/pyre2/Manifest
@@ -0,0 +1,3 @@
+DIST pyre2-1.0.7.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
+EBUILD pyre2-1.0.7.ebuild 462 BLAKE2B ca80fbb9a73042cfac03b4c70ec2deba418ef54794a2c9d1654b36a28e25f627176b1e210aa3828881b4232279d479f227bb17e4876cc0604aaa7ebca2145e65 SHA512 fb3fa2a2ebd94237e6f2b84f4c32c4054af9accdc5466270f6acc2f7229006d7b302283994f4f86c68d408bba339fe390d77a26ae1bb58bd05f3ac90328edb1e
+MISC metadata.xml 354 BLAKE2B 02eb3aef38bba7e6decf621a35bf48bd60df852cbbec84441757c218da75cc46866dad50078f2f158966b5b45fafc301739dd7924cd5d96bc2dd9553d83b72eb SHA512 4c6f434e4ec394eb393248a08ba165e29fdcb74b681627d9caa908e376ae08463b673848a3d7497b5b06ac59924c203b9020a43a506f52f23f02660c18dd5b4b
diff --git a/dev-python/pyre2/metadata.xml b/dev-python/pyre2/metadata.xml
new file mode 100644
index 000000000000..b218af704866
--- /dev/null
+++ b/dev-python/pyre2/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>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyre2/pyre2-1.0.7.ebuild b/dev-python/pyre2/pyre2-1.0.7.ebuild
new file mode 100644
index 000000000000..89d8eb68d771
--- /dev/null
+++ b/dev-python/pyre2/pyre2-1.0.7.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for dev-libs/re2"
+HOMEPAGE="https://github.com/facebook/pyre2/"
+SRC_URI="https://github.com/facebook/pyre2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/re2:="
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 1c11057feb11..a07082d54e4b 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,5 +1,3 @@
-DIST Pyro4-4.79.tar.gz 490917 BLAKE2B 421fa2d0b32c27c44d11adb7c89e24cfd7a79c10ae40827407d3d8965e98b7d5126168e5b00b042c4bd94800d3e73fc8febdbbbf2b82d3046584ea88106c4734 SHA512 03e75537c7943e1044b7e6623ead934e3004b023ffc6d364472868e0895e3819c4b3c92d1610018ab1466262f32681e69a91d360c33b17e687861c8c742bdf72
 DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3
-EBUILD pyro-4.79.ebuild 1368 BLAKE2B 6af0ed7ef59d58313089aea896d303c682143739ed787fb102364db389cb1c64e622a4a245d8e12b0d7c4308a48dc9735a9a34b3cbbb5b55fc9d81ec3ae7a8d4 SHA512 3929f706a24e30e5731f83b3070c860e80ebc648676c2050f3833c95f489d593f06e826a666db7be1741d1fefa6c8640cda4ad372ef7b198af6ed026a028f526
-EBUILD pyro-4.80.ebuild 1371 BLAKE2B 7a181ed193515308579e537426e5bf614236853730e52b2abca4691549b628391e9dbb160c5e5b326a5ee4d09d66ce55d1965cf651c48f42d45fe7014d7596bb SHA512 ef3d9b3ab4a03d6a65d9a4bba398110b80b6ea13096ddad670f3fa9c0248da9024888fd3942e6798e8692373d35c9e14212e1a570cbf6db90c9860568c4c327b
-MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
+EBUILD pyro-4.80.ebuild 1368 BLAKE2B 6af0ed7ef59d58313089aea896d303c682143739ed787fb102364db389cb1c64e622a4a245d8e12b0d7c4308a48dc9735a9a34b3cbbb5b55fc9d81ec3ae7a8d4 SHA512 3929f706a24e30e5731f83b3070c860e80ebc648676c2050f3833c95f489d593f06e826a666db7be1741d1fefa6c8640cda4ad372ef7b198af6ed026a028f526
+MISC metadata.xml 395 BLAKE2B 00770102b68b0c2d63055d065b43a6f14463717b54aba5de8d89c2f8373c11a161445c9f1247887a466d7549c5760586c1b8882a3547e85ec45eca0cb241891d SHA512 e74a9c8c0cd3b95dac218e093b7bd13ce8052b5f7adad5287bf5f7cb4e159133ae3ee7bd1aae42e46c7391344eaa29be3d411216700659422be30f6615fcf139
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
index 47aaae3963b3..56387a3a05c1 100644
--- a/dev-python/pyro/metadata.xml
+++ b/dev-python/pyro/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Pyro</remote-id>
     <remote-id type="github">irmen/Pyro4</remote-id>
diff --git a/dev-python/pyro/pyro-4.79.ebuild b/dev-python/pyro/pyro-4.79.ebuild
deleted file mode 100644
index 9e1e384627f9..000000000000
--- a/dev-python/pyro/pyro-4.79.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=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
-	>=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.80.ebuild b/dev-python/pyro/pyro-4.80.ebuild
index 456079265b51..9e1e384627f9 100644
--- a/dev-python/pyro/pyro-4.80.ebuild
+++ b/dev-python/pyro/pyro-4.80.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 4297efbb7db0..b33cce5385b1 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,6 +1,4 @@
 AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
 DIST pyroute2-0.5.12.tar.gz 425500 BLAKE2B 2b8f919bc7fc9caea9f4dd41b110e8a321406de998598408bbd12d6d62fcae009d01511271e462a4118311f12c54bf51696c0334da2ce9cb185688e35994b0a8 SHA512 6115826a43f6392a727fe2dde0dd24317f35c3a7af5e45459766c3fbe9853540c68f9a9a2233c266e866f3decd22dab0032117f687758f69b962ac6606d4cbdf
-DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
-EBUILD pyroute2-0.5.12.ebuild 731 BLAKE2B 8a6106536f09b838a9a90f78f24f2395dd744e5c3e8e950710259f156b761ab88ac56467fca9bea8606026ea7adc2c32b8a8a4904e912b939740a21a9c7f5f13 SHA512 05bdf4a47077719e5c0841f900dbe9cade00c50991515d039bea6d49177f97d9a2995376752d043c8cafa0ca09d6c4c22e8dd3c3a829b2b86baa07eacefed8a0
-EBUILD pyroute2-0.5.5-r1.ebuild 501 BLAKE2B 9f8a59ea1744a308202d7b7ffc619e956be512dc781397b38d21cdfece16a358ad6a7fff6ee09a81d653347065505c273a4107c948a56cadd222291ef72f8c5b SHA512 487449e86e115bfcef143615e2cfa8448f60f1547a393a17843baa83fbf387e52ef1479b7db094d89775ddbdcabf4fc7037dce7962bd70cf51a64d58cd98d484
+EBUILD pyroute2-0.5.12-r1.ebuild 888 BLAKE2B cc11e4a26b6c768159da3bfd6c8af618d7c6623713e3d0224ca1841e0442c64659f88158676234cb1543186e15a58fc4aadd81dd0b7f30b74c2f6d8c103c8990 SHA512 50f844613c5692fa6d49b2bcf23fe35ae3cd78f6c843be8ddfd04a3bc79e00a34389b97fdbb849b6aeae3a38726e755b4eedf974e9aff34bd0541627e41e412a
 MISC metadata.xml 488 BLAKE2B 79dad1e2821167a54e6df2ce2b3aff8671e52b966fbd181703130ad2ff04ec8cf9d4ff4d0790fa9d96fea93f0f3586a0e4381595c74707511770be6ab3327a5f SHA512 28980431e5515acc723ed2fb6075848ec384b7365256986e6d3dadb3d39f2e6c6edb998b4a6f1067503805c57a31eb08108e9c8218e2167018444500ba1e182f
diff --git a/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild b/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
new file mode 100644
index 000000000000..e4c7dab8008c
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.5.12-r1.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} pypy3 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library."
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+# tests need root access
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/pyroute2-0.5.12-readme-filename.patch"
+)
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -i "s/^release.*/release := ${PV}/" Makefile || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyroute2/pyroute2-0.5.12.ebuild b/dev-python/pyroute2/pyroute2-0.5.12.ebuild
deleted file mode 100644
index 101c5a98dd3a..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.12.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} pypy3 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-# tests need root access
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/pyroute2-0.5.12-readme-filename.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild b/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
deleted file mode 100644
index 440e626dfa33..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.5-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=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-PYTHON_REQ_USE="sqlite"
-
-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/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index dfaf86791de6..898cc9b8d216 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,4 +1,3 @@
 DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
 EBUILD pyrqlite-2.0.ebuild 638 BLAKE2B 299430fbd475fe2f87caac36d99fc49c43011384d192163b0416b8dfdd31b738caed14267658af4fdec20af8323579678bcbaab361402b51e591684f1357e21d SHA512 6b5e7340f32782cb7c4a077c1bb7fb8f9791b381f23f3ee5129b98bc44efdd9e4e910f2fb61e86f85008a84752cf5f1a91750092c0570bf99cb73fee3884b4e2
-EBUILD pyrqlite-9999.ebuild 552 BLAKE2B b7e7a400f93112f6e3d52b41aa03c968f05faba3513e3de9c675cec9d1eadd6f119db1b14218307a1b28d860bdec79c03d3438aaa900355382caaebfbca0f282 SHA512 17648596b0239104ab41a7cf361b06552dad607d9d0a6857f7724374e9d433943383746f59e63d51e6859d3dd5d36e38c2dfd17f605b82e8c3189ae19fbe4bf1
 MISC metadata.xml 306 BLAKE2B 6848a797588465344547135639af1cdae67a9db23851e940a5f5aed347ad4c6e8114c2fc88159370356bb4360c926d4b44e1f4474c98a7577e3dd64403100d72 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
deleted file mode 100644
index 4ad296a7f2cd..000000000000
--- a/dev-python/pyrqlite/pyrqlite-9999.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
-fi
-
-DESCRIPTION="Python client for rqlite"
-EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
-HOMEPAGE="https://github.com/rqlite/pyrqlite"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index d5d68bbd3863..985a6cc5093c 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
 EBUILD pyrsistent-0.15.6.ebuild 651 BLAKE2B 379b5169b1bf9ec52c6470d1398730189491c67ad65a0d756dacbd9cd8abb3a254bc29f3a415940380a2300c1e0694440d8176becadf236bf6051d1a03db1f4f SHA512 29d8d5250cbf300d3df5a9176631663e5f2849fb8347798180d64ac32a12a5a2381067591278757c81a572dd574819f6bd1792727e7903d5bb7538f63c5b84a2
-EBUILD pyrsistent-0.16.0.ebuild 654 BLAKE2B ad82b97f9dbeebbf6eabdc3f20bb76000e5bcb4a53d2d5b7aa22db3627923fb4943907e8a32c423c1ac9bcb7283730bc37d5b8c44a65d76daa335b33cd920683 SHA512 a9930a24e75a076c16e05a5e9b60611354224617c89dc882c21aa55d999ffef86f0925597fb85a39dcfabcd044a57e8627f6ff66f9e4f8e2005cf4556469e62a
+EBUILD pyrsistent-0.16.0.ebuild 646 BLAKE2B dfbda08ad6d2f9359e23d1208275b763dbc0b1f30148070d39ffa44556e9f80783cb9fd5214e3b59a47d7d0d846cb08f924707797c1c9daa83415b9558565706 SHA512 3598e0806a7b4a0cb43dc2c32a79f143278c5fda354862f8810d38692742a8163f8c746129e6a803e754f1103110687727da2b5831d3fd81024520270434c504
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
index 213ff34df431..e584c29e93f7 100644
--- a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.16.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
deleted file mode 100644
index 7b200a29bcb9..000000000000
--- a/dev-python/pyscaffold/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyscaffold-2.4.4.tar.gz 110337 BLAKE2B c436cc4967cb671cca36b5b28a69ef27f486264bc39d1bbc40d745ea015f57db053fbf38d66a92b53c5f6c82a60d75ed2b114b27b9906db02c5bb6cc14de24c2 SHA512 840d205a84528410674e898d6f32a57d3e89edf71e4773a4aae38a4f1fdd883129f6f7be437c2d07fe89b58152a3b250f4a9a7125d1a6d9461673a7f22094d70
-EBUILD pyscaffold-2.4.4.ebuild 1289 BLAKE2B 47a884b828e0576620ad3e1de29065dafcd575dd40df685a613606b77f21ce28a3560d61cf19676cab24837665920bb981f2a30527b2923894855ae3f5b5f3b4 SHA512 ccbe6abb84b4653d8c350d2342d8e686810e261afb38a8f07fa822ad3cf5125f1c147ba6b2c184f475aedb9d709f57a4fa02e8306eb20126d7e36d2f75cb2343
-MISC metadata.xml 238 BLAKE2B e7496279307dd2f84b20d840a421d575722a22ad7297a5a85e18595ae80bee30e82b1ce0c7ccaf7561017e6d8a2c917661602f45ce4013cc3ad92eb974b8d57f SHA512 7d369d444860c44e7ec6938c631dbce96a674309a257837ac24a3cac1949fa19cf1744cbd5c112f4223ca0ffaa839077114a47a57fa13d2223876541fe6d0a30
diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
deleted file mode 100644
index ac33afdd6be7..000000000000
--- a/dev-python/pyscaffold/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-needed-->
-	<upstream>
-		<remote-id type="pypi">PyScaffold</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
deleted file mode 100644
index e5fcd987a5a6..000000000000
--- a/dev-python/pyscaffold/pyscaffold-2.4.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=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="PyScaffold"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
-HOMEPAGE="https://pypi.org/project/PyScaffold/ https://pyscaffold.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed \
-		-e 's: + pytest_runner::g' \
-		-i setup.py || die
-
-	# Creates all sort of mem problem due to fetch restrictions
-	rm tests/test_install.py || die
-
-	# Online tests
-	sed \
-		-e 's:test_api_with_cookiecutter:_&:g' \
-		-e 's:test_pyscaffold_keyword:_&:g' \
-		-i tests/*py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	git config --global user.email "you@example.com"
-	git config --global user.name "Your Name"
-
-	TRAVIS=False pytest -vv || die
-}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 9d21e59a8949..0d8b2f3699db 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,3 +1,3 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 596 BLAKE2B efaf81688bf28b374aa01c37c5f371c8ea0573701e00093ff7c333d86f1c76106f6df2fd28be79c1a8ed98122703ac61744b1b0dfd1195ec52acbb95a5912259 SHA512 f22a862f5854dd2541d492ef9eebb26597f1eed0d586c324576f882ac6526f7e4cbc071d3d35dc1434ad18077c4ea06b821b2369491e6b65752dd30438c7297b
+EBUILD pysendfile-2.0.1-r1.ebuild 590 BLAKE2B b1e8743c3e1d4dc9c95ac98781444debddc0b1e7ae2ff4f7362af23658b0452a4d1e4b1489654172199aa22bab8ae6e5a8a9013616f3fa7ee99a3cdb3d31d25c SHA512 0862253aae36053540be77a6a94429f78ddc90de99d90b3aa0883907c0d05664a5cc505d40a6056f137212bb43121930c531bfc76feaf9cb5c6cadf1af64435c
 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 4d916f5de6db..5d6541382f8f 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.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
 
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index eeac9beb6feb..2868f4239684 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.4.ebuild 877 BLAKE2B 79e180d35c6faa13612fdd628406ea97038917085913c7d04d40b6ffc17aec146ea6393b2088c3270554c876e6a500387d064a63091e9b7c34252db5012d741d SHA512 bcd0559ebdf31bcef7fd26ab43f55fdf42125d5040f51091dead3eff20da8aa229ac1fcd94fc07c76b4524ea11df4a2b323d9b556523cda70b2144003cb54957
+EBUILD pyserial-3.4.ebuild 813 BLAKE2B 2f316a51911f5b3aeb713a9df188b961ab2eae43854304c007ef9085ad121897f3c93afc757da9cc71c6f95b711d3958410c76b266739ae8d7004ca9dd78e6e0 SHA512 211a2ecb3a10d64831d074e05e126ac7a3debf043f207719eb5ad04f964429229fb63461db8c69259bfb108a3e7253a5ac4996d93cf244705cef3ed85c4f5e9b
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 1e2985aed603..11492e2a223a 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,10 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
 DOCS=( CHANGES.rst README.rst )
 
 distutils_enable_sphinx documentation --no-autodoc
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 98d1644db36d..4e8660cec6ae 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 999 BLAKE2B 4659737c3d2be77a928c47cf13cb199b2ddb5d66bf338a0d738f4f3ed16256aabdbeef970c15a8fdb1895905671c1c64fae8156d7a82b1b65726c49a07688820 SHA512 cd99ac46442730e4b8074471a0975b5a00ffa245c871f553e51db72720e43c84d2aabf0533a2493b4f3ddf0930e185fc66dc30de1cab5ae12bb60099459f6bad
+EBUILD pysha3-1.0.2-r1.ebuild 995 BLAKE2B 11f8ec2450fabdd847f15984f17f757a25e31818448300be7bcd1e0f90352e380d09814f3d226914ef0b4392d7bfad260ae48e77cbfb2b14a0a270ee44cdf6ad SHA512 a26be6e3b778f81848c9cf8c299488822f486752662ef6630a3b31f8ee921533a3a08e8be4d9d1fb3136e1561fc34b530662c2b1e8a5fd11198e821b31f3e5ec
 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 6516423f4d41..791d4c5a4c99 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index ad2a1d717c46..5d0fd168b627 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,5 +1,3 @@
-DIST pyside-setup-opensource-src-5.14.1.tar.xz 3217008 BLAKE2B c02a79ecea0ba8c7f5547d16c842437455f7f7fce9b7993849919b593fc50b70661e1fc7c1e01eb6a505807f05e17696b2e7727f6ada9ecae2ce30a9ab37a4aa SHA512 6dfe8dc6f302a35a6448c4facb2b98d638506381638c8bda69b75a47ea6cb3168b11515faf0000dbfb5e36bfad5d14488ba5a9bd914adb3f5c38ed18714521d4
 DIST pyside-setup-opensource-src-5.14.2.tar.xz 3238036 BLAKE2B 454f19ae4e154747bad2b833727ab62ded15bbac495cc0bef112ce6cccdd69bb5bb541c9b31125bd05090bfce042bac2ac8b47690c695e82b5c901e45e87f681 SHA512 6708c4ebb115119796756ccac89197e111eb27c4a91f52875da04eff4ca6f9e3fffefc18cc0219a8c3a3c81a667bf7509909a6d1d9ff1ee2cc0d957453cceffa
-EBUILD pyside2-5.14.1-r2.ebuild 8469 BLAKE2B 6fa501ebdbb0f20cdb4103b3655120d85a9f45fceac5f01bf09f39e247505b11d77e33438c40a9a31daab28453da6ef3a25580c60647d929adf8a6deb1536e03 SHA512 cec526a0fc8c38bfb0bf69e5b3355310c8f8e9a173e45335542fde725cafa352750d7fcd5906f368aa455abb1835fcf6dcfb56694a6f21df3d134cccb1aac105
-EBUILD pyside2-5.14.2.ebuild 8469 BLAKE2B 6fa501ebdbb0f20cdb4103b3655120d85a9f45fceac5f01bf09f39e247505b11d77e33438c40a9a31daab28453da6ef3a25580c60647d929adf8a6deb1536e03 SHA512 cec526a0fc8c38bfb0bf69e5b3355310c8f8e9a173e45335542fde725cafa352750d7fcd5906f368aa455abb1835fcf6dcfb56694a6f21df3d134cccb1aac105
+EBUILD pyside2-5.14.2.ebuild 8460 BLAKE2B d96ee1302de5389a43473d3164ef9dc31e304da0658745af055f9f809f65114254b1e8f79cac7984e3650344c27e5051ada915708f024dc1f12a12b29507f8ca SHA512 ad6173f8cede571cec4ed64832c222ecb672fa4803ba68e4665755f56822754447af5bd1e83cc037219b2ef8f5059f81052916ed18f8850925a616523500083f
 MISC metadata.xml 2030 BLAKE2B 7bfe233c9f4af260b8ea28eb731aaddc9876c490b5044ddf7a1be370c2a672517ea4a8dabac5a2bb23848345fefbcb0c0171bf904bbf5275b6ea5a4a358f6ec1 SHA512 f5a3bab776c9a1ab6547b98926616baa1dd21c1c9b4d24a37f039e5256a95cb57550242ecd9ee520687231da42b530b5385dd8cee4aaef7d6705062c25ff359f
diff --git a/dev-python/pyside2/pyside2-5.14.1-r2.ebuild b/dev-python/pyside2/pyside2-5.14.1-r2.ebuild
deleted file mode 100644
index f5097497f214..000000000000
--- a/dev-python/pyside2/pyside2-5.14.1-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	3d charts concurrent datavis designer gles2-only gui help location
-	multimedia network positioning printsupport qml quick script scripttools
-	scxml sensors speech sql svg test testlib webchannel webengine websockets
-	widgets x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set\(.*_deps' PySide2/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( widgets )
-	datavis? ( gui )
-	designer? ( widgets xml )
-	gles2-only? ( gui )
-	help? ( widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	printsupport? ( widgets )
-	qml? ( gui network )
-	quick? ( qml )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webengine? (
-		location quick
-		widgets? ( gui network printsupport webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] )
-	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?] )
-	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}[qml?,widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scxml? ( >=dev-qt/qtscxml-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( >=dev-qt/qtspeech-${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}[qml?] )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xml? ( >=dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-S=${WORKDIR}/${MY_P}/sources/pyside2
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake-utils_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake-utils_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake-utils_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-gentoo.cmake" || die
-}
diff --git a/dev-python/pyside2/pyside2-5.14.2.ebuild b/dev-python/pyside2/pyside2-5.14.2.ebuild
index f5097497f214..2b915396cffd 100644
--- a/dev-python/pyside2/pyside2-5.14.2.ebuild
+++ b/dev-python/pyside2/pyside2-5.14.2.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 #     https://bugreports.qt.io/browse/PYSIDE-535
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-r1 virtualx
+inherit cmake python-r1 virtualx
 
 # TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
 # USE flag after an external "dev-qt/qtremoteobjects" package has been created.
@@ -35,10 +35,10 @@ LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="
-	3d charts concurrent datavis designer gles2-only gui help location
-	multimedia network positioning printsupport qml quick script scripttools
+	3d charts concurrent datavis designer gles2-only +gui help location
+	multimedia +network positioning printsupport qml quick script scripttools
 	scxml sensors speech sql svg test testlib webchannel webengine websockets
-	widgets x11extras xml xmlpatterns
+	+widgets x11extras xml xmlpatterns
 "
 
 # Manually reextract these requirements on version bumps by running the
@@ -79,6 +79,7 @@ QT_PV="$(ver_cut 1-2):5"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
 	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] )
 	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
 	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
@@ -166,23 +167,23 @@ src_configure() {
 			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
 			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	python_foreach_impl pyside2_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
 	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake-utils_src_test
+	python_foreach_impl virtx cmake_src_test
 }
 
 src_install() {
 	pyside2_install() {
-		cmake-utils_src_install
+		cmake_src_install
 		python_optimize
 
 		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 2f00be001551..cc536354a22e 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,7 +1,3 @@
 DIST pysol_cards-0.10.1.tar.gz 20670 BLAKE2B 1183502ec0e7c070686ed5fc2972091a5bf91d55e31170690124e949bd592401daaae44cf25e3ac9b213230e27fbc90ea9e58450d75caa09b9467f0d2ba513cc SHA512 40ef02fe919f961688039667b9073913acb452d163eef1a4ef71648788676c678bf615a26b1f4d562ba072167eb3629c4cc463678edff89bfdc62b0878db062c
-DIST pysol_cards-0.8.18.tar.gz 20324 BLAKE2B 230dcb57ed5d8f75f70bb55ef339347fb7ecd9877b29fc72237fab7595b15fc1ec28b56021a66478c1d4f5f5139562b976155267b1e4e325559a74f68869b98b SHA512 86f0e110b354703745f16410d4f9f8187173a2ae06088d18e7e87b3b6e3149422b3b442e8384f3863ace34de844d9aaab4c080d3e286b4890b188621b6101d06
-DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
-EBUILD pysol_cards-0.10.1.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
-EBUILD pysol_cards-0.8.18.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
-EBUILD pysol_cards-0.8.9.ebuild 549 BLAKE2B f8853c4c8395a41ba1e4f103df1a1e9d0d2092dcbb35d8002c24543ece55858d0db929384ec4a89acc0c9410049ad789e016a0090b9eb2c04a670ff0317b3e92 SHA512 714fd9150f5ab51d91e9cd19eb5245c4e0a1004f2477cb917eeacd950cb005779c87d39bb95cbc64b455bfbc24cb6165e5b34f2d28a3da34c1d4783a4cf49848
+EBUILD pysol_cards-0.10.1.ebuild 549 BLAKE2B f8853c4c8395a41ba1e4f103df1a1e9d0d2092dcbb35d8002c24543ece55858d0db929384ec4a89acc0c9410049ad789e016a0090b9eb2c04a670ff0317b3e92 SHA512 714fd9150f5ab51d91e9cd19eb5245c4e0a1004f2477cb917eeacd950cb005779c87d39bb95cbc64b455bfbc24cb6165e5b34f2d28a3da34c1d4783a4cf49848
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
index 9407aad9b5fa..2153dd470d0c 100644
--- a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.18.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.18.ebuild
deleted file mode 100644
index 9407aad9b5fa..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.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=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
deleted file mode 100644
index 2153dd470d0c..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.9.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="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/pyspectrum2/Manifest b/dev-python/pyspectrum2/Manifest
index e8ac191abc5b..164448bba2e6 100644
--- a/dev-python/pyspectrum2/Manifest
+++ b/dev-python/pyspectrum2/Manifest
@@ -1,3 +1,3 @@
 DIST pyspectrum2-0.2.0.tar.gz 31500 BLAKE2B 230329f9b1f12c7f7cff234b95d9715609cd0922c6c833726dfe72e7da0ba646e8d059d2f42d70fb97c8cb755436307369336551d44bf7954f2281f49d03ea6f SHA512 40c9f7dda808fd5bca05026b7418022b660d53b6ef52d684885ed04a47185ce2d1e2988bff5b874977c736bf5cf75f10f9daf752475504327844d4f1948f2286
-EBUILD pyspectrum2-0.2.0.ebuild 620 BLAKE2B 254c36474089454f54c07c8f6d824f10d4d2ecfbc68fbcdabe79a75740285c939876da0fe3ad29eafcb33deec736bcbe94c7eb55cc330e279fa0b222eb4a3034 SHA512 d8e614f0bab98ca7d598fe03a273335cd0072943f9f3c5c61e752e5c7de16f08f2dde846376c3005fcd46d7d3b631a3bc6069837be9f6755dc064fa4c0bbf423
+EBUILD pyspectrum2-0.2.0.ebuild 619 BLAKE2B 6ee7fc16f15482973eae18b442613457abb59c0b2311b6df82e0adddfa334dd066620ac755ddb3e17e409247df287127aaf34d03d9bfaf93c451a6b7f1076e3d SHA512 eea6a0418699b3e6361065699c5ac8bba7547189ecdadcf834627d5689e23c19b860d72fa0196ccfa68c4edfec885707b3955f69e662bc12444eb0d3249df037
 MISC metadata.xml 560 BLAKE2B fb53cfbb2cf5cf7fcbaeb4c94ac495f838c948c5154c7a22d8e613dc99188ce2a6b4559d9569a5639572cf66ba9df7694112da5d7806dcf656cd5bc8647656c3 SHA512 c3b4e7856ca8d1a178eaff246e75915ca6b73eba78373d91f8c2a1adfe35230a74e0e999a9db723f63cee336b9698b6cd7253db7f63bda72e2ee440e96b74136
diff --git a/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild b/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
index af87236159f9..4250c8f61942 100644
--- a/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
+++ b/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index d7f181a5c764..1a061766a7ce 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,5 +1,3 @@
-DIST pyspf-2.0.12t.tar.gz 67189 BLAKE2B 40ddecf6e9717da9e496c5852866259f28af11c5e9ef581ef1188b07896bce7abc3ba901063bfea2ec9f89d70e17275b0e2619f23f9dc334628ebb0af084b79c SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d
 DIST pyspf-2.0.14.tar.gz 69446 BLAKE2B 95a3bf89ab85aad84dcbbe81ada7f19d23cc689893df1d1317c0e06eb1f6b6d21b1e805d68e7c0c84161d711b9c6067f115d78c8786ce384036f7d0c425269b9 SHA512 ca801a899a80c18cd2c6bb8c125817c29898189805040cce8d29ace7a5aa34b43b9d10545150a1f39abd7bc49cd8da4fe753a04ac9b911e7bb9d77473753eeee
-EBUILD pyspf-2.0.12.ebuild 792 BLAKE2B b7247f6bf0d8fecf265f793f850038ebbed93ee4d723718a3b2988cb2125e1a9a750d0bc1dcaf48caa42dfaca74a4916d79303c6fe6a2e1cd661fd7c6fdf4eda SHA512 c97669e7936880222f752b56788805d10b67ec499972e7d3d5121a6bb9b138438cc08413036e4035fa2d07e425da49d810da9da24199f0ba06c51b0b2e9fcf3c
 EBUILD pyspf-2.0.14.ebuild 822 BLAKE2B 3dd0ae5ab746f3bae58649b38763a7cfc468fd39c46b40c52d05927f6cc406233370efa30fe2d4eba9baa860cb7c2bfeab5220ab7da53b658a39038d562fb422 SHA512 e019d402f8882251245dddc9d0239ef7bd5f400044136c7427672443758ce65d3b2e4ea77c05644e6f8a2f2fccfabb0d0f444cbc84966dfb0a5a09bbf42fd925
 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
deleted file mode 100644
index 9cf73938a2f0..000000000000
--- a/dev-python/pyspf/pyspf-2.0.12.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 )
-PYTHON_REQ_USE="ipv6?"
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="https://pypi.org/project/pyspf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}t.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-# >=python-3.3 comes with the built-in ipaddress module
-RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
-	dev-python/pydns:3[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="test? ( ipv6 )"
-
-python_test() {
-	pushd test &> /dev/null
-	"${PYTHON}" testspf.py || die
-	popd &> /dev/null
-}
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index f6ac80098853..63c7a30a0a78 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,6 +1,4 @@
-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.ebuild 795 BLAKE2B ef984c345d9605038a9cd3e598d3b11a4202d87e2b4d7138d80ed33827cbd5c1ab32d41e6c25e44d1aab852bc6f309361a46dcbda4d83610114dfda0e1bc3e8f SHA512 97e10eaf59149d57817ebbf9bafee70048b94d146a458bf42f129f005ca5c6526b1cbfa567a5680b92f2495afbbdd4a2d1a03857fa5c390412a16d45db7c60ad
-EBUILD pysrt-1.1.2.ebuild 790 BLAKE2B 50489ef1b3ff90f99981b66fc49fccd3fb5a5892bbdec879afb270f72f68329766a7ece8322d7135861fb4ff08b60211c907fe9cbbdc8013de999fadb8637928 SHA512 ff6ddc02c3f08c80b5e2bd029fff469d088ec379f589bd40216cbc7a05d69fc722cd54db92e44537cd2dd681985817e273ed766b30f9b9c4ba997f15b07f93b8
-EBUILD pysrt-9999.ebuild 792 BLAKE2B b7d6c2c306c4def9450e85d6e789c9b4c9b312ae19b22b0f26b4a672906bba1701ca15fe06b522bbd58dd6146c47e9f5905f1073f5d1fe95be93b1c2bcfc43e7 SHA512 678fd6278c0a5ea62f580852666d818024ee0524c1c9dbb68fa1c6080c326dc6b68cd04f8b54ceb6cb352850cbedbfa661aebc2a74d19eef8c12afbc6c6ccf8f
+EBUILD pysrt-1.1.2.ebuild 638 BLAKE2B fccac0387d6907b9e5c9cd7024f49a2ace32555667deb62c11ddc68441cc626f620d77f14e52aad8608d28a3b1de9187fde4f0696f8112b113ccdab790619a04 SHA512 fb8c15ff2a1a0244efd34256b42bb5cb9f9259f54f25008d909b0bccade65ef2ea163b5c0b3530a5042a16458db63f96e4650efd68da0c4f1319c5f6a3f725ae
+EBUILD pysrt-9999.ebuild 640 BLAKE2B 9ba0336107d27e172f09fd3fa879130c865a3b19e606451769f0797b41d7fc75d28c3632c93c316759cf0556417b8be97759a95aace050da76eda028c2f9ce05 SHA512 716c7875fac6ca31177c27d70ee6d5afae5e689bae7e14c8bcd125bcd0f01ec0b88858de3bece2227d033e221423ae8ef5e888fbaeb077c46390327b5a142134
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
deleted file mode 100644
index d5c1c4e88569..000000000000
--- a/dev-python/pysrt/pysrt-1.1.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-SRC_URI="https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pysrt/pysrt-1.1.2.ebuild b/dev-python/pysrt/pysrt-1.1.2.ebuild
index e72f359339d2..4dc902e8279c 100644
--- a/dev-python/pysrt/pysrt-1.1.2.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -20,17 +20,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
 
-python_test() {
-	nosetests -v || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 98e0450016cf..c6b6da91f0de 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -20,17 +20,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
 
-python_test() {
-	nosetests -v || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index ff1c0f55166c..63313154b567 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,7 +1,4 @@
-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
 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 1332 BLAKE2B 277ba7736387fbf3791c6d5121517c5d90c2b07dc26ce5e31a5c7cee1e60f0ab699ff8d5f78aaa64c3331d2af6d0c40302b8abcff6da0d1fe25eff1cdb1ce800 SHA512 beb70a95693a4c6b3338e2152d24183326030173d18a4e514d1b2e6fda4e6d84cadc3ff29f4ff97ba422bd156f13d78a42d0289f044cb3a33d33ae974a984f30
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch
deleted file mode 100644
index 9b4c3a075e8f..000000000000
--- a/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch
+++ /dev/null
@@ -1,99 +0,0 @@
- Source/setup_configure.py | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Source/setup_configure.py b/Source/setup_configure.py
-index afeee2d..47f2717 100644
---- a/Source/setup_configure.py
-+++ b/Source/setup_configure.py
-@@ -849,8 +849,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'
-@@ -976,8 +976,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' % pycxx_version,
-@@ -1032,11 +1032,11 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-+                                        '$(CXXFLAGS) '
-                                         '-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',          '$(CXX) $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         self._pysvnModuleSetup()
-@@ -1048,7 +1048,7 @@ class MacOsxCompilerGCC(CompilerGCC):
-         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
- 
-         py_cflags_list = [
--                    '-g',
-+                    '$(CXXFLAGS) ',
-                     '-Wall -fPIC -fexceptions -frtti',
-                     '-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',
-@@ -1074,13 +1074,12 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-         self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
-         self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
--        self._addVar( 'LDSHARED',       '%(CCC)s -bundle -g '
-+        self._addVar( 'LDSHARED',       '$(CXX) $(LDFLAGS) -bundle '
-                                         '-framework System '
-                                         '%(PYTHON_FRAMEWORK)s '
-                                         '-framework CoreFoundation '
-                                         '-framework Kerberos '
--                                        '-framework Security '
--                                        '%(LDLIBS)s' )
-+                                        '-framework Security' )
- 
- class UnixCompilerGCC(CompilerGCC):
-     def __init__( self, setup ):
-@@ -1140,11 +1139,11 @@ class UnixCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-+                                        '$(CXXFLAGS) '
-                                         '-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',          '$(CXX) $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         self._pysvnModuleSetup()
-@@ -1155,6 +1154,7 @@ class UnixCompilerGCC(CompilerGCC):
-         self._addVar( 'PYTHON_ARCH_SPECIFIC_INC',     distutils.sysconfig.get_python_inc( True ) )
- 
-         py_cflags_list = [
-+                    '$(CXXFLAGS)',
-                     '-Wall -fPIC -fexceptions -frtti',
-                     '-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',
-@@ -1176,7 +1176,7 @@ class UnixCompilerGCC(CompilerGCC):
- 
-         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list ) )
-         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
--        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
-+        self._addVar( 'LDSHARED',   '$(CXX) $(LDFLAGS) -shared' )
- 
- #--------------------------------------------------------------------------------
- class LinuxCompilerGCC(UnixCompilerGCC):
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
deleted file mode 100644
index f64c4e01c59c..000000000000
--- a/dev-python/pysvn/pysvn-1.8.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=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="http://pysvn.tigris.org/"
-SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${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-6.2.6[${PYTHON_USEDEP}]
-	dev-vcs/subversion"
-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/pytables/Manifest b/dev-python/pytables/Manifest
index 26ea4d44d095..3b3050f42c7b 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,3 @@
-DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
 DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
-EBUILD pytables-3.4.4.ebuild 1734 BLAKE2B 0b9d317bd8a6074c7770f29fbfa8b10bb8bb7b7925cdf95eacca691449070f8a6fffcdd4e7d4258212b58291631aef89070c4b044ebb07bc62540b430969f266 SHA512 8c2383039512ad9ecbbff0e0eaf986dd2bca5781534ed6cd4d4c8ed63072664220adabb3bbe08b6a8ce9d272d92689b37d44d78eadac28ec0fc018dd65c8c1c2
-EBUILD pytables-3.6.1.ebuild 1737 BLAKE2B 9499f51855bd35998865af1439b803eac86c09936faddf3ec4059d6f3475a518043c3b817d6ba1dead77aa508d09203df219ef0367f62aa165224c7d6c638d27 SHA512 f0b2f951d189bb5d62d87fb754a525b5f4047eac1ea41ecdd020b20323be941e0073901df960eddec9c98bfff31e09c328b1744b0807eea386490a74e090fdb4
+EBUILD pytables-3.6.1.ebuild 1650 BLAKE2B 99a7e864521d33301bf1652c2afcb541894a1917e2d28b60fa9e51f5da8c473b2885e7ab3ee6f7053a1d85aed1823a96827e9134a4e0a9dda18b5d9e3b26315c SHA512 3d9c90dadc1da5be31f72bed30e06d6f3abc9eb6eef2e7c65879079907d0241974793a8d1e0584d20ed53cfd11ca7d7130b784379d1ed2c256f1da73a66adeba
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
deleted file mode 100644
index 9a5ed1e38117..000000000000
--- a/dev-python/pytables/pytables-3.4.4.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=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="https://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0:=
-	>=dev-libs/c-blosc-1.11.1:0=
-	dev-libs/lzo:2=
-	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.15:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( RELEASE_NOTES.txt THANKS )
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	rm tables/*.c || die
-	sed -e "s:/usr:${EPREFIX}/usr:g" \
-		-i setup.py || die
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die
-	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() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		dodoc -r contrib
-		docompress -x /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/contrib
-	fi
-}
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index abe2b97d2fe5..926cdcf18003 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.pytables.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
@@ -52,11 +52,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
+	distutils-r1_python_compile -j1
 }
 
 python_test() {
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index d024d281fdae..b9953d336625 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 533 BLAKE2B 7ddaadc87068932e19f7adfe23d484a2e8dd1c4fdc317d53300ed43f36b49ea89b9edeee6babda4e24de630fa940de793f8ec3ff4885329e6ce039e6df8edad2 SHA512 79624acb3947f27b97bf9b506623ce07ac49350fed8480251e67ea8e2cf11aa077701a3d7f00f6cb0c592a7865deb40e51fbfb6cb52367a21d5ee0467550d6c8
-EBUILD pytest-aiohttp-0.3.0.ebuild 608 BLAKE2B 15c3fe584a822ae28da6b01f91dbeb89b9fb7e2691164d585c4072128671289dfedce1b9e4dadad83342a18c7e2ce89ff4effc77e525d9ef862fb5109299974b SHA512 40409add5aacf9f266d658cff98be13321e4540f0dd5f367f9f61db4ea6078c8b834e6e1d024ee85d90d94afff48a7d071a5e4759d0451fd40690a2c16a20ea0
-MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 537 BLAKE2B d6cf7880451f350259f1aa937cbc29825c4a2f7027b5fb62c4fd011a8bbffb4f968445642939ca440aa14d732bd66fa3c26073968e505f073327e65914743207 SHA512 217bab4486fac2b50629beab79c910b4a70a39ade1a5aafd19a1c991a947660b6ab319098ef37341a303f87154c8dcf44e23b3806b85360e9acd34efa60dd89b
+MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/metadata.xml b/dev-python/pytest-aiohttp/metadata.xml
index 947779f0a967..61d57668b0ea 100644
--- a/dev-python/pytest-aiohttp/metadata.xml
+++ b/dev-python/pytest-aiohttp/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/pytest-aiohttp</remote-id>
 		<remote-id type="pypi">pytest-aiohttp</remote-id>
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index beda1c97ad55..a274f95e1396 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.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="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
deleted file mode 100644
index f4e7c577fbe8..000000000000
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.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=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 18ab52f968fc..02c788d54eb5 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,10 +1,3 @@
-AUX pytest-asyncio-0.10.0-py38.patch 7093 BLAKE2B 013901feddc45c5e5e832c5d2e016a1ccc4e8be29414ff350baf87b434fa29a803e030f7d4fe869e1276bce079cc075e0e876e8ff29cb6fa5f3abca5c83e77c6 SHA512 d9c3df879b288821a87a7dc1ca55e86e60007128af7dbdf54c7221b7f0c05b7750f8b1e7389a0956d5188d82f0ef8144678437e1391951fe0cfa63c872286ff0
-DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
-DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69c589efffefdfe0f1cef09ce98c1dd150f4298bfa9d707dfc264a6d48c71839847f929237204ba2a36e1bb1aae4e95cbe SHA512 db1d6a9c4b3f6f24014eacf3b108d76e5b2d6761d35260f20023638cd898b6f0b499dd475bc07abd58bc73bee2a88b565c3ebcced2460e619a1b375fa6a27a64
-DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
 DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
-EBUILD pytest-asyncio-0.10.0.ebuild 833 BLAKE2B 7474a3709b045c8ba57623907eeb2fec75edff8f09d27be3ce9957c7dfc31836655ff2020a6c287a877df6705e9c11805bc33a870e8d407e076b3479f7cc6f48 SHA512 0211e34d00b6761465d543920a5341f5043317cc4d86a94401606647013efc3be81ea83e4d75ba9e1ef51f70ce00f26b8a590cc1d7635c4be7f24fd78a3fc3e5
-EBUILD pytest-asyncio-0.11.0.ebuild 762 BLAKE2B d55984ddaacc624f1f96457811448e4d3d9af28d8ab9ee5610b0def42beca68b2c6294afec80f55324451a623e3ed40151fac52f662eb35eaccb2bea22358763 SHA512 66f3e6661bf185adae6304480f4f5fec32ea0c8ea75177f8ce9111e00f87e7d8fc4b5bde230e7dfa3fe9899140d1ede0d4a1b42bf35dac5c8b8ba3dd887e8cb1
-EBUILD pytest-asyncio-0.12.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
-EBUILD pytest-asyncio-0.14.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD pytest-asyncio-0.14.0.ebuild 812 BLAKE2B 991edb98286be2947f51efa1f8fe1c66c52b5bdccd5650c8ccfb413d350fea4bc764ff6d94384ae0d49e57ad8f21182546ceb454a4dbc2f4a319d9c42d3e881b SHA512 4c4da6b1503efd2981ce599488b67dd2af419a7289084f12bca4a5ef79fa3242ca5a1491771dd611f8cb326e18afa01fcc80ec624cd197e69844ff22e1235461
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/pytest-asyncio/files/pytest-asyncio-0.10.0-py38.patch b/dev-python/pytest-asyncio/files/pytest-asyncio-0.10.0-py38.patch
deleted file mode 100644
index 5eee735007a0..000000000000
--- a/dev-python/pytest-asyncio/files/pytest-asyncio-0.10.0-py38.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From ab2b14048a691479fa9f8811aaa558018c6db6e3 Mon Sep 17 00:00:00 2001
-From: Andrew Svetlov <andrew.svetlov@gmail.com>
-Date: Thu, 9 Apr 2020 08:44:46 +0200
-Subject: [PATCH] Test on Python 3.8, drop 3.3 and 3.4
-
----
- .travis.yml                          |  7 +++---
- setup.py                             |  1 +
- tests/conftest.py                    |  2 +-
- tests/test_hypothesis_integration.py |  2 +-
- tests/test_simple.py                 | 32 +++++++++++-----------------
- tests/test_simple_35.py              | 17 ++++++---------
- tests/test_subprocess.py             |  6 ++----
- tox.ini                              |  5 +++--
- 8 files changed, 29 insertions(+), 43 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 6203cf8..cc2ec16 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -17,7 +17,7 @@ def dependent_fixture(event_loop):
-     async def just_a_sleep():
-         """Just sleep a little while."""
-         nonlocal event_loop
--        await asyncio.sleep(0.1, loop=event_loop)
-+        await asyncio.sleep(0.1)
-         nonlocal counter
-         counter += 1
- 
-diff --git a/tests/test_simple.py b/tests/test_simple.py
-index 1627139..00c07fc 100644
---- a/tests/test_simple.py
-+++ b/tests/test_simple.py
-@@ -1,28 +1,26 @@
- """Quick'n'dirty unit tests for provided fixtures and markers."""
- import asyncio
--import os
- import pytest
- 
- import pytest_asyncio.plugin
- 
- 
--async def async_coro(loop=None):
--    """A very simple coroutine."""
--    await asyncio.sleep(0, loop=loop)
-+async def async_coro():
-+    await asyncio.sleep(0)
-     return 'ok'
- 
- 
- def test_event_loop_fixture(event_loop):
-     """Test the injection of the event_loop fixture."""
-     assert event_loop
--    ret = event_loop.run_until_complete(async_coro(event_loop))
-+    ret = event_loop.run_until_complete(async_coro())
-     assert ret == 'ok'
- 
- 
- @pytest.mark.asyncio
--def test_asyncio_marker():
-+async def test_asyncio_marker():
-     """Test the asyncio pytest marker."""
--    yield  # sleep(0)
-+    await asyncio.sleep(0)
- 
- 
- @pytest.mark.xfail(reason='need a failure', strict=True)
-@@ -45,13 +43,11 @@ async def closer(_, writer):
-         writer.close()
- 
-     server1 = await asyncio.start_server(closer, host='localhost',
--                                         port=unused_tcp_port,
--                                         loop=event_loop)
-+                                         port=unused_tcp_port)
- 
-     with pytest.raises(IOError):
-         await asyncio.start_server(closer, host='localhost',
--                                   port=unused_tcp_port,
--                                   loop=event_loop)
-+                                   port=unused_tcp_port)
- 
-     server1.close()
-     await server1.wait_closed()
-@@ -68,20 +64,16 @@ async def closer(_, writer):
-                            unused_tcp_port_factory())
- 
-     server1 = await asyncio.start_server(closer, host='localhost',
--                                         port=port1,
--                                         loop=event_loop)
-+                                         port=port1)
-     server2 = await asyncio.start_server(closer, host='localhost',
--                                         port=port2,
--                                         loop=event_loop)
-+                                         port=port2)
-     server3 = await asyncio.start_server(closer, host='localhost',
--                                         port=port3,
--                                         loop=event_loop)
-+                                         port=port3)
- 
-     for port in port1, port2, port3:
-         with pytest.raises(IOError):
-             await asyncio.start_server(closer, host='localhost',
--                                       port=port,
--                                       loop=event_loop)
-+                                       port=port)
- 
-     server1.close()
-     await server1.wait_closed()
-@@ -117,7 +109,7 @@ class Test:
-     @pytest.mark.asyncio
-     async def test_asyncio_marker_method(self, event_loop):
-         """Test the asyncio pytest marker in a Test class."""
--        ret = await async_coro(event_loop)
-+        ret = await async_coro()
-         assert ret == 'ok'
- 
- 
-diff --git a/tests/test_simple_35.py b/tests/test_simple_35.py
-index 1e4d697..4141fb0 100644
---- a/tests/test_simple_35.py
-+++ b/tests/test_simple_35.py
-@@ -6,7 +6,7 @@
- 
- @pytest.mark.asyncio
- async def async_coro(loop):
--    await asyncio.sleep(0, loop=loop)
-+    await asyncio.sleep(0)
-     return 'ok'
- 
- 
-@@ -27,8 +27,7 @@ async def closer(_, writer):
-         writer.close()
- 
-     server1 = await asyncio.start_server(closer, host='localhost',
--                                         port=unused_tcp_port,
--                                         loop=event_loop)
-+                                         port=unused_tcp_port)
- 
-     server1.close()
-     await server1.wait_closed()
-@@ -45,20 +44,16 @@ async def closer(_, writer):
- 
-     async def run_test():
-         server1 = await asyncio.start_server(closer, host='localhost',
--                                             port=port1,
--                                             loop=event_loop)
-+                                             port=port1)
-         server2 = await asyncio.start_server(closer, host='localhost',
--                                             port=port2,
--                                             loop=event_loop)
-+                                             port=port2)
-         server3 = await asyncio.start_server(closer, host='localhost',
--                                             port=port3,
--                                             loop=event_loop)
-+                                             port=port3)
- 
-         for port in port1, port2, port3:
-             with pytest.raises(IOError):
-                 await asyncio.start_server(closer, host='localhost',
--                                           port=port,
--                                           loop=event_loop)
-+                                           port=port)
- 
-         server1.close()
-         await server1.wait_closed()
-diff --git a/tests/test_subprocess.py b/tests/test_subprocess.py
-index 83490e8..069c6c2 100644
---- a/tests/test_subprocess.py
-+++ b/tests/test_subprocess.py
-@@ -21,8 +21,7 @@ def event_loop():
- async def test_subprocess(event_loop):
-     """Starting a subprocess should be possible."""
-     proc = await asyncio.subprocess.create_subprocess_exec(
--        sys.executable, '--version', stdout=asyncio.subprocess.PIPE,
--        loop=event_loop)
-+        sys.executable, '--version', stdout=asyncio.subprocess.PIPE)
-     await proc.communicate()
- 
- 
-@@ -30,6 +29,5 @@ async def test_subprocess(event_loop):
- async def test_subprocess_forbid(event_loop):
-     """Starting a subprocess should be possible."""
-     proc = await asyncio.subprocess.create_subprocess_exec(
--        sys.executable, '--version', stdout=asyncio.subprocess.PIPE,
--        loop=event_loop)
-+        sys.executable, '--version', stdout=asyncio.subprocess.PIPE)
-     await proc.communicate()
diff --git a/dev-python/pytest-asyncio/metadata.xml b/dev-python/pytest-asyncio/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/pytest-asyncio/metadata.xml
+++ b/dev-python/pytest-asyncio/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
deleted file mode 100644
index b5141f97fa04..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/pytest-asyncio-0.10.0-py38.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.11.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.11.0.ebuild
deleted file mode 100644
index 25b48145d633..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.11.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
deleted file mode 100644
index 64dfa2878e8f..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0"
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index 64dfa2878e8f..3b6370c3ca07 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
index fc1f0bc82b0f..e56b141b9d23 100644
--- a/dev-python/pytest-cache/Manifest
+++ b/dev-python/pytest-cache/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
-EBUILD pytest-cache-1.0-r2.ebuild 860 BLAKE2B 216b73f1199fcaf51c682132f9acdd50e73098315ed0a7154a5d5c4589ab4c312740174f5f4a79a805b4dff8bbf686b1defaf52173fc39459cd6b3e52eebe82e SHA512 2dd9b128e2693951ad9c81cbd3adab0f8e19aa694f137e77aaaf5ef53a54196a7894fb86dfdd76b28ff65e11fbb678af5cc050f6d38944b00140b87212f2cc64
-MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
+EBUILD pytest-cache-1.0-r2.ebuild 811 BLAKE2B 09d7763d18a09db94d3ab67ed9df53061f09d9670892df138bc7baac00eb2d095c2d226487fa55325f9593ea8196d78101976409cb93d2b80969cf1beda40301 SHA512 19aec4c61fb2bc2b92ea70f07f118a8be6d2259abe1906aef96069828da37936c718be635f6e44d375189f9ac846597941374a51007d5864abb639671d87a9aa
+MISC metadata.xml 315 BLAKE2B 4374835d7854b157d1a29aa9a5a1546ec695c0bb8492aa198f1a5aeb14d8dcb03f1df8bcf6d28c559fbf51e666ed76f5ecac2dd89fb3d98afebd02b6deaa71dd SHA512 5eafc2f6af157e5b68346c469f1bbe64278f4a056ca3eecf98c6f539888c7757997bd9e40390f6de722c4b15108c47cbe01050f4221d0e469f4b8c8f1bb8f91e
diff --git a/dev-python/pytest-cache/metadata.xml b/dev-python/pytest-cache/metadata.xml
index c84b16d0098e..c3909193f7e5 100644
--- a/dev-python/pytest-cache/metadata.xml
+++ b/dev-python/pytest-cache/metadata.xml
@@ -6,8 +6,6 @@
 		<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>
+		<remote-id type="pypi">pytest-cache</remote-id>
 	</upstream>
 </pkgmetadata>
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 69bf0b434579..9dbbfe62d855 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} 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"
 
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index ccf9fa96840b..2d53cdb31a08 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
-EBUILD pytest-catchlog-1.2.2.ebuild 806 BLAKE2B f79d3fa1732018eb15e15271e76f6c671dae98bd154ba5f26b7e9eb41456fd64a3bad5209c4f0412d0578d54a9790b6af759c90cd14c1f6ba5e4864d469dd9b5 SHA512 5a39dd98369241e919106de3dcf3e8f320c6077853e0ef6b3bfada47fe1101ada7ea2a2d996f6836b111a61f713a0d8b1092577ccbe688bd8174e9d8bc29a8fe
+EBUILD pytest-catchlog-1.2.2.ebuild 796 BLAKE2B 79e00c511c1cdbabb67f4de085f82f393839d91552b4330d5668cdf2bdc29c9ace6943577b2c419e1b1c6781fc7b9fd784890a32ae3b1baadc1ef27982d4369b SHA512 8f65a32e1dfa5ab23f4a47add3b62d19ebc9987a23999b2f8cb7e8166618c15606ab4697765eebda75cbdb297ebc5021f70127c1c6220d31e865cfa95832f71c
 MISC metadata.xml 384 BLAKE2B 0dff6cbe91087adee6e5fba8d8d1e38ad51f94d97808c62d7e68844f5eb9097ce4fa22bd7a2e19456836721880fdf4e54d4abab42fc9c1285d6fdf5bc761a27c SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index cd8bb7dd4e0d..846c148487f2 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 732f813d0e97..4938ed52328b 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,5 +2,5 @@ AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619
 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.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.8.1.ebuild 1385 BLAKE2B 5b812da49639f40f71f5968050ecccaa3c3e154b4ce96a129e0b46404bb13c84c0f8dcbd41a80a28060b80fea128fed29c2e562c7b800ac8e109bb4080c64d8c SHA512 dca4399dad56456a3154ffb13f3a969d7d14ed57a61ed3b481189f6128636697672a44190c6cb74f2c96a9c94ec9ccf4df23e87b2a8b04642c90669911cfec65
+EBUILD pytest-cov-2.8.1.ebuild 1379 BLAKE2B af9d3b41059044fb681a5cc95a2cc54ff154e254fa45c41404572fbd5ce7583d7a9e94bfd8e8b9a916dffad18a4cf4dd69a86ee36a0c21c47ab84403800693d6 SHA512 1d4c068babaf0c6b34d755e4de2eaf55b3e933c2f2e417874b4653cd72f6793966b28b0df9e3bfff8f0d7ffd45ab0f82b2580b74f2d65eeff0897833c272f4b5
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
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 9bf837927521..974fb87fee81 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 3d7ba0ccc6e2..3e10db82b844 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,3 @@
-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 727 BLAKE2B e3cb064747983e53a3e9245a2cbc872f3ba1545b89047a81143bd103407ea8d942b7fe0423b3038216eb42e591302bf360570be407be1edcf78a8c20aaff58e7 SHA512 da6f7f1481b82c9380485c595ac74baa46dace9b059e5fc56abaa9924b08c87e9debddc50e7c2cac532c0b06ffa19d5ce5b8ae5ebf55850a8a5f3240f33ea702
-EBUILD pytest-django-3.9.0.ebuild 729 BLAKE2B 952250a3344800163d4a695e2d926341643a414fd9fa845571dfb4facdfbbc74124ce80a2d32e439d6c60609da0d627db22473accdeb5cfde11ddaa423e46029 SHA512 496fa81c41038cf9234271fd5e6124c1c431ab9ae6b7d1c8c05a86833bb827dccfea69375cddc79f942177a3c834745eea4ca54821d744084cfdc6179ca0fbae
-MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
+EBUILD pytest-django-3.9.0.ebuild 727 BLAKE2B e3cb064747983e53a3e9245a2cbc872f3ba1545b89047a81143bd103407ea8d942b7fe0423b3038216eb42e591302bf360570be407be1edcf78a8c20aaff58e7 SHA512 da6f7f1481b82c9380485c595ac74baa46dace9b059e5fc56abaa9924b08c87e9debddc50e7c2cac532c0b06ffa19d5ce5b8ae5ebf55850a8a5f3240f33ea702
+MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
index 6cc31041286c..f5b26f1ff8d8 100644
--- a/dev-python/pytest-django/metadata.xml
+++ b/dev-python/pytest-django/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-django</remote-id>
 		<remote-id type="github">pytest-dev/pytest-django</remote-id>
diff --git a/dev-python/pytest-django/pytest-django-3.8.0.ebuild b/dev-python/pytest-django/pytest-django-3.8.0.ebuild
deleted file mode 100644
index 8643926ecc9c..000000000000
--- a/dev-python/pytest-django/pytest-django-3.8.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
-
-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
index d8944a9de33a..8643926ecc9c 100644
--- a/dev-python/pytest-django/pytest-django-3.9.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthed
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 5e99238d2d44..80710d812ceb 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 653 BLAKE2B 035de653d10042b0d42adabe9677ebe38add21b84d0de4e4df3de1478554013bfe226e74bd78600200b53ea2fe1947fd4793570a2ebcd97a62697c47483cffc7 SHA512 c80404793739f5afcd0187d4eebc05fa2e0011d68ddeb0e971c36511a06e0e4039aaac933ef7bac86e5f52e8c25623d3f4e291b4f980319b7f645538afdf3f74
-EBUILD pytest-expect-1.1.0.ebuild 685 BLAKE2B 9774b9b955ae1d19d34979e9c8c1254ae2aa5b65f38d1e186f4f043a75f4679a2d19a0ec46b2a16ee38ca6e3b70a1a3635c46ad62ceb1388453e3f9c0eee65cd SHA512 84c2d74b5255fe18f7c9a33f32a750b8aaf76a85019ae8e752ea074d35b4b622b3eeb8d62ef9868919853c43027943f1ea7215d977a761d20d86ae50a41f0cfe
+EBUILD pytest-expect-1.1.0-r1.ebuild 646 BLAKE2B 2c19e380454c57f0dd9022a41b18650fee3c8af32b6b56bbe0af85e5b564c31f9c924e97401eee4696914f7a091aa07ed0080c3dbefbc8d1ceb810ff7059f1ba SHA512 064f79933aa0367060aaacadb37fe253f9a7d9b6f1fc4835ab8a22b5cb0a4b6a99d908eeb9905d3ad8685cf68b4b604628a7680cc1fb3c2f6e080acdee5bbe55
 MISC metadata.xml 458 BLAKE2B b8e23df2621be3f2cf2818753ab7a18102fd3e1ff32e80aa425c50b36f9f7ea736a1e9eb9030920c2882e65bdb2372afb0ece371ee13dbb45b3be3144d73f8fa SHA512 a366c816a1513376742bf1d43bb4cc60df9923b3e191d169ae56ee9706f60cbf8edbe35a195f41fd214bdc4cc10fc35c106d798845b3d45ac6b878f16718eeae
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 d594e0cfcf23..87a8f34bb03a 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
@@ -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,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 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 ~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/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
deleted file mode 100644
index dd0c5cac25a5..000000000000
--- a/dev-python/pytest-expect/pytest-expect-1.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 that stores test expectations by saving the set of failing tests"
-HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/"
-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=""
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/u-msgpack[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 46adf610bf04..d38bf1c6dcb9 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
 EBUILD pytest-fixture-config-1.7.0-r1.ebuild 840 BLAKE2B ec5f331940f164bba0e335436a9b0023cf39beffbb5b890a8141417f318567c4a2335b2f7f0f1443b83680ae13f3c3427f5039e3ca0487e314cb31365904111e SHA512 52467291e2359f09bfccff78e7ef23d0fc4437ec6cac8753019afe5d43d2b2e68792cba7ff45aa84319a7d875386685552ce4215696f9b53f8c675dc27498dc8
-EBUILD pytest-fixture-config-1.7.0.ebuild 709 BLAKE2B af149d1dd47f5df522ed1681bdad81e4fecaf2a68ec91710a9a77a9240ca23750a553b8b0b4269c68e881da1a90d3fe20d2124e9625ad077a51b23e29b6f81f9 SHA512 77d9560ccf644178ada1b6c6098d30b0ee5a6a75d31428693ddb5018e33e0841c1de29c3f0eceeb3af932bd074c3552538b62d7559afc7e25e576c4b837b9528
 MISC metadata.xml 678 BLAKE2B 9d7e4416bbdafc423e3621840c698db8c0ccacba79340d9c0174301d73bee373dc7aff0e299b0cd787a2813dab517b0bde5f669e5d973eeb2d34a9d6df25d532 SHA512 e65a58f40b53106d63faa1aff2e0ff97e3a184a59294df19346b2c025085395965853794fa90fc7e1d1e8ffcb4b6ea63cdb9fa1f54089adc27158e60eb258416
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
deleted file mode 100644
index d2db63806a95..000000000000
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.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=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/man-group/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-forked/Manifest b/dev-python/pytest-forked/Manifest
index cc785ecf98d2..2b04484b4b08 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,5 @@
-DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
 DIST pytest-forked-1.2.0.tar.gz 9533 BLAKE2B f9762fd34ffa05eb0abe143388c9608563b0b3d8d5f8c6cbb2e5e36271f4625f10e573042e66d5be5f7f9e124cb5171e570e0d59f2bc1100d2d88ee54c9b4e9b SHA512 d7ed2c36213cfb81988e84e370e0504add77fdb79d31aed4d7aabb73943042f860b4a3ca6c9aad7de5b11234631b1e0f66eb067fcb46079d2cc4ba53ef0cabfb
-EBUILD pytest-forked-1.1.3.ebuild 812 BLAKE2B 4dcbcb5b13749ce80c6765485a8f985b011c699e044977e22de39e55caa0515f9d2b4b79f9591f3a65e8ac63693ceb2fde99ef59e717c3a780bc6c5ec7c06c80 SHA512 2eb71fa68ec40dc3039cf04651896c9a6541b72c22a4c657d9601412c1489422627f0c35d772c7f7fe8cb2cfddab27cd5220c32c930561417f80f72873597530
-EBUILD pytest-forked-1.2.0.ebuild 818 BLAKE2B 7c95bf22858fff4b783826567b8d6dfd56707a25429f9638261f8aab933425f98fe03b83e06a690f071ed7bc1fcbba9b9f1c4e2ba2feb5c464e486e532b89222 SHA512 111d5bd420826e272c6da5ddc2894e2ffae7021617c1fac351a62c4d667dc916d67d990a3b0e2be37233e6d646e47a47782fb556493c3253c3fff0f84daaf60f
+DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
+EBUILD pytest-forked-1.2.0.ebuild 963 BLAKE2B 6ecd1551fefff7b4584e8dbd6f954ec8e7ac765bbcb4c34b19951ce762d4b7f1e6b2c633ecde9d6003b70b1f8a82e5f472559ec7432b2163326dd0b6d9a18d95 SHA512 353abc3083c5f29dfb17804ab8ddcd3257ac87069064c4d0ca8675d7fc7447b22246a3155eaf3d3b2fd71e0c67ec458662351b3d6b21cfac4441c8ed8062e35b
+EBUILD pytest-forked-1.3.0.ebuild 1014 BLAKE2B 3d39126be48628983e4770809868da3439d3962bd568cdebfd9dc99f956eeea1e5c3c3c24461a016cef2882e27eabdeedcd371030d824c207ff2a0a134038737 SHA512 3134d45fbe783c446392c33b25df3a0205cefa0bbcf3c2308c867d7deeffb1ebbc8ffbf937e4f7a5f726f06ce39000c10660ef4ff0d285fdca3e3548f5a800ac
 MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
diff --git a/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild b/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
deleted file mode 100644
index 08d46d8c9a51..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv -p no:flaky || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
index d1217706c9c8..c097aaa86906 100644
--- a/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
@@ -14,16 +14,20 @@ 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 )"
 
-RDEPEND="
-	>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]"
+# Please do not RDEPEND on pytest; this package won't do anything
+# without pytest installed, and there is no reason to force older
+# implementations on pytest.
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
+	)"
 
 python_test() {
 	distutils_install_for_testing
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
new file mode 100644
index 000000000000..8a7709a86625
--- /dev/null
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# 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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="run tests in isolated forked subprocesses"
+HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Please do not RDEPEND on pytest; this package won't do anything
+# without pytest installed, and there is no reason to force older
+# implementations on pytest.
+RDEPEND="
+	dev-python/py[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-3.10[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv -p no:flaky || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
new file mode 100644
index 000000000000..3cb5b014dcc9
--- /dev/null
+++ b/dev-python/pytest-freezegun/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
+EBUILD pytest-freezegun-0.4.2.ebuild 718 BLAKE2B 9df6f62483dc862312fc98d17951536c6bd86f171965a931e9f73ab3138b472608dcefd803f2c381630a548ce8d77f05a1c34e1809d6fe6740971b940caeff71 SHA512 6ad029714293f5c8d88db61a14f71db94b820f0a390f2089d75cb838558e4b40e911c855c2e8d1ea8bd6b419ee86e1f394ca6b473038801b1f0b477a1a7457a5
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-freezegun/metadata.xml b/dev-python/pytest-freezegun/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/pytest-freezegun/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
new file mode 100644
index 000000000000..dc3914fb1791
--- /dev/null
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easily freeze time in pytest test + fixtures"
+HOMEPAGE="https://github.com/ktosiek/pytest-freezegun"
+SRC_URI="
+	https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+
+RDEPEND="
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 134c0aa4effb..076cb1ae53f2 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-1.0.0.ebuild 853 BLAKE2B e52110ded4e7929fb76bd263191df3ba24f11abb39d8bedd43fa628c0919894939701fe18e7ce88ad009ee99521001f905d9efe0f2dba48cfb8434ca72945fb9 SHA512 0259be7f5085c198bbc59cc20ca1931493635d52f99b181bc8da5a2a87c251b55b65c30a431b47778bec2e7f3b3cd41ef4a1d3696d401474e8d89f5a3d136287
+EBUILD pytest-httpbin-1.0.0.ebuild 850 BLAKE2B 48a676944a544aef4e01d55a8a341ed2bb96bbab37f7000efce89d0277321ed1b76bc6d4e3dc86bd3d940d95309a065ef5072bad031ac90dda6ba7e887e871fd SHA512 adeaafc8d9366a378de6e384ceb7e198af9281d934b5598c6e2e2d51146760f65ecf44498ff446fd3f2debbdb14c45e270fc89f1fd7122a2a1d8aa077751548d
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
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 b5c375726734..4eab5f5ee096 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="~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"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 5381a53507d9..387b5a6d97fc 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0-r1.ebuild 716 BLAKE2B 0e6635efd6ebd7b961a5fb69a8cbceb79fd2f24b951a89a8afbe222b8b2f835be0ee4cdbf46c982c60af595f59457e516390a7f94a7fa28306ed1076a4be407a SHA512 d75d5c52f5693fc7f583a2757f78aa40470f0ced3cba0df2ae8714fc79c663eaa7a8b0e974bca3c116db874ed3a7594de4178d3c2c900cbca2a26f622a2f8ff3
-EBUILD pytest-localserver-0.5.0.ebuild 718 BLAKE2B ef763eb4fdc13f0a707423923ffb7b7011588e15cff660394e690c3cc6824ea78875adba55baae14e0d817bbecdfe460716553be3540983eabe8735eb98eab92 SHA512 5c0eb9a788cd21976f6c7428b55778b6e654eabeeca9b506a3972682c0d736ceb62482aa844270b86c985393c578bacb01ed1fe69fc89307f576149dbd55d07f
-MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
+EBUILD pytest-localserver-0.5.0.ebuild 708 BLAKE2B 10e4b25cd1a9090c08c8e9463d5664c2f1ccdb15e00488563c6aba7eace4270e59ee44dedf34f365a002197a5d35095b0b96c36a7e73d8b530599d96d36ccadc SHA512 8ac6bd5083f36712fe5b3cfd9346a02e79e3addde59ed0fa0b383f7312205186203fea068bffe5980947a7dd315c22ce1c01407fa1c534f5ba5cad13b9869535
+MISC metadata.xml 345 BLAKE2B 79e94a8ee25d0f7284462fc21638c20778f60d0f8cf2e84f6904bedc165293c5f13335b3bc2976cf6bd0170fdb0be80b52b256a3abfdb9eacbaa98661a9466b8 SHA512 5a2e28bdb0a20b1a04e1f549130a7f1bf3b33fdd176baa50db33e999540474abe091bcf8ad76c4554a0e046dec7466c72f0786acaa87c88e72f6164891c3decd
diff --git a/dev-python/pytest-localserver/metadata.xml b/dev-python/pytest-localserver/metadata.xml
index 1dd74dd642a3..4439025a551b 100644
--- a/dev-python/pytest-localserver/metadata.xml
+++ b/dev-python/pytest-localserver/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-localserver</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
deleted file mode 100644
index bccd1638b901..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0-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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Py.test plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-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"
-
-RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
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 25e11c83f598..e313962f0ef9 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index be42e0ffa142..b0e1d2ad8d1a 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -2,10 +2,10 @@ AUX pytest-mock-2.0.0-warnings.patch 1363 BLAKE2B 67611daf7c070a0de2d368506b3e34
 AUX pytest-mock-3.1.0-warnings.patch 1373 BLAKE2B 1bac1315bb8d95d1e6435aa15415dd973d2834cd9fb68867b99d72f5b8233c736b40d3865d19ec9f4042387f3d01e57a0055f992fa7a37f2084c043be52c7e88 SHA512 177a318dee0957ff761d02db57890bedf3f780ce46e3d756f21c2c743d264e982eb9a711b17647ad2fb43e17f9f1b30808e943b5c89076b9c905c16e57a3e313
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
-DIST pytest-mock-3.1.0.tar.gz 25003 BLAKE2B 5f12bc664c6342912e0326bc4ac20c1e599f13c047964df3943ae5d31b8a3710406bc4d30bc2c2304c0fffefd0f49441644b667fdbf79426809c230e5b2ecc78 SHA512 6e970aeb1d4086df045a355e11969074e761fcdc3c8486e0405a4051cdf7c4425ae264e7005afe7afe5356f73061ad5f4cbad05b3ce2f55681a3e12ce1a6b671
-DIST pytest-mock-3.1.1.tar.gz 25038 BLAKE2B 416a84af52980d6984b4a2fd63a75fc79bf27fead86e7d0950f6dfcf38bfc27befbf86bdf8d6361b19a4e45c0bf6965d7a57bea5e3fff29a361e0cdb542ef0a1 SHA512 8e55bd7dc45de2c35fbbbbf4385ea805e6546c8d894f3b351bc31fe1c6d9c790f9e14f79de01262c18634d9dfd5142be7520181f1195faccba1f0e8a06ffe675
+DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
+DIST pytest-mock-3.3.0.tar.gz 27139 BLAKE2B bd7295b00ef78f6a4c73eb732faa3573c668bf95884a23c6753d6674f082cbcc565e84c5598e6015c60323f6fba2b3d344c63009c353c5db84ade2b339d83970 SHA512 6ce63495e326101942d1808fe937547cca781dccbdf0845a6a70bb7c990f443ae16f870169c9c8c32084cf6d8ce7cd17f74f90504bd505a7f916c9376b75ac5a
 EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
-EBUILD pytest-mock-3.1.0.ebuild 1034 BLAKE2B faba5a4f333d031413161f90d574c49b5be57d5d13a940aa9e85c101dca4d3c54ee123061a0d0e91e05f71b5bdf9371100a15451bd94bd37f1da096fe56c4ebe SHA512 156486f9c8a47b5f3a23550f204898cda9d71ca0dde1d653d7cfe9d3c0ca48553d12a21e46fbb5edc3f52a76f68a637119ffc8980565f4be0b11c856a5a0776d
-EBUILD pytest-mock-3.1.1.ebuild 1039 BLAKE2B 8038537b64d82bace524df12da32054d46fb53cf19e3c6208bb321e131de68f5764c76d7eb628a5a465f940aec24c16ab01db24110f7b4d9c5ce92bb7224005e SHA512 dac5dd8572962236515ba15320dc6d113dc51fbb0ac2dbe6021f01daa43dea888dabc0fc7d1eb6ea210b74f8040c3f8060c627b4a7e64d29a72f7f65aba84f80
-MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
+EBUILD pytest-mock-3.2.0.ebuild 970 BLAKE2B c2d9bf51aa358b3748bedbc4b8fc73a47f1ae9c6d0af02d98847ecf72edca0334f7d7846b4ad2c95da73da2063ea71722926afe1eb4eb3a8fb29291858594920 SHA512 322d6aa0f181cf291d0a46471018d1ec717dc4c8f1122ad2cc71a8d1feac7f025e489712cae90769e287444055b8f2887a5a447828d2ebc16e407f575312cd30
+EBUILD pytest-mock-3.3.0.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
+MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/metadata.xml b/dev-python/pytest-mock/metadata.xml
index 46dd2d763fb5..a8e8ccbdb5a4 100644
--- a/dev-python/pytest-mock/metadata.xml
+++ b/dev-python/pytest-mock/metadata.xml
@@ -5,6 +5,7 @@
 		<remote-id type="pypi">pytest-mock</remote-id>
 		<remote-id type="github">pytest-dev/pytest-mock</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
deleted file mode 100644
index 4e98df61a1ba..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-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 hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytest-mock-3.1.0-warnings.patch
-)
-
-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 tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
deleted file mode 100644
index 145bc659f1e9..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytest-mock-3.1.0-warnings.patch
-)
-
-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 tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
new file mode 100644
index 000000000000..cd95af08b9b4
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
@@ -0,0 +1,37 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+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 hppa ~ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+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 tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.0.ebuild
new file mode 100644
index 000000000000..a646df8a08aa
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.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
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+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 tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 737ef02b82b0..16d84818200d 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,4 +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 693 BLAKE2B d55f9cc32e4a4c615a52dbeeacc691f7a5de136597b620cb0afebc8ed9f9711c3a2e430020eb6eed010be16b2c1bda50c64f3049a8b8f1734668759318552d41 SHA512 f9bc0090b948c6b3a6b90717f8b2e53c31af7fd6695fac1a1fefbb72994ac2046ef3eb2a7b70944364b48de3a7aaf73628bb9c789eed36274b89fcf58112d720
+EBUILD pytest-pep8-1.0.6-r1.ebuild 687 BLAKE2B 21014cce12554e47aa9e0b07d2170c863a9056d0fc89b5aa7d838384f489dd2f82ba3f19918dc9acea476a00bae02851d5b20ece85708cef2283577c93a40442 SHA512 f2e99a161a9b3d3971bf44bd8ae314544e12975e9ef44d4b8d98d16806425482fdb1af8f61459c3ba3780b1852a0b5a576647ab5e9ca164ff9fdfb5bba11d5c6
 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 c772b5287435..f531e8650ff7 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
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check PEP8 requirements"
@@ -17,7 +18,6 @@ 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}]
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index fe904cf5cc9b..24913b983d9f 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
-EBUILD pytest-rerunfailures-8.0.ebuild 673 BLAKE2B fd1e78b051549c59532279c060023f6e87d4057ad215e12489150e37e7138bdb25b5d37e4b3569e64ee56240f73f08facdc1062c9485bd2e6755fa7f5fd124c8 SHA512 3d906691a5fe6c6080881b1c2e10108cf00f3d323eba255ac9398639461d47b26811993df071cbaf5aa1404a74895356ecf6e9f280aab7c27b4d4e1b99bf90a0
+EBUILD pytest-rerunfailures-8.0.ebuild 514 BLAKE2B 9cd5d3da05110a5555f3c047b36bd5f6e5278a4df69d806384a7dacb7454b1cdf49ebc77499ec61bc3f943c411c996b4797ab0b60f55dd07abd770a8fb588b1f SHA512 10e19071d5a0dbf68c6c377391aa867781b2dde21df0f13efded5baf2e48b5b5f25abd9f30bf557f51176e91f4fe8ae1ad0223e861219643fed106bb0cebf0f3
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
index a1904fda3eee..0962c178654c 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.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
 
@@ -13,14 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
deleted file mode 100644
index 399bbb83690b..000000000000
--- a/dev-python/pytest-runner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
-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
deleted file mode 100644
index 014232c4d121..000000000000
--- a/dev-python/pytest-runner/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>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">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-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
deleted file mode 100644
index 4f67ca4f305f..000000000000
--- a/dev-python/pytest-runner/pytest-runner-5.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="7"
-
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
-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 sparc x86"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-40.6.3[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/jaraco-packaging[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-distutils_enable_sphinx docs
-
-# Tests require network access to download packages
-RESTRICT="test"
-
-python_test() {
-	esetup.py pytest
-}
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 260b6c768454..a298f9c0909f 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,7 +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
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
-EBUILD pytest-services-2.0.1.ebuild 1228 BLAKE2B 3d933dfc11cb8259132329a6150dd7e817afa0547d81182e0b347bf1c9e99c1849dd5d61e9975927200c22c1f02fe2ba30b519a687701bbd2b1268b3a0db791d SHA512 a3bc05992dc5b07989abc3d99ceaf88448120ffa8355399adb062034f27b5851be1f054a39483b6abb160d307d755e6a812a571c0c49203b9de28c14988b23ee
-EBUILD pytest-services-2.1.0.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
-MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
+EBUILD pytest-services-2.1.0.ebuild 1225 BLAKE2B 5f2c7bf24fd7af1ce364a2a9b87b4fb073aa00365e38c960c92970ac5d83718ce7dd1abb486165b29603c46f0a813552cd588ea87b2d537b47eb3cea7063c864 SHA512 c550e8b95d208a8cedc612917209ac4ab575e0d17030fd997aee1e5960823266072a93607c2a1214a9be4ba972a9ce956b4ec6dceb9974372f8e5759fd30dcc1
+MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/metadata.xml b/dev-python/pytest-services/metadata.xml
index e3205b37b69e..0d519d2171f2 100644
--- a/dev-python/pytest-services/metadata.xml
+++ b/dev-python/pytest-services/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-services</remote-id>
 		<remote-id type="github">pytest-dev/pytest-services</remote-id>
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
deleted file mode 100644
index 8875cb0a0719..000000000000
--- a/dev-python/pytest-services/pytest-services-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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-services"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		net-misc/memcached
-		!dev-python/pytest-salt
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
-	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pytest-services/pytest-services-2.1.0.ebuild b/dev-python/pytest-services/pytest-services-2.1.0.ebuild
index 60d08abcefa8..08f343771474 100644
--- a/dev-python/pytest-services/pytest-services-2.1.0.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 9c62c697d079..f57cca20016d 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,6 +1,3 @@
-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 1046 BLAKE2B 13bc77397a8c9c3b90d8c170d151f5f92cef32e60c5ee814351d29baa3098ece9e84a345c417bf9719efa10e975bb2038e8d02fc36fc70aa952912e64ffc7ace SHA512 fc3eba98d9e9e770944baf8e06c4f3927973727a7989313b927785bb6b7a73ac35e1792ebd4a62f3a652a1e373410dec1ea608c8df92173dc0716104f6b269f5
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1473 BLAKE2B 2cf57d7ff7e038578fb8a82f4fcc6474b5456dc8fd3a70c8781b46befcdc1daa9d9715a97bd1e949b6a71d7c3b338a0ae32d71189ee674a1a8861c777cafaf41 SHA512 8caf7ca31564b1047cd66a0a2e7b1cc446657d8445595da41a6f4b3a9fe56b197eb4ef31199224309e4ecdfffadd0933047f5a717f706826fa24114e4b5f113d
-EBUILD pytest-shutil-1.7.0.ebuild 1331 BLAKE2B c10ec9a16b2a2e36fe3caef51240ae25817dcdad17b49b352c6d5f8e772d69676e31d095f31d56d98349a0e4a190de0a8f75f890a7729e188ad7dcee0dfb2213 SHA512 1d256181917ec67f49c71df1a1a099511dd31ed8e59413e58a4a357cd093f9abc238246a9c4e46e449b1cb03c80b7b3e7db56d7d5d6a112b88bc6117b040b789
-MISC metadata.xml 708 BLAKE2B b8d9f61638c355a67e3f59b91a61190f334a8cb38e16cec988b54cced0028a4b7d730575eed93a0f562b3d86a4e5610fc750734746b7f86ad685e957703c4121 SHA512 ae58ff809ae82cde03544ccabbff1e866dedaa777afa74ff50d757babd8d95da0f7448e15b53f7754c182b8dc62e17e0fa8bfdc2e6664c8b6c2481b77d59ab48
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1304 BLAKE2B e2094a01efea9283b5dfaa557787f82ea85962a36f7935b234a4ea41b4a25eca4fe0ea0a0f40105424de86dbe141d3a16b00cb3a9128a755e4ae7410ea25b3ac SHA512 6fa465467cacd88b4c30b3245fd9c9faa2c812c7980f54f60f9d8914dcef3d6be2f24116af4f4228f61db3bfc0bc53b6af87e525e57ed277da3093361c20dd19
+MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index 5b33c8e6cf95..67b2d829ae84 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<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
deleted file mode 100644
index b4eecc6c24f3..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.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} 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 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	# various pickling errors, but code works to run pytest-virtualenv tests
-	[[ ${EPYTHON} == pypy ]] && return
-
-	esetup.py test
-}
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
index 668d150c5535..0e2c74cc89c3 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -45,12 +45,6 @@ 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
deleted file mode 100644
index d7793ef0daaa..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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 ~arm 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-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 6a6143854b1e..67ca92b3ca26 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,10 +1,6 @@
-AUX pytest-timeout-1.3.3-tests.patch 1113 BLAKE2B 88e8158169bb254b4c36c6eb3a32a4f9c78b3e47ef080e2d28703ef0826267b3c925bd6de84b72f1e5b30b4109fcc99fd830704f2790e5505d5974eca90af676 SHA512 3543b0240d17a7e6e3aed29553e22a9638b285817110dd1fddbc26f667ab3c00864572ea4f9e4564c81e7dca60203b24e7ea2b317b6e328a48d518853e7ea26a
-DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
+AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
-DIST pytest-timeout-1.4.0.tar.gz 13661 BLAKE2B d55cf85e44da1e8216d28d08c6783e720a37dbc4bed58c82a24918ac471e8d66f33967f16a249aa5307d0e227082e5628c06041b1bbd12e251a97449c69e5cb5 SHA512 457e30c0746e2762f4a62b0cdbad4f7ca4514175d97daa97fdbb1ebab8743085e828336f137a9cc7dc655c0827c038177195b589ed531d81bb911b6e5e5c875d
-DIST pytest-timeout-1.4.1.tar.gz 13804 BLAKE2B 45e9bdf6eb39e706cac2c9484cd34a9f16096d71d0146251bef9591c35c269043c95e641bed40b25e3d2076fe29a5782363bf9130b331eb04c4e867b1e8f646b SHA512 b62b090365c1cfe1a4d544b5645f828e451ec5229313c50a26ce04ba6cb203ff9ab487c61fb000af342f3d499e11f67aff5f84ff5b00328a129f1f39d4aabf28
-EBUILD pytest-timeout-1.3.3.ebuild 741 BLAKE2B e3408a045aa7dfcb9e3e752c413a257cb57c9f3e7f4d2b12ac120ce0fee057e0f481ed09b83bac86a005587a96e4140305af98b95048ac3292bb3c42c238d4fb SHA512 7d589a28ee3ed5b286ad0fd4d0e1eac46f1236631f69c868576f182f6281475243981c31a828d1190605bdee5a5c25143e31f42f8c4daee810ed1594b187c275
-EBUILD pytest-timeout-1.3.4.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
-EBUILD pytest-timeout-1.4.0.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
-EBUILD pytest-timeout-1.4.1.ebuild 842 BLAKE2B 89f6b0a532534d54dab1fd9b6e51fafc7ddc4774f44d2c10d2f830a1dd9b68f37b77c8663f955be6e719491f1cc7aa79eb9c782a89cf91a22a337381e838577c SHA512 213ddf28bdf2b7fbe831ea17c1f2e0b1f397f35acc7c95085d2e58058318d92cb6c03cba18bd67cc77ef4bef96f5568d1104b4fca7f705ac5adc14b012fff0f9
-MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
+DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
+EBUILD pytest-timeout-1.3.4.ebuild 752 BLAKE2B 059b1014e51bccdddbad59eac0ad718b5523073b6b032838458ddc365897027eccac6ada911142b41d72443cbca27b9b81a248fb0d8b400bf03bcf695fb2b4b4 SHA512 0fc9cf5951d8faa9c6790ca875aa97653c6e6fdf08c73314b5c31589e891bada76e22a08da66ffdcf80b3bee2fabf706c8f7708ccf023cec0183cba33c495c94
+EBUILD pytest-timeout-1.4.2.ebuild 941 BLAKE2B 02338bfdcab14553372cf19dd990cf0cae211fa0c2f3a33b8dd8bfce2db713f8ddb11606b88005f15cbf803c607a9815aa47e0d0170881a9e2e796314af932bb SHA512 023668bf37770a54966a20bf6d1ffa44f3b87e93fdf906cb26072fe8a045c91c1f311a7a0e57199d331312061c4bcda63903d5dee4e30664091bd0ad8eb6d66b
+MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/files/pytest-timeout-1.3.3-tests.patch b/dev-python/pytest-timeout/files/pytest-timeout-1.3.3-tests.patch
deleted file mode 100644
index d3fa9ca0fd34..000000000000
--- a/dev-python/pytest-timeout/files/pytest-timeout-1.3.3-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur pytest-timeout-1.3.3.orig/test_pytest_timeout.py pytest-timeout-1.3.3/test_pytest_timeout.py
---- pytest-timeout-1.3.3.orig/test_pytest_timeout.py	2018-11-16 03:41:33.000000000 -0800
-+++ pytest-timeout-1.3.3/test_pytest_timeout.py	2019-11-21 22:34:08.429287370 -0800
-@@ -1,4 +1,5 @@
- import os
-+import platform
- import os.path
- import signal
- import time
-@@ -93,6 +94,6 @@
- #     assert 'Timeout' in result.stdout.str() + result.stderr.str()
-
-
--@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
-+@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
- @pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
- def test_fix_setup(meth, scope, testdir):
-@@ -133,6 +134,6 @@
-     assert 'Timeout' not in result.stdout.str() + result.stderr.str()
-
-
--@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
-+@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
- @pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
- def test_fix_finalizer(meth, scope, testdir):
diff --git a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
new file mode 100644
index 000000000000..424cfa6c57d4
--- /dev/null
+++ b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
@@ -0,0 +1,27 @@
+From 65a79fe8ceb52d7ae978f4a2ecc47a1fd34fda2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 2 Aug 2020 00:11:53 +0200
+Subject: [PATCH] Skip test_cov if pytest-cov is not installed
+
+Skip test_cov gracefully if pytest_cov module can't be imported.
+This would help us since we're removing py2 support from pytest-cov
+but still need it for pytest-timeout.
+---
+ test_pytest_timeout.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+index 16302d7..69707b4 100644
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -77,6 +77,7 @@ def test_thread(testdir):
+ )
+ def test_cov(testdir):
+     # This test requires pytest-cov
++    pytest.importorskip("pytest_cov")
+     testdir.makepyfile(
+         """
+         import time
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-timeout/metadata.xml b/dev-python/pytest-timeout/metadata.xml
index 53c928b91c5a..628e655974c4 100644
--- a/dev-python/pytest-timeout/metadata.xml
+++ b/dev-python/pytest-timeout/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-timeout</remote-id>
   </upstream>
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
deleted file mode 100644
index 2b7786b403a9..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} 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="~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}]"
-
-PATCHES=(
-	"${FILESDIR}/pytest-timeout-1.3.3-tests.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
index 7b3e50afe479..bbad0c154fcf 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.4.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 ~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/pytest-timeout/pytest-timeout-1.4.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.0.ebuild
deleted file mode 100644
index 7b3e50afe479..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild
deleted file mode 100644
index acb582e46efc..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
new file mode 100644
index 000000000000..2821063d3083
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.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=( python{2_7,3_{6,7,8,9}} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# do not rdepend on pytest, it won't be used without it anyway
+# pytest-cov used to test compatibility
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		' -3)
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 61eec642e742..937afb839254 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,6 +1,3 @@
-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 895 BLAKE2B 3a4bc62099267b8d5f9b89b615bc878c7f75e5dbb2be3ffc66d6c0530e483de5796c80e1c0b3abccfb77c7374f057b70ad89a927e4267a1e8a835f0aabab907f SHA512 386e6d536ee3621b2121eb11be99f4a293c2b709669e531d6a133d522e4eed71fc2353a283d74c21d39b622ab4458cbf1e9989c79fa97beb8260a4d4e5225d44
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 795 BLAKE2B 1a55c5a76e1e87ce4795120fa21cd3c8e3afba9447016a85c422335839d0035643f533a0f0c638e3206f36bd4308bcec2b46f7550c7b9d0eee85212a87d80711 SHA512 b0e9db474e85c90a519938d1552f81e92ae22d34058df48cdf2bdf46b7f8461f49757ff5d9cc9ce633358f617dfac3186e2b833a75816a948a80421566627b4d
-EBUILD pytest-virtualenv-1.7.0.ebuild 794 BLAKE2B 74c50de44d66acdb6bcefc862d15557c1ecea36e06fbc886e7d50a55257d3e628ada9abaa1af1f257b077591edcac0d86a04188dbdc704454ff59a98c2ab6a97 SHA512 b69468dd31cd69b1c23daedb6f73838819b29eeb36b7f19a1484f7023a814bf7129bcfac74368ea3fc6f7fe665e2d707386ffdbc385f45fa335b2f6587e9fafb
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 832 BLAKE2B 1be7b54fb19bcfb8aaffeb6d3ea0fc81451a41477d7fad5b5947790df07c911fc3b817cafa415f67dd62f4b9851c0991af93045ebd35a1b1d8f1fd873bb2ab85 SHA512 81da8857af4209cb98246bf2e9d451bc7b2fc6baf013c5216bd8cd6e12cbce3c65907a37737392fa4020dc2f78f1991be489280d07eecd2f23014676bcca7171
 MISC metadata.xml 679 BLAKE2B 1b48d29c49745469783c9bc7a8ce2e18648f94cc377eae50f2459e642a2c21373f7782ecc8cb3bcbf9bec448d2487f47528d45af6de18a741bc7d6cd0eb6b5aa SHA512 0d01c6c2a0b1644ff0755a5f8822075ef96055c54b721b651b3dfcbb3fdeff342469de1a5057c5b69eb281daed6d8763d8cce4dc7b8f5d1bcac449551dd92724
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
deleted file mode 100644
index 8343d3db9a36..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.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=( 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-virtualenv/"
-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"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	esetup.py test
-}
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
index 238b2714e536..7f6f53a08718 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 "
 BDEPEND="
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
deleted file mode 100644
index 2a2037b22018..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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 ~arm 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-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index fdffc20ac54a..0a1577e5ac7a 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,11 +1,9 @@
-AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
 AUX pytest-xdist-1.32.0-timeout.patch 1864 BLAKE2B dcecdd06bc1e41a1206f5bf08cd19b5bbb35fb5bbf8e81aa188a75e43c648c68b052e3eb6e9041d1f92337a271e278cc60d4e9a7cbdaa43c0f155f5425373cdf SHA512 71520b9da47c272799c91f1856979bb087f7dda73bebb38f6288c2c688953853ce474e92608d84dc17316d22cd7cb78027144269662ce4cc6f62b923acf620ba
-DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
-DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
-DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
-DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
-EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
-EBUILD pytest-xdist-1.28.0.ebuild 992 BLAKE2B 1e550a1cb605b0d0df688f89271ea05ceddcd33b8079fe9dfe239cfe66d7c856cc45f81237bca814ad1c44e605b2f111b7fd2e45ed80b5e4a95335ece97b3b90 SHA512 0b894d560dbdfa1deb8f8580d21958af57b1f2107caae0849353202ec622d5c0ab0055f803357c9c11169edf7e85e1914546e0f7e4b82c1d11d5ea1666aee3f4
-EBUILD pytest-xdist-1.31.0.ebuild 951 BLAKE2B f19b0849f99675e4f6b151f5bc2d7364d10f399e7bd14f0200592ba8e1a75ec91a7cd74632140c3ad1f490b32af940bcf6963d4f9aca0b0521075eb050edefb0 SHA512 cd6524fcd8d023928e6d64f8d89828158841463f5fdf528905b88a2aa022609a33553d3721792939bcfcc8e85eb3b281637bc4f494b262229d1b2e092cdd4e50
-EBUILD pytest-xdist-1.32.0.ebuild 1028 BLAKE2B b097cb41d9f2cbb02f85e128b139a93410ad87ebe1712677b9e9578733c4d4a7230ef443f82089df972fe0a98383e4c3fb131f59f74021c6ffd95d9a79123c88 SHA512 e1bc7e10673f5bb8904186bc4893187e12c8a20dd5b06bc4b0b61cb8dcd43ee804912a1b41dd03239b52f3ac3fc110e14b87e97824e72013a62eb90758e20913
+AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
+DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
+DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
+DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
+EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
+EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
+EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
deleted file mode 100644
index 8ef0272d2b5b..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 17abe9a..81422db 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,9 +6,13 @@ install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
- with open("README.rst") as f:
-     long_description = f.read()
- 
-+import os
-+with open("xdist/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- setup(
-     name="pytest-xdist",
--    use_scm_version={"write_to": "xdist/_version.py"},
-+    version=os.environ['PV'],
-     description="pytest xdist plugin for distributed testing"
-     " and loop-on-failing modes",
-     long_description=long_description,
-@@ -24,7 +28,6 @@ setup(
-     zip_safe=False,
-     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-     install_requires=install_requires,
--    setup_requires=["setuptools_scm"],
-     classifiers=[
-         "Development Status :: 5 - Production/Stable",
-         "Framework :: Pytest",
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
new file mode 100644
index 000000000000..8595480c01f0
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
@@ -0,0 +1,50 @@
+From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 31 Jul 2020 20:13:24 +0200
+Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
+
+Fix test_config_initialization to be correctly skipped on pytest<5,
+by explicitly checking pytest version (idea copied from
+test_looponfail_removed_test).  The current conditions are insufficient
+-- the outer check wrongly assumes pytest>=5 will always be used
+on Python 3 (which is not true if you need the same version to support
+both Python 2 and Python 3), and the inner condition apparently
+wrongly assuming that invocation_params attribute is not present
+in pytest-4.
+---
+ testing/acceptance_test.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 7f9a551..29c5d9a 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -2,6 +2,7 @@ import os
+ import re
+ import sys
+ import textwrap
++from pkg_resources import parse_version
+ 
+ import py
+ import pytest
+@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
+ 
+ 
+ @pytest.mark.skipif(
+-    sys.version_info[:2] == (2, 7),
+-    reason="Only available in pytest 5.0+ (Python 3 only)",
++    parse_version(pytest.__version__) < parse_version("5"),
++    reason="Only available in pytest 5.0+",
+ )
+ def test_config_initialization(testdir, monkeypatch, pytestconfig):
+     """Ensure workers and master are initialized consistently. Integration test for #445"""
+-    if not hasattr(pytestconfig, "invocation_params"):
+-        pytest.skip(
+-            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
+-        )
+     testdir.makepyfile(
+         **{
+             "dir_a/test_foo.py": """
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
deleted file mode 100644
index 2d3a4cc23b66..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.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=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-# See #673106 about the pytest-xdist blocker.
-DEPEND="${RDEPEND}
-	!!dev-python/pytest-capturelog
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( !!<dev-python/pytest-xdist-1.22 )
-"
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
deleted file mode 100644
index 26489b96dfa9..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/filelock[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.28.0-strip-setuptools-scm.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
deleted file mode 100644
index 6babb2e6cfbf..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.31.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
deleted file mode 100644
index 8ff5690847c6..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.32.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pytest-xdist-1.32.0-timeout.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
new file mode 100644
index 000000000000..0a7311caa0e4
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
@@ -0,0 +1,43 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/pytest-xdist-1.32.0-timeout.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
new file mode 100644
index 000000000000..2cc790bff706
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.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=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest4.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
new file mode 100644
index 000000000000..454164201554
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+# please do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 8b2b86d13a91..12527a0757ce 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,19 +1,9 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
-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.10.tar.gz 951516 BLAKE2B f87d00c3d69990f39369ec6af8c4b88d8b7da9bbdc9fcb324243ea2164a501e1b23d1c2a7f92049b58786fc2f1006673a5b5348e2367a8ca476650623c1f67ed SHA512 73668967f6568654cdf92e260ada79d9685fcfc30967499709caeb12527e39a9e886f057c4c73e8a39125c0fbfcd674d905b7023402ce0ab9e836aa77d3888cb
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
-DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
-DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878
-DIST pytest-5.4.2.tar.gz 1020640 BLAKE2B e10ce7a2dbc1ff42ffbe02c3a9f72b4c829c5cc80ba9a50ae015d181c03916a807ee2b13d40e0d7590844f67f8b68e926c770d298fd839c3cf24d9daa4b4e1e7 SHA512 c92ffa613a02cee2580d690c24b76f16957082b138cf7c51d277b0fb5098fab2272ab73295e5e368cbd908026130a9185a35f8792054e36b7ade0a05f7f3f192
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-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.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
-EBUILD pytest-4.6.11.ebuild 2480 BLAKE2B e07497464d930cad0e01a9368fd24b3b101d429bacf69555e1e3dc4eb0b5c17dacc4c14f4ee369f19c0868ae8bcf329cd5baf7f66bee0c382cc7d924fbd7284c SHA512 46fea47ec76e148a86af25434b4db9d382d14d13a1b8a6643196684eaa6604d806fe0934343562fdc24acd1ada63d975d2e2927bc1d963312fb458fad351c2c9
-EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
-EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
-EBUILD pytest-5.4.2.ebuild 1937 BLAKE2B 0daa6532a40c9f098d68909976723249039fafdbea364b9051e7d00596c6a99d8f1e0faf650ff4326f172e3a032c74f96bd30b98e198cd07b29ee21eb6852c9f SHA512 4f0c41aa9ba7c1029e3400786ff3b81be695ed7d0668c602324ffa41681c52ad87ad5c54361e16cdaf1d3fb22d8903e502287f796189da12700416bfa2f0ab9a
-EBUILD pytest-5.4.3.ebuild 1942 BLAKE2B c916fc49800604c6f732dd9ab8a3931da2c9f4a37e7095bec502fee038c8bb69c3486ceebeffa72f4824f0ae08c6aba7329367ced5e1615ccdfc30f61f45585b SHA512 93ca726ac64abb5dcea47f64b725c2d42b36c18eb0968224bc359ab725ce27f250ba7d69853cb09e36d2df149b191d03c1322e46722e9f666d9237647e776f50
+DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
+EBUILD pytest-4.6.11.ebuild 2483 BLAKE2B e86dc097a51aa541671c6ec5570e5087337c4ee0ce32e5d06e8f9efffed3f9d1dab45a5b0509ba06be45371dc189d7dc25c5069e83986fe42a66626ee2051add SHA512 b0ec3a8f2ec77ba07b92d4ee81ff0ec65ef954125a073b771a78cb3d36cd2c0ee72bb2e8378955caa67bc0c0ed1fd0ec0e45c9cf546f926193c93039e0f1d679
+EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
+EBUILD pytest-6.0.1.ebuild 1620 BLAKE2B 38bfa8c63fa796c384a4d301d6091a9463f7497398b4127d0e7f17ec173f062dc110e195686a64081622c0fa8d97c26d584faac4a9dbe92c661ebd3aa91dd6ca SHA512 64c74dcf6d2c9f041167cdb4b359cf618a5ed613e6c54859014a049b13d42fe4e44faabb1c79c27cef9260f0b3b17e46bb3bd2165120f81465567476f50973b4
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
deleted file mode 100644
index 58d5ac51c856..000000000000
--- a/dev-python/pytest/pytest-3.10.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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/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}]
-		<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} )
-	>=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}]"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-		!!<dev-python/pytest-xdist-1.22
-	)"
-
-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
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
deleted file mode 100644
index a83f1311e0a9..000000000000
--- a/dev-python/pytest/pytest-4.5.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=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.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="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/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}]
-		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}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/requests[${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() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild
deleted file mode 100644
index c8234af1fa7a..000000000000
--- a/dev-python/pytest/pytest-4.6.10.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-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="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/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/importlib_metadata[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)
-	$(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}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-aiohttp
-		!!dev-python/pytest-asyncio
-		!!dev-python/pytest-django
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
-	"${FILESDIR}/${P}-timeout.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() {
-	distutils_install_for_testing
-
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index bc5454e1edee..dde2b477e88a 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -9,12 +9,12 @@ PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
+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 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
deleted file mode 100644
index b0edb8058fea..000000000000
--- a/dev-python/pytest/pytest-4.6.9.ebuild
+++ /dev/null
@@ -1,82 +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="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 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/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/importlib_metadata[${PYTHON_USEDEP}]' \
-		-2 python3_{5,6,7} pypy3)
-	$(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}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-aiohttp
-		!!dev-python/pytest-asyncio
-		!!dev-python/pytest-django
-	)"
-
-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() {
-	distutils_install_for_testing
-
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --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
deleted file mode 100644
index 221b7a703d62..000000000000
--- a/dev-python/pytest/pytest-5.4.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=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 ~ia64 ~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/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
deleted file mode 100644
index c8caedd2dddb..000000000000
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ /dev/null
@@ -1,71 +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,9} 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 ~ia64 ~ppc ~ppc64 sparc 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}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	>=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/pygments[${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"
-
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
index 3453fa72eca5..7a531fe1ffb2 100644
--- a/dev-python/pytest/pytest-5.4.3.ebuild
+++ b/dev-python/pytest/pytest-5.4.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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
new file mode 100644
index 000000000000..9fcfa6c56d65
--- /dev/null
+++ b/dev-python/pytest/pytest-6.0.1.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=rdepend
+PYTHON_COMPAT=( python3_{6..9} 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 ~arm ~arm64 ~ia64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	dev-python/iniconfig[${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-1.8.2[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+python_prepare_all() {
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index cb4c52d78ec2..e61e958b935b 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,8 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
-DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
-DIST python-augeas-1.0.3.tar.gz 92747 BLAKE2B 0dda6ae6bbac1689c633301b91877cca4cf20773a3bf83bfd8a809dfc973da011cbeb39ed12f34b67f8f1be50ce5b9fc89e9cc7abbc992117853c11851b18fab SHA512 737b41e7bb438d80da75b55714c3f0b1706a4b2cacddd20fadf855bc3044e532f4079319b3775032e6f6009cf7f282af33fdf583332772b443a6c2d4925639fa
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-0.5.0.ebuild 502 BLAKE2B 2e83dc4cab811049499fba53ec94ebf26c360caf91f38465f804fb6cd27a34f71ccc60f2b1e21e6749adf25532e65c3291147d80f4ef61be28c859aee71c58df SHA512 7651b65a3a002900d785127d4b500f4f42e0b88d06949734ecc4e0c59fb7542e3b5c2f85d4ceaf790c0d9030dad08230ec62aad0a569e5f201aff5b6fcdff3df
-EBUILD python-augeas-1.0.3.ebuild 549 BLAKE2B 5b6189382e0195e634eecce3e53fec7eb60e0b94b5be1e9cae057be9b193bcd7d232d2aeea9ee960500baecc1ff96460938d696f9fbd03b0bb73080e9ebdc636 SHA512 5aa0c2d9ac17cd6a76f0651e067926418121d1b0cd26cc5047a99a02fd567c972c3b52920be765f8c0c3c7bbdfca35a75676b93bc69a0044fa2b6a594c2bba56
-EBUILD python-augeas-1.1.0.ebuild 599 BLAKE2B 98e32c8943f7871414def4256f923ffbe73d48b6f67a6709a07e001cd268d0e44d0c62dfc48df0b19f42cc96c2742fe31b782ad41c8ec70be16d4d6a5f21172b SHA512 c975d60e0d3b6de3de729f853e506cb16e3e868906421560465a697f395d0194b2dbaf35cc5cd453bdce360a2a59df5c408e79ac6818cee1f0b4878e042b4d13
-MISC metadata.xml 378 BLAKE2B 730a72f0b71dda3f088896f90b941d3e2999248d58f17901e736f05c510e62bc5a7f4e2060b2d379d2e5d74e81856c7d85272f9e106c873ac0fce636c956fcec SHA512 0f3de67946ac3aa2cb80adbc39b42e4ee92d4a8f9886048d77d14ce6aa9c47e15cedcceae9e70ba07261407cb2e3906f05633006ed038062a9ad10d341701267
+EBUILD python-augeas-1.1.0.ebuild 597 BLAKE2B 86cfcb6c43334384b822d56beac8fcd4aed16e67de136d4a1d38cc6193e2cc2808925f7b86f07ea96b22973e90633951c808e12be7e3941f33312ff67f4704e1 SHA512 18c5f8536d439c954cfd8635f497b10dbd09b96370173d2ee7ceecad15a7aea9d067d67b9a59feb72fc355dc101880a2bdfb39514ffe3649e16eff9923021e87
+MISC metadata.xml 422 BLAKE2B 32ea953c135e9cc5fd7fbee8f5371975f0ec23cdb87b257d87d8b969d7d725232db169a65ece36e1d9765906c8dad54f63cc47ee61d554ff18550b403be1f498 SHA512 613157be0df0ca791d4ceef9caca1d0e1724716125321b9672778e984b9b87070c05af2322a3d45969e6211a3671c4e0383ba699f5d5854ab491d5c6113fafde
diff --git a/dev-python/python-augeas/metadata.xml b/dev-python/python-augeas/metadata.xml
index 27a547e80d22..22c6619aa5ce 100644
--- a/dev-python/python-augeas/metadata.xml
+++ b/dev-python/python-augeas/metadata.xml
@@ -4,6 +4,7 @@
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
+  <!-- ffi : not suitable for ALLARCHES -->
   <upstream>
     <remote-id type="pypi">python-augeas</remote-id>
     <remote-id type="github">hercules-team/python-augeas</remote-id>
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
deleted file mode 100644
index 01717f456dbf..000000000000
--- a/dev-python/python-augeas/python-augeas-0.5.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=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="app-admin/augeas"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README.txt"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test_augeas.py || die
-}
diff --git a/dev-python/python-augeas/python-augeas-1.0.3.ebuild b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
deleted file mode 100644
index 2e5aaf2f767e..000000000000
--- a/dev-python/python-augeas/python-augeas-1.0.3.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=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="app-admin/augeas
-	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd test && "${PYTHON}" test_augeas.py || die
-}
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index 42d631372089..e66ad08496e3 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="app-admin/augeas
 	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index 31e6d2430f46..24f587bf1f4c 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 559 BLAKE2B 90340d8b240e946608e292900c91e83225d4d69bc13b30a0de5e5261c5bc4989671a8a7453eb411d26c919eee12d3bdee7013668e4169965f52ca1785be9a7b1 SHA512 fc88d06fd1eb18619239510744d22923ff12ea333fa9aaab8cdc7f6428b359a766b6eb68c53b04918172ca6ae9047528658726935efa552594844c96b0ec38ac
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 542 BLAKE2B 118da6329dfd7f82e3789f4a553a12e6261bf8911edad41c36f03b97b92b1a151b704cdae715c886c318eb9bf5bb8a3b1704c55c90555dcc56d87064d0789983 SHA512 0861d00772873bf608ad1bce3ff5f72d3db7cb28cc579a0b405345c103437f2749e775778f45c50ca97c029cb555058d75d2934e0cca92ea8aaf58db48c4ed7e
 MISC metadata.xml 758 BLAKE2B 44d2f74b77f128d9a539067c204c0fe8463f252c9234dc57dd10258e75ddcd9667876056dca4f838164cc64bd89a54e2d4de100ba21df2b5b11f92087ab9d08e SHA512 a6488a0bdf2401098547a3a48529e91bc9dd0144d4b24142ae37470e703a1fb9d152686bf908522eb44b3935c644357d4fb8d33285a647d3fbf1da6056f054b9
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index 6bcd18abb008..4aec5750e68d 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,6 +18,4 @@ LICENSE="BSD GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 0a8cfa370ac5..84397545eb5d 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.2.3.ebuild 665 BLAKE2B bc57d8945fb5156bf272c2c36ce5060f4bb06b4b834ce76c3582afeaccbd5467140cc0b41776f0a8a6f17d515a86b9097bd3cd9354cd6f541114a634497b24d7 SHA512 cce8faee4980862a5c661def235a769576ff82a87f597b435cce7bd3a4d3f313fb24894fd57f7663cf5ae71f7bae4eec50376821f6b0dcd456f89abeb39c8db2
+EBUILD python-axolotl-0.2.3-r1.ebuild 645 BLAKE2B 39e6eefde516865872dabaca43dad17df0fa7e85e73a9436697a82bff6e9ac7aef4f6f39deacab254cd120fd976e03b7d076bcf3ac23907d9786c21e9352725f SHA512 d3973fcb5949fc6bb9c02eeca610daf195415ad45d1f78cff480c6d8068a72046a46c903361f81fc8ca69703fc9c44115e239545ebe42636ca1b563728b6e8a1
 MISC metadata.xml 730 BLAKE2B 0c9161ec83f8400b375a9932747d552fce0e320176addf34523d72f0592302e961b4ee2564b405fe539d0f68d383811483757ec3861e673b3a9ea66c4da4b7d6 SHA512 efde207f98e3bb3d15a9f09f87822cde14df1fc4d19cf88cc45434d7ce32ce20e5277cd97b59474e7f6f7297cc1dd04d765ae258cd35c28b95ac86fc93e0ffbd
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..e0f66f75e82c
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3-r1.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="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for the axolotl protocol"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
deleted file mode 100644
index 05c43ad2c920..000000000000
--- a/dev-python/python-axolotl/python-axolotl-0.2.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,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python module for the axolotl protocol"
-HOMEPAGE="https://github.com/tgalal/python-axolotl"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 7eee5b5c52a4..f461b9445428 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,7 +1,3 @@
-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
-DIST python-bugzilla-2.4.0.tar.gz 109556 BLAKE2B cf2c7a5a0f491e92c484f2270ab6c8cf67e4ea87419000474ee8ca80e2b406a837d699915fd3c76f62dd79e4338a7276e88ed653fd0d81efcefba5e259559129 SHA512 cbe1d735d4a733eb91d5c6f278a1b7c23a0b142a515eb8a4efed1bf0446a692afa9780f6bfd99e21a079cd4921c4b11d20f65596886b2eba3ba08abdc8593515
-EBUILD python-bugzilla-2.1.0.ebuild 616 BLAKE2B ef3d330c140e9734ac55057504d0ba6b8046b69d396927b7b333a489ef5952216877a556b04a887be37bc556fe1a1a85978c5b0616bbd6c116dd7fc472eacc49 SHA512 339318432730ae45f8e50a9487e2811aa47cadbbc44e856b9b4767969565fdef903d2bd8e9472fe75f792a9bc46ef3a65128fb3a8d6448127bba57fa9f51c5f7
-EBUILD python-bugzilla-2.3.0.ebuild 607 BLAKE2B c17c5b324a6f112fb19503a0cc47f09d78c332b2874a8ca965dbbbf42afca0f52d368abe6ab8f91497ca4b0d9aa7f07e78454d8f2b9c3a5be02ca6b5dd2a9002 SHA512 b740f012ffc724e20d3bd7d14f7b591c264406e2dc84a0271794faf0bc5dff1daf883df1918a57597dc7ce9a0718e170c203df7170be48975b67944d90ba531b
-EBUILD python-bugzilla-2.4.0.ebuild 749 BLAKE2B efeaf789c2c0a67b11093964be39d6ea59b82528c3692e10e01be691331262f3cff504fa7529343fb78625b96c72e0de14de97d3ba020a8b4e68c27146f229ca SHA512 cd8df6e3c5364822d4efc6c1fbe10373a2641b42f0e093b54e840d4236e677cfcf594563310b4aae5ad14fb6a3143a16bb8dbea6cd586c99e1e3af72b6cbb356
+DIST python-bugzilla-2.5.0.tar.gz 110931 BLAKE2B e7a4dc0ee00abd4bd4c55aafac8a8d2902ade116b9f35d881c3ea07441b340dc247405951b5437545720c1742f54aae3c28fe64f93191a4d7f178a3cd2db7a0e SHA512 a840db5790a7f45cdcf6ef9e261d86c6b930db30ab6340a1f351b3fd32f32e4d0f6afb68af9befef5d4e84969d568471c5c236be047f6dbab52534af3570a244
+EBUILD python-bugzilla-2.5.0.ebuild 669 BLAKE2B 346b0766609dc137684a6c68dee70895cea240eb53381a152bd8b2fb7d54a226f24bf007372e4892f1f9a29d169311050a5bd69f935bc1fe78fee79e1b68b223 SHA512 c98ea2ef050ef9bae9605166439e03ba35bf8b82e0e7fa856a8fe4de3259ca4c21b2aead64f2c44b303cb78358f7763455f9aa6f08caf97f32ec9b3064c116b5
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
deleted file mode 100644
index 05a656acb4be..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-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=7
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-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 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
deleted file mode 100644
index 425feee87dbb..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-2.3.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-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-bugzilla/python-bugzilla-2.4.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.4.0.ebuild
deleted file mode 100644
index 1f4edae4f358..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-2.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-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}]"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:rst2man:&.py:' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
new file mode 100644
index 000000000000..0244dcb58ba4
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# 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..9} )
+
+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 ~arm ~arm64 x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 651680871719..6f89c201b125 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0.ebuild 1112 BLAKE2B e3ed1a42e7b7181dfcb14a8f41b1ff0d8bfb60eeaee3b0a064d7d77986deca1dee9aaa1e72818b7eeab5edbfc3faf0b4e559276a3833a57694a062ae2780caea SHA512 357f59b67e80d5a9529257dfc763403999863bfd6f5ca0d422d5b290adfdfe235ab39e5110d6330df87ddd5117d1b269f7aab74e2d01136f7a0f60453df23600
+EBUILD python-caja-1.24.0-r1.ebuild 1238 BLAKE2B c6246ec404142eae09fbd15ef22a9a58611b1f843542cb40b0a9ac2c6b6828a3c741751cc88c5a06d1cf9718252d0ac83447d390c2db3671c020e65b15a9eb38 SHA512 0c95e497ab243747de397a450634409cdc293fba2143fbc1f48dac7be77eb8a769a0e5488786978e9c82109bfa1117db5d6e82a40da347ab945a59a5516c5720
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..de4838c77ebc
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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{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_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
+
+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-caja/python-caja-1.24.0.ebuild b/dev-python/python-caja/python-caja-1.24.0.ebuild
deleted file mode 100644
index 5481317062ed..000000000000
--- a/dev-python/python-caja/python-caja-1.24.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=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{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-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 62190646b617..394ad62e51e9 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,5 +1,3 @@
-DIST cstruct-1.7.tar.gz 8768 BLAKE2B 9b66c1cadb5c32965fe29de4e1f3bf2a3f00695d3c6ced4cf28dc85d8580b7fbad626633f9672e25521e5e2fde93049a953c6fe089fb154aa51c82f080427121 SHA512 c3a612ec4c5778801a9d506a49b8817b56fb99e1788c4894ce753178aa4472cedff3b842fe1f40a925e76efbf737166384c279ed0f697655d6ea8d5f1581973a
 DIST python-cstruct-1.8.tar.gz 9911 BLAKE2B 88e091274495034c05d66e4ac808b3884a766017da92bb661cb6c90111cdb5e0d11f93a83e59be74acba9ba408c37b8cbaac88a1bb4fbbed120a2d0aaccd0979 SHA512 9ca9abf388965af06be6ab455652c60aaf2738a08bd7fcc32a8be57c19b2d705784618fd108bfa727a1c05c5749f761d698adc6550bffa1ebcaaedadd7d56a62
-EBUILD python-cstruct-1.7.ebuild 609 BLAKE2B 5b5e7b7111947565bb9431a6d920e85010477fcee7e72513039bc1085afcaae9968631637bebd4d45ca6e889d2d8921c0f042aeae84a32754e8a2ef6d1873cee SHA512 f1761b561c51879a772d9a9039c9c023849e26064b41506b035a266a5dd5c81fd64405222bcb90e47708ee6d64ac9df0d1038ca0daed950858cbc83b459337df
 EBUILD python-cstruct-1.8.ebuild 673 BLAKE2B 1722cf529e39f1f7b629682c9c2304a625dc677feddf6087b5572f44d0c6dcc2ab3ffb2aaac242c894f645946575046863723c0ff6fb564e9648a8ddb70580c8 SHA512 32ad4f7cdf357f6d9ec624ada03fa8680003a1f332333d5984952ab7d5bcd52be07fa263d0b8ab58410ae62596a6e27d017ee4a6f72ec2e4c3c6bc75120f53b7
 MISC metadata.xml 352 BLAKE2B a2478767166958184fcd375f35b563a7a8e55de1c27068cc0959eab9fe6ace8fd1d42e3db862114e73bf7bd30181a09dd0bb3342ed48bf5db4496a882751197f SHA512 979cb550fb49246beeb8dcc2adc4119af81d80c7ccfe2ad21be0eaf2ae0042ac0c38a974366686104038ba5ba960910464a64b86782cf12156e44bf0faa6b2d2
diff --git a/dev-python/python-cstruct/python-cstruct-1.7.ebuild b/dev-python/python-cstruct/python-cstruct-1.7.ebuild
deleted file mode 100644
index 7e559d966790..000000000000
--- a/dev-python/python-cstruct/python-cstruct-1.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=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN#python-}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="C-style structs for Python"
-HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( README.md )
-
-python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 699973deaa0f..838d808d7d12 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
-EBUILD python-debian-0.1.36.ebuild 951 BLAKE2B 1abca73ddbeb0ef794d73e23f1941471a2512df2470cf3145a26ecff93627955a3f871d1680c9109294d25dbf31c4327c0dd6ba3ca6d0f9d3c0a65b47f863296 SHA512 280c21e8f9a25b7eaf7abafc8f073b85b7d2419b6886a9fb5ceb7b97c028399f0548b1ec018f67e6fbe84632b4185c4c49eb475a8b804471550459c8d1f0db4e
+EBUILD python-debian-0.1.36.ebuild 879 BLAKE2B 1434aae56894778870b5c252808f816daca20eb24fb5e803b060afb1a239dce1ef5ce652ecf45825d16747c33136d9b69f69ecd17b61c3e4d70c6a4da09808b0 SHA512 83b3dcfcd5afa201b4e1a7382b2d72c3712a6df3f44d99cc110dd3229cac668d318e1aa3ba215ace5c8ec2e0c76a312be347241bc1e18e096d0843afcd4324ce
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
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 78fab194385a..c4ec7d333fa1 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -23,10 +23,7 @@ RDEPEND="
 
 BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/dpkg
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
-	)
+	test? ( app-arch/dpkg )
 "
 
 PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index 87c95059bd67..67e06bcb0b84 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-designateclient-2.11.0.tar.gz 85761 BLAKE2B 7baaa417e0610fc59c2b5b3c86d69e5ddfd02fd23b94f19f0473bc55e545514a47923e48f6a831954f964f43a735668191de8e8a775e314eeb5e935718e47f31 SHA512 ba01da49100a7ddddb9394291babdbabbd1813db3fe3cb2ebd5e2be251795c7aaa8e5ea15e455ec4322a5a0481e6670bf59add49e91bf6799c748711c54e1975
 DIST python-designateclient-4.0.0.tar.gz 61298 BLAKE2B fc307cf07728e1adcd722b7162223ebeed4df34b81249b0ccab4e9c42d191ad1e320be486a9420d7fdbb9c4db02fd9ab2ab80c021472a101c83a1365b200f5f3 SHA512 b6a11c14219a65da059a4d55822d954b96d553c3dc30a0657a3cff1a309715c4d7f009e81ac54820a4d6f27451105833123fb89513cc7309cc09c124d7e15d26
-EBUILD python-designateclient-2.11.0.ebuild 1101 BLAKE2B 0900bb792c8791b953b60b9ca64ff9c8822e102fa38552baadd4e434889d7c251bcbcc4525908dd54faec5ac1b083c02c4dfbcb0c6654ae92844e96c9da6cdac SHA512 babeb6af4295e2e76c89802519e34abbe28ea43abacbd675db6d73fd6eea93b9c06614621d1b60717c469be7c17faa811774a04aaaa92d678520a19c51993e9d
 EBUILD python-designateclient-4.0.0.ebuild 1169 BLAKE2B aba56c300f631229560178e6bfdde94657c49fce8eb468694afcdb09b3b4b446fc8ca7fe0588231003c21899bb68e9b306146366234e7a432c64637bd4cbb72e SHA512 55c049a19e37cbea17e277a85ddfc5746dc8959bcc666a1aed459ac49b2d126b5a9c319c13a763396b7e18683566f3c907512de949cbf14587ee947ec5cb4b09
 MISC metadata.xml 620 BLAKE2B 5fa33f0a7ce50185042950605d92a30c786ecfbcf0cd6ce4b948623dbf9aa18192d832f9931715d898802f644b814b11940a44d8a18a9f659453ea1304f27ddb SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e
diff --git a/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
deleted file mode 100644
index 6be2f60a7905..000000000000
--- a/dev-python/python-designateclient/python-designateclient-2.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Designate API."
-HOMEPAGE="https://github.com/openstack/python-designateclient"
-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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${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/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 7ea1a7d98796..b5f3c60494d6 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,7 +1,3 @@
-AUX python-distutils-extra-2.44-skip-build.patch 2560 BLAKE2B 2c027fe6875b1b0b94f7a40b521bfdf226be5add5634958395c637918363ea6ad98d82b7befbd95b3c566581719cd316afbf487ce30683427eddde4d49ff2818 SHA512 07808a920eeb5b1519778bcc9dd24186715b90b82b32b5c21a2e1754e6cb89057c3da856a250874777311fdd38de277161999f50e03af7a60fcc9b295450469f
-AUX python-distutils-extra-2.44-test.patch 1020 BLAKE2B 5818c26d89980d5f1608a9d0ed59f4ebedecc942d5eee599a78b77ff331244b4969d265390c9e6b6dddd3a0886f2a39eaf7f4e7f631ab6dab9fcdd5dfc02cdc5 SHA512 3381a8ca6cd87635a260f37d349204cb5112718f7a2aa13b384d1c3622fa3e61685c2e4bdbd15e7f8421d2d8554a13cabbfd490e17975d5aa7084c293b161c55
-DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
-EBUILD python-distutils-extra-2.44-r1.ebuild 1082 BLAKE2B e466ccbb2ca635c9d090ecc6a9e80181558ee4918bf1d6ca2a04df7b67775d0c00d9b6bd2a35fef3d9e6983054f9182dba0129cee05df61351210f239c7f41ec SHA512 17fdf960c10b6654bd19c2fac3d72497d3254fb44db577488a0e84221a968cf16665b3c6e059e1d0fc7016c8d0d1e79e3a755b54c8770dd1534ae9728ff299e0
-EBUILD python-distutils-extra-2.45.ebuild 920 BLAKE2B aa6eff79bbacae0546157626555ba8b46de2d7d12439fd0b761b87d649621e12f48a103842993a173794d7acb7f1a303afaa3bdc1d50dde0d4d7e35904406ac6 SHA512 689820557953e0e5dc7ef162ba8c35184a3cea23d33215445c8b6126c7cd47b86bba4f5129646a4f42dd1eed50986f3b55b07a07a8a06e406ff083f5205ddd91
+EBUILD python-distutils-extra-2.45.ebuild 907 BLAKE2B 0cba3536f3809dce9b6ab9d34302d294042be4f0dd8b99dc3b1f68663a0f71ea80d212c0528a20e1bdbd46b2a7832dc91a49a8e2b571df18e07cae0267b34209 SHA512 824eb2f000b947a714fda7ae31bb562446121807d6b12e786b7adf527ff3beabef8ddf65d4838efc1f766ebe10b4774fe619888306915b3db5a935d9f69a6aff
 MISC metadata.xml 339 BLAKE2B c7a822f45ad521df2cf6837bdc46e1e8473d8fac77428f80561dfd518b84b47353a37064bd0b9ad1e77441e7f376f0f005755d9c07c67e742c38b7dda02e7348 SHA512 2b8f9ffa8823ba2e9f1811782e17e8a6b3011c2096454b3dfa9373d085b4404f6a0afd1d8d9346adedaa01e09f4410c0d154ca74a00d770b8ad5da33a1a151a0
diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
deleted file mode 100644
index f2a19990ed34..000000000000
--- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4f5e11110ce9cc3f511c798acfc009ce5db4e9ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 28 Apr 2020 10:48:18 +0200
-Subject: [PATCH] Fix install_auto command with --skip-build
-
-python-distutils-extra seems to rely on a very bad practice of modifying
-internal state (file lists) in middle of `build` commands.  As a result,
-if the package is installed via `build` command followed by `install
---skip-build` (since everything was built already!), most of the files
-are not installed.
-
-Ideally, this would be resolved by making internal state updates
-independent of `build` command execution.  However, given that
-the package is not really alive and worth the effort, let's settle
-on a cheap hack of calling all `build_*` subcommands from `install`
-if `--skip-build` is used.  This partially reverses what standard
-distutils `install` command does but it will rebuild only the data files
-rather than all C extensions.
-
-Modify tests to use `--skip-build` unconditionally to test this better.
-Testing both scenarios probably makes little sense.
----
- DistUtilsExtra/auto.py | 7 +++++++
- test/auto.py           | 5 +++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/DistUtilsExtra/auto.py b/DistUtilsExtra/auto.py
-index ea15183..db45f7a 100644
---- a/DistUtilsExtra/auto.py
-+++ b/DistUtilsExtra/auto.py
-@@ -711,6 +711,13 @@ class sdist_auto(distutils.command.sdist.sdist):
- 
- class install_auto(distutils.command.install.install):
-     def run(self):
-+        # run build_* subcommands to get file lists if install command
-+        # won't run 'build' for us
-+        if self.skip_build:
-+            self.run_command('build_help')
-+            self.run_command('build_i18n')
-+            self.run_command('build_icons')
-+
-         # install files from etc/
-         if os.path.isdir('etc'):
-             # work around a bug in copy_tree() which fails with "File exists" on
-diff --git a/test/auto.py b/test/auto.py
-index b9644ba..15780c6 100755
---- a/test/auto.py
-+++ b/test/auto.py
-@@ -873,8 +873,9 @@ print ('import iamnota.module')
-         '''
-         self.install_tree = tempfile.mkdtemp()
- 
--        return self.setup_py(['install', '--no-compile', '--prefix=/usr',
--            '--root=' + self.install_tree])
-+        self.setup_py(['build'])
-+        return self.setup_py(['install', '--no-compile', '--skip-build',
-+            '--prefix=/usr', '--root=' + self.install_tree])
- 
-     def installed_files(self):
-         '''Return list of file paths in install tree.'''
--- 
-2.26.2
-
diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
deleted file mode 100644
index b00fc32d017a..000000000000
--- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 33026583f3b2f59bcc415fae4c1ae84bfd058817 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 27 Apr 2020 21:25:37 +0200
-Subject: [PATCH] test: Find .egg-info file rather than guessing path (wrong)
-
----
- test/auto.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/auto.py b/test/auto.py
-index b9644ba..1d605e6 100755
---- a/test/auto.py
-+++ b/test/auto.py
-@@ -734,7 +734,9 @@ print ('import iamnota.module')
-         # parse .egg-info
-         (o, e, s) = self.setup_py(['install_egg_info', '-d', self.install_tree])
-         self.assertEqual(e, 'ERROR: Python module unknown not found\n')
--        egg = self._installed_contents('foo-0.1.egg-info').splitlines()
-+        egg_paths = [x for x in inst if x.endswith('.egg-info')]
-+        self.assertEqual(len(egg_paths), 1)
-+        egg = self._installed_contents(egg_paths[0].strip(os.path.sep)).splitlines()
-         self.assertIn('Name: foo', egg)
- 
-         # check provides
--- 
-2.26.2
-
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
deleted file mode 100644
index a53af5d7f0fd..000000000000
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.44-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=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
-HOMEPAGE="
-	https://salsa.debian.org/python-team/modules/python-distutils-extra
-	https://launchpad.net/python-distutils-extra"
-SRC_URI="
-	https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( doc/{README,FAQ} )
-
-BDEPEND="
-	test? (
-		dev-libs/gobject-introspection
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-util/intltool
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/python-distutils-extra-2.44-test.patch
-	"${FILESDIR}"/python-distutils-extra-2.44-skip-build.patch
-)
-
-python_test() {
-	unset LINGUAS PYTHONDONTWRITEBYTECODE
-	"${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
index 426f03e80fb7..a802c7dfdbae 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 7e0479406c68..fa3599f9b95c 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,11 +1,13 @@
-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.7.6-docs-html.tar.bz2 6248802 BLAKE2B b2baff27bf3fc61ebe521b5bf621c265a50336d63ec8c2e14f8f2fa75b552fa4f959b3448ed39ebf18bece46cdc14f8a7a62cae3fcdd4f44e3db09489807bf4f SHA512 52657627dfe088184afbc0827731cf919884f21ae483c934a84e1e93bd1b03fe7b948da8ea8dfc1ba80e0557504d14eab729d22b7230000ba34731e1b866a253
-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 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.6.10.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.7.6.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.7.7.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
-EBUILD python-docs-3.8.2.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
+DIST python-3.6.11-docs-html.tar.bz2 6012332 BLAKE2B 9daa262be400912c82382dd8e878dd2a21430e99f15bec50386c421a2cc1be44f827cceb37c45c819ab849db5a44372d9b1f508fed1c8c4e884558cbd97ff8c6 SHA512 e98745e0f27c466f93d1d0a8883d9285c56c7b7a27915bc2fcc71f44cb10feebcaa5d3e07b8fce478cf64f11b0863182a1df25307ee383bcf0db0b6cd518035d
+DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778 SHA512 da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
+DIST python-3.7.8-docs-html.tar.bz2 6283763 BLAKE2B 617feba1f9a751fe98f124e572339cbad96abccc0c0c00339331edf52596f47dc73c13b8fcfae4343ea5515ecbf59c697b0611358ff3788e380695b2bb9e5a20 SHA512 8aaf57b0a539d98a7158ffeed03b4c631ca45e34bfc9000547b4372ecd397e79a652f297674d3af631c696d80272aedec3930f4a01b584e17c3e41e9f933e16c
+DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
+DIST python-3.8.5-docs-html.tar.bz2 6562020 BLAKE2B 29a375c0b0be6bedc7d52c15e038b1d150940a0b6185490bdacbce5822c6e88c49124a293a85ea2c08642fcdb99625986ec26ca1d712184988e02729f35e17aa SHA512 db9cc21223bc3b3126140e30c7731152816c61fdb647787c64e138ec882838dbc69fce8a4012ba389bc8efebdb2e0efb5e1b0a6cd652a8b9ad20bb021b277de7
+EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-3.6.11.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-3.6.12.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.7.8.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-3.7.9.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.8.5.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.17.ebuild b/dev-python/python-docs/python-docs-2.7.18.ebuild
index 2804f868635a..2804f868635a 100644
--- a/dev-python/python-docs/python-docs-2.7.17.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.18.ebuild
diff --git a/dev-python/python-docs/python-docs-3.6.10.ebuild b/dev-python/python-docs/python-docs-3.6.11.ebuild
index 2804f868635a..2804f868635a 100644
--- a/dev-python/python-docs/python-docs-3.6.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.11.ebuild
diff --git a/dev-python/python-docs/python-docs-3.7.7.ebuild b/dev-python/python-docs/python-docs-3.6.12.ebuild
index 16f1d2327d67..16f1d2327d67 100644
--- a/dev-python/python-docs/python-docs-3.7.7.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.12.ebuild
diff --git a/dev-python/python-docs/python-docs-3.7.6.ebuild b/dev-python/python-docs/python-docs-3.7.8.ebuild
index 2804f868635a..2804f868635a 100644
--- a/dev-python/python-docs/python-docs-3.7.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.8.ebuild
diff --git a/dev-python/python-docs/python-docs-3.8.2.ebuild b/dev-python/python-docs/python-docs-3.7.9.ebuild
index 16f1d2327d67..16f1d2327d67 100644
--- a/dev-python/python-docs/python-docs-3.8.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.9.ebuild
diff --git a/dev-python/python-docs/python-docs-3.8.5.ebuild b/dev-python/python-docs/python-docs-3.8.5.ebuild
new file mode 100644
index 000000000000..2804f868635a
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.5.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-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 4ceb0d55637a..f7c102076c56 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,3 +1,3 @@
-DIST python-dotenv-0.13.0.tar.gz 28679 BLAKE2B 068c4cb499956a14bb4c310d2c9a63f4c33b6621efd11c231eeea2808951530fa6e7bd5356973c19f7ba6f3693434ca46bfadd065c7369f95014389badb2a00c SHA512 a7e725fd0fcb262f240a8f9eb6cf9b73560d799a10ec946cf901f960cbfa972396ead1aca833808a1675ebaec0b89720c32b2fe957ef9805faa942b0df1a9608
-EBUILD python-dotenv-0.13.0.ebuild 670 BLAKE2B 19b2e6f076d519c7c08af127a772852f1b42beaf311ce6ab5ea9ea3acfabb55966d7a1448941b9061e293379b5cb9e64f0a7168a34c03a47caffa5e7ea8b224a SHA512 4c57e4f396b267dd5146d56c0f14a4b88c358c23202f6b7e0c32048a9f349def2c81d8084d5072d733ee36f28d9e8b06307b2ec3311e48a402ad369a59a19b62
+DIST python-dotenv-0.14.0.tar.gz 29029 BLAKE2B 33db159192faf9b74439b5e98e2b9a090a68001ac19eafd2925071ac7fc1872f7ee585b575dd96615c2ef934041dbfacca7948b7a8a69419243f9823f3bf6b42 SHA512 e8f6d575cd76cb231d14d98befe8a75017c927e0de39fbffc0ecb852b2aab1ada964cf37ed51c50968a4e8a96822a794c960a058a6deb6a2f0a8f8061d0560df
+EBUILD python-dotenv-0.14.0.ebuild 670 BLAKE2B 19b2e6f076d519c7c08af127a772852f1b42beaf311ce6ab5ea9ea3acfabb55966d7a1448941b9061e293379b5cb9e64f0a7168a34c03a47caffa5e7ea8b224a SHA512 4c57e4f396b267dd5146d56c0f14a4b88c358c23202f6b7e0c32048a9f349def2c81d8084d5072d733ee36f28d9e8b06307b2ec3311e48a402ad369a59a19b62
 MISC metadata.xml 365 BLAKE2B be359f891f6469f9d650dd2d0ec29e0641b3313f8dd5132462a3385d557a6cc72aab5fbf59f416c98239973630f8fa9c6e7d926b6cde078bb6535de322c033b5 SHA512 7eb826c13ed20a90b7317fad1a4647a8b52baad287c0286c3b1005c7d0ffbc148d376c8e7c4e2cb55a9af66aba6169f9a680e0f4eb8e8ad3fb7e55fce01b4b8f
diff --git a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
index 19b23974b9e8..19b23974b9e8 100644
--- a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 9eb1d80a5902..b8f275dcfedd 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,3 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.4.ebuild 512 BLAKE2B e1e648fdcd210f049b0a845ac9f7d44e19bc269dafb7c9ae123c99a1a635b44bcb9859d8516a00a3751835c8b9712d2dd768259d4caea2bb4cdb377475ae91f4 SHA512 d6edd3c6814afa05d9f25fb7c374ba936b723ab7f87a7539173c080787cc8b0bad71f492e4e27e4b1021877c2a051530a915f51a2eaa2814c9a4dce5ae977b96
+EBUILD python-editor-1.0.4.ebuild 502 BLAKE2B 315a68f24c927d2df72ec4a99da799743411aa996f01744bd51ba7c26920ca8b2205de492d8cac3636c393f72b0f78c912732bfdbb36e1b90316fe5d08fc9c26 SHA512 b4572bd64774904d46503f28d402daf8e9ede3c1d5ea4e07d1a49cdb66702fc480a1dbe8d8b0b21bae84eb941bd309e4395c45bb16779d44bf6f2d3a1fddb054
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
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 f1f26e7feea9..a0cfe0c0d027 100644
--- a/dev-python/python-editor/python-editor-1.0.4.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4.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="Programmatically open an editor, capture the result."
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index b68e2dc03cf9..4fd2a95251c1 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,4 @@
-DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
+AUX python-efl-1.24-clang.patch 1826 BLAKE2B 7cd37e1cfcd95fe151b965c35419af7ce23fe32b02b2c0b880f77842785f76f1ab1175bb8dd10d33ea39d88fe9c5bf93cd10cb722c102f8ea9c028ff0e34492a SHA512 0e0cc94eded217d6696a69afec375d16b8a2e23ab515c6c19efc896387b15edb1f744e561e585f36c2009eda2b5099c3b0c6c0025a9229fbf53244ee937cc685
 DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
-EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 23bdaa32248d33620e294470259603e43249317a8dfae2a1d0dd32d49e057f0c2d5021ae21dc26a953196481a784119f3ec035bce2cffcda9244b715bb360c5d SHA512 6edd2f0e156a29b8ba109267bb6ceff24bdb35f87e0d2c48008f78b748cebfda85f6af019e8313f2231573deb05487c968539056f9578c529dbc65f5ecf982f0
-EBUILD python-efl-1.24.0.ebuild 1725 BLAKE2B 4d3387989ec4e2d52b1b7944643e4d5fa441a981cb8c500f02e1119e6facb63d4f2e3486cc0512ad50aeffb5c1dc6cad36d1461166815e2b1159f44220158e6c SHA512 e63e8ed8af0ab82869f9bbc1405b208adf45c0fc183bd24b615dfc103b4696ab2933bf5c002198f3ca779a5e2e48ff447ddde1721fc6a67ab5e79464b94554cd
+EBUILD python-efl-1.24.0.ebuild 1778 BLAKE2B a49a7a27e5dcd5da3f9dcf7f22b04a32e1f11cd3f7e1a611a1677b47325afee28f412be14630c438c4b07e6bcea74960f7689d524f8c0cb97efd4629c826c4df SHA512 24bab6cc4907e942e270d937567d6f90eda2a77ffa41d653ffe86594e464226bfab4daf4b368ef20f47c54895a516181450f76a938c37ad70e9b56331e2e4bb8
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/files/python-efl-1.24-clang.patch b/dev-python/python-efl/files/python-efl-1.24-clang.patch
new file mode 100644
index 000000000000..7702c38d9f3e
--- /dev/null
+++ b/dev-python/python-efl/files/python-efl-1.24-clang.patch
@@ -0,0 +1,44 @@
+From 5a02f132107abc6a7d022eb349f7ff6338b71feb Mon Sep 17 00:00:00 2001
+From: Dave Andreoli <dave@gurumeditation.it>
+Date: Thu, 25 Jun 2020 18:54:03 +0200
+Subject: Do not fail when build with CC="clang"
+
+clang seems much better in building elementary, while gcc need a lot
+of ram and tend to fail badly
+
+So for now on clang is the suggested compiler to use
+---
+ setup.py | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3ed0028..a863a19 100755
+--- a/setup.py
++++ b/setup.py
+@@ -211,13 +211,17 @@ ext_modules = []
+ py_modules = []
+ packages = ["efl"]
+ common_cflags = [
+-    "-fno-var-tracking-assignments", # seems to lower the mem used during build
+-    "-Wno-misleading-indentation", # not needed (we don't indent the C code)
+-    "-Wno-deprecated-declarations", # we bind deprecated functions
+-    "-Wno-unused-variable", # eo_instance_from_object() is unused
+-    "-Wno-format-security", # some cc don't like the way cython use EINA_LOG macros
+-    # "-Werror", "-Wfatal-errors" # use this to stop build on first warnings
++    "-fno-var-tracking-assignments",  # seems to lower the mem used during build
++    "-Wno-misleading-indentation",  # not needed (we don't indent the C code)
++    "-Wno-deprecated-declarations",  # we bind deprecated functions
++    "-Wno-unused-variable",  # eo_instance_from_object() is unused
++    "-Wno-format-security",  # some cc don't like the way cython use EINA_LOG macros
++    # "-Werror", "-Wfatal-errors"  # use this to stop build on first warnings
+ ]
++# remove clang unknown flags
++if os.getenv("CC") == "clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
++
+ 
+ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
+     sys.stdout.write("Python-EFL: %s\n" % RELEASE)
+-- 
+cgit v1.2.1
+
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
deleted file mode 100644
index a0ac7f2e657e..000000000000
--- a/dev-python/python-efl/python-efl-1.23.0.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=( python3_{6..8} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
-SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="=dev-libs/efl-1.23*
-	dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)"
-
-src_prepare() {
-	default
-
-	# Tries to download a file under /tmp
-	rm tests/ecore/test_09_file_download.py || die
-
-	# Tries to use that file which failed to download
-	rm tests/ecore/test_10_file_monitor.py || die
-
-	# Needs an active internet connection
-	rm tests/ecore/test_11_con.py || die
-
-	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
-
-	# Make tests verbose
-	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-
-	# Disable any optimization on x86, #704260
-	if use x86; then
-		filter-flags -O?
-		append-cflags -O0
-	fi
-}
-
-python_compile_all() {
-	if use doc ; then
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd tests/ || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ./build/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.24.0.ebuild b/dev-python/python-efl/python-efl-1.24.0.ebuild
index c084d1a1477c..d1a7a54ab74b 100644
--- a/dev-python/python-efl/python-efl-1.24.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.24.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
 		media-gfx/graphviz
 	)"
 
+PATCHES=( "${FILESDIR}/python-efl-1.24-clang.patch" )
+
 src_prepare() {
 	default
 
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index f847fca79a45..a35987fab429 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.1.tar.gz 18497 BLAKE2B a65a5603854920d022062fb4f1575eafe7274e5501ae00fdb58a53a75c6582353ce2c46e20a6a172e7a4a1bbe2b25515b543ace2af4151102c5201ff1ac27132 SHA512 fb4dc5b728adca6041129aa3eecb3efbb358ecf47bf383737936132df7b24c3b9e47e56918d375d8eb4a2535d56ce22c9e03dc126dafd8894911b43fe30f5162
-EBUILD python-email-validator-1.1.1.ebuild 821 BLAKE2B 6fad7946d2b19b3323d766d00e670133033ddfc0c0d47edd382bf90f438814089f8baf541db23b43e033c77e8fdaf7014845c9b080f51e95b8d49514e16c026c SHA512 976766dd671f1bf7b10466fb0011e1701b1e642efb6f6c2ffc019ca986e3700a39a2953d4b0afbb053e4d60a11e52915e619a4c0f5734999bbeb19d4b1a8a534
+EBUILD python-email-validator-1.1.1.ebuild 819 BLAKE2B fa518aaa7f447540775b5a4fc2ef0f93eff7e17ed695d37fa6a6f5c853143551d4b24339fc3df8bdffa845d685146c9ddb8bc7b28d7ccda6b113c6fdd3365358 SHA512 4f053aba850bfd0c76c1bd1cbeae8b30ea09f25c8b3e227bde6642733f1707180f9794245ff0b1e385a658649fd3be5ec4ab7938ef91fa0531603f359753a558
 MISC metadata.xml 738 BLAKE2B 84c1f0f3fa44e391de12ddc2eabf45020499a8244f1a96bea47c49fa9f946c07cfaa68ded9c8b62f144431d322fc1bf7c5c2ac67b3a628f982e224b8fd920d2e SHA512 7b158b2e20c466264f02b338bb16d8fdd2b1ce527f35eb8f61c4f4692df50ae51f8bbdecd5a21f1660ec10323397daf1215fed2384ebb9c4df4ac9ff78a7b46f
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
index 8cd9e9bd41e1..c63816a0f215 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 04f4755343ad..629e0e178082 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-EBUILD python-fastimport-0.9.8.ebuild 777 BLAKE2B f983c1de7881eeb768a49a34e5448416d691f2b00750fefca795a718c5aaab7535a735bb56f116e00dd69d61c2ba0fcb7df0ef77d3615492f10ae0df13220af7 SHA512 6e576dda8705d5b5744bc4d39fdc443aa35575883748eb8882569274f85f03f8936e5e8e5909c7f084ab71464db23b69c7d523e0b33c62d3fafc1539d11639c0
+EBUILD python-fastimport-0.9.8.ebuild 782 BLAKE2B b9051a9ce9a1f592c32161e74d57af1df19a00e20f80de38ec66b2888589530cb52d2ed70f54538ef92943abac6fc3f4b1df7734e65ff11150c2fbf043c179a6 SHA512 917f0d169e37f6f79ec21a37f0eb55d19cc83eff83e9954457e24a0a428548c6f731523e88b90a76171655251c022cc2c0c161a39e9cbd64fc2ea6a2f3798d75
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index 723334075aca..2e4a3c90c52e 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~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 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 30d4d5952ab1..802c1d09d877 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,3 +1,3 @@
 DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-EBUILD python-gammu-2.11.ebuild 786 BLAKE2B b59d9751b4f730e9c5dc5ec7147813b1de8d059cb23a6f0128504eb98b6f52a3a5f247d3a34eb916b3f75a4282065d1b79146789b79861cca308492226da885f SHA512 af045a3dab5a22a175316da7ad09f7030827c508f26cdc0f3519c56a29c1b7b31c29ccfa2131d2c406bbe893451b035502d3e1a6cd4fb8da737c26ecb36f8995
+EBUILD python-gammu-2.11.ebuild 780 BLAKE2B a95b3e68be9aa0417c49fbe1f3df876ac5005b2df076f5b0c4fd499a0df2ffe686dc743a45773a907ec8d53b09e83d4f3776f01b785ea75d620e09296f260c35 SHA512 5f10d748b9f5571e263b8e000733960e9e717af3968cd04c012a032947695549b9985f1e4720a7618cfc26c04418d1f716348af4c7266ce238540897dc127d5f
 MISC metadata.xml 298 BLAKE2B 4943c4978a37d9a4df5d7629dfc523c9c112c4138e0c4580688e7021f764772aa4f4f9478e2c7872481ca0c13c6159511c79ba32d34f2d9df4ba087a7de22326 SHA512 421fd8797b7e76ce73a181e3403f39275594bfec21e9a260ec8740d80e3fa71161a78d6ad23d3b6f6998351348f4901f3b01632a7f086158420484f21c8aa8aa
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
index f29f1e89dae2..20bc74316514 100644
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ b/dev-python/python-gammu/python-gammu-2.11.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,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 224456cedf3a..924d73e07839 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r1.ebuild 852 BLAKE2B bff1637027d8af42849e142ec4052331766ec49def48b0f8ea9e540f36ea09358d72d0228f988836291a7ca73f09bc5b63e82ac24bae5bc7ca6f50f7963e7c93 SHA512 d41597b6f6e97315311df14778db479947f3e4b7e89a2e3a5200afb9901af835745dd1290a2fc9e80bd9df03198ec8571dc249fad0618137307666a14fb5d609
+EBUILD python-gflags-3.1.2-r1.ebuild 846 BLAKE2B 59bb7f01095993596e59b32962d843fd9ec5746cf7c187a417009345c7e27a261928c32e38d4172b81ef07ac6993797f0bb27f5e7217492fca9e3f9c5645d7dd SHA512 d3cb20129e1f78a28ab23962660fc97377ab3f88707516f4b5614077a1eae872e0227cf36bd136d66d149f7fce6ccdf722a1916a9b08d0d55bcc0ce6b6c45876
 MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9
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 9a25317e4632..97610d54c1da 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index a8a6ef2cdf25..07348430759b 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-glanceclient-2.16.0.tar.gz 189395 BLAKE2B 9de8b162c1eb5bfb44700f41cbdcd4f8a983d8c7bd7b281df09db67df6a0de5dee905330f03c967be9e1c3b2aaa379e4c8594f7f4cdbb34870a1e87cb7ccaf1f SHA512 b853f529752247873d9f319d4ec6f4cabc89ee4c26a0c1013e7609fc38e3c9f68d774b3682166e8155e21572a0a011eb6859a84c253ca9f7a9b8b1ccf79b5322
 DIST python-glanceclient-2.17.1.tar.gz 189763 BLAKE2B ef085f6e6e0b8d3c79ab3cce95fdef2066a999258e511fe3c5efa9be577990d8381f07929ead4e83d1859f345ea55629ab75f980d04107e41fec192a64c6f055 SHA512 2082112ce01292b232f63a0a8a95d16f209f33db5c9b81ddc912cef2ce378d5f0bc7ea0e039c0608ab382f3e9f6efe020d71e94b5475391c4d41fc1fca45678e
-EBUILD python-glanceclient-2.16.0.ebuild 2006 BLAKE2B d68ce198d7957649f5e6bc5c58e6be0a14a161780d9a3d63e399362cd707a3a22241760306b997547e0dd1474c14bc91a70626929fb903456b1285dde715cd43 SHA512 7de48e04276b2c2fea7efe5a5b9bc1b520231d896b2f42c7456b82b8c87ceb16183b2698f5cfbdcc4f8ddef52a806dbf8862b263eb8fb567d2ed7afab7d11bcb
-EBUILD python-glanceclient-2.17.1.ebuild 1103 BLAKE2B 3275d4f7928135ff0c4a51a98096be02297547ac1e742cbca9398154129dad6c670d083fad724ecca07899b2eb283b443f712e9ae89b7694c9ead50bb9e4d526 SHA512 b4ad474670195a4e94354a05e74ce2d2bc06fd30e99f364bc0178dd874526821027856843245d787aaf6fca6498097eb351bd53a86c4973dc3d8b8a75a37917d
+EBUILD python-glanceclient-2.17.1.ebuild 1101 BLAKE2B 926ae56f4e5e7cfe18a0b67c3edb74e8102489fbd5cca24bc3ae0ed29fe3f3d4668adeb48952758f923b828351ef2b5e53c9da498017de753e47d4011979b297 SHA512 c7e4cc24f7c8648cbabd6384903aaf2dabe91df0ec2721bbf9f079fdec02cdd15fb83eed60263fad6cf3b513ec326157a8c8d7db95ea2f959fe45387668e2780
 MISC metadata.xml 530 BLAKE2B 8b986229c3bfbc1b53f64a82ac7dee2928b57d5ef6ea57f2ac46c112e058005d9ce617ea3adb4d8d0df1e43ecc74b3b6d07b675dbbcb96527c7a3139b9790a16 SHA512 369ad6988a7f6c068c62bb5d7139c6bf807ccc29a2d8ec314c8f4156b41690291b7243f4f6562f16aa8733211513838e4916a67fad1cda6d1ed698cbc14b843a
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
deleted file mode 100644
index 885408a4fbdc..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.16.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=( python3_{6,7} )
-
-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="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/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}]
-	)
-"
-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 -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild
index e04d9c12203a..ab9e2dde06a2 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.17.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index b29ff9bd5053..00c8f07a6106 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,5 +1,3 @@
-DIST python-gnupg-0.4.5.tar.gz 48792 BLAKE2B 1bf9cc1c8efafd4fa783574724852d0f168d4d4d4ec188bade9a3ff21be61cc1b087bd4ae72f11f189d182cd49c765d9b57ef22d954a69555c0368f1d863f1fd SHA512 441b49e1f87a7e8e3abf2d6e90f677dc33f1b66a36483787f972378127f31308bacc5e200ae254dd75942191d2fabd61ca5a2f200cf5400be70957942f889ca4
 DIST python-gnupg-0.4.6.tar.gz 52527 BLAKE2B ac616bebac3c5d0ac35c2c1a9353b4ee700848be2469fabc4b6df9f328868638f61211adc786ec59a24f122106ae53cce68d0f16c33b64c2d3d27cb94bf17956 SHA512 33b98bdd1c7d211d31173bbea2358fdfd2dabdbd5e70d4b33035a0edbf666bdba7319ffc847c8617f2626d1bf5a91102f1103c0bfe651fcd709d51ee821be104
-EBUILD python-gnupg-0.4.5.ebuild 711 BLAKE2B 754235b876936b56473f095f10b7d7c30792343351640fb99f091d01d4398780387653751a3cecbb6fc17e167eedc1b816abf032c814cf2fd194a70fec87e551 SHA512 532b2047c00ab3ba4fa9f239ce48123260a9f46ba26b03ddde5accd64ed1fda6db4a2c3adfd084ff3b63f90c5ed7ebc28be7c755c18ff68e74e27a73160a55f9
-EBUILD python-gnupg-0.4.6.ebuild 683 BLAKE2B 8ad67025f8bb5e649d92c3c30f0204e6cda09094e2f374176493522b83e58a1a18b2a7afbdc6ef1035ce586f67905a9ace2f85a72f17be106259c6abd05e49d4 SHA512 77e0afb21f5b61d85b98fef216d816c2256f8ad3c0cf76fb6317d8cd1411cc9dc37fda673230004b74b7620723b6829119561a148d63a413d2fb339d52c705f3
-MISC metadata.xml 645 BLAKE2B 23e7cfc3792cd9aa1c8eac9c52fe3d01076f93880a17f4fd8aed0c6c30d8e00b866a9f3e71664ca08c41d1a8a6ea4a1ef55a01d6b12285ce36aa0654e2a837ba SHA512 77f5c9739da1875f655257da826acdb16e5dbdbac02f5c05ab66a91c842d63b478b26af52901fb6dcb2ab0b6ea19c3ffd09e761ddcb1df0d5e55d25c105fbc65
+EBUILD python-gnupg-0.4.6.ebuild 683 BLAKE2B 57550847fa349499565d18bae600c004dd1617d1f069143944c1d1cec4b205c83b1f5628f32fd2ad344c3a112179dcbecb14730c01994363e6a0ccfd924fece2 SHA512 4aec283e2eebd4b2d2da7062e541eaa03622279754892018648a328f52f3d924a1acf704bcb319b3ca7844cfd19c11e4e8307e171262947dc3f64d1f1894c822
+MISC metadata.xml 669 BLAKE2B 298cda90bcc252eb432cc072e54a5711f54a4cc10d5603a90954d4db72a7e580a1111d44f1eec01203e60350effe1eef91d696cb9c3b345675dd9e8c70c7ae22 SHA512 7edf035339ca4722070ed955fadb7b7a40c3c4041ee7dd7536e21a7bbe88cc319b1ef54a925fa6abd092cb7b2b90ec67d0885954e558840460f360c67c76a5ea
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 64e837ef0067..a845b0bb7d0c 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		This project implements a Python library, which takes care of the internal details
 		and allows its users to generate and manage keys,
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
deleted file mode 100644
index c97835233c08..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.5.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
-
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="
-	https://bitbucket.org/vinay.sajip/python-gnupg
-	https://pypi.org/project/python-gnupg/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 "${PYTHON}" test_gnupg.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
index 499da4e413e1..f1d0ccd3d12b 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 723942322a6a..d87e64cd0d61 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-ironicclient-2.7.2.tar.gz 246413 BLAKE2B 28c71f619baa539a2d82b8aa1e2462de092a385f0b6efd88fa3f5c676aab5603b1060e671b7fd93c2f69a83e6ce4c065fe0492483dd93cdf0af6633403775cab SHA512 6a41ccc0e811fae571652837244ed7f23ec9a7ccf512a71519315406abe7fe0117013765c4d6c1e3c75daa21346b1f94881a32217b3a5829bf473d0b18470c0e
 DIST python-ironicclient-4.1.0.tar.gz 201589 BLAKE2B 654e5f328676cdf44446cf12725821e65036e963be6be47c7bf390c87dde28df5a2d7673e52397797587d135dd89eaf0382ac724e5ff75ed07af1930d7754b44 SHA512 d2e8536ae91493e724c6f93acd8c85069a888eb11c9084519010e4a6ad96d7d507991c99301e9c9620240291d9f947b67455551d68aac3f126ea6a578e217658
-EBUILD python-ironicclient-2.7.2.ebuild 2408 BLAKE2B 8472d2f44aaeb56ae932eab35d1288e5be3af619a887031d034bb393c333a99b57d3afc2ba1cd451b6175ee2a76bffbc6c3c66b3fd9ed0de196afa859bc3b0b0 SHA512 06f4a6e6fce400df43375387d551d2729881f967ebd5988259e88ddf7dff4449edf009ba7bc9f544f9dcc2b174cf0f9d85585209331d303f14c66b1193afea41
 EBUILD python-ironicclient-4.1.0.ebuild 2458 BLAKE2B 148111fd8fc0ad6781f2e595d05addf590aa7fcbf80ee0983a2304bd2369c3f1f759c419152280ebe114a52205df23c72319562854bde6c1e7fe0156e9e8bec1 SHA512 205faaf2021bc77e78fb2e6e2c886c74d35e34067a3beb12026cdf3c4b80aa5c3b9816ab54936d52edaebfa6c9ee4e2f5b70871b39702b675c828ad332d35fc2
-MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
+MISC metadata.xml 336 BLAKE2B 6994a6390d135ffa40d25d245d370e770d58a88d19e5b17e09adf2d675054f9294860323e1a0025031937a89213ed157cfa760bb7c9e7bb337bf163f18956d94 SHA512 fbefb91dc86c550661a0289a04cbb1b3c3893637f57ac2c6d0b4d813b4938a7d599ebb87b3e2c628d52746638f0550da2209a0440a27f12f315ac88714822529
diff --git a/dev-python/python-ironicclient/metadata.xml b/dev-python/python-ironicclient/metadata.xml
index cc25c556f9b2..5c21eab672fa 100644
--- a/dev-python/python-ironicclient/metadata.xml
+++ b/dev-python/python-ironicclient/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		API bindings and client for the OpenStack bare metal provisioning service.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-ironicclient</remote-id>
 	</upstream>
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
deleted file mode 100644
index ba0ca14114b0..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-2.7.2.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 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="https://www.openstack.org/"
-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[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${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/osc-lib-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-		!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^tempest/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-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/python-iwscan/Manifest b/dev-python/python-iwscan/Manifest
deleted file mode 100644
index 6dbd31753c26..000000000000
--- a/dev-python/python-iwscan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-iwscan-20080402-wireless-tools-30.patch 366 BLAKE2B 23d65df7931bf9e8c46d975165a8b9cbe638f080bba9cf59b07678647ad248eed03d5972de1f181109c595f86dc2b93a4bc3dafe473ca6cd787daf0f13b8df09 SHA512 67687e0c3fe5dacc58dca129325542b7b5fe11b761ce1c699d4d38a77738bad8ed1ae191716d7ca10bae056481242454c5afce7b6e4143f34e5c45121fdd4209
-DIST python-iwscan-20080402.tar.bz2 16891 BLAKE2B acfdfba08f6c7fbd7a89ca8932c6155f306332f03bfa1aec70618370c12480779d13726836074ab049f1ba496111a3b02cbd15fb515c317d48fe5f66d8295df4 SHA512 9e9d5e1b2cc491879a4f8a216044f46253820c6c8f30904a1867f758f6d158a9270c9c70a91f22a80f15fbe0446d786869104c5dc5d6bfcab470a79478f533d2
-EBUILD python-iwscan-20080402-r1.ebuild 570 BLAKE2B cb03626df7c68f48505af66f2cedd6f7e3a4c798c9ff4b6d9c1b9f6444abbaca7e7e41c7034bff07743218953dac902a7615955fc4eabf15d41cd50604d1c618 SHA512 4eed6889f0b6b632bc6314b6c97a6db2bfba5bb903c93fcfb081e15f322574c2a2a9a1edb58effe6d587a14b99165d8635c311545cd534123d45c17775364c46
-MISC metadata.xml 238 BLAKE2B 42382d5ebb1aa60ff6a073fdc038e223500028f83581747b85bd1d1ac43160aef294b49db65a26ab2e713ef88b2e869eb3065b0a9f0be787e32f4cead3ec8fc4 SHA512 47119affb0bb88a6fef7b2121569fa43cc30157b6aa8d1edb7374367a11ea9d422497da9bbc0bb7106b4124c90e3c980ced5ae202d96a48526ecaf875975db6a
diff --git a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
deleted file mode 100644
index 16a9dce1858f..000000000000
--- a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pyiwscan.c
-+++ pyiwscan.c
-@@ -13,6 +13,11 @@
- #include <structmember.h>
- #include <iwlib.h>
- 
-+/* PROC_NET_WIRELESS is defined in iwlib-private.h since wireless-tools-30_pre9 */
-+#ifndef PROC_NET_WIRELESS
-+#define PROC_NET_WIRELESS "/proc/net/wireless"
-+#endif
-+
- #define IWSCAN_VERSION_MAJOR  0
- #define IWSCAN_VERSION_MINOR  7
- #define IWSCAN_VERSION_MICRO  0
diff --git a/dev-python/python-iwscan/metadata.xml b/dev-python/python-iwscan/metadata.xml
deleted file mode 100644
index a5c911a491f5..000000000000
--- a/dev-python/python-iwscan/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/python-iwscan/python-iwscan-20080402-r1.ebuild b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
deleted file mode 100644
index 1a0bfd3da421..000000000000
--- a/dev-python/python-iwscan/python-iwscan-20080402-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 flag-o-matic
-
-DESCRIPTION="A Python extension for iwscan access"
-HOMEPAGE="http://projects.otaku42.de/browser/python-iwscan"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="net-wireless/wireless-tools"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-wireless-tools-30.patch"
-)
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index a240d6d40c55..101fb15b9645 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,5 @@
-DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
 DIST python-jose-3.1.0.tar.gz 101693 BLAKE2B 1ee43ac5aef673f32c3d56e492784e28939b8f74a8232a83d31381b3f978d96ab132c94527df686b52f60c2865936ce022c2cd31ea66f009a83772d1389a7d4a SHA512 c4a04bed8fc17d65cb8fc9b2cf37996edb50fa0dcdc2dedd76a97c784f8af34a9c86748ea2f9ea348955ce780035fbe3a756abc8e1eb5e9b77ad57d411622c6b
-EBUILD python-jose-3.0.1.ebuild 1204 BLAKE2B dc1a25484f1a36581090967e8dadaffe471cbe37360043b0ffaf88be4f3d7013bc4d3e436595de859ea0d6e66dcc951d6de326acbe5efd412286f735e7713af0 SHA512 2f892d605794ad628653fe3f2a99e713eb8caf27b50a5360253085f2eec14d56093ddfa584ec5b162264c169b3ecd5075062f998e2fcbf6c912f755180675544
-EBUILD python-jose-3.1.0.ebuild 1079 BLAKE2B a52062825ed82531ab6e9c4796ee353493f667dfed9089bcdfd137d6c5feed3c806c3a5b19ded642bbf93c1777953d8e05683721d8bd6db621c409789e322864 SHA512 61f341ad530731e41de7741d6aa88c805d06e422369a77c052965de76d98f0ff38f517d9c2ea618477adf8b60836cc42889d5c964bcbbfaf6a9d055156070fff
+DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
+EBUILD python-jose-3.1.0.ebuild 1077 BLAKE2B 1671774b5403290ae752bcfc1e5f1194093687dbef6895936d15d07885c637853d01ed69adb2f1535081490b6253e90322383cdaa1171fda0f75d116f2405ddc SHA512 62cac143d24c40a91a1abf8f05de81fb5ef9e5a11851217366001b686d6b0273d3542c2ebb166c25114d41af6be34a58389bbfa3cc7827afa8701d40a51ddb16
+EBUILD python-jose-3.2.0.ebuild 1079 BLAKE2B e50eed8b6c4a6f107f5bd73523d1ee2956cc6133a6c21afdf110e6b7b4452ef4f88f995e9251e09045ce9a1e7646ebe62b0749959754c56a3bd8e493b9544935 SHA512 1d5d82f7c2b2cbce20871699f69217b36c75f9c30588693dcd1a032fb1657fee12a4244d201f5a9e98d006792c5b719165e343803622cb6a1f4c1d7393c28ed8
 MISC metadata.xml 545 BLAKE2B 239d505d9411dc5e1f129f6f7c922d9e2ceb541b1d1706f75aee921862af80c94372100145eea73b3d25649c97371f83d6278ef4ef9de65fc1049eaca1f4bf88 SHA512 8192d2511a4a14c938f5a6e877b83ddc850982a9f2e07212bad1da48e7eab9a698466caa8a31780f37bb82135eca7383eee62553f21b5b7304bbae8e2eaba1d5
diff --git a/dev-python/python-jose/python-jose-3.0.1.ebuild b/dev-python/python-jose/python-jose-3.0.1.ebuild
deleted file mode 100644
index fd1f877acda6..000000000000
--- a/dev-python/python-jose/python-jose-3.0.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
-
-DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
-HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
-# pypi tarball lacks unit tests
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/mpdavis/python-jose/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/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-jose/python-jose-3.1.0.ebuild b/dev-python/python-jose/python-jose-3.1.0.ebuild
index 58a59dfc0efc..78bc93ccf8ee 100644
--- a/dev-python/python-jose/python-jose-3.1.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-jose/python-jose-3.2.0.ebuild b/dev-python/python-jose/python-jose-3.2.0.ebuild
new file mode 100644
index 000000000000..f46dbd7c1edc
--- /dev/null
+++ b/dev-python/python-jose/python-jose-3.2.0.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
+HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
+# pypi tarball lacks unit tests
+SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/pytest-runner/d' -i setup.py || die
+	sed -e '/addopts/d' -i setup.cfg || die
+	sed -e 's:test_key_too_short:_&:' \
+		-i tests/algorithms/test_EC.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index ac6181caa271..3cfc18f64c65 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,4 +1,5 @@
+AUX python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch 3003 BLAKE2B 9b4cb5168bd591a8832ddc3bcb14797adb58b5acbf5d4be22d7a6d5e559ea32013670417e15005c123d4d322e4af53b866cef0ddcf2f9a1720d200686e11ece9 SHA512 599cb7561e1fdee594f9059a6a669725e6b0d1909309bec28ede40d47a0e2a151f419011279cd8823d4a2946499696d240d099b9947784d19dc457279db20c20
 AUX python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch 359 BLAKE2B 73548cee569f25bfd6cf98897ab5553507adb4e2f28a2cad6029451432f2144a8de2643bec491a1937f88fc2b7bb3a2f23dd1b56bc82eaec94f206fbdf0b133a SHA512 d8a7ac71a897d4dce9290b51a658443e5b6c954e38cd8477a55a5e3b8abaabf033a9f34410eb282156340efed36758a904eb2473a91b01fa181615fd8a641761
 DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
-EBUILD python-jsonrpc-server-0.3.4.ebuild 751 BLAKE2B fddea08399b1353f8c69d00b4954c3767c94b8718b673fc15f3d33b47abec3141423587cba4124969bbee4b3be22203b641306a2fcc9cc1683a2811daa2fbd86 SHA512 714453f951851bb038a8cb4810ec31c2993f8104efd81c2c92dfb6e281666975c9b2e5fd95d19ca4e6a3d5b884db57bfe71be16e2de55285756e654ed8cec04d
+EBUILD python-jsonrpc-server-0.3.4.ebuild 825 BLAKE2B 0bbcc16c879062d0b34d81767c165aa27e358d8dbcbeca5e402910594c97816879ccd76e7327ca96eb09dd42d450ad5e024bfcc234f3a7dfc0fb3d3a0a788f71 SHA512 05711e36751bd7b2ad02513d86f2cb117e1969b47a40b2279affce986a365280a5f75542634b6fee82ff7abbc3027eac0c7b042e6ea5ec424a853577a4ce6a4f
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch
new file mode 100644
index 000000000000..8d597ddda03f
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch
@@ -0,0 +1,84 @@
+From 7987e30c99edddab8acbf567bad0ebf2d1c3381d Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+Date: Mon, 17 Aug 2020 21:28:03 +0200
+Subject: [PATCH] Python 3.8 fixes for endpoint and tests (#37)
+
+* fix endpoint exception lists for Python 3.8
+Author: @maximbaz according to #33
+
+* fix test_writer_bad_message
+not only windows can have problems with serializing datetime
+
+Co-authored-by: Carlos Cordoba <ccordoba12@gmail.com>
+Co-authored-by: Marko Bakovic <delta003@users.noreply.github.com>
+---
+ pyls_jsonrpc/endpoint.py |  1 +
+ test/test_endpoint.py    |  4 ++--
+ test/test_streams.py     | 19 +++++++++----------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/pyls_jsonrpc/endpoint.py b/pyls_jsonrpc/endpoint.py
+index e8bfb5b..0caf612 100644
+--- a/pyls_jsonrpc/endpoint.py
++++ b/pyls_jsonrpc/endpoint.py
+@@ -236,6 +236,7 @@ class Endpoint(object):
+         if error is not None:
+             log.debug("Received error response to message %s: %s", msg_id, error)
+             request_future.set_exception(JsonRpcException.from_dict(error))
++            return
+ 
+         log.debug("Received result for message %s: %s", msg_id, result)
+         request_future.set_result(result)
+diff --git a/test/test_endpoint.py b/test/test_endpoint.py
+index 47a038b..b954732 100644
+--- a/test/test_endpoint.py
++++ b/test/test_endpoint.py
+@@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consumer):
+         'params': {'id': MSG_ID}
+     })
+ 
+-    with pytest.raises(exceptions.JsonRpcException) as exc_info:
++    with pytest.raises((exceptions.JsonRpcException, futures.CancelledError)) as exc_info:
+         assert future.result(timeout=2)
+-    assert exc_info.type == exceptions.JsonRpcRequestCancelled
++    assert exc_info.type in (exceptions.JsonRpcRequestCancelled, futures.CancelledError)
+ 
+ 
+ def test_consume_notification(endpoint, dispatcher):
+diff --git a/test/test_streams.py b/test/test_streams.py
+index 8c2e93e..480a73b 100644
+--- a/test/test_streams.py
++++ b/test/test_streams.py
+@@ -97,7 +97,8 @@ def test_writer(wfile, writer):
+ 
+ def test_writer_bad_message(wfile, writer):
+     # A datetime isn't serializable(or poorly serializable),
+-    # ensure the write method doesn't throw
++    # ensure the write method doesn't throw, but the result could be empty
++    # or the correct datetime
+     import datetime
+     writer.write(datetime.datetime(
+         year=2019,
+@@ -108,12 +109,10 @@ def test_writer_bad_message(wfile, writer):
+         second=1,
+     ))
+ 
+-    if os.name == 'nt':
+-        assert wfile.getvalue() == b''
+-    else:
+-        assert wfile.getvalue() == (
+-            b'Content-Length: 10\r\n'
+-            b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+-            b'\r\n'
+-            b'1546304461'
+-        )
++    assert wfile.getvalue() in [
++        b'',
++        b'Content-Length: 10\r\n'
++        b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
++        b'\r\n'
++        b'1546304461'
++    ]
+-- 
+2.26.2
+
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
index d4423e655f56..637c726e751e 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -26,6 +26,9 @@ DEPEND="test? (
 	dev-python/pylint[${PYTHON_USEDEP}]
 )"
 
-PATCHES=( "${FILESDIR}/${P}-remove-pytest-cov-dep.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-pytest-cov-dep.patch
+	"${FILESDIR}"/${P}-Python-3.8-fixes-for-endpoint-and-tests-37.patch
+)
 
 distutils_enable_tests pytest
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 7c1785b78289..69b4dd85b3f1 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-keystoneclient-3.21.0.tar.gz 318108 BLAKE2B 3708b8f464fea1d09edbf7d887bb0a73cb096319c38604381fb60ec33cdb41896a145a5896ff3cc094f055bd30a47e04e30c1238d278edea57e89da8757047f9 SHA512 d705a6183be9cbfb0743da7ef535620e92ea0b4161d87b6c21ef1298ae5cd9e95e280163f286c60565154d22a2374bf5cd3d51f6274e212499e58569dc3a0f55
 DIST python-keystoneclient-4.0.0.tar.gz 313891 BLAKE2B 886f354ea29b4bb8886bde1c337e619403f81ee608079777f1e96bf55e936fb7bef48194d721b14857043e1c878f2f2c925483dc0641bb5c25afd6af1536fce9 SHA512 6c094327b4c8bcb32c42463a3abe412230c514c59a5b45387da99689385780f530669979b6aa06ee03450a1386ff089bfc69c24c625e56ed46ab093e6f58153f
-EBUILD python-keystoneclient-3.21.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
-EBUILD python-keystoneclient-4.0.0.ebuild 1213 BLAKE2B 31c6c90c4911e0cee38ec651d9fb17b86cd94bc2acc3fa873b092b82c347f641c92ac4f2ade96bc25001cf93b1043b8274f2421c714c251c668cfc6dd79b8772 SHA512 a26e14e80cd573af03eda0b0150fd0864f98fe75bea7281a553168e6c3c03fff8867acfe671a6bc0624f57b8deaabefc94db022303bf4bdaee76fa1fe31e3ad4
-MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
+EBUILD python-keystoneclient-4.0.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
+MISC metadata.xml 461 BLAKE2B ea083857a88ce4d65cb5b073b3510d992b5d01e73b2736136468bb43bc575389c8ef5f5f65c55e36a8bc824ccf7680a82b933be7de1040834fc7cd4206cabd63 SHA512 351ad0a37c2e424c92b4364bbb64b6f88acea9bc944a06a2e99c4f9f054c6e7cf1fe56f3a7b5584dd3894c9fa59ee8265fe597a263eefa412e234abe2514ddc3
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
index a1e7baa5fad3..78397ff12367 100644
--- a/dev-python/python-keystoneclient/metadata.xml
+++ b/dev-python/python-keystoneclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    A client for the OpenStack Keystone API.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-keystoneclient</remote-id>
   </upstream>
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
deleted file mode 100644
index c9534e0be00c..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.21.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://www.openstack.org/"
-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=""
-RESTRICT="test"
-
-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/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=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-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${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}]
-"
-#PATCHES=(
-#)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
index 623d0b7f54c1..c9534e0be00c 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index cf4bdc03eea4..a256e5b83f6a 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,7 +1,3 @@
-DIST python-language-server-0.31.10.tar.gz 66009 BLAKE2B 9c5de5ab3d3e75273f4039ef11a7a94e14acc2b28a8a1b08fd664d24464e41a3c00b49e6937b8e6479028a382805502c27dfeeccc06d6daf0b848e4809d98058 SHA512 2f922fff1b88c197314816e5d749cd1d1148ce00ab3eeadbefe45a71fd1f521bce386be9494d882a4d1b001a9797a5b31e42c6a4637dd0343eba419b9fccc6e6
-DIST python-language-server-0.31.9.tar.gz 64940 BLAKE2B 579b2583854acfa261c01c9f99e32030aa5c1bded869d7d5e8b306118bd2ea8c7fb81593b83dd471c0d77be5de6b99b635b373e354b02a07b14ce83cd41c5bcc SHA512 df078a7cd0510c0ef574b46d80a649ba582e7138f7890293fe5b331404a183c1cabe41f322333f3b11c1bddf6ee6988d4412bae96d557fa4dd0cbd268353ffbb
-DIST python-language-server-0.32.0.tar.gz 67137 BLAKE2B 83611541c36ab70ab16fd3814a198280dfbb878cb8982625855e102bcd76fb605961fccd7efbb099f3f7b4dc7f974f12a5e064170140880eb5b9cd0a71702e9a SHA512 7c4a6de3998f7a09cca18530e0803629924b26eaec4f1a1a4001996c680fcf35195052013f390569b0f79da94000ec86f92e9d68215dff53018080567e28ca0f
-EBUILD python-language-server-0.31.10.ebuild 2470 BLAKE2B 5066a3eb83e9a1d70bbcef89371a978eadb63c9154d3a0aa4bdb9edd0c74b5b1ef1f3acd3dbfa1780d7c89c3556a66a9aa3819462fd9a01d0ff641d1e42fa557 SHA512 f3c3887d4a120c322e4bb4ce053be61a8ce3380b04355e8f7e7c3310ac7d0351a018ef45d789ef00c4d4ccef12c1390357b25370673cc7ac4663693cf5b64af8
-EBUILD python-language-server-0.31.9.ebuild 2193 BLAKE2B d73c21e52aef77e0a9bfa60c1ab3e3d87840f012f50475fe7e5d53edf63a0fe7469008c73fe3c79d25d7d345b9c6458d71d4a3da5d5d0a0e21aef10ef32213a7 SHA512 ed62b5868caf03a88f4f7c6c828b32279a27baaa85ed5f2e194befc1b9e7c5620e115c7479662569e9be9ef22bd6f50584ca9a93bb81d776f9849b4124018af8
-EBUILD python-language-server-0.32.0.ebuild 2321 BLAKE2B 9d42354e8ef82c7ba08e02866e686f2cc787123e25da7d4a25fb481aa4903b3c9fad3b003a2a1acc1d20910c19facbcf551feb1b11e2b8f6f4db866575134fd6 SHA512 38dfdfe29e768ac075ece3c8115c63820eb6a6584e1570addce3c111fffa79825057755a9233aaf29607a189a39f9f897e8636bd8a06e2a38a7cff0672c33622
+DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
+EBUILD python-language-server-0.34.1.ebuild 2329 BLAKE2B a91a2877912e64dcd1561cf5770fdd12e71c175cc2179c27983f4dbf3b76b4d1afc941c64ff80e5f7846781e2a9172c8d27b413bcc32164ee74c1ddc46878f0f SHA512 40af5bcda777ae3645ec2f551fceb68613bae70cfa2f86b8c57d822f4c330a5bd14fd6902e02fc0fb775a50a7312322955faa7627830367a42255a17b1f52f29
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.31.10.ebuild b/dev-python/python-language-server/python-language-server-0.31.10.ebuild
deleted file mode 100644
index baeea9880c10..000000000000
--- a/dev-python/python-language-server/python-language-server-0.31.10.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=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit eutils distutils-r1
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.16.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
-	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependencie
-	sed -i -e '16,18d' setup.cfg || die
-
-	# FileNotFoundError: [Errno 2] No such file or directory
-	sed -i -e 's:test_flake8_no_checked_file:_&:' \
-		test/plugins/test_flake8_lint.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.31.9.ebuild b/dev-python/python-language-server/python-language-server-0.31.9.ebuild
deleted file mode 100644
index 48a9e2e98798..000000000000
--- a/dev-python/python-language-server/python-language-server-0.31.9.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_7 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit eutils distutils-r1
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.16.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
-	<=dev-python/ujson-1.35-r9999[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	dev-python/rope[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependencie
-	sed -i -e '16,18d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.32.0.ebuild b/dev-python/python-language-server/python-language-server-0.32.0.ebuild
deleted file mode 100644
index e3eac548d087..000000000000
--- a/dev-python/python-language-server/python-language-server-0.32.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit eutils distutils-r1
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
-	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependencie
-	sed -i -e '16,18d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
new file mode 100644
index 000000000000..ecdf65416d5b
--- /dev/null
+++ b/dev-python/python-language-server/python-language-server-0.34.1.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_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit eutils distutils-r1
+
+DESCRIPTION="An implementation of the Language Server Protocol for Python"
+HOMEPAGE="https://github.com/palantir/python-language-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
+	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependencie
+	sed -i -e '16,18d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "To get additional features, optional runtime dependencies may be installed:"
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 097dd2aea096..0bb1f01a92f5 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,4 @@
 DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
-EBUILD python-ldap-3.2.0.ebuild 2187 BLAKE2B bf7e8c35e39bb472a863384ff5f12ba19ca5f171cfc351e863471d483eabab1f660a0087576957eddf954861b2356caa1ac0f8bccd7c63f1c63ab0df0ffaf300 SHA512 39ba1aa7bf77dcdcccc293bd6725cfa79f1ae794daf397d82876e227d30e23d14af69443ab650acb6f5ad35be3862d59d33e5d278baed2a03d29212419568dde
-EBUILD python-ldap-9999.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
+EBUILD python-ldap-3.2.0.ebuild 2181 BLAKE2B f4ee7fc8f4abbcf8c29bd8a767d4223c119fe308082c4f1b589c9499aa44176d40a7d2554b7a923954c5fde83e47a6a9b8c75f4eeed9fd545d7fac76b405410f SHA512 41b71c123d8784501b8eaa9c915d5c37254fb08c1aa16bd6032db128f5ba75b94296e27b57b55488383fb8b90a1be07b7fbe722481e8c175e55d68a74930d212
+EBUILD python-ldap-9999.ebuild 2186 BLAKE2B ad8f36282fc0a641689c5b09e26bd9d1bf7200776b4324eecf30da32424e6e4c31674c8258fba6a7bd73921912b7544d829643bd868ef6a68a6545f83528a003 SHA512 accda7608fbaaff9fc277f4ae71fcdf5cea9717f87fcbe3e99eb7208371941c41be493703ae5b6345a62c5beecbcfa941d8390520bdb0f49ae12e485689f49e2
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
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 be94a062dea5..b72354b393af 100644
--- a/dev-python/python-ldap/python-ldap-3.2.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.2.0.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/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 108ef92cab3a..7d0e119b94bd 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.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/python-ly/Manifest b/dev-python/python-ly/Manifest
index 7b3f0b01f975..eab52cef786f 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,3 @@
 DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
-EBUILD python-ly-0.9.6.ebuild 514 BLAKE2B 1fd1fc61e1de387452a3f8aab0bbd5525e639253308917a682a848ece6b2b1f6262fdf8ddde2242746816982d6f13fc44d78a63ed19fc384298e9fb1ca369474 SHA512 b1e29fe07b672cfe02a0b8c9dd470f422e3e5dcae77bd8018f83f804465bd61dd7710ce8d96875b6334d2e91ae09eae32728c22bc5f0e3d82a029c2e3442b831
-MISC metadata.xml 302 BLAKE2B c1c2d9a7ad2000bd1273245b6137e762adcf45f8fd97dbd4c0ea53becc6f55fa9b603ae5fd6c0f7b4184bf2eb054228721559b5e8cd60495a78804fa3b350d7b SHA512 9e87419e39c35b0303c414eb36fa860847d1aefa9a601786a34bdf2c8e9b19ca7d775eb72f2588e538afcdd52d5ce13e153a9643b31287be9a807bd836dec6be
+EBUILD python-ly-0.9.6.ebuild 519 BLAKE2B b6feda6fafbf675bbe7d949f05f64178a245cc1189180adb2610558e3c10ae0c9916e18dfba33dda3f6d5a00d72e3d0ed87c64bc9da2507e2c63b0c1747e2950 SHA512 84fb7cfc6ead938fe487095a516e7082c0dda615bba73940519a07d732fbbcfba25117414406fd71ed46ccce640acf985067d12fbc566e0835e26dae1623ef4a
+MISC metadata.xml 307 BLAKE2B 7eb583fd7175f9ad3e3cb506485023ba395574be7d5f0e969327ffa4f1903bd9bbd3d42db7e0d10b56567576cc32796e1c353028d18983b2d4ff133ea473818c SHA512 9e79afe747571652dda724ff77bcc2aadd724ee1f31283a64cd3275cd1b42f9c31fc811749b209d8b3ceff778f01b12eb6c427ac9b986e880df6013a3f0ec0e1
diff --git a/dev-python/python-ly/metadata.xml b/dev-python/python-ly/metadata.xml
index d4fe5358ee84..558512826a7b 100644
--- a/dev-python/python-ly/metadata.xml
+++ b/dev-python/python-ly/metadata.xml
@@ -4,6 +4,6 @@
   <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">python-ly</remote-id>
-    <remote-id type="github">wbsoft/python-ly</remote-id>
+    <remote-id type="github">frescobaldi/python-ly</remote-id>
   </upstream>
 </pkgmetadata>
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 a3af081be8e4..be75de5f2ae4 100644
--- a/dev-python/python-ly/python-ly-0.9.6.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly https://pypi.org/project/python-ly/"
+HOMEPAGE="https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 4d319934b565..8b98dbd0481d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,9 +1,3 @@
-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
 DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
-EBUILD python-magic-0.4.15-r1.ebuild 1179 BLAKE2B 401a4db2a9d6aefb67229c51e53da0aa9fc36ab99159c8579cdda0429b4666e880307b532eb2405c4e2b30dfe4451d600b20684f20b73b162c7833eb7e5d455d SHA512 8eed0841af63fd4290a9d391cbcb10bc4b112e89f5c4c5a24ad5c5854447c850fc7fc1e689733f3068b62dc361eed6ef0f57126441d434034c32074ec664f166
-EBUILD python-magic-0.4.18.ebuild 760 BLAKE2B d9fe02ef4c6f110cbe8bd930d5499ecd60a7a95895e70616cc8cc2416ef591398be2d95024e045bf3405f355b9c6fd3e04a888972dc622fe69f1e46ddedf97c5 SHA512 d5e76e1fdf28041a5d068321e21f0d58025286d8e9bad43210a9dd71e256e743614a09857d42d79415fe5e9293e3a806ae79fcd25b373105a3aa32d5ffabc23c
-MISC metadata.xml 498 BLAKE2B 74961e260f07110e36c46b4ecba047d325fa74c5b7d45376976720cbe378d8fdac68be1075b3027dfe0b80c8b60445e2449c9d437a2e04c7e5eaadedc9ce0d6b SHA512 1e4c6799db1664066d98cce7fdc47f0397e8dd42acaa479e0610fd4273c15c5314a47289aae2a31f7157207d019069b1b322592a1825b516a66461fcefd23429
+EBUILD python-magic-0.4.18.ebuild 747 BLAKE2B a1f9decbf29900b1a33b5d1c03374b391a5fbac2660ebe441648304ffff901fb82da1dc4d14f9e19d4f068e7c4aa48e7916264b5d6da1ca048000bad5fede7eb SHA512 7d937b866c98c3838c509c9a989a7508d0c85a02ec60c2a45b7a4280576acd88a3457503a597dcc266f08ee40a908e197655155b96ab96b86f4f5352a7dfe51d
+MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch
deleted file mode 100644
index 75a769b6a5f5..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit acfda9c26df888741805249f3ec0f60f369fc664
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Tue Aug 14 11:14:19 2018 +0200
-
-    Tests: allow differences when reading a buffer or a file, fixes #173
-    
-    Also remove the loop in order to avoid analyzing files or buffers for each
-    expected value, replace it with a call to assertIn().
-
-diff --git a/test/test.py b/test/test.py
-index addccc6..67957ee 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -10,7 +10,7 @@ import magic
- class MagicTest(unittest.TestCase):
-     TESTDATA_DIR = os.path.join(os.path.dirname(__file__), 'testdata')
- 
--    def assert_values(self, m, expected_values):
-+    def assert_values(self, m, expected_values, buf_equals_file=True):
-         for filename, expected_value in expected_values.items():
-             try:
-                 filename = os.path.join(self.TESTDATA_DIR, filename)
-@@ -21,15 +21,16 @@ class MagicTest(unittest.TestCase):
-             if type(expected_value) is not tuple:
-                 expected_value = (expected_value,)
- 
--            for i in expected_value:
--                with open(filename, 'rb') as f:
--                    buf_value = m.from_buffer(f.read())
-+            with open(filename, 'rb') as f:
-+                buf_value = m.from_buffer(f.read())
- 
--                file_value = m.from_file(filename)
--                if buf_value == i and file_value == i:
--                    break
--            else:
--                self.assertTrue(False, "no match for " + repr(expected_value))
-+            file_value = m.from_file(filename)
-+
-+            if buf_equals_file:
-+                self.assertEqual(buf_value, file_value)
-+
-+            for value in (buf_value, file_value):
-+                self.assertIn(value, expected_value)
- 
-     def test_from_buffer_str_and_bytes(self):
-         m = magic.Magic(mime=True)
-@@ -62,10 +63,14 @@ class MagicTest(unittest.TestCase):
-                 'magic._pyc_': 'python 2.4 byte-compiled',
-                 'test.pdf': 'PDF document, version 1.2',
-                 'test.gz':
--                ('gzip compressed data, was "test", from Unix, last modified: Sun Jun 29 01:32:52 2008',
--                 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix'),
-+                ('gzip compressed data, was "test", from Unix, last '
-+                 'modified: Sun Jun 29 01:32:52 2008',
-+                 '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'),
-                 'text.txt': 'ASCII text',
--            })
-+            }, buf_equals_file=False)
-         finally:
-             del os.environ['TZ']
- 
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
deleted file mode 100644
index 4dd362ebb610..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/python-magic-0.4.15-fix-gzip-test.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test.patch
deleted file mode 100644
index d48637139e2f..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e83487a20bacd4f9b33d0478861671bf79468f59
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Aug 13 12:15:13 2018 +0200
-
-    Allow x-gzip as MIME type for gzip files, fixes #96
-
-diff --git a/test/test.py b/test/test.py
-index e29335f..e3ee703 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -54,7 +54,7 @@ class MagicTest(unittest.TestCase):
-             self.assert_values(m, {
-                 'magic._pyc_': 'application/octet-stream',
-                 'test.pdf': 'application/pdf',
--                'test.gz': 'application/gzip',
-+                'test.gz': ('application/gzip', 'application/x-gzip'),
-                 'text.txt': 'text/plain',
-                 b'\xce\xbb'.decode('utf-8'): 'text/plain',
-                 b'\xce\xbb': 'text/plain',
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
deleted file mode 100644
index 9efb34b6672e..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 4bda684f8b461cc1f69593799efcf6afe8397756
-Author: Adam Hupp <adam@hupp.org>
-Date:   Sat Dec 9 09:09:00 2017 -0800
-
-    fix test for xenial since travis started enabling it
-
-diff --git a/test/test.py b/test/test.py
-index addccc6..c6e2d9c 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -17,7 +17,7 @@ class MagicTest(unittest.TestCase):
-             except TypeError:
-                 filename = os.path.join(self.TESTDATA_DIR.encode('utf-8'), filename)
- 
--            
-+
-             if type(expected_value) is not tuple:
-                 expected_value = (expected_value,)
- 
-@@ -37,7 +37,7 @@ class MagicTest(unittest.TestCase):
-         self.assertEqual("text/x-python", m.from_buffer(s))
-         b = b'#!/usr/bin/env python\nprint("foo")'
-         self.assertEqual("text/x-python", m.from_buffer(b))
--                
-+
-     def test_mime_types(self):
-         dest = os.path.join(MagicTest.TESTDATA_DIR, b'\xce\xbb'.decode('utf-8'))
-         shutil.copyfile(os.path.join(MagicTest.TESTDATA_DIR, 'lambda'), dest)
-@@ -92,9 +92,9 @@ class MagicTest(unittest.TestCase):
- 
-         m = magic.Magic(mime=True)
-         self.assertEqual(m.from_file(filename), 'image/jpeg')
--        
-+
-         m = magic.Magic(mime=True, keep_going=True)
--        self.assertEqual(m.from_file(filename), 'image/jpeg')
-+        self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
- 
- 
-     def test_rethrow(self):
-@@ -103,7 +103,7 @@ class MagicTest(unittest.TestCase):
-             def t(x,y):
-                 raise magic.MagicException("passthrough")
-             magic.magic_buffer = t
--            
-+
-             self.assertRaises(magic.MagicException, magic.from_buffer, "hello", True)
-         finally:
-             magic.magic_buffer = old
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
index dd6d746af2f6..cbbc97a4c4c4 100644
--- a/dev-python/python-magic/metadata.xml
+++ b/dev-python/python-magic/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-magic</remote-id>
     <remote-id type="github">ahupp/python-magic</remote-id>
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
deleted file mode 100644
index 47ed926109ab..000000000000
--- a/dev-python/python-magic/python-magic-0.4.15-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=( pypy3 python{2_7,3_{6..9}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-# https://github.com/ahupp/python-magic/pull/178
-SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-PATCHES=(
-	# https://github.com/ahupp/python-magic/pull/177
-	"${FILESDIR}/${P}-fix-buffer-test.patch"
-	# https://github.com/ahupp/python-magic/pull/176
-	"${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() {
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index 681cb207e6ef..cba012d735ce 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index 67fcf3c9f81e..e540c848c4f5 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,3 +1,5 @@
 DIST python-markdown-math-0.6.tar.gz 6406 BLAKE2B 43172ba4b36b697f196bd569c93d56d1a3a05aaa306b1f149f3b70372e624e35fc0d3f3ea3c58c6b86e00c68408a5ebfe9fcc6562fe5065c7f8a7aa8683ee084 SHA512 af5773dc5b6d8968d811487a86fd027042d381b8b5b37683b519f03f21097bafd3d174881d8201cb6524e0975cd6868781e116cec6406fa20ffd3c6b9f9d4e87
+DIST python-markdown-math-0.7.tar.gz 8320 BLAKE2B b402a6c1c3ef93f8716b88c0ba356109e6b483ce26b4a7923c16642a7a7fe69b25ee00e4f537d26b6fa743e81fef05871c447f9e5d3a986ff52bf7095bcdd436 SHA512 05bfff71c758785591c388a95b176205a8707428cbda91734c4f1b5d39cd030d9106782e92aca8f1de18be227b1489ad2cb09981b4455ba1d1177974cd0cbecd
 EBUILD python-markdown-math-0.6-r1.ebuild 880 BLAKE2B 10826ea731911c3ee9a738d657a8b70782b4cb69cf8b7ec2f5b0f4ced04a8fa71f36a8926a4b6a5a07e9dc708f5489676bc6556a26f280fa1db21f791e38d8f7 SHA512 8015a0539d943f83d0ed0e84c37451e894d758da8a50af0b98afb4f48899105405fba3a936c69ad9d68c52f425b175d6631179ec389f84f9675da6b2cbc4170d
+EBUILD python-markdown-math-0.7.ebuild 888 BLAKE2B 828efca52077d8c74862db193696afc84dc4352a13f886167a0cd606b92d19f3b0c3ff5f8c451fa0335097f8d7c01d21cf15c036830f5d6bfe4a7abbba4daf67 SHA512 2b47515689a808624cecc0c17d4c15dad5859d5c88fc6f713fd4d99d9d2462afd4d83a5b1028940823c2d6387a8ed6531830c8251fc0a467e512c6c9ce10a96a
 MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild
new file mode 100644
index 000000000000..101a75936a83
--- /dev/null
+++ b/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild
@@ -0,0 +1,40 @@
+# 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_{7,8,9} pypy3 )
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+
+DESCRIPTION="Math extension for Python-Markdown"
+HOMEPAGE="https://github.com/mitya57/python-markdown-math"
+
+if [[ ${PV} == **9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mitya57/python-markdown-math.git"
+else
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests for python2.7 ran fine even with dev-python/markdown-2.6.5,
+# but only python3.7 is supported with $PV >= 3.x.
+DEPEND="
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 40c50a7d50ab..30bfbe50c045 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,3 +1,3 @@
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
-EBUILD python-memcached-1.59.ebuild 1266 BLAKE2B 1bde806e950eca897a28f11cb6dbe3ee4ce45c86b6f9c20ff924c62c14e09c4114471f3888d22fb57969330d3defc66af2f4cd6389ee1816739bc2f33957cb0c SHA512 75e823e39a548607d7555bc00d3a08579267943eeb12a3edf9412952379440739edecaefc2fba8efe5a811b74998d464ce47d7c6d6d4e5ac68cfc658a494d916
+EBUILD python-memcached-1.59.ebuild 1255 BLAKE2B bb04c0eeaaa34086942176c298e3c01cbe71c014dae7c2abd85e57e01e2de401b6b6a88654215ac48ec6f6802eb695cfab53752b4f52412afdbc4261834fddc9 SHA512 708ea202402b8fb3af376b76c4cf39c32af13cc9c0c23aac102a574b0cbe579abb3bd7da942955c7512acf334e4031d278944fdf18eae141eeea6fcc73f3d067
 MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
diff --git a/dev-python/python-memcached/python-memcached-1.59.ebuild b/dev-python/python-memcached/python-memcached-1.59.ebuild
index 4a7c105d041d..d394de416857 100644
--- a/dev-python/python-memcached/python-memcached-1.59.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index db1d694c1797..68f933fbba9a 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,4 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r1.ebuild 592 BLAKE2B 974c0c76c435c5d8236eaa9e1dcc97e9cf6a95180ba8bc558e6ec545fad48b01b95c61944a1464e072160b5b597ada007d2c68535ffaf7cb116ee32405b9b8d2 SHA512 f8cf6d105543eb9ca27c0425ea666f8481a9e05643a46149c1717a55f9c2dbb89f1967707643745619386690d7eec1282e0560da9b0baf43e5841f176e2b9083
-EBUILD python-mimeparse-1.6.0.ebuild 984 BLAKE2B 2c276ae0a8dadca8ae5900cc16c96bd5b1407cd07abf77d6d658648bbe24fb513081d4e422acbd1514670db66fa49f9c00b3883b57638cd82f8bb7a4eacb9414 SHA512 04f103fd15a7fdd62da234f920d074f49863c2625f850f13c6d7270a085ab1bfeeda5ea1d3b46d1db640a16e2f0f5d6e470bd9fce03865a9778c7438e55f7bb6
-MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
+EBUILD python-mimeparse-1.6.0-r1.ebuild 583 BLAKE2B 8869be5b3634dc4f08b1a8289646327a9adaa0bb38f8e00782f14b605a2d83fd1a2cb4d84b9810802ec77e053e46286f14f318a32917c25ffbcfbd92b5ab723f SHA512 9d00aaf05080bdaa33635a3dc60050a800320bd5af937506eecd0212e45dc54811058d8697a2fb45e7b61a670c6e2c1bb78ffcff3434f5f7fdc2e79a56052d65
+MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/metadata.xml b/dev-python/python-mimeparse/metadata.xml
index e9e258b9c887..3a6806b71a83 100644
--- a/dev-python/python-mimeparse/metadata.xml
+++ b/dev-python/python-mimeparse/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-mimeparse</remote-id>
     <remote-id type="github">dbtsai/python-mimeparse</remote-id>
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
index 2f3f88f83972..e88366c25ada 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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=""
 
 python_test() {
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0.ebuild
deleted file mode 100644
index d4063a6602cf..000000000000
--- a/dev-python/python-mimeparse/python-mimeparse-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=6
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-python_test() {
-	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	local pyver=$("${EPYTHON}" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_version())")
-	python_export PYTHON_SITEDIR
-
-	# Previous versions were just called 'mimeparse'
-	ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \
-		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link"
-}
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 63fe202752bf..d9bbc06bb6ef 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
-DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
 DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1195 BLAKE2B 45fc13c619c250077a781e23368ee2301e962605ee91660c5c11495802b1cf3e46ae145a34f2bf1ab60113ae5d840db5a353aa8551754dbedbc05a0c0605d9fd SHA512 232285796b411c587660196112feda843ace095214cdc05a13914c935694b12f174e1db5b4c3fcdef541d8689d673f10565cd7c369935fea5dfb47159ea38c87
-EBUILD python-musicbrainz-ngs-0.7.1.ebuild 917 BLAKE2B cef92aea67cf6a67870a1ef398de497c2182ff8385a86cbf09ee1b86fd7d1983384e1642a4599581a62bbdfd07b1da7b56293494cefa8f41c684d2d720c84463 SHA512 fcf90c132025a0bfe88da66ec213def759a65dc532b8f013055893252f09e35c573cb93d405172eca12ab90b3f9a3d34d1569dc2e198cfc185ea0498da4530d5
-MISC metadata.xml 850 BLAKE2B cff60327b0cffec47ea9a378880dd8c48b9fb7abf684b6c6e0686064d4097dd6e67c19b2495f971689271ecec80dc9ad721562057b6e451a5f52301d9a244f2d SHA512 e554fedc0d886de2e7b1bf60bb20a24b327a3a1b7f8137c0828a52d7f1bd77b00fedc17c6147b7bde7cd48d80888bb4a988faa56fc4a8a5c209ace57a618d0d1
+EBUILD python-musicbrainz-ngs-0.7.1.ebuild 915 BLAKE2B dc3d87f03584c8bc32af75bb7196bcf781acd4ba71ae8c517c2cfee705f02b133369c05be9ad9892594c4cccb2e05d9a091376e95a3f6deb8f91c097eb8c991b SHA512 fce4607a3fa0c1f9baf2424489463cd7f19b3afc2afe076e99daf3f4033b47e7d3999d13211bbd107196fed606b64c2996a0529ce846e50f7265ac92c3ee7334
+MISC metadata.xml 874 BLAKE2B 314e3fcb22de398dc9be9f545ac5aa72e8fbb8474883e88141717ee2d97f17d4c31f5a21060b7b695b318dcf6a532ff934003271796e8ee85bdb392d2983e65a SHA512 8770159a60216cba543a6ff9d558bf3990ba37ba1d04d6514bda3a6674d4cf32c24ca2ff9687df2f20e3e46fad7fc5bc3204aa85cb7d4f2a112bd32c48b0d779
diff --git a/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch b/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
deleted file mode 100644
index 4881936c80b1..000000000000
--- a/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/test/test_submit.py b/test/test_submit.py
-index bce5362..2d13811 100644
---- a/test/test_submit.py
-+++ b/test/test_submit.py
-@@ -1,13 +1,23 @@
- import unittest
--import os
--import sys
--sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
--
- import musicbrainzngs
- from musicbrainzngs import musicbrainz
- from test import _common
- 
-+
- class SubmitTest(unittest.TestCase):
-+
-+    def setUp(self):
-+        self.orig_opener = musicbrainzngs.compat.build_opener
-+        musicbrainz.set_useragent("test_client", "1.0")
-+        musicbrainz.auth("user", "password")
-+
-+    def tearDown(self):
-+        musicbrainzngs.compat.build_opener = self.orig_opener
-+        musicbrainz._useragent = ""
-+        musicbrainz._client = ""
-+        musicbrainz.user = ""
-+        musicbrainz.password = ""
-+
-     def test_submit_tags(self):
-         self.opener = _common.FakeOpener("<response/>")
-         musicbrainzngs.compat.build_opener = lambda *args: self.opener
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 766578df9ea2..7495e8fac2c2 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -14,6 +14,7 @@
 		With this library you can retrieve all kinds of music metadata from the MusicBrainz database.
 		The library can retrieve and submit both, the XML and JSON based webservice and provides the data in native Python.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">alastair/python-musicbrainz-ngs</remote-id>
 	</upstream>
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
deleted file mode 100644
index 35e315ca5825..000000000000
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ /dev/null
@@ -1,52 +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
-
-MY_PN="${PN/%-ngs/ngs}"
-
-DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
-HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
-
-LICENSE="BSD-2 ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES="${FILESDIR}/0.6-fix-test-submit.patch"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test --verbosity=2
-}
-
-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/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
index 1977a6d5c123..d4d897c6847e 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index e69ed1e60105..798149997ea1 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,5 @@
-DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
 DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
-EBUILD python-nbxmpp-0.6.10-r1.ebuild 540 BLAKE2B 749d38849761b31533cb8216b168d70d713ae63b8e94174b4ac270679837283081aabea5565f96df77b2d155bad7faaf37d6a49ec3f2c6767a74422a03bbb414 SHA512 517b329bfb4ef46c6d370f6fe909fcdeb0a0c5306ce15176062bd2565ed1ccf9f936285c4a31be3154102942cbb825e69abff82d64b1d8faf990d15ff974633f
-EBUILD python-nbxmpp-1.0.0.ebuild 547 BLAKE2B 254f57a62604059093a247ed5aa4a31306a2a243a004a0b0d6ee5c633da16db3d4351b79456a1bed7c71f0829dcf9e82c1da1f952e6f68e10d4481f5ccd9488b SHA512 12e7438ee615e1485f765dd069ba482afa533fdfd8b7d35cefa98114c6dc408c6c808dab21534a77c7b40f452062aacb9afc420e33fd0e331e7b12896461e7ae
-MISC metadata.xml 400 BLAKE2B d91b7691b7e19817b6441875611ead242b77cf55dcf1668ee543d7e2fd705cae7a30cd64aceb08a05f79b02e0c7975418f398cdfb96e2dacf250e3ba43ec020d SHA512 e017ebcf7a834286a653ce9ffbe662cf5d1e021bd51fcae75ad09d8541654d8142044e6961de60ca96e45e5b9bf66e06d8671cb1c3bcf2ad3f41843028e52f97
+DIST python-nbxmpp-1.0.1.tar.bz2 112700 BLAKE2B ea0d271961a7e15a374cafa42678429b9f3395a8921f7cb92ff20664adf17f0482235240f0f849e8492d20aeb23d99eabfb1375eaeb48d55bf81aed4e3d702a6 SHA512 f3bda30b08e48ce59c19b705d45efe13286b4f8a27f44a60fe5759f9e7915beb655166d240ed1f875615f5995764a28a3c5f676e84068aab870f32ecb7d684a5
+EBUILD python-nbxmpp-1.0.0.ebuild 542 BLAKE2B 4bf7d26b351b76f4f4d22b9218d7a86ca565f10628aa422468579065ff7ec7394ff10606b834ac357ad2788ad4951b850a49c47dbf09d197c29977946ce2079f SHA512 41c82248248fcfd63ed1aee3a08440edbaf65edb0ce702f5fa1b3022109481ee1f5f68d3017eac19fa0730fe34e9631bd1144851256beb8b1cc53a253f163e16
+EBUILD python-nbxmpp-1.0.1.ebuild 544 BLAKE2B 99054d04a2461455d0cef5423949a4040fcada83d0580104a9042ade7a56b2826e4de2a6d5180e40c7070e8d4ec1e6c63143041e0172ad66daff51e5d078873a SHA512 0adc03096c96bee643c9f7bd34543e0a8a2367efce88e423e531fd2b3f88d8619e2e180b1dfcb1418cd848c2d5071c2c868490b140bd0a735e065c24552c1233
+MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/metadata.xml b/dev-python/python-nbxmpp/metadata.xml
index 09d7eeeeb451..1b2602c8c9ed 100644
--- a/dev-python/python-nbxmpp/metadata.xml
+++ b/dev-python/python-nbxmpp/metadata.xml
@@ -8,6 +8,7 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nbxmpp</remote-id>
   </upstream>
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
deleted file mode 100644
index 7f5ace9f7876..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.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,8} )
-
-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-1.0.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
index 32580d7acdac..d834f82c670d 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
new file mode 100644
index 000000000000..fb10afe54623
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.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=( python3_{6,7,8} )
+
+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="GPL-3"
+KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index dfd527c5ef8c..f98b1c0c9085 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,7 +1,3 @@
-DIST python-novaclient-13.0.2.tar.gz 312390 BLAKE2B 2a436a2f843afe466bbf3d376d16a994f25e2232dfcb67271837159c5f21d7970027ad6d946c331dd6bff5c248d6b526303205a96a18ef4872cc8b1b526ff366 SHA512 988264cb6b6034dd0c4cb3a79840f591bda9c1c0134ddf0124beea6d9992192dbaeb9ec20bbe73f5a831bf561d175fd3d312880093f58de51d326922502cd1e5
-DIST python-novaclient-15.1.1.tar.gz 323657 BLAKE2B 63f213a3710beaeda477a858164187ff1e48dbdeab5fefd3192cb4c7799461cb13d2fe82624661b21b4f51ba07b138929842a2aa87bcac568f955e41ff3350a1 SHA512 9024deb1036778030977689824d089eeb4a1fa60a7cc3f1f156c9ae8ff03e84330d90092f55d45853ff6e522d83b6e097b6c566f1ca1cdc6896e47183c2efcaa
 DIST python-novaclient-17.0.0.tar.gz 325548 BLAKE2B f34bb6cb2cbb7f65f81ef410828b9c3a14b67bc4558f0175b4c9b66899c192367637d281d86f5e1a7267c2288930845f22fb389244839c2dfa76fc9a58bf3480 SHA512 4f8a789364f4a6603c67236fb61ef1ca2aabbc8e18d96d5890af137cc6d2d06c250a5202aa91c95432686ce7b5ffba8e31cc38b43032ae2420c08381751d3332
-EBUILD python-novaclient-13.0.2.ebuild 2375 BLAKE2B ff78aaa836cbf67d080e5c0cb07885651da984846a9433bc833b34eff5dfe322a47a7d4a6568cf45bde23cda0edd5c8eb02e85b20e06b874f58d0bdf78ab37f7 SHA512 299c4e06fb00c39a7e3c64029600c728d5306ecd9951340853cf8cfa7122b24662cb4fa8d56780469e8bdf6e28ed1232ff210264e9098484f7bcbb49448410a2
-EBUILD python-novaclient-15.1.1.ebuild 1254 BLAKE2B 842c14fb32e4df10e18fc437a57c85b93f8e10a4340c302741660c60f933a8ae4549a2c3c74cd5ef507b08b54377d6868c20941513799fdd78d8fe02fed65518 SHA512 5ae97ffe3fbb7e9f05690f8b378e80eabe508dc28d26a40ac341f55fc88199f9996e1fd7179e5819c43861aa7948a33f52c66169d3aada2643a669b84b84b33a
-EBUILD python-novaclient-17.0.0.ebuild 1211 BLAKE2B 14569279d7e79b9e5613e997dc64a63583e44c3057bffcea468d839baa9e279cb9582e7ee23318bd91dce8678344ae9310fe6b528f2d21c8720eeb5f613b605c SHA512 98b3a63b44849c0a635ddc9ab37125a76fb4b116f8c9aee5ce64e0d94c5483b5d8c716047c2116567958f44d046ed0ed810dc0b3d9e0eed129e79800ae8620bf
+EBUILD python-novaclient-17.0.0.ebuild 1209 BLAKE2B 22392cee67780ea3fab60a81ece0609fc0ea6a191148739ae80d6fb29b6c90033a0c14121523e0179b732c6d491c5fb7cb8f48a9ad3f36d9ec0c9dc15bed6b65 SHA512 3de5c6521a0879e12074389ef1da1c5ae1a6c17f315d6c80325eaef4ed38d0edb49d7a60f4440fd6371f88d7623308cfbfcbe5673472b7f8ea59b083e9a53dfa
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
deleted file mode 100644
index c7431df06cd2..000000000000
--- a/dev-python/python-novaclient/python-novaclient-13.0.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${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/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.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
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-15.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-15.1.1.ebuild
deleted file mode 100644
index fa8dc2ac6d01..000000000000
--- a/dev-python/python-novaclient/python-novaclient-15.1.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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="
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${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/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.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}]"
diff --git a/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild
index b880671a1a2b..dfe527ca0d4b 100644
--- a/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-17.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 0fd3b068b5a6..bb8e6e54de7f 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-openstackclient-3.18.1.tar.gz 721120 BLAKE2B 58394b6172f6bdbe2ebe5a1d8ea2209049887eb7cca635b9b87b558e6ffeb7130c2545aa8b3bd11d8f8b1cb6c315acecc5fdfa7dba21c2442ef049ed688af546 SHA512 2fb15e2c9d3daa9e70871ba2005d2e94be975b564e1f70690e8a5b2fc4cbfebef4870bb39d8099829968e05eae356f4f38edad154ff041d8ab20fe2ab68f2bf1
 DIST python-openstackclient-5.2.1.tar.gz 722343 BLAKE2B 894424f8ce8a7d0489df4ca6c4d811f489f7ae4a0933b9e0a7ff30c0bfaba8bbf783d56376de655c6cc2fece28b032063f6cddb330353f3dd78c44584061c236 SHA512 74abb72435e95070e2d9a849def79ef56a4afbf9473cf29053af3cc65ab5d936fe0c542ae9240ffd5b801964f17c9a65af8f4770c49606c180e4eef25e73c26c
-EBUILD python-openstackclient-3.18.1.ebuild 1282 BLAKE2B 7b3d5bff111a9fb0e00d702a844439faec00d7015d5a1a1ba87efebf4ee851c7ab7a7c9e4ed45bac715b4d9d544d6d5aee6da07638b2651d62c09ef9338689eb SHA512 03ed2e9bfaa50e852b2e497bc2d27909a2ddfdbbc5f60a0dbc113e409c6189966a54a98516c93b1a7636d9c969d33c81e3ba62be20409862d62139a88ef9018d
-EBUILD python-openstackclient-5.2.1.ebuild 1174 BLAKE2B 47561d8eb50667f62b38148a51f515ad31a7e12a9d9d08c779f3acc59104ac6836b29b0a6e74a327a518aed35d5501f5ba5bf959326737a8fcf8aaacdc81dcdd SHA512 d40f6ada315bf41ab3ac0247ecf1b3f45ded7d3aa312a3e04a5d61bc6775593633aeb79fd22ff82b9f0396a73c91feeb6b6918ac4b8e6ae9fe963c5b4df3fc38
+EBUILD python-openstackclient-5.2.1.ebuild 1172 BLAKE2B a3594ea90b79208b8f2497b69a8e0b67b47f5c2de8dbeea42ab10925cc737a23af48269f2bbfd01ac10ce56ecf504917d83e7b1d4d3b6e25eae451179ae13f28 SHA512 1404bbd006b8bb2ceb8f698a7fa6b2a91c23affc4d8b07ce3ef3add73c096ae5e3674a1200df2c53364daf54125ad5ccf4ea666429e6a5cebd35039b85edd2a3
 MISC metadata.xml 536 BLAKE2B c76563d24c7dafcfc12b46ef9864a6e5fda3e65b0fa37b5deaef04ec8f870134e9e22c248e9c005d32a35465d2d16aed0b2f98c6c6058b42e5e10f080b8d751e SHA512 f9ead8f5d15828f9660287f651e4a0e1fc1e5442cd00e6830126af05021b2f23f5d419559ac72d5befb2cf3838a90ed5f8c90be5e41f2941e0b6cac15f0169d5
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild
deleted file mode 100644
index faef905306d2..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-3.18.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="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-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}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.17.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-10.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild
index 9cc9b5bac881..31b4e5831f27 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.2.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index 7cb85a53837f..965baac02e93 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
 DIST python-redmine-2.3.0.tar.gz 67915 BLAKE2B ad31d63ec5bebd33ff436f04c40fd49e35a79751c353ba1e343bbb03048c2d1662ec8ffea5819561b675e366f8cbad48a0e0a0a59dcaa563a90301ad4f1eb1cf SHA512 a317743a561cde65c17356a317d3aed082149d648aaa7487858c8533ceb286d08b6610d742321f6593fef8b61b1a4526963ddffc4ab180a83795d66773154b70
-EBUILD python-redmine-2.3.0.ebuild 473 BLAKE2B 16f551d804516563452c06c14c7363e71215fba691dc71eabdaebce599d8eaf5f3d57c2121d3e7b65433d9c49d680f8f916159705902298e2e39f3316d0c60c1 SHA512 0215667a40d27cf3d354cd90dc52d80bc58aa06a5f3c0383d92efe114e53427c39e8f8643101666253f51415bd592fdd98b14ab4c5c4ef445e20ebf40ca5932b
+EBUILD python-redmine-2.3.0.ebuild 475 BLAKE2B 962eaa3ec879a289a916cb34950a67a526bccfa4f41ce769ae6e45dfb95b1324bd009682c4b8f6e4bbfb806c9f426667cd9e818c73dbf215d3fdfe178b0960bd SHA512 629bbb913d8f1f099ac7b1cf002823f6985b48bd21d3b774ecfed1f0e67544bb22a50798fba1306f4d4fa4e803d5441c02f3f68e05130b9038f6984f956fa971
 MISC metadata.xml 400 BLAKE2B 03f628bb2d3dc4fe61613c08dff75e0534c475d637150a9c895e23e613b5c32188f78b298fb1b754d0df6e617f5d7c28e5e20f1984fe297a6d550b2debfe290b SHA512 12d43f2ec4712a7c01ed86aa2b1d05eebb907a8a6bd787ec82aff8ea2a97cc6708255dfad3d386550bcc72887d1b273b6ff3f958bc22e5bbdc4bd8a8d28a57ac
diff --git a/dev-python/python-redmine/python-redmine-2.3.0.ebuild b/dev-python/python-redmine/python-redmine-2.3.0.ebuild
index 493cc6814736..b36d8846ca88 100644
--- a/dev-python/python-redmine/python-redmine-2.3.0.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index b71719fa9e1c..24411b61cf3f 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r1.ebuild 614 BLAKE2B bf94895831390c354ffc456ed2912a834cac8d1e9ee0fbde61b551e72c23c2e7f1acfa9bbf9f756166515b9628c1f36a9153a674cbed44370997da957731e3f5 SHA512 0fd3c704ca7ea2e48ec6839129b45bd859458ed339809a1e5fbd56ca498032fc18dff699127fdbe04f76ec1bd68084202ea0a1d8d05ffac3a1926a4519e2f261
+EBUILD python-sense-hat-2.2.0-r2.ebuild 599 BLAKE2B 8054c428b24df11acb537427208030d7c0c34372f8b6daba7f6ce33dcb6fe6fe6646146bd057c732bb9bb5bf2cf52634ca71f61f685c51d2cbff22e9319c432b SHA512 61b13f6e10fc0a1562877080ffe816f164e0bd580d9b4930963451cf5dc03eeb078adff9742451904db946102d1295f6c737ccc2ddd13579269ea003ca1e267c
 MISC metadata.xml 652 BLAKE2B 09d216bb62cf9bcedb9c75f1d6e7c3b684f8c0716cca30332d90c17713d09ecf0796b453ec5d0714dbfa821e37a42d63c752b97bd4afe1a11c2fc6430a54678a SHA512 b7cd7d7f6380f4ab4a4d0dca35c611e0b783c8c188fd511fbca1908857f497542e3c1e9df5fe390fd4c850194b0fad1388bffc4563e1462bb4eb2d3531a9f151
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
deleted file mode 100644
index d901ff21d981..000000000000
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Raspberry Pi Sense HAT python library"
-HOMEPAGE="https://github.com/RPi-Distro/python-sense-hat"
-SRC_URI="https://github.com/RPi-Distro/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="arm arm64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/rtimulib[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..eee4918e1a4a
--- /dev/null
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Raspberry Pi Sense HAT python library"
+HOMEPAGE="https://github.com/RPi-Distro/python-sense-hat"
+SRC_URI="https://github.com/RPi-Distro/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="arm arm64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rtimulib[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 69a06d40ad56..dbd8dfc09cfc 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B fa137e728ecb5fa61eef8d593500efcf9c6dc9e642ce9988fb37f2faa3741b95e21d26709501374b75a6a00c6aba7230931ce87bd298e75bb226cbcde77e712e SHA512 427d09e8949304e5a95d03fcb89ab3a606b579fc08bbaf95028b261665c807442158f1acefca6fe7c331883720c7d528c7d41955375603b913c5e44fedb4974a
+EBUILD python-slip-0.6.5.ebuild 1191 BLAKE2B 98c01dfb332619deb983b1396853954366802aca04b3d95a41a9c8a9cdcc19b6079729cf5dac88c4b0575abc016b1fdf8ebbd3df7c61669dd1b862af3b874de5 SHA512 28b71a01706313972acd70f1e1668b9f23913a3ad5d1351386744a513f5db855c00772a95c1cde55721416788a3d7e24523317cfd76560b3a2778aafcd82f0b1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index 7d6d12a009de..1f6a9d06837e 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 eutils
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="dbus selinux"
 
 RDEPEND="
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 0a03caaa3967..2918594a5eb3 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,7 +1,5 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
-DIST python-slugify-4.0.0.tar.gz 9391 BLAKE2B 386e0186f9300bd00098ee534c5c5521b04b087e17a2530501291c17884c5ceb4895aa357dc0d4b573ba39aeaf4a69f60e2c110b3efede0e066f70ed9992f5f7 SHA512 a4b0da48ee887a24a022076c9b21fa5795ab104b1d382bae96fc7ba5ce6c09c0cc42e1f4c3b6874b44097d2246ea5b18302dc42386d8844fa41f495744e5ed90
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 6cc4442f9861783a0b0927f675ec661e6344ef2c801c911f22c187ef8102670a4ae8ba71cde81646ceb7a2d7b96849e24822e9e7104bf15d3ad297265b21def4 SHA512 3a4e137e8073c476c7f0418b057ce50cd829cd9fd59973e5986faea0897838fd769c96bc815cd5dc5d5194bfbcf17ef1bb2b6ffe756e697fb58e27f49e87fd5f
-EBUILD python-slugify-4.0.0.ebuild 578 BLAKE2B dd9aecc487b38472b5940415ee7c07a314d7396c52f42c2f6727bfb845a0493a9534bf7ab86dabecc9a7ec7d016130fa95cb88d8771911d05e99c2eaca7b2e77 SHA512 24c8d1c8014725956579414c06100de83985464a2158b37e523ead7148e0ce46c9233d45c48758a2af2e2510f261b90f644cfaeb8e40628417fd1e4061b93879
-EBUILD python-slugify-4.0.1.ebuild 578 BLAKE2B dd9aecc487b38472b5940415ee7c07a314d7396c52f42c2f6727bfb845a0493a9534bf7ab86dabecc9a7ec7d016130fa95cb88d8771911d05e99c2eaca7b2e77 SHA512 24c8d1c8014725956579414c06100de83985464a2158b37e523ead7148e0ce46c9233d45c48758a2af2e2510f261b90f644cfaeb8e40628417fd1e4061b93879
+EBUILD python-slugify-4.0.1.ebuild 576 BLAKE2B 0faf81d34c2cf9a1a898eea7befb853741235ee890cfded2d7c8a281c46cf156c84eb34ac519d743a7b24d6b670e3e2a3096c76966d6e47d3b280b2ec95e49a0 SHA512 6086b7cc6d439b7d6eb9aa9df638b3c65766bc92b459175c6dc089df48c687ecd655a352021d932113ff54a01ebabcfd58ce4788a2b57b056d06b922795aa262
 MISC metadata.xml 582 BLAKE2B aec9e0c331eb3b395607d2de104195cf7c6bbd88f3546420844ddd30407fa78ecfb6eb207ea208d910ec280441aac8c578b94a5cff71adede454e04f55ae60b3 SHA512 95eaa04f1332aa04a3f20e6e6d0ab4f8f86a8532d35c3e8059732febac20c8157c017d66abd1fc70b75e1f069b9ac90aa6ce64851923bd8db9efb1c219ebcb1d
diff --git a/dev-python/python-slugify/python-slugify-4.0.0.ebuild b/dev-python/python-slugify/python-slugify-4.0.0.ebuild
deleted file mode 100644
index 979461ce2cee..000000000000
--- a/dev-python/python-slugify/python-slugify-4.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-4.0.1.ebuild b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
index 979461ce2cee..160fd1b74267 100644
--- a/dev-python/python-slugify/python-slugify-4.0.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index a3e44e6a72f6..23132cbb771b 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
-EBUILD python-sshpubkeys-3.1.0.ebuild 555 BLAKE2B 1c6f48c6ec6d9d967051ec39b68b9da68e01024891dbe288ea4f253d1f95ffee0ad80db6c9446453cc6ea60dc9705d6a221c8949d26e8465334c4e6365cedef7 SHA512 4b9c7a8c954deb449701c02c097bea3c33be6d32c9aea90bc8954dc57f75d3420aed9b61dd85f6e217956e201d2da6b42ec854c2e5fa864bbc167dfecd77f1a9
+EBUILD python-sshpubkeys-3.1.0.ebuild 567 BLAKE2B b3dfe117fe342c64e7b6e4fa06e01cc7f87c6a9d3c6546ff19a70399292f6107bdaa9ff4f5340293fba2aa307c84bd9aa5c005129440633be93f53ca639fa651 SHA512 c2b0dc091bae51779057e54c646648d3e72e9e6387c3e95dfdef731dcb7b1fbe1011a0452113388f8e5005889e7f09a5b98995527f1a7c91d7bddc66c93f1b6d
 MISC metadata.xml 362 BLAKE2B 789c599311180046c3d8d7332e1c11989cde2dedc8abf68d6c72ef5924a8e9a15847426fc71a5c57905c022910e2db735879de2cf20c4b8f770a4ee51118a031 SHA512 78963cc8668296c4b984155d1cd7169a89da8b4950a1c3c95f2d1782c197d40e68e0e5e9c6b3b59b72bfad056986be367dcbfbcba489c915eb79a4f5770b56e0
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 295c1da3eca1..ea892d761ed5 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 20f1c64951d9..d075cbc00373 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,5 +1,5 @@
-DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
 DIST python-stdnum-1.13.tar.gz 893897 BLAKE2B e901a0b56d8ca4bcc25eade617af80bffce8f4b49a94dadefa7cf252edf567d01267256d3eaee77f01e41a99c0ffb26c80de1092f6437efdea2f115a9e997c80 SHA512 91bc476c0fec49627b772c43f031bcdfea044385256817d76a2fcff3aa76f26e85d308aab5262a682d54f67a1851907074b21d260e687f81c733326c40a0e0cf
-EBUILD python-stdnum-1.12.ebuild 629 BLAKE2B df37770bb3e45b1d3cd6512c0cc3ca4b9cd91ad3a16d01c4c4d0534bdb97214a62509aa2964bcec5aecab81819bbe5063e91a99dfddae716a84d77fb464443e4 SHA512 7ae58dffa8c80a4627738cf51e1990dfaccf96633faf314d4a63de8175bdd780213d474f62ab067040ad585958f6d5ef4b35e81d494bde572886c4aa5c142616
-EBUILD python-stdnum-1.13.ebuild 630 BLAKE2B f22b60593fd1345f9656648c2deb85367fcb557c19f70b3d44c0b4876b49b876f3661bb248f1132ee32bda1083c6c60cf77b6ae91b8077cfc2c3ffe94a13448b SHA512 fe989b0074421cebfaf65a10ba2effb5868f10a89a255ff93aeca32f42fc4040b00e34b44ac0c367df9c32979139919e57a7d6f7b5b951fab2c8903b0590da38
-MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
+DIST python-stdnum-1.14.tar.gz 953637 BLAKE2B 5772fd2284dc9c255b544c6f0d1f4d1ebbaa48547cf1ba9aafb082a4d649ce90574444b298a333c9fbac5e232d2ea144f2e5bbd817fb6e7b78ea66081ed871b2 SHA512 d17643a2e4d8efc5f554c9c114399802e6dae0ff60b6ab0e32ebf6ece7c87a96287dd1c2e68e4fcd97f8ab475a267de5dad41d726470690255a2a0aeddedbb8e
+EBUILD python-stdnum-1.13.ebuild 518 BLAKE2B 1d9eae5c34b2fbdd36288e0e96c0bdaaca10a285edf9369863394d7503b35e5444895fd918a3e40dc5d90e928dc6a28ced310851a140c24f2d824550cb0a5749 SHA512 bea1f469aac9e4548de79a0fb848520aff5d48f5770ebe35e5717af720e7084c47ff89f9b43dc0fa479cb93c866fe19b3168b527aa1bd79c951e6ff84f7747f7
+EBUILD python-stdnum-1.14.ebuild 520 BLAKE2B 0eadf7abda4486993adbae44670ccc9eb8afaf3b895dbda86a9d1c248a5f0f28533dd67ebd207e7ba3ea85e2599a484ccc3075d1438a8238fc996efefad210ed SHA512 b26142e87ae6fe7d3022fe442f9b5c4c29021a4bf1fff56a8c9fcc7864b98d3a0dafb053807d9c09b2eae968dd8716e5916840f0be89103eaf0b81a78040ad22
+MISC metadata.xml 374 BLAKE2B 598d8373a9289d49eb36cb7088a4115ebf5627f5a34afc55eef782bb65316da9fc24a1ffb2c8c9b22681c3f7a89edf8c15fb707ff90b757264eb965551ac1deb SHA512 097e90d8af5f1bea73c340e0e2a85f52329bc8816cf12baaa80102cebddaf96e4a5fd6cbe038058b19316aa9bc3deaadebc239f2eeb437eab6a6579a8246ffd7
diff --git a/dev-python/python-stdnum/metadata.xml b/dev-python/python-stdnum/metadata.xml
index 60baaf8d7a53..dcb46a6b59e1 100644
--- a/dev-python/python-stdnum/metadata.xml
+++ b/dev-python/python-stdnum/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		A module to handle standardized numbers and codes
-	</longdescription>
 	<use>
 		<flag name="vies">Enable VIES</flag>
 	</use>
diff --git a/dev-python/python-stdnum/python-stdnum-1.12.ebuild b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
deleted file mode 100644
index ccf5764af038..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.12.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
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vies test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-DOCS=( ChangeLog NEWS README )
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/python-stdnum/python-stdnum-1.13.ebuild b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
index 0d8700d77754..6d65e2186d23 100644
--- a/dev-python/python-stdnum/python-stdnum-1.13.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,16 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="vies test"
-RESTRICT="!test? ( test )"
+IUSE="vies"
 
 RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
 
 DOCS=( ChangeLog NEWS README )
 
-python_test() {
-	nosetests -v || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/python-stdnum/python-stdnum-1.14.ebuild b/dev-python/python-stdnum/python-stdnum-1.14.ebuild
new file mode 100644
index 000000000000..8e0346dc058d
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.14.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies"
+
+RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
+
+DOCS=( ChangeLog NEWS README )
+
+distutils_enable_tests nose
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 24fc5bd8e18f..4ca6a2aa0081 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,6 +1,3 @@
-AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b348bf4ccd1877c843864a71bd52b19d53ed3c98f0de0b690c2158b6ceffe10682ed79c64c829103a2e34fe14 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a
-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 888 BLAKE2B 11e40225df1e1e6026fce87a299d025b73f92cbe1a22db3f2167672768a1f75b2d369325f922f22e0108e3e8570b3205d78f881a3b6fe5c89db3937e856f7343 SHA512 661ae59e8316d6f199db4df7efe58ea18dd11f5339e2f4aba2504e6ba7e4e9ce9d4c983b2165531fa02ec9ac7af2ed5bb2a8a78247f3a0abe546f80e617f5f57
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/files/233-xfail-bind.patch b/dev-python/python-systemd/files/233-xfail-bind.patch
deleted file mode 100644
index bb0fb761bd59..000000000000
--- a/dev-python/python-systemd/files/233-xfail-bind.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1c0d575f7c058f227d27b1cb92d3936d0c170a5f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 21 Feb 2017 17:34:28 -0500
-Subject: [PATCH] test_daemon: xfail test_notify_with_socket if bind() fails
-
-This bind() call may fail if TMPDIR is too long.
-
-Bug: https://bugs.gentoo.org/610368
----
- systemd/test/test_daemon.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
-index e827e1d..7733552 100644
---- a/systemd/test/test_daemon.py
-+++ b/systemd/test/test_daemon.py
-@@ -238,7 +238,10 @@ def test_notify_bad_socket():
- def test_notify_with_socket(tmpdir):
-     path = tmpdir.join('socket').strpath
-     sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
--    sock.bind(path)
-+    try:
-+        sock.bind(path)
-+    except socket.error as e:
-+        pytest.xfail('failed to bind socket (%s)' % e)
-     # SO_PASSCRED is not defined in python2.7
-     SO_PASSCRED = getattr(socket, 'SO_PASSCRED', 16)
-     sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
--- 
-2.11.1
-
diff --git a/dev-python/python-systemd/python-systemd-233.ebuild b/dev-python/python-systemd/python-systemd-233.ebuild
deleted file mode 100644
index f5819d3df03e..000000000000
--- a/dev-python/python-systemd/python-systemd-233.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 module for native access to the systemd facilities"
-HOMEPAGE="https://github.com/systemd/python-systemd"
-SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	sys-apps/systemd:0=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd[python(-)]
-"
-
-PATCHES=(
-	"${FILESDIR}"/233-xfail-bind.patch
-)
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" > /dev/null || die
-	"${EPYTHON}" -m pytest -v . || die
-	popd > /dev/null || die
-}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index c0bd58579d05..e8a77f4d7174 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
-EBUILD python-xlib-0.27.ebuild 872 BLAKE2B b0f89b9e907a4c1063d7b050a96eb2add4edaf84715872c4e7e43a9717d4b589d77c7fb825301b847441eeeb7545c96137f562eec91c86b622321159762946ee SHA512 42b5f01ab1c4d6a2cf74c04baa2ed90282202d2398d4e241d107cda6a309a70ca4d6c354b6cdc3d3bf78659a068f020fda4dc386a4262f0b66c0a4d878024738
+EBUILD python-xlib-0.27.ebuild 864 BLAKE2B 58f7ff16cd873fe0d46ba832080f7c5716250ff99d1b2f95a078b3ef324bebbb6fadb750c74045c29f2e3e5221466c760c4865c0695defda6c8728b251350515 SHA512 9709939fe00f4efbde974b5ff009d9c262679338590cab04d584dd24aaf327536f71f24a9d970c4c974d961c5a8f4bdf4b9950b6a1dcfaf085c895672d31a75f
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.27.ebuild b/dev-python/python-xlib/python-xlib-0.27.ebuild
index 65044eed3df5..d1607af092f2 100644
--- a/dev-python/python-xlib/python-xlib-0.27.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index e276d49ab1de..325d4b3136ef 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,5 +1,3 @@
-DIST python-xmlsec-1.3.6.tar.gz 51174 BLAKE2B e6571d16268450c5e144aae8da5be42a6aa20f239859c0a5a85f5e20f361d5d85b85772cd5cdd296f2fb9da5f3dffbb869d537bd96fe68b7d4495bb378471d07 SHA512 ccfbe4c8266a5340f67331eac35174ae2cc175ce32ea8482c8b9757275466f058a5977ce62f39bce3c3abeda28988455c93302362c7f219d7b88b44ef245e972
 DIST python-xmlsec-1.3.8.tar.gz 71522 BLAKE2B d5a35a11c0664ba8ef191db1cbd57abbae2a38a404ae1474fcdc553c6a85c8c96a976c2f4b2ecdab59d9f1b26987a5feaa17851750a83d901deb3c2c47046ebf SHA512 db1a80443b0f86f84eb6256a9d67827da023b989c6b24cdfc0588b34c7a120071758ccc7b21b0b105f0a6e879a4769a325794b8db82c0c41ec12004cd7ea185c
-EBUILD python-xmlsec-1.3.6.ebuild 741 BLAKE2B 077da2efb037b9071874c4b2d61e851f72ba8185432d5e2dc7deee5f02445e956292e69e394bfc3bd3587e51a65a8580a33a61bd00125ead9d7ccb0380e3ef35 SHA512 ed4ebad1def01f14118df2326f8a220403467ec4aabe7b5d743dc5043a625fe1bc6ce2edef86fb164a8e80f72fd62182b372fdf9ed6719819442c4f79853ad56
 EBUILD python-xmlsec-1.3.8.ebuild 901 BLAKE2B 9bf05197739e959c049cfacbabd0e274f9641dbc74abcc58517f5c1ed00ca92313a6134c87ecd192be3b1399b2d0cef0761efd42a28b9ff816921fdaf5d01718 SHA512 f6459b28c6042db09a4c0ecfba53af43d8cfee678ded775e1faf5d85daf594087c65117668d5cb8d6a17ecfb1c277f20ece0b180d720216abbcb4810d3874a70
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild
deleted file mode 100644
index 1604a70c861b..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/xmlsec:=
-"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
index 2e616bcfc202..dc0253be8721 100644
--- a/dev-python/python-zaqarclient/Manifest
+++ b/dev-python/python-zaqarclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-zaqarclient-1.11.0.tar.gz 85724 BLAKE2B 84e34998a76bd475b3aad2882f076f8ca89dcfc1a24155d0e88269fda3d82d4b1348461d1f59a5f21726dbc56b37219d9e75957737452e759672505a1f16a4c9 SHA512 4b57cd336a6517760d32a5e01a7c87a9ee0526323a222faa6fcd6e33a506b0746d6418e9eee3fa00e7ba4a01912ee108fe1feb3469e0a14089cc760a0756b7fb
 DIST python-zaqarclient-1.13.1.tar.gz 88428 BLAKE2B 71870c7232d4f00b626421fc41e033925fe58f0699538d3e7f3deba2ac07e692d8e676eb763429efcc16ca0c39f8a15317106ca8f6ade583555a89495eba324c SHA512 4854e0a90e98d8172058316fbfcefc0a327a81ae870db28a51264b8e4b809383b652818506f734dd2b35648a544d0811046957c97a86f12d696021d54fbfa890
-EBUILD python-zaqarclient-1.11.0.ebuild 1197 BLAKE2B 950d06f78eb5510df2958478b706fa5c7e45b8c0ae13ebba441ba713f12390c2a3ab5730a0b3b40399ee518d495630c49e59fca40d14f38434b202168d9dbc7d SHA512 24089a1cb53adf8feb4c0d81a0457bf468576d72fb51519aba6e69d450e28684ab8274e1a780a7d3c18ff773126afcca41946a6124e3ff8b859d26bddf57ea67
 EBUILD python-zaqarclient-1.13.1.ebuild 1149 BLAKE2B 320088647351896feb6c7c0a71550e9dab6a3bda6457644a1f4292319105c38c62f1a7172162562b2f34c4c0ee3ba9450990efc0d701dbc3ac3b18b9ded399e2 SHA512 9524ba8f8fc7a44079116c2656fba6a767891c6ee0d9f19d39868281de688a3dfa8edc11de2a0ff1f657cee0b9e56c171d902ed67092018f78a79c34fb4745b6
-MISC metadata.xml 607 BLAKE2B 28721f37ce75146475891a79e765fc5ebc12f2e4067b259328fd63fc6aabb16d328d720c2e31cfe538841a638f15e63f141b35a930495e132470cdc0a3777a63 SHA512 73cd47155606b208b2ba83664732ec7fda229f075a86837bae68344bb3fbc10756a049a1f83815f65346d93fbee7a30b629c6769646da2385afab6237173038e
+MISC metadata.xml 510 BLAKE2B e44ccfb1b6153a4cc446f4cdcbd3faf1713826c78cda969b945dda3f4378ff43d289b031a9e5d15f76dee4aec8cd63a1d8119fa97c9c3eed83b21aa286a97120 SHA512 399ec17f8ef52f0f5285a99e347ef122ba4816b65fc71280cbdd3142368964b4c629f015c4251092bad7239b13749f771615a9c81675b1c67c5f59c21f37e35b
diff --git a/dev-python/python-zaqarclient/metadata.xml b/dev-python/python-zaqarclient/metadata.xml
index 543082e5c85b..efb9c8b4d7e6 100644
--- a/dev-python/python-zaqarclient/metadata.xml
+++ b/dev-python/python-zaqarclient/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 Zaqar API.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-zaqarclient</remote-id>
 		<remote-id type="github">openstack/python-zaqarclient</remote-id>
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
deleted file mode 100644
index 9562e9703a1c..000000000000
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.11.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zaqar API"
-HOMEPAGE="https://github.com/openstack/python-zaqarclient"
-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"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=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/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 68fea9646d77..5595a35d14d6 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-zunclient-3.3.0.tar.gz 112986 BLAKE2B 4e605144b19e938c3d4fe556d647c6e6e112ab3419961318a3f711ac0e29d87f3fea5d5a1f16c836e669ee1dfab78f3d8039e0e829038e213d06a657743066c8 SHA512 1d3be57a673359efbabde71e34a3e5e7b0778d60d8f469273f087ad5927040258bf4dca264ced64d6a4236f05cde51fdca0f644a0dad4ba3af5d333dbaccd5fc
 DIST python-zunclient-4.0.1.tar.gz 114913 BLAKE2B b0bf2722f67158a79b4e4673d237696564668a96e01107d33cfe13dd51ff0efd9916930277a7146bc1600cf350b41839817d496462f48162d569bfe3a7fbd26b SHA512 bdbef196053241582d0b641a6c4c25c0c167a21693e2796a2d92c6d93c6b627d19fbe14286fe469bd7067c79b2bcb298009cda763398dd2f31e9df891efa09c4
-EBUILD python-zunclient-3.3.0.ebuild 1091 BLAKE2B 7a2b16f262b35d3fd18555681a14a5c7b86f03f5a09b1cc31dfaa1173f44476d77efc2d58bc15aced718993a1b168d1ff3909ee283c176b3eb3d8b5c56a518a2 SHA512 a31eabc7ddbc8b7f6d92bbd3c78734277db59f20301cc6d8d512bc953d6db772e4c44ff0b628ec1f304c2a3ddc0b793660efb2fb7dfcf53c43198366b232476e
 EBUILD python-zunclient-4.0.1.ebuild 1087 BLAKE2B 1ce2d1115c1d7d57a16d349902e3b3fb46a6e2ac358223e3109421623ad506dc6011d0b259b55ccb009ba14911ccab95da1ef7cd587c341b53d3d302aaebbc27 SHA512 1479bdb9009989849316732e9b700db070b8c8d099edc1d3c14ab2bd13bfdd0990afb94e8532adb083ba94f3923abe2647c7834b26584adaf5e6782af130c099
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild b/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
deleted file mode 100644
index 18ae2b86aa17..000000000000
--- a/dev-python/python-zunclient/python-zunclient-3.3.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zun API"
-HOMEPAGE="https://github.com/openstack/python-zunclient"
-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="
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${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-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.44.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]"
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 8e4afe512c3b..a9cc71fdfd5f 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,5 @@
+AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4287 BLAKE2B f3dead6103ff71bccb2ed535fb8e95e4cf0679b57d5ae5bf3ee5888b60c5853db9998ca90ede222b6a2162ec378f76c8bd90aebef1a5747fe95adf4d9b3743fe SHA512 c2bb4a8593de9ed5f9c819939466ba25181d02163000edaaa5130931f20d0fb77cfba587025465e4d086f956d86e3b8574ca2d0ca8e350ff793ca59d5f0db95e
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1440 BLAKE2B 61121d421f7eb521c8b784559bc2e8228dcaa32f9217b97557519eb5a0635f57e9a399f903000c62a85215942c3edf8c00d06923d8a14b36b07e1e74773d6c88 SHA512 c86bda45241932f1890c20868dbfa08a0296763c08d4ec1244fb4e6051d6731985ac992e147899629e074c238f99176ce6f4ae8e62575ac7aa4dc50cbfe3106a
 EBUILD python_orocos_kdl-9999.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
new file mode 100644
index 000000000000..b02f18747cfe
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
@@ -0,0 +1,134 @@
+https://bugs.gentoo.org/728618
+
+Backported by Victor Mataré
+
+From 30e5057f01627539dd170a1e831bb14278433deb Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jun 2020 17:04:12 +0200
+Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
+
+Starting with v4.19.23 SIP expects a working operator= or one marked
+private explicitly. All classes in this PR have a reference member
+(&chain) resulting in the compiler deleting the default assignment
+operator. This PR makes this known to SIP as well.
+---
+ python_orocos_kdl/PyKDL/dynamics.sip |  3 +++
+ python_orocos_kdl/PyKDL/kinfam.sip   | 29 ++++++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/python_orocos_kdl/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
+index e0096dd..36f833c 100644
+--- a/python_orocos_kdl/PyKDL/dynamics.sip
++++ b/python_orocos_kdl/PyKDL/dynamics.sip
+@@ -72,4 +72,7 @@ public:
+     int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
+ 	int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
+ 	int JntToGravity(const JntArray &q,JntArray &gravity);
++
++private:
++    ChainDynParam& operator=(const ChainDynParam&);
+ };
+diff --git a/python_orocos_kdl/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
+index d87fd00..e87ceb8 100644
+--- a/python_orocos_kdl/PyKDL/kinfam.sip
++++ b/python_orocos_kdl/PyKDL/kinfam.sip
+@@ -344,6 +344,9 @@ public:
+     ChainFkSolverPos_recursive(const Chain& chain);
+     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
+ };
+ 
+ class ChainFkSolverVel_recursive : ChainFkSolverVel
+@@ -357,6 +360,9 @@ public:
+     virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
+     segmentNr=-1 );
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
+ };
+ 
+ class ChainIkSolverPos : SolverI {
+@@ -392,6 +398,9 @@ public:
+     
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
+ };
+ 
+ class ChainIkSolverPos_NR_JL : ChainIkSolverPos
+@@ -407,6 +416,9 @@ public:
+     
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
+ };
+ 
+ class ChainIkSolverVel_pinv : ChainIkSolverVel
+@@ -420,6 +432,9 @@ public:
+         
+     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
+ };
+ 
+ class ChainIkSolverVel_wdls : ChainIkSolverVel
+@@ -506,6 +521,8 @@ public:
+ 
+     void setLambda(const double& lambda);
+ 
++private:
++    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
+ };
+ 
+ 
+@@ -520,6 +537,9 @@ public:
+ 
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
+ };
+ 
+ 
+@@ -546,6 +566,9 @@ public:
+     const JntArray& getOptPos()const /Factory/;
+ 
+     const double& getAlpha()const /Factory/;
++
++private:
++    ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
+ };
+ 
+ class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
+@@ -559,6 +582,9 @@ public:
+         
+     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
+ };
+ 
+ class ChainJntToJacSolver : SolverI
+@@ -571,4 +597,7 @@ public:
+     ChainJntToJacSolver(const Chain& chain);
+     int JntToJac(const JntArray& q_in,Jacobian& jac);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
+ };
+-- 
+2.27.0
+
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 06e204006f9f..a1f82a9e03ef 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
 	>=sci-libs/orocos_kdl-1.4.0:=
 	dev-python/sip[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 5b22c74cf8c7..eefd4cac18da 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,5 +1,3 @@
-DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
-EBUILD pythondialog-3.3.0.ebuild 932 BLAKE2B 4eb1fcaa43010d888a376392c9154048092f8876ece3b505fdee604ea44a992e38228c676528cf238050ffb770e84cc7a999c9f763770c9141dc86948681de62 SHA512 c587d7b4b3a7a4684524c9b0e2e9f2bf6e56caa2b4caa82c1b9b259cc0888ec33c6510a4eee7d4a2455a8d7b5876cdbe545564b6bfe89136bf4fd7980a400fcd
-EBUILD pythondialog-3.5.1.ebuild 737 BLAKE2B ea89c8a815adfd828a17ca0221cb4004a16e92c4a990d0ff953bef3f6bb672eaf5ee45cbae4946982e1f4acf51ecf4508d30837deed61c203296ce0c070e1f55 SHA512 597f2cb30d00e46782821aef4feec482f9b0c5795f1ac11e51595b6a6c1f0caedff4ea5c4d88fac72c50ececc856aedac1eaa067408f3ceb4d525110adeb761e
+EBUILD pythondialog-3.5.1.ebuild 733 BLAKE2B 35bd7cc6e9ba81e9f30264dd7f03d3a1adcda863b477a438f576eaf61ec8ff52a09cfd662e34ffd01b400759d771a16c0990ba948a3ed76ab4a502335eed3e15 SHA512 366edd04e6efb63d8f52c19258d415bd45017fbc00c74c56d83286c7c10447e5fb2ede24e0a38f91a8630a42f17cdaf8f98bcca55b63a9ed928ba0c18af923b6
 MISC metadata.xml 476 BLAKE2B 7b503ba47b66c7d0429557590fd070e977e0ffa1bd9b5a25f29d396996ef7efeb0343cd6ffb5324b52c22f7fdf607824ef1f15dbb90cde51fed66160cfa5c7e4 SHA512 0797cb8228d91a59931a9b36151bed33e8a01dba279b503d5d76e70b2674a2ec7dc0ab04f1aacc4f5c4571ea397efff8c087e701e0e6304608c1193de0c1102f
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
deleted file mode 100644
index 08b42b40f48d..000000000000
--- a/dev-python/pythondialog/pythondialog-3.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=5
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-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() {
-	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.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
index 460c64b9f263..9e20150dce2c 100644
--- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
@@ -13,7 +13,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"
 
 RDEPEND="dev-util/dialog"
 
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 1f7de435f404..39b9d5e06b44 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 595 BLAKE2B 4bc9ac79f18e9617dd5f6b60fe286dc34ba6941cf4dd9faec62e3298794786d247e4b64281a8d811c821615bbd0641e5aeaf9e2580cc71b9617dcc29116c715a SHA512 2919282771f67e67e6f2e7c66a2368d77306bbf21094c0b66bbe1dc147d8bbd51a8f17ba60ced7d4caa918720e59f59c1b6c2f61befcba85820cd9408c0c44fe
+EBUILD pytidylib-0.3.2.ebuild 597 BLAKE2B 3379694b1f8c99417b458425635e7b2347ef9868594f3fadba618082d30030fd137a3521aecebdbff38ebe3994f950100dd4907fc11c5153edeb80ab4144b8cc SHA512 5b9dff3ff5f2d8806fc58b5eb72583a9f973c9e172530f2f4861a977e81ab1744c455e6f8afb611e2bddcfde019ea6825b9edb0aeca1a56fdb3219f0c9ac7ce7
 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 928099aa4cb7..4c0a9bd939f4 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index 903f4a1245ea..2eb17b1fc2dc 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -1,4 +1,4 @@
 DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
 DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
-EBUILD pytoml-0.1.20.ebuild 783 BLAKE2B 14781d83f07f7d89cc739a339ba2094b6743aec6d63e0237fd2427b2d78c4d3f07109429555c62151384908d15dd55de90517d1b9095f88f7608bedf4dbec806 SHA512 ed33762453a55f87b41ff7cdac10424d6212421bc11817bb251fa9b12c32d5061321c4aee904313b93dab9c1dba5c8fd0f6ea9126930cb8d514eaf9fd45dd4d0
+EBUILD pytoml-0.1.20.ebuild 773 BLAKE2B ed6e21d5d5d7386279c4353ac1b403023e9149404487e91a21c0530d129dc9afcb506788c0e5e14d140a6c3685fc9a99b91ebf4e02a520723eaed6e6c43ec0c2 SHA512 fb3dbb999a67b2eb689cc25e4ebc026ab595833ee886cfc50a9d6c5ff866cd42780c4f0640911c402606dc63f581ae46e41628a367fd21fe001cbd97a7aa2ac3
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
index a8d4997fd98e..9894d88cc6a2 100644
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ b/dev-python/pytoml/pytoml-0.1.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index ab461801cab5..79ce36a26b07 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,8 @@
 DIST pytools-2020.1.tar.gz 60662 BLAKE2B fcab8af5e10a483f9fdbb835bbc18fc98ebf3da80da9c8e98ff5131eb4a9e780562827966ba15f64df17ee46c48ef2498caf292e29b6b838ebfc5a49a1dccbae SHA512 b8b6513677f84fe97dfee9b96449ce6f2bad5d1dbd51a4f36b080136efd3b1d97850f02ec52e8e70c317104f99ad383dd9d2b260f0c151eb11851b03efcefe58
 DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
+DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
 EBUILD pytools-2020.1.ebuild 723 BLAKE2B cf1dca7c8b57b9ca13710be55298ded50d235ee924d5ee4fdd9c578f5075d87ba82c61dd0c30176d0949f6c2275e40decdc2f77920f5f8c0d1420ee5dcc321b1 SHA512 1901b039414fe6899f1866b87298d39405e473a83f66c82aaa257b8d830fc719e284cece71961dc0c06b8d52ea4796ab7f5be64a00fdda8fdd73a8e12ec7e6ab
-EBUILD pytools-2020.3.1.ebuild 671 BLAKE2B d8e7e67f5e9ca2e79a22e2e933997d75095a6d4a87939ecfbcfa4674cad0dc2690e97198cdf97295c292c7dde9c712e8f7495762ed234ce6077d44aa7b370524 SHA512 012a0d25cd87188b9b19305b4e4a0b287994bbbdb96b23f9d25abe1e09cebbb19dee15117cef055bf382e84fa6358543454f3e5c5c84cd509b1b7078dada4312
-EBUILD pytools-9999.ebuild 836 BLAKE2B c2b0d7927b0e5cc98b599d95932709b787a3ea2235173a6b7d44a5275975a513d3159c9612be3c6df75482f83a1b0d0d105c1d6aea5d354e670030692b8a6338 SHA512 7e6dc6c51682ee388bfda2fd1844260a0c5c4c379ae274fde10d6535c5b2e479e880eb26b7bb040baae6860bb5bcf3c94ad14e28c41792e683392597dbbc51dd
+EBUILD pytools-2020.3.1.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
+EBUILD pytools-2020.4.ebuild 671 BLAKE2B 839e1f378bb8802c37a1b831dc6dfc58fa72837a9d9a2f00814163c5d02c4eeeb11c3c2a0a534b405998084e46f528d98c45319840c66dd870b385f58af4d213 SHA512 d340adf02e9ee7e6cd033d668cc9bb48a8786de6d1e63f4d6715fefe8e3c79431f7b15d52b0df9f9719cf7057542611b5c100ea6722c88bd51640e9659321999
+EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/pytools-2020.3.1.ebuild b/dev-python/pytools/pytools-2020.3.1.ebuild
index e822631055e5..452aa2e327c0 100644
--- a/dev-python/pytools/pytools-2020.3.1.ebuild
+++ b/dev-python/pytools/pytools-2020.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='sqlite'
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/pytools-2020.4.ebuild b/dev-python/pytools/pytools-2020.4.ebuild
new file mode 100644
index 000000000000..7c6b5339389b
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.4.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..9} )
+PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+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"
+
+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}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index 765b22bf080c..618ec9fc5a6d 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -1,37 +1,24 @@
 # 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_{7..9} )
 PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 git-r3
 
-DESCRIPTION="A collection of tools missing from the Python standard library"
+DESCRIPTION="Collection of tools missing from the Python standard library"
 HOMEPAGE="https://mathema.tician.de/software/pytools/"
 EGIT_REPO_URI="https://github.com/inducer/pytools"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+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}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index ff15c669e195..64ad6c0edd23 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,3 +1,3 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
-EBUILD pytrie-0.3.1-r1.ebuild 624 BLAKE2B 646fb4a3903dd9b8f76cc1763d5a08006df3f9ff35d5cde35b3ecb0b1cd68fe846c52dcf99eb4a302f11496a100387389f9bd681111683519a24ef9b0fc026d0 SHA512 4e540995bfbca6010a3857505e11a027daa81ce8c771ec400ef5eb966f30174db88449fc0861cc26f7c80cbac7dba4e6a994f67587bc6ac6ef741f93329e3aaa
+EBUILD pytrie-0.3.1-r1.ebuild 623 BLAKE2B 3951261ff9e665f072faa6949ef82d80acbdd3e34a1181bfe9631c2e1393b2d3f178700e315c1a0aa5005c9475c0d15f3a23b5775468999a5508934dbe7a566a SHA512 68e11828d68fddf33e49e20ee9a3a54263ac81aa564ab71aee2722fd9206b4bb7234ce9b4d7b4023f7d7fd4f44923a6408eef61149e59811d34862554a5b1cbe
 MISC metadata.xml 829 BLAKE2B ef9b4c75180fee10f9c412eed555ab692308570a634b08109c6d4007d8f7c42ab3429bdb0d7108b306b9f34d0a39fcf5629b6550f04f4bd7d33e2d9e4f419855 SHA512 883132c3806860fd0a64cad3f748aede024a408b38261c0a4a5cdb2a201526e95a00e501c23a7fe93203bc6c00d8847898be1a08039647b3f4f7aad962db0f13
diff --git a/dev-python/pytrie/pytrie-0.3.1-r1.ebuild b/dev-python/pytrie/pytrie-0.3.1-r1.ebuild
index fc5d1d89a7ad..f50ac9e2a2f0 100644
--- a/dev-python/pytrie/pytrie-0.3.1-r1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 832ad0419b53..5bf44d08ef35 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,7 +1,5 @@
 AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
-DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
 DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
-EBUILD pytz-2019.3.ebuild 998 BLAKE2B 2071e46018cffaea4fc2664b357e17ea49ad12b2f53cd63a6018be3a2fbe2bd32f9e8a159c417873bc665a3d0ce87b2e59bad2fda20ece4346c4e819a869670e SHA512 07a167855fd0791f67d1e364cf6596d1d9e9234f1b43d19ae1eb9fe2e58e1c62da0a0082d8c6a320a438d547e0676367a980e2e65574a919b58e62c495422a86
-EBUILD pytz-2020.1.ebuild 968 BLAKE2B 6114281f06cadf21ec2b1ec3b2aa57a4d62bafb6b7485d9938ee9597c24752fff87217c8c1ac62e6aacec111eb9709a57a89aba514596a7b36d237d37c912487 SHA512 e15faa300d483e9b783ca7db9f455eb97e6b358b861a5cbdf86733b9156af1a2b47290504add8403fd7093ecf28f7d307bdb769b3cda6c06a9e74e996865aae7
+EBUILD pytz-2020.1.ebuild 959 BLAKE2B 29cd1c62b31c3b45de541f907d0b86d0757658876cea8b43aa79ac995676e0d4868f272c55b00a5b143a49e7f3e83ab77ab65c0967ce7f45467fae0596fe95ba SHA512 c5ca799c82795e99b83d4be3e78eca0e32f9828963e881bd2badd5100e7adf6db721b22f2b7328d0e611b1818d5f658a47f007db5f61f7faaeb870369862ac0e
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
deleted file mode 100644
index 527749a75ec9..000000000000
--- a/dev-python/pytz/pytz-2019.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,8} 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 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() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index 1c553363fab1..802b437f99de 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.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 ~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/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index e2df4a4a5b33..f578023a9ace 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,4 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
 EBUILD pyu2f-0.1.4-r1.ebuild 932 BLAKE2B 3295754bdda4c67396a9420abc777a9590372261e70c27557e4ed781b9c2c4404b0b15f31e0e799066e1c0c66eb55aff3a59f707e3b7e689051ff0a780720af5 SHA512 43518194c0aecb5436ce6a36249ee2fc21ba9dcf864064b929e6dbd56a5f76a1048fb4207b23468bc68eba5b404f744a7997a37a093641868abcb794c4b436a6
-EBUILD pyu2f-0.1.4.ebuild 1122 BLAKE2B 78e680f8a73d57f2b963343dad6f5f68ffd68fa8536a3d3ff9d6b44f58683c85f821e6d54014de618fd2eb56e7fe790214fb3742f3adeebc87235ee81d742544 SHA512 de956d02327e0343adda3e30116b0fedbc6a8d07272c8621db888888be270be35f5c327af7e703a552ea2bdc9f44701f00926c00f093c64439b019457ad5ae6a
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4.ebuild b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
deleted file mode 100644
index ac8c32eb58a1..000000000000
--- a/dev-python/pyu2f/pyu2f-0.1.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="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/pyu2f"
-# pypi tarball lacks unit tests
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/google/pyu2f/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-python_prepare_all() {
-	sed -e 's:json.loads(communicate_json):json.loads(communicate_json.decode()):' \
-		-i pyu2f/tests/customauthenticator_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v pyu2f/tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index d7528f55b158..d23fb625afd4 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +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-r1.ebuild 1130 BLAKE2B 49aea3fd048f82deccbdcbe47e9174b0850d60f89fb9ca0cf2097a1272df78caf4fa97a0b41f40a48dea7585758401fef009e2c216c57aae04fc6f7112622033 SHA512 fdc45941068f9428cedaa479acc186c069eb2696ccd64f22748e1821e679f60a2d9f6db0525c9eb7cf64340dd0daae271432898d5197590bbc11d3db3253572d
 MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
diff --git a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
index f5b815f20181..81caeeed13af 100644
--- a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
+++ b/dev-python/pywavelets/pywavelets-0.5.2-r1.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/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index e119fa8149a9..634db86dd88b 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1,5 +1,3 @@
-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.3.0.ebuild b/dev-python/pywinrm/pywinrm-0.3.0.ebuild
deleted file mode 100644
index 2643b3da1972..000000000000
--- a/dev-python/pywinrm/pywinrm-0.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=7
-
-PYTHON_COMPAT=( python3_6 )
-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/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index d9535814a88f..c131a2959663 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,6 +1,4 @@
 AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604c907f2e74197414422c9486c93bec84ba8f4515afd20eb6bdcb898207200da4d1071489a7390a14e835531816a5b458865 SHA512 24531ff4fb116c69b8ab3e432753bad2d0b704c86ec21efe69741f2d34ced24c6a580872acab0e063f3be3dfad4f91199bf61fb8d1485d1c86a9266f7c163cd9
-DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
-EBUILD pyxattr-0.6.0-r1.ebuild 1965 BLAKE2B 57c3eef93b9bbe7d289106f010a7de133cc9dc41262699ce33d02c3ef93a349d21fb58f3fd60e7f6c7cdd4e575d183ee074cd4f21f9e2ca2578c5d9776df1241 SHA512 0aa606e1da1e7adb5ebbaec3224c0d38abaa11c39da1c8937577c3b2ec302a966a8932e74376cf5809b3e52bbfe32039c93466e31b6272363e0b75919d4b7479
-EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B c8fb7d37db1934f76961b52187fa258c08b99179ee5c144951066e0d5ac15c119b9058c9c5f22de680110cab6ae6a6276a6a7970f2e8482d81185d9694f2c900 SHA512 0061e5ca98400094f1d340e42c16a65b7c034fb9c7aaf02554126b533a1c82ab52fb24ef1b2a9dd5ecc8fdbc04ec320c1e0fdf40342b123f692565a8217c0a6a
+EBUILD pyxattr-0.7.1.ebuild 823 BLAKE2B 43d40a0701f4d8ef869655a5ba8c4dc337f6045a60c0eef7799d1c42e3d9eb71ddc41ca42000b1d5741c751d94b1cad8bee97d6e9242e23172baca39d6155c5f SHA512 b980df47ba500ffc800ebed6ebc0b703c9befd7f88429741f4eb03aac68bfcf226cc91a05e5e26f5037e708617f10286ec36012dd8d47b1e0b489f95ee78d924
 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
deleted file mode 100644
index 57280811c535..000000000000
--- a/dev-python/pyxattr/pyxattr-0.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,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python interface to xattr"
-HOMEPAGE="https://pyxattr.k1024.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyxattr.k1024.org/downloads/${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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-xattr_header.patch"
-)
-
-python_prepare_all() {
-	sed -i -e 's:, "-Werror"::' setup.py || die
-	# Bug 548486
-	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
-		-i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake doc
-}
-
-src_test() {
-	# Perform the tests in /var/tmp; that location is more likely
-	# to have xattr support than /tmp which is often tmpfs.
-	local -x TEST_DIR="${TEST_DIR:-/var/tmp}"
-	# Ignore selinux attributes by default, bug #503946.
-	local -x TEST_IGNORE_XATTRS="${TEST_IGNORE_XATTRS:-security.selinux}"
-
-	einfo "Please note that the tests fail if xattrs are not supported"
-	einfo "by the filesystem used for ${TEST_DIR}."
-	einfo
-	einfo "The location for tests can be overriden using TEST_DIR variable:"
-	einfo "  $ export TEST_DIR=/my/test/place"
-	einfo
-	einfo "Additionally, TEST_IGNORE_XATTRS can be set to control which"
-	einfo "external attributes are ignored by the tests."
-	einfo "See https://bugs.gentoo.org/503946 for details."
-	einfo
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index 7c3ca1076353..ed6d57bbfa4e 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
@@ -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 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 6230f01500ce..6eb607bc0139 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 808 BLAKE2B fa9de977631490ea8f25641766fe4cd48283e0bbeef236c7ae3a541ebfc77655bdb7427a38e82538a39e1b9fdbb604635d9f52db65cf97830f45ea443bee2fcb SHA512 a02da06742416743ebdf1a06843ec9241078c29f2fed62a54ab39aea46ac2a6d604de223232b782800ac3244fe7f192883a0a3b3adb46478bc8f90a0a26503cd
+EBUILD pyxdg-0.26-r1.ebuild 812 BLAKE2B b2be3d43a6dba45376b15a93deb9f83f2495896a04763b095fab4a47d6b171d6b3d36e23a5283d91dec751364e697be4cd59cfc6df25d272ea64d92d676594fd SHA512 c6ceb0f80019fefb1ec479cc4c6655dfe21d3486d176472e9f1e82a9522f8257b67c609a6db924d641f51ec36fb623961e343f6c144d3715eda5f0982dface75
 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 f20f69cf822d..80252e41ab4e 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 8ca978c858e9..01e86fa86107 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,8 +1,4 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
-DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
-DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
-EBUILD pyyaml-3.13.ebuild 1041 BLAKE2B e01c1cb0756d37d79deeba33b91863183ac5b5fe51101461a1dd1da8966742a090c6350f8e61c87bd91b3ab8a350a1d898f8139a4d88caedf1c86e140f56afa0 SHA512 22010477c8997084423995590f2d0f783cbcda6635e736d462a3cc6b73c7eb479489c0b21a4d8299bd129df9cfe5d12f9b8d4dc3158364f453298b4109cf4943
 EBUILD pyyaml-5.3.1.ebuild 1164 BLAKE2B 04287dde778f61fa86141215661f71b3f82b238c3d27d7e8615a90e68c9682d7699adad1071327b6c1ac022f4d2390f89cb160c3f9db05c076ca354007f8f82d SHA512 75c605d42b9dabd3c1af1ed1ac79fdb9cc220e390febaa7eb1f0267de8d40e957fc51251399d099a77e4691c67c7f544bd71f0806d3884ea1d43fc75edca2b36
-EBUILD pyyaml-5.3.ebuild 1173 BLAKE2B 718a64909dc7e926610afe52bbf57aeced8453806c16b05aff32fa9cf2567a04175655c9ecb6c9009eebd52e9f429c1af2fba3356bb70453ae5eff8e0a113c68 SHA512 d665671cdd5289b94cda61191b1f859fd3fcd23ef8849f31fb18757b64b64437b418969de5376c8305220d5dfc1441974a0bd2a4f2af3ed544234e2909dcbf8b
 MISC metadata.xml 439 BLAKE2B 2be21fbc47c75ba527e1b7969a9b472234a0cf38d39b6574eebf7c388b119c6951b7517d4a34c251b0d2a2bfd9ed73cd0157759a17c026da1806439e457aade4 SHA512 fe4be818db191edf5e1bc8abc09012e1065c46a940beb507c8fb48d996113e3601b2d1ce1cfcb70ed85c7d192ed0ba0416f7143f87fcdaa7912fd85e2e80af53
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
deleted file mode 100644
index 3207b9eadaab..000000000000
--- a/dev-python/pyyaml/pyyaml-3.13.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 )
-
-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 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-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
deleted file mode 100644
index 3e79df1978ea..000000000000
--- a/dev-python/pyyaml/pyyaml-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=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 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/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 99a8af55c390..8b0d6f227f39 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,8 +1,4 @@
 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-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
 DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
-EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3
-EBUILD pyzmq-19.0.0.ebuild 1543 BLAKE2B 416944298550b4e5fc76591c4cd9727f5c1dc162b585050aeb343b667406fa398f4d0396809bad04e78d4f4f1044e5d57ed9ba9f5bba77008eb0d32a085bc0c6 SHA512 ea0593aebe18e5c3c371b7aae95737dbc405a101aa20704860b599e0dcd4b878c15a68f3b5a6b9724be70bb5a0c7544ca1be53e4ef016692bc1c8ca71f8925f5
-EBUILD pyzmq-19.0.1_p20200608.ebuild 1502 BLAKE2B d2db4bf85470754dae4b3f848922cfb89464f7162eaff5ae8cc0fba54bd722c88a08764c3323729ed030998e70491c8367c31c6dacc3be216b53d71f733745ac SHA512 cdc2d41d19b563ddec84c6ef24125eb1e2bd91ec42ac907f38fc5692e03f03b8f34556541391cd890ce8086a350758decdf4254de95f415dcbf8f43fee03fa9f
+EBUILD pyzmq-19.0.1_p20200608.ebuild 1497 BLAKE2B fea10c8b964a2a0730242c8d45a40135bfc646d217fe67122a95f39503f0b335f7bd9e2df03df9f8eeb43d274e14d2cdbd3b1d151dbe144d94bb75160f5cc7b3 SHA512 88cbb433c1baef81aa3fe2801a93f0f66d7c3874141376f3ca8da86b9e64b4f7377d1a711bf4b0dcfce3f6ea6f329f6193d9ac2fe3271cf6350335d349128355
 MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
deleted file mode 100644
index a77b3c5d365b..000000000000
--- a/dev-python/pyzmq/pyzmq-16.0.2.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,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="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 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-libs/zeromq-4.1.2:=
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	tc-export CC
-	append-cppflags -DZMQ_BUILD_DRAFT_API=1
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	esetup.py cython --force
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v "${BUILD_DIR}/lib" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyzmq/pyzmq-19.0.0.ebuild b/dev-python/pyzmq/pyzmq-19.0.0.ebuild
deleted file mode 100644
index 4b60d5b65a75..000000000000
--- a/dev-python/pyzmq/pyzmq-19.0.0.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=( 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/pyzmq/pyzmq-19.0.1_p20200608.ebuild b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
index 56869da78599..9b8e49085f08 100644
--- a/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
+++ b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="LGPL-3"
 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="+draft"
 
 DEPEND="
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index cf206564acd5..d52b2730fd95 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
-EBUILD qdarkstyle-2.8.1.ebuild 1378 BLAKE2B ea48f645c3e9332a82869ec6aa545c6bbd62465e8d643f8bb0f394a65a08d24f44cc615d980500d2feb4e6b2bdf6c5aed5c16fa8754d710e121c4357b01d5066 SHA512 315816213eba0741eee55aa2923e8465672da1061b4e5220bc77600ad704dd483ab42ec7878f14521c74eb498360c0f7d2fc40b50a3ad2ebc5294dee3befe194
+EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B 99bd0d347ea0ce028e897fbde9c0b11fce98416f3de517ea80efea83f894783f6cff71ec28df403d0295ef84d1ac4b6ea58cc0d0858de6e874b67381c191bf92 SHA512 f47628b0d4a16e38de6ba1a75d4dcc1c7d6ff2b1d841370f14f39a2323616457fc226c4bab2ccb4578369a0ec2c72ab85d9bcc486e4ac71b11e57bd4353dcd97
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index 9e29ded805c9..fd2c520e477f 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -21,10 +21,15 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="examples"
 
-RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]
+"
 
-DEPEND="test? ( dev-python/qtsass[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index ecab29801727..56fdbb08aaa3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
-EBUILD qscintilla-python-2.11.4.ebuild 1782 BLAKE2B 2484322cc56bd746192300cc954f2c5af3041b2b48db25f1c0f952357bb0b037c398727c5161a7ab9aea63586207fb1989c87b599160c0e2e088341ba8356da2 SHA512 26836958cb815c272ffeeaabb858f296f586af6d49f98202dcb975fc83706f964b43cd40f607d1586c0294bea9af35032a562c4c982d72d53cd974518ab32a20
-EBUILD qscintilla-python-2.11.5.ebuild 1788 BLAKE2B 1b82c0af7b35ad9f7d4e343ae772a87c4a6784ef51de5d9155f9d8381976be63025b551dcd1769ed0da349d6adecd341b053cbeb4d1fd5553dce345592ea6b99 SHA512 e5a95258bec3adfbee11ff0b2e97c63a8948e471912edf19869722c4628bf4b2c62340616268f26ac6612d6cffbad7327bff72b427139e79fc0446235d88feef
+EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B c444293bdf725fc4c8616614a0d7cb43029279a64980048948906a4e94959387fed7c51ef53711f9e1785835704314837f55b22063ecff97c72e97e198b5d000 SHA512 859eb027fbff13a6d58a9d2aae5bad285ee077199640fbafcb01c052d162d126bd158ffc3cfa3c04a874f7ebf41e3233a90e60d01e4f52b3a9f27e5b8883b47b
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
deleted file mode 100644
index 27a43b25eec9..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.4.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 ~arm64 ~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.22:=[${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.22[${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.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
index 45a5ed0c4c68..c04ae33878bb 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 7e93cd0b6634..26c9f933e435 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,3 @@
-DIST QtAwesome-0.7.1.tar.gz 846772 BLAKE2B 8bfbd430399bb42fab0d7d236cd8bb4daf372469e8a6dc604df57a11f70202772bcbd9df8f49875c559106cac8e2ec89110c9f0c39b441aae238d84c0426ecfd SHA512 1cfa0bee80bca28b087eb4dc7ad57c8fec85a586185fce379d611cb6034e7666c8523abc28f78dadd7510aa0356cfc423f01ace295dfa6b279645ff379ecd846
 DIST QtAwesome-0.7.2.tar.gz 847272 BLAKE2B 559b41a1ccb1563c0537703ec285bb24639ab9dfe72515dae9462271666dbe49b7d04b5d5dbc3f24bb6475803c987f7ac7bd6bbf828b79b07897f0b6e60edd70 SHA512 edc3a4794befd6f87ea144477d18d48e8ea7c1e349cee3fde04ac25c3f372126448adb7d820176927394ca89a8714154f354625e58746725c30eb0a95d7b0359
-EBUILD qtawesome-0.7.1.ebuild 805 BLAKE2B 625a760e5250d551bc7c76b777ad76c9d9a5beb92ba067fa35a1b02088b891cb7219ea41b18d2226f9a2fd21bca33ca32d55c8dfff2abb0594432cb2d79e07c8 SHA512 63230a92d2b26f0a8e70583bbeb6f5f960bd63393502bbe9a85e8efc42ed9dc0a0bbb4e1a37a220e393526c05373e13e18a17eb11a795a3fcf1087e64d23cf22
 EBUILD qtawesome-0.7.2.ebuild 803 BLAKE2B 1c76f23c80f52aa7709aaf693e994d9b7fa8a9383b1b9d399cc76d7dc0f6544b271961f3f3791d353c56a272acab7768f3476952e5188508746f771432708854 SHA512 1fb1391a109f934879790d567df33f1341a600b64309ed9c195d370022af0c1878c8129a483934d3f582917dea28f4e1027f9bf13e88c4725a5d34df9754567f
 MISC metadata.xml 907 BLAKE2B 0668d113e8863279de6bbd5a1c7af7cc101a826647574ec971704a31745767d22ab6683d3cdb82d5394490cab23a6d0d1b86d11a6ec93f711dfe596a34afa86a SHA512 d0148746d4d9b429e350593b7e9f5bc4c88030a99a84200e8b6351e3846749e1e667832671d671db5705c3d4c8af0b121aabe9a3bcbc25a2a0b03de192f02278
diff --git a/dev-python/qtawesome/qtawesome-0.7.1.ebuild b/dev-python/qtawesome/qtawesome-0.7.1.ebuild
deleted file mode 100644
index 8361f65f23c9..000000000000
--- a/dev-python/qtawesome/qtawesome-0.7.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,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 26c9c7a8d0fe..3fdc95449305 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,9 +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
-DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b58705fe7c0672108b57c5cd9bb7c35d77569ce59a3cdb8dc21b3e403cc41845a534c55838ecf2e82038677132e90fbb SHA512 4564c0ee15b1feaff235ae35a22bfb719497e5f74416ea0ab471018c4d68e13dd05cc4d0180b69151f81817180d4985589340698067b5a2166764a39147255fa
 DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
-EBUILD qtconsole-4.3.1.ebuild 1680 BLAKE2B 249564f33745d57c14439acd6cec7af71829d3d31e4982ee5c57ce71ba469053cf5d5932f4480d1f30f3f0556b27bf2d57a59de54556673568f282011612fbb0 SHA512 ae28aef823f50eebce4ec374704bc83ba3accd1bd1a9df72709dbc3c46c8a45a74f5e33667360fc8b64a349210368ae4d5151ae73cb7d13f70b839f168d9b3ae
-EBUILD qtconsole-4.6.0.ebuild 1283 BLAKE2B e551099568780f4f9e05dceee530499b8e7953d8b3052a7a1b18125dca93d9df453ee7ad76da67999865acc6f81ae9946a7965c69e71de66ff6292e1f8bc2139 SHA512 0c48143d092b3b582314c07967bc9be1c727fcacbf37dc60676a7b6f146d17826c79fc847cd31feb194a16c093885685da1fb41af06e1964df2f362c60a54569
-EBUILD qtconsole-4.7.4.ebuild 1236 BLAKE2B 1c5f96f1dbec7e23921ce0c3d273b90b0db9601ea9daaa5459369a2cb78f227bc979c59ced22cda22311802cde2dd9efe818ef4d81ba7b7529ef3b9c8abf22de SHA512 961c7732cd730e3c6c0029b4006cc173226c50c813ea8644564f73f22dae9e4a7a89e88dc7010c1d90250e7b8e743a6d1ffb05839de99828ecf710ece40031a4
-EBUILD qtconsole-4.7.5.ebuild 1237 BLAKE2B 8cd414d9d54885e2f70846384f73cda49be0a75e464ca24aba07a69e37db86786c8fe0ae6c96a833fd0f2e45aa9e29d0debd313eb66e3f741cbc2e301b8c1789 SHA512 7d604d90441840f02810fcd32fcc7d03b4843b0bb103fa6a04efc410c803c7572a5a877ae36497f34d7bc072d2ba0713c7ed0aeb56f49c61d63a02a03504dcfb
-MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
+DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
+EBUILD qtconsole-4.7.5.ebuild 1251 BLAKE2B 5abc609de0126c2838c063fa637c814c980209738cc03569eab99bc799e9e904e2fe19161751811031d7653261e2df9487483b7efc867055fb834bb13a991278 SHA512 95a8268f168336bdc7a613b3dab0019a658f5fed6a1285554eac8ffcf78129d4222278b54a631826a510699872f4e91ff98fd19eb3e8d17489e022d46ba6452c
+EBUILD qtconsole-4.7.6.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
+MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index b4be59fbf857..27ca01d55a21 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -13,6 +13,7 @@
     A rich Qt-based console for working with Jupyter kernels,
     supporting rich media output, session export, and more.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">qtconsole</remote-id>
     <remote-id type="github">jupyter/qtconsole</remote-id>
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
deleted file mode 100644
index 6ac296b425dd..000000000000
--- a/dev-python/qtconsole/qtconsole-4.3.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,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://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/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib]
-	)
-	dev-python/PyQt5[${PYTHON_USEDEP},svg]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
-	"
-PDEPEND="dev-python/ipython[${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() {
-	# jupyter qtconsole --generate-config ... jupyter-qtconsole: cannot connect to X server
-	# ERROR
-	sed \
-		-e 's:test_generate_config:_&:g' \
-		-i qtconsole/tests/test_app.py || die
-	virtx nosetests --verbosity=2 qtconsole
-}
diff --git a/dev-python/qtconsole/qtconsole-4.6.0.ebuild b/dev-python/qtconsole/qtconsole-4.6.0.ebuild
deleted file mode 100644
index 02da2ab44046..000000000000
--- a/dev-python/qtconsole/qtconsole-4.6.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=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	)
-	dev-python/PyQt5[${PYTHON_USEDEP},svg]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
-	"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-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
-}
diff --git a/dev-python/qtconsole/qtconsole-4.7.4.ebuild b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
deleted file mode 100644
index b9aa30d6b720..000000000000
--- a/dev-python/qtconsole/qtconsole-4.7.4.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=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by removed tests:
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-4.7.5.ebuild b/dev-python/qtconsole/qtconsole-4.7.5.ebuild
index eab98c37d95e..aab6373c31f6 100644
--- a/dev-python/qtconsole/qtconsole-4.7.5.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.5.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"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/qtconsole/qtconsole-4.7.6.ebuild b/dev-python/qtconsole/qtconsole-4.7.6.ebuild
new file mode 100644
index 000000000000..b8f4e1d3bd94
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.6.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..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by removed tests:
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index c206cb7f1636..fb9739357bdc 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD qtsass-0.3.0.ebuild 653 BLAKE2B 9251a12d9eb0bbcaf6ea4f22b5548944348847c077a52902833081e179b0bba6357ed8e272d7307d19f56df544415985b46711529bbac28015d68d855c708c78 SHA512 30b3a1815bf45f684690d0eb0128d3bdee90c48ee506048ec8da46ac308e4295ac72624697003269fcb88190f2e0f1af788b8e609a7a8437d106b50dc17f2981
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/qtsass-0.1.1.ebuild b/dev-python/qtsass/qtsass-0.1.1.ebuild
deleted file mode 100644
index fdaf47419aea..000000000000
--- a/dev-python/qtsass/qtsass-0.1.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compile SASS files to Qt stylesheets"
-HOMEPAGE="https://github.com/spyder-ide/qtsass"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 16dcf1fd7207..55b1d70e7d73 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
new file mode 100644
index 000000000000..87de01f93ec3
--- /dev/null
+++ b/dev-python/quantities/Manifest
@@ -0,0 +1,3 @@
+DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
+EBUILD quantities-0.12.4.ebuild 817 BLAKE2B 0cb0a3555c857ddeeb5959e2976bd0384c0d0170c027d7890f52463685cd895bc634ef79ed81a29b4c28fb2ac56fb276a92d5a043cd799827e670b81d8afe9e7 SHA512 a82c6407016798da18aaa46e17137cd5dd01ee3c3b73b71bf7bbb1e887caee9b15eef6cbda366070728a55cc0362c59c3faf68606ee290b64b8840b23161452e
+MISC metadata.xml 515 BLAKE2B 6745bb76b63c90cb4c7de8c1b103e9cb5b0fbb9a3b0f5635f02e37f05d48236f9f203d8b6cb540921254226dc251111c9f1e90713fa6f8441db0ccb568ffeefa SHA512 9cfdf5931dec119f380401ae62a1226243a41cae42cd4002e80a324eac3ab50772fd31b4a54c3025d53d8b6aec2e64d0fb0703b71a98f03a413e39042083e96e
diff --git a/dev-python/quantities/metadata.xml b/dev-python/quantities/metadata.xml
new file mode 100644
index 000000000000..7ffdf7f0ad4e
--- /dev/null
+++ b/dev-python/quantities/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">python-quantities/python-quantities</remote-id>
+		<remote-id type="pypi">quantities</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild
new file mode 100644
index 000000000000..41a8e27b48b7
--- /dev/null
+++ b/dev-python/quantities/quantities-0.12.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="python-quantities"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Support for physical quantities with units, based on numpy"
+HOMEPAGE="https://github.com/python-quantities/python-quantities"
+SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[$PYTHON_USEDEP]
+"
+distutils_enable_tests unittest
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Unexpected success
+	sed -i -e 's:test_fix:_&:' \
+		quantities/tests/test_umath.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/quex/Manifest b/dev-python/quex/Manifest
index 7da3a10e377b..1cd749e4677c 100644
--- a/dev-python/quex/Manifest
+++ b/dev-python/quex/Manifest
@@ -1,4 +1,10 @@
-AUX quex-0.65.4-gentoo.patch 1592 BLAKE2B 2b1b03d108dfa9e10b60acf16f474a0b98c32e7caa6f7a7da08b3d13253cc54ea9cdcac304d20a3ea524a8a9a0088e5ab514c71f2bc3a37b74fb910ec3bf9cc9 SHA512 7202b8e9621357dd01d93e260c95df3c006d28648e12158c3e8031d6c23988ea623d10697042c1f0c6887a6af5bbea979faa7afa0ff477a9432aa4c6f56fd288
+AUX quex-0.65.4-gentoo.patch 1255 BLAKE2B b37ffe9069f97ef75737b31e0ebca6d93ab0a25f0168bd746c1651e2ab39e39f4540c1121d55f5fec1b96caa25aa02e8536f69090f406be555c888a58a090380 SHA512 992be8f711482333ce32e0d8ddfa17488e439f822dfd6e20f1fa5788ddcc550d2cb94eac962680e71eb933c3c51229255f06a1e70904b433eee0e3ccb03b4ebb
+AUX quex-0.70.0-gentoo.patch 530 BLAKE2B 93fec6f7a4516c14af50b13314e6cadee8dade71fd471f632e2021979328661efa0bb85de41b67a26f1955f9681345818cfbbfd32fa8283a431115c31e113819 SHA512 6e56e192f84b0de8ccb4c64276b3538a09717e155342ccd583af19dbfc855fef98919eef2acdb7cca459bcb1748f49209a2501c74e018192f3a11e7711cac1d3
+AUX quex-0.71.0-gentoo.patch 533 BLAKE2B 40c189ff1c0cf6dde96351af9aa1d54f98111b23794b616dacf092c779a1ce8993fe87c8a03d486be1eaa819a1efab158bb27cc161a4c5fad1482ce004c75b4d SHA512 6d3fcaecbf45f130ada04bdcbbcd71e81cd623b3ff4ce5c5952285026e1080734f3d07ae4b59302c12787d06457cab561334f58fdd66a1bfed6f3b5cdd7c31d2
+AUX quex-0.71.0-py37.patch 604 BLAKE2B 50115d12bca3e4fa448549b799163944e85b01065a95df71c5dace1a5bb6e1671425758c3011dc80530ac3878cec24267a2506d58dbcb7427fcba7100dfad120 SHA512 92bce2ce2b6d9fa7438c8ff97f815db5ad17f422ca43937921f7b585aebf33f66bae2c385bb37f6a31962924786aee3b1e37e87daebf25e741878c81369ed3ef
+AUX quex.sh 28 BLAKE2B c2ae538107a05055fe883c5327c8c4baf2c45568fe34cae8d616a8145d4bc870c111f90aa6c7e88771ed6f20c4d55751625bdbede97b2b306ea025ca11223fd5 SHA512 97fb88ea8894d618ee133aac6edaf6317c247728801bb39f9a7be9ee30b278073290659a27dc72834d2783156fbf4ab6f1cb3c15da178ac0acf4718e6aa476df
 DIST quex-0.65.4.tar.gz 2202154 BLAKE2B 6b273998c9641aeee458291245a4fb956b5fe9b66d8c42f0c1d9b360a4d171c830a1d487bcbab9ccea49d10b7532ed488ce66dc165f31cce9521f97c5a4575f4 SHA512 0b11d7e5c5165674626fbbe7f54853656c579c63b78bd2fef2f5a9b316171dc647812d9a37df4e7c49c05de11a307b6425089f4ab281affb6c03a9cf09e2a035
+DIST quex-0.71.0.zip 4599847 BLAKE2B 37bb5b0c7ec6540563cd94e0fbc277064b69b0c84dcb3da20a02d1b3fa9d8ee5a801a71be41f908c33ed4fe9271c0cea31ece19be4b489228ae0c962d5731b43 SHA512 9d3b75680b9336dc4903e334dc8e1a389e2acee715ba1c5fba26aca1e905172f52098eb9c6a1c3e8b9354ea1cc857d8802a2bea4ac864fd0acb5d879c2524997
 EBUILD quex-0.65.4.ebuild 915 BLAKE2B 0499ad6312f5d1d04c9f20a55ec2066aa4bb1da17f127cad6bc99e3a5bc22061213fd34fe77669091259470316b2f3a48bd474138841721ff8f00e9606cb9f83 SHA512 44b9d57618501a952b411da30dd89acd3fb620a7f3840942bde6b8e7b99cb7a8ffbbbe348b3bf1a83d88751aefc32767b31b38b1fbcac4a8a2b76af4d4055fa3
+EBUILD quex-0.71.0-r1.ebuild 1143 BLAKE2B a7b3abf8341f5bc27a9f7f6417189d3ffaf6912ab27423c1a354de7dc2ffeaeec73a0e2a8e6c975a78ffa0c6866e6ecc98eb0da302e5aa877ade989b5c41043e SHA512 8c93a399235e7f9d8593f3e0f0888e6b8faf255bf99d049bb4c31a4f2a8143034414e1eb8d6063986dca59104e3b02afbdf05222885f60cb5f3f0499ccaf8faa
 MISC metadata.xml 807 BLAKE2B 778188ed4c2e4c0b626c8e732be918b44583c5b490356f2c28dcd978c1c3b76b45440c45b0175b203f36937d43f4e12aeabcc1f40183f740c1357006d5841dc2 SHA512 37a5d2bd9351e1bd4f20e6b40808a1598b7b46d1d5559210c83ef106d25dd895d2d0fc31bd6671c98129176c36564388d071edbd058a57666aca07f6ff0fb930
diff --git a/dev-python/quex/files/quex-0.65.4-gentoo.patch b/dev-python/quex/files/quex-0.65.4-gentoo.patch
index cbe161a18e11..d870c765f784 100644
--- a/dev-python/quex/files/quex-0.65.4-gentoo.patch
+++ b/dev-python/quex/files/quex-0.65.4-gentoo.patch
@@ -1,5 +1,5 @@
---- quex-0.65.4/quex-exe.py.old	2017-12-13 21:42:48.633280478 +0100
-+++ quex-0.65.4/quex-exe.py	2017-12-13 21:43:02.066040530 +0100
+--- a/quex-exe.py	2017-12-13 21:42:48.633280478 +0100
++++ b/quex-exe.py	2017-12-13 21:43:02.066040530 +0100
 @@ -40,11 +40,6 @@
      print("error: Please, use Python versions 2.x.")
      sys.exit(-1)
@@ -12,17 +12,8 @@
  try:
      exception_checker.do_on_import(sys.argv)
      import quex.DEFINITIONS
---- quex-0.65.4/quex/DEFINITIONS.py.old	2017-12-13 21:48:52.887765325 +0100
-+++ quex-0.65.4/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
-@@ -23,7 +23,7 @@
- QUEX_VERSION = '0.65.4'
- 
- try:
--    QUEX_INSTALLATION_DIR = os.environ["QUEX_PATH"]
-+    QUEX_INSTALLATION_DIR = "@PYTHON_SITEDIR@"
-     # Note, that windows can also deal with backslashes.
-     QUEX_INSTALLATION_DIR = QUEX_INSTALLATION_DIR.replace("\\", "/")
- except:
+--- a/quex/DEFINITIONS.py	2017-12-13 21:48:52.887765325 +0100
++++ b/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
 @@ -49,15 +49,14 @@
      sys.exit(-1) # sys.exit(-1) is acceptable
  
diff --git a/dev-python/quex/files/quex-0.70.0-gentoo.patch b/dev-python/quex/files/quex-0.70.0-gentoo.patch
new file mode 100644
index 000000000000..c110c4bdb24d
--- /dev/null
+++ b/dev-python/quex/files/quex-0.70.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/quex/DEFINITIONS.py	2017-12-13 21:48:52.887765325 +0100
++++ b/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
+@@ -57,7 +57,7 @@
+     global QUEX_INSTALLATION_DIR
+ 
+     # -- Try to acces the file 'quex-exe.py' in order to verify
+-    if os.access(QUEX_INSTALLATION_DIR + "/quex-exe.py", os.F_OK) == False:
++    if False:
+         print "error: Environment variable 'QUEX_PATH' does not point to"
+         print "error: a valid installation directory of quex."
+         print "error: current setting of 'QUEX_PATH':"
diff --git a/dev-python/quex/files/quex-0.71.0-gentoo.patch b/dev-python/quex/files/quex-0.71.0-gentoo.patch
new file mode 100644
index 000000000000..80eb411f5a0e
--- /dev/null
+++ b/dev-python/quex/files/quex-0.71.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/quex/DEFINITIONS.py	2017-12-13 21:48:52.887765325 +0100
++++ b/quex/DEFINITIONS.py	2017-12-13 21:52:29.805877359 +0100
+@@ -57,7 +57,7 @@
+     global QUEX_INSTALLATION_DIR
+ 
+     # -- Try to acces the file 'quex-exe.py' in order to verify
+-    if os.access(QUEX_INSTALLATION_DIR + "/quex-exe.py", os.F_OK) == False:
++    if False:
+         print("error: Environment variable 'QUEX_PATH' does not point to")
+         print("error: a valid installation directory of quex.")
+         print("error: current setting of 'QUEX_PATH':")
diff --git a/dev-python/quex/files/quex-0.71.0-py37.patch b/dev-python/quex/files/quex-0.71.0-py37.patch
new file mode 100644
index 000000000000..9c2ed48d5495
--- /dev/null
+++ b/dev-python/quex/files/quex-0.71.0-py37.patch
@@ -0,0 +1,11 @@
+--- a/quex/input/code/base.py	2020-08-17 11:27:16.948578316 +0200
++++ b/quex/input/code/base.py	2020-08-17 11:27:27.604426654 +0200
+@@ -123,7 +123,7 @@
+     def set_source_reference(self, SourceReference): 
+         self.__source_reference = SourceReference
+ 
+-    @typed(Re=re._pattern_type)
++    @typed(Re=re.Pattern)
+     def contains_string(self, Re):  return self.__check_code(lambda x: Re.search(x) is not None)
+     def is_empty(self):             return not self.__check_code(lambda x: len(x) != 0)
+     def is_whitespace(self):        return not self.__check_code(lambda x: len(x.strip()) != 0)
diff --git a/dev-python/quex/files/quex.sh b/dev-python/quex/files/quex.sh
new file mode 100644
index 000000000000..26bd161e969c
--- /dev/null
+++ b/dev-python/quex/files/quex.sh
@@ -0,0 +1 @@
+export QUEX_PATH=/usr/share
diff --git a/dev-python/quex/quex-0.71.0-r1.ebuild b/dev-python/quex/quex-0.71.0-r1.ebuild
new file mode 100644
index 000000000000..7b55297c7f76
--- /dev/null
+++ b/dev-python/quex/quex-0.71.0-r1.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=( python3_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Mode Oriented Directly Coded Lexical Analyser Generator"
+HOMEPAGE="http://quex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${RDEPEND}
+	app-arch/unzip"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-py37.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@PYTHON_SITEDIR@:$(python_get_sitedir):g" \
+		quex/DEFINITIONS.py || die
+	mkdir -p engine/codec_db/unicode || die
+	mv quex/engine/codec_db/database engine/codec_db/ || die
+	mv quex/engine/codec_db/unicode/database engine/codec_db/unicode/ || die
+	mv quex/code_base . || die
+}
+
+src_install() {
+	default
+	insinto /usr/share/quex/
+	doins -r engine
+	doins -r code_base
+
+	python_domodule quex
+	python_newscript quex-exe.py quex
+	doman manpage/quex.1
+	dodoc -r demo
+	insinto /etc/profile.d/
+	doins "${FILESDIR}"/quex.sh
+}
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 0d2011ddf149..6ff123c93943 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,5 +1,4 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
 EBUILD raet-0.6.8-r1.ebuild 1030 BLAKE2B 1d584778f931d88cb13cf84f5d25f1391774d07dceb5fa0351f0aba05941380338d814f4b212e019d23e0d21d6d457a3e8dbe16ac8b3a3ae5dba32cebdbde425 SHA512 e9689a56d13a6230a90c25d943c601061923ed80eedc5ca5bb9f9bf4e2a25f728dfea0647c7ad7c024ae7e9dffff08799885e8ebf0d479c566a46fc451cf9fac
-EBUILD raet-0.6.8.ebuild 908 BLAKE2B 3fc45741dc163e06dd450730feff0007ec21f88ae7dbb3c0dc653b93bcceea29b1d3aa7c34a572f0b28971dd7b8738693a22ae6b13610e978497c355b0ff2b6d SHA512 025be2d4a5b55ec054b60669c6ae02380b51fe3467670081502713fa36c81722720b760e49f7545137b826c969ab3b4a69919d307ea82a9817f23bbfdfbd7536
 MISC metadata.xml 489 BLAKE2B f5c03c42cb002c7d6c81692f7f98312ad51a06e306a33b63cd048cbb25d0ef1429e5322bc5eb08de2d3d5a179a100f61c5e73d7f874a43e009eb0bcad8013e26 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621
diff --git a/dev-python/raet/raet-0.6.8.ebuild b/dev-python/raet/raet-0.6.8.ebuild
deleted file mode 100644
index c0717ce6d463..000000000000
--- a/dev-python/raet/raet-0.6.8.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="Reliable Asynchronous Event Transport Protocol"
-HOMEPAGE="https://github.com/RaetProtocol/raet"
-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/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/ioflo-1.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "/setuptools_git/d" setup.py || die
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib || die
-	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
-	popd || die
-}
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 913b4cdaba66..68756287704c 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,6 +1,5 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
 DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
-EBUILD rarfile-3.0-r1.ebuild 475 BLAKE2B 89071d439a3217d0d4c8b6626d37fcc539b3cb6e20651a4525d82fe449457d1294ad0a554b73fa889b0a82239592cbdf8e1daad2400f993639c752dacc0f7dab SHA512 411e674941ac140cbde53ccef37c8fcbc6a9e24308f286f9964a2ae524ec87959e12f43c981372d976e2b13c885d940c13d4527022aaf06aa58ed474c0ce453a
 EBUILD rarfile-3.0.ebuild 484 BLAKE2B ef54ff43da9b5c2cfc29f56d1efd1c98cde8394166bea02be00152a19772ef6fda05effc569c7efa6726ee95f0ad0927f25d813e24688d083b1b0dfe571b18f1 SHA512 0eacb1c5d1a69a61e0ea644d3236764100c58d9aae8da97f700970f0af101af482b83dc895fdfe3f13f1aca44b3bfbc524b60964b11749208f4aac60ed9fd15f
-EBUILD rarfile-3.1.ebuild 477 BLAKE2B 4f845acdf60dc1b1d44d5360ad17341d76a6a4cc723b842ff11fd5c84effdd3d3dc5139fd4ed94fa3f7779ddbe57af4aeeb37af896806d43b5bb55bedc25f90a SHA512 35b762ea0b2144e9881920e1bb14b05f6d44fedf5586f57827f404cea422ef7f5a1b8aad76986bec9376e08ca91246ecf857d3b50f5bdf2d9fa117eaabe865fd
-MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
+EBUILD rarfile-3.1.ebuild 475 BLAKE2B 07ab2c877f2d0c35af4ab1e6c8dcd512b8185ab288aa9b52f3ed8d2ef2586a34f556a5dce240a2ca512eb2ca8e073515d557ce517086e3167cb2f5fda6d3dcef SHA512 952362ddefa6221f2c69efce8fa7efe2848669ef8bd317c5a0eac694040f40e5c81986a4ebd474963105dea165d03c13bbf0f37d32cccf867ba5a321d59488ab
+MISC metadata.xml 530 BLAKE2B b0f4d62ebbfab89b9f927c24dca9b138d6a3b9c2754a9d62684e634e0868e5a6007ffb1f4c52a6568bdeaa8bc9095d2789f6fa994e7c6e1adb71566bac54b9f5 SHA512 714dab1f6654a89d13b5443b91a3713a360b8c73187513021cc97c1be1ec09628c78b01c86f84d886931614c83caea3496a11202f64c195d5ace4015a699a861
diff --git a/dev-python/rarfile/metadata.xml b/dev-python/rarfile/metadata.xml
index 87069bfb4d39..42b6967b6cb0 100644
--- a/dev-python/rarfile/metadata.xml
+++ b/dev-python/rarfile/metadata.xml
@@ -5,7 +5,6 @@
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
   </maintainer>
-  <longdescription>This is Python module for RAR archive reading. The interface is made as zipfile like as possible.</longdescription>
   <use>
     <flag name="compressed">Enables the module to support compressed v3 archives by calling the <pkg>app-arch/unrar</pkg>.</flag>
   </use>
diff --git a/dev-python/rarfile/rarfile-3.0-r1.ebuild b/dev-python/rarfile/rarfile-3.0-r1.ebuild
deleted file mode 100644
index 3b2be61a9fb4..000000000000
--- a/dev-python/rarfile/rarfile-3.0-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Module for RAR archive reading"
-HOMEPAGE="https://github.com/markokr/rarfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compressed"
-
-RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )"
-
-distutils_enable_tests nose
diff --git a/dev-python/rarfile/rarfile-3.1.ebuild b/dev-python/rarfile/rarfile-3.1.ebuild
index f7282bc66968..7f2e756a2df7 100644
--- a/dev-python/rarfile/rarfile-3.1.ebuild
+++ b/dev-python/rarfile/rarfile-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Module for RAR archive reading"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+compressed"
 
 RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 8e25086630d8..53766f9324a6 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,6 +1,3 @@
-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
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
-EBUILD rdflib-4.2.2-r1.ebuild 2646 BLAKE2B 200438df7ee74d82c83727e877f5226970a56c20b8d4da2907089f9d7dd127e90c185497a87fab1faef8b4b563b9df5e403083890879a9566e91977f3c57b2a7 SHA512 67386d00225887ebc55275080672de3bb83830c1848dc6aa6f5e05bc774750e17683beeb45604aabf3aa32a30186b255467b9915605813ccf8ae0be52574d37c
-EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B e95dc1f09551b279076d5b2fce01df9772ec29b30a96786d04959f43cbbcd90c360409a15077f95629b49cd00cb1c6dc438ac6e7f958d4e497caeddd5124d980 SHA512 f85beda0c258d8cdbbdc672f5755436b2be2e3d50d289d1b66846cdba5bb6dbe2765e8eebbdc034b30603726a400606dc95feb1980dceb17b4ea5d837a62b6fd
-MISC metadata.xml 487 BLAKE2B 6ea6370e51bf11be515d0f860bd4ebdd0ed57b3975a3e2bbd0912a91da824378b84d67cafd3bef185178aa88eb29aa6c389d99c87b5cca469b7b04ac91b2d10c SHA512 3e2ac7fdca434ecc3dc2e53323af84f0f272b402bff973a04c78c04c02dd3fcb9bc4ebfe586c0d2e72e565ce3bc948a2bfd0c876acfd76b11c5dba3bb34a3ab0
+EBUILD rdflib-5.0.0.ebuild 1202 BLAKE2B 4726ba9a743e5b574f51778f04871ee0a3933d541435163b764ff6da9a93246a8cec62664beff938d99cd2f339a8585d2c9777f8e4762213b8e16714481d42c9 SHA512 df25ff02eae2e4bf21eb70077ed3ca363287ab1258e5f465114f485dc4fe9dbed866bdbacc48e708494c6eda788ad6c0d985f70edf54daa28751fc154d53aa2e
+MISC metadata.xml 399 BLAKE2B e2869846251c99bd7ad7811f6f3831916f230f3e19b62eb17b19b28f94b5d3422c31a6b71e1231768489ea625a52b0e0b4d145e19a02cdd57d22be2e2ece85f7 SHA512 ae939728cb382dac06c8c76ce2907bcdc53dc5ab5dd934a9278a3826d1cec5e8158cb2685c2410c808269f04019d47c40db37eb8e27d0593a2e669575ac4679e
diff --git a/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch b/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch
deleted file mode 100644
index 389d220dc1b7..000000000000
--- a/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Traceback (most recent call last):
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/plugins/sparql/evaluate.py", line 330, in evalSlice
-    next(res)
-StopIteration
-
-The above exception was the direct cause of the following exception:
-
-Traceback (most recent call last):
-  File "/usr/lib/python3.7/site-packages/nose/case.py", line 197, in runTest
-    self.test(*self.arg)
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/test/test_dawg.py", line 434, in query_test
-    set(res2)
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/query.py", line 258, in __iter__
-    for b in self._genbindings:
-RuntimeError: generator raised StopIteration
-
-Patch backported from
-https://github.com/RDFLib/rdflib/commit/58c45d6f30af88a22f60edcb9a459648a885e226
-
---- a/rdflib/plugins/sparql/evaluate.py
-+++ b/rdflib/plugins/sparql/evaluate.py
-@@ -15,6 +15,7 @@
- """
- 
- import collections
-+import itertools
- 
- from rdflib import Variable, Graph, BNode, URIRef, Literal
- 
-@@ -323,22 +324,9 @@
- 
- 
- def evalSlice(ctx, slice):
--    # import pdb; pdb.set_trace()
-     res = evalPart(ctx, slice.p)
--    i = 0
--    while i < slice.start:
--        res.next()
--        i += 1
--    i = 0
--    for x in res:
--        i += 1
--        if slice.length is None:
--            yield x
--        else:
--            if i <= slice.length:
--                yield x
--            else:
--                break
-+
-+    return itertools.islice(res, slice.start, slice.start+slice.length if slice.length is not None else None)
- 
- 
- def evalReduced(ctx, part):
---- a/rdflib/query.py
-+++ b/rdflib/query.py
-@@ -1,5 +1,6 @@
- 
- import os
-+import itertools
- import shutil
- import tempfile
- import warnings
-@@ -181,7 +182,7 @@
-         return self._bindings
- 
-     def _set_bindings(self, b):
--        if isinstance(b, types.GeneratorType):
-+        if isinstance(b, (types.GeneratorType, itertools.islice)):
-             self._genbindings = b
-             self._bindings = []
-         else:
diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml
index c27203b015b9..b6848176643d 100644
--- a/dev-python/rdflib/metadata.xml
+++ b/dev-python/rdflib/metadata.xml
@@ -6,9 +6,6 @@
     <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
-  <use>
-    <flag name="redland">enable support for Redland triplestore</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">rdflib</remote-id>
     <remote-id type="github">RDFLib/rdflib</remote-id>
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
deleted file mode 100644
index a6eb50c7d38a..000000000000
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,93 +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..9} )
-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 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}] )
-	redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/sparql-wrapper[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# Python 3.7 StopIteration bug
-	"${FILESDIR}"/${PN}-4.2.2-python3.7-StopIteration.patch
-)
-
-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
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/src/" >/dev/null || die
-	"${EPYTHON}" ./run_tests.py -v || die "Tests failed under ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-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/rdflib/rdflib-5.0.0.ebuild b/dev-python/rdflib/rdflib-5.0.0.ebuild
index ee3a9c338a1e..d7c55570274b 100644
--- a/dev-python/rdflib/rdflib-5.0.0.ebuild
+++ b/dev-python/rdflib/rdflib-5.0.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 ~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="berkdb examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 83adc297d5b7..1438e96022f4 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
 DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
-EBUILD readme_renderer-25.0.ebuild 836 BLAKE2B 3b353b438d980a053a8e53e2c9d912b68e43d59ff60c85a5fc8f6b3c278a0bdc90667b88f5ad52285535cfc1824a819831e4a14763353bb98a3386b7a8bc145c SHA512 69c795de5cb0a3c92f16f37de2859353fc49730ad25c2fbb4c2d3f4089158252123a1d1bfb2b0ddb6926a8aca742370369dc696df5c8ea2f6ea7dbcf5f0135d4
-EBUILD readme_renderer-26.0.ebuild 842 BLAKE2B 4092a8e2f2d59439c9723e09d47839970fefbd1268e29da0818eb75d33f5cd48bf1c01a8a5574444c5c17e762e0ec223a618e19352f69113028c3d2797b1e300 SHA512 22eec30dc8af1ce076551a0b78c51dff2b5b8f4edbc59f2a77f8e70ea9fe01cb91eca239dcffec014922cbd3f78dea4cb2c903a13d607be61c0d66418408f7c3
-MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
+EBUILD readme_renderer-26.0.ebuild 824 BLAKE2B b8f822fb13a631cd6d6ac07a65c5e34bb3795c5cae4ab0d06f42a97692e70c41daa4bef1b2c6c6a365718b74edb7a151bb4361f141a291a9b27f5704929187f5 SHA512 6367493101d816179c9e839724093b4fa5f4ff0f8eba302610d5d39d3620606d619bfdba31e6ad5c9177a55a50b51c039689d34e7f58aa34ae3ea3d5598090cf
+MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/metadata.xml b/dev-python/readme_renderer/metadata.xml
index 654b29049752..047238c26c2b 100644
--- a/dev-python/readme_renderer/metadata.xml
+++ b/dev-python/readme_renderer/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">readme_renderer</remote-id>
     <remote-id type="github">pypa/readme_renderer</remote-id>
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
deleted file mode 100644
index 2513f39528f9..000000000000
--- a/dev-python/readme_renderer/readme_renderer-25.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=( python2_7 python3_{6,7,8,9} 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 arm ~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/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
index 32744b6eb0dd..8e3cb7ff0c21 100644
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 009cb7889360..93948f6c7f5c 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,7 +1,5 @@
-DIST readthedocs-sphinx-ext-1.0.3.tar.gz 11589 BLAKE2B 9c6ac1bd3baa2a92cbc67d18f5fd6b3f63ce0fe7cc16832ad23940c7b8d85d88f299c8cba6623d0c2b229cbcc43e43ece926aefa01d6a3055ef9c252ddf68dfd SHA512 571336adbb3f6c9077d2530562f5d72092f8df440b282187fca5aaeb2a9c281aa49bc29423e550905696a200f692ebcea5fe6f83e023f64759224697c49e2f03
-DIST readthedocs-sphinx-ext-1.0.4.tar.gz 11686 BLAKE2B 3c188e52682f8c24633f79b9ec0eed7f06c922989f7578f06e0ede0e3844ca019e1905450df8d12150d05f3a82a1103a0786cb2c60dc3551e3e3097849cdc301 SHA512 52f45c26ae934b44a41073a9e77096ea8ed97f2a36ed1ea9b63084be0af58dcff24c6b729cda7a8b631f9fe5f56822ceabdbbd2e11056b44df18212986cb445a
-DIST readthedocs-sphinx-ext-2.0.0.tar.gz 10570 BLAKE2B cd1d424ede0958dd3d14b0b3f207e8080b038de294d003244f81d7eecaf5d8ec9a54c22d77460096b6bb3b70cab0b3915f94f0c529e9754a39351f7a4201dab5 SHA512 7cbed8a1ea0ed9f61d9fdac7ed283c7f49d78d8661ba7165efb763a4afd34a47c557174e855f73637e5a9aeaaff0c5acef1f1d273363432886343dcab71c29aa
-EBUILD readthedocs-sphinx-ext-1.0.3.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
-EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
-EBUILD readthedocs-sphinx-ext-2.0.0.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+DIST readthedocs-sphinx-ext-2.1.0.tar.gz 9961 BLAKE2B a172fb2b7bff930f4ef728c5509e0a303bd46fd07e5da496721896751dcd0fa4fa4ba3b4d3251931598cb6172e186a3f340100f13d88c840bcb6912e5a134185 SHA512 81e60f3b6216e1c0fef12493e668cff561937bc5da965b0dfd06dca2f034f95291dfa977f94f726ec7f0bf048fa57d9fd7887219ec172b14ff2558be5e09a130
+DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
+EBUILD readthedocs-sphinx-ext-2.1.0.ebuild 737 BLAKE2B c454efbb516d2b45c56fd90406e549cdf1f8ba04648c3e44d5ab4f32bd9f7cc2c26ba4bee5124ffdd5e7dd17e41a8e1ea0aa05936a147a58e3be72635e03f52b SHA512 4c7c892fcbe2c99ffe18409237b0f399779806e8facbf583f487d10f1721f6ece30e01d6746702f88d8c3aba268ba9d90d4cfc6b5ce7c0c6cde03a589a12d862
+EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 743 BLAKE2B 6e7da88b3fa326bdc62496fb5473bfb04ac5d37dda1ae10daa02f7c97dd6c7222d88ab98af491369e13b3730cb04ec6e6a140ad56983a8783516622320ae92a2 SHA512 39b9a25537ad2287cbe521864cd2b38ec322bd7aa295d1ec5ae4d56a8d075e1aca47a9838f9f8658d52a58241ee9d45dea40dc17391d6f0d8e63808604970a5e
+MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
diff --git a/dev-python/readthedocs-sphinx-ext/metadata.xml b/dev-python/readthedocs-sphinx-ext/metadata.xml
index e24dd86faa2a..ec3c387df89f 100644
--- a/dev-python/readthedocs-sphinx-ext/metadata.xml
+++ b/dev-python/readthedocs-sphinx-ext/metadata.xml
@@ -5,4 +5,5 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.3.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.3.ebuild
deleted file mode 100644
index e8bb844066b9..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
deleted file mode 100644
index e8bb844066b9..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild
deleted file mode 100644
index e8bb844066b9..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
new file mode 100644
index 000000000000..1b290f5a107a
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# 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
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
new file mode 100644
index 000000000000..72b472afcbca
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} 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
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 9a5907f10090..7b316d6d71b5 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,5 +1,3 @@
-DIST rebulk-0.9.0.tar.gz 257342 BLAKE2B a08b2d74685eea35597331bb2ef3c48e8a9cddc39ad3821cb7f33b80a47184a21f813b339e9d64548b3003913178191075455a6f787ab80ffa2cb3bf7f0db35d SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262
 DIST rebulk-2.0.1.tar.gz 258115 BLAKE2B d19210911cf89cb7c371819e384da95c2159eb92abf9f027cbdf1803a18054c556e73364ae10c5bb0b5007cbdb2156b2118d22d6e278b6a02055bacbcbdbc322 SHA512 7d453b7ba952994dec3258aa95a3f6090e6f8afb5a674c1b5e54e036f41022b887d3d65d21f2023ae6e2596cce3baf52d33fc23708498a4f0aef26d3594c8289
-EBUILD rebulk-0.9.0.ebuild 749 BLAKE2B a5c16f951c8bbdf29ea59f5ad5759a6b19d9ac8d021d685a5a9603047d5a58574888afb32bc9dde66be58a3d7ff336cc6a861d804914fd9fefb193bb22ef261e SHA512 332309723fe9a988f14591f39c277050aaf55264826e9269663e2d2b065eb2fc1ef4faf5f0701505a04deccb934add19dccbc7c4c20b9046f0f07473b593c3ff
-EBUILD rebulk-2.0.1.ebuild 751 BLAKE2B 7bde43813a7465eeb62e3a0657dc85ac75ebcee3955896544b02cd7b73a29a75cfe50dca64d1e4f24c04b15f875c06d179dcf59a17bd2f605443b6d1f301f106 SHA512 df3c12228b0ebbb875b0f11d826945e7e7b7db8a6343de3efb3130101ee36e15d84dcb4da1d576be8bde44d276e595ae290a3204ecf0a901bab80175918fe2b2
-MISC metadata.xml 362 BLAKE2B 92728c5fc622b180019e7b663a6a76b79031bd5e3c66d67c3c22123175ac40eed5891719550e26b0737444f8fff3013e1b1407dffbf14bc268022e039039c524 SHA512 792ebcf8764e7810b1670b8281ee6d774aa78a918336320b61ed8ab1cd4e114bec2badf0506a4b53ddb262dab20a77606cfde0ae5807b479df09e00f3f458116
+EBUILD rebulk-2.0.1.ebuild 753 BLAKE2B 54cbf88b574153c4b0f2923a02b3797f9b568a157e7fc2363985cb3664967c72c9ecf41c4828a1f79ba31b1d2e7eae5c537633dd252d46719e8c664212b0b610 SHA512 4afadd7c0ac54156c6c7003829f733a2ba1f8f6ff3ad2b899e6888d7690b1995fdcdb72dcf9b04f607f427dd29310b72348b89ef57ef952d8e1467dbb4f2c614
+MISC metadata.xml 386 BLAKE2B 5b6b41af4bf557a88768e8e34a371a52dd7df94a7b31eb627bffe04965664a7b7ab41d3c9ee646b178a1dc447d2364e1ec223164a84b6a04c8cef910d19ab9dd SHA512 b5f8a25a3dc3e6fa49203f824372b951bb551b792df25b580ee531a61bc1c6dbab6291c1ccd9ab0faf70a2f557814273d580834dd93fa9066493ddf6d11cc2db
diff --git a/dev-python/rebulk/metadata.xml b/dev-python/rebulk/metadata.xml
index a513aaa33dae..42103a2395ff 100644
--- a/dev-python/rebulk/metadata.xml
+++ b/dev-python/rebulk/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Toilal/rebulk</remote-id>
 		<remote-id type="pypi">rebulk</remote-id>
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
deleted file mode 100644
index d0df2d1455ca..000000000000
--- a/dev-python/rebulk/rebulk-0.9.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-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
-}
diff --git a/dev-python/rebulk/rebulk-2.0.1.ebuild b/dev-python/rebulk/rebulk-2.0.1.ebuild
index 780383afe8d9..2d0556cbf7f9 100644
--- a/dev-python/rebulk/rebulk-2.0.1.ebuild
+++ b/dev-python/rebulk/rebulk-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index bb9949791e13..de2084ee45f0 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,5 @@
 DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
+DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
 EBUILD redis-py-3.3.11.ebuild 1392 BLAKE2B 0c8044cc01e3ddd2e0241b6c0c11af2e7502841ee35467e85ee0ce9d1f6d3a504f13dec3e398c3f25d824c4b1351455ad076f7f6c470c35cde219d34f29d576f SHA512 5e5e60f524274914a9aa3921f2e6f5d8f9cacef862d37aec617ae6f91c7970c0b6d629b3fdadc47f0a765fd85f87a8c90c89c2730cb4c8d39a468b697b6868e0
-MISC metadata.xml 405 BLAKE2B 33aa17aa79ad24668e5a7383e8677b9c9eed8d966ca92b681c55453c1b51a8a25d89be0bf807117240cece38025bfceca429473bd8453e9b061646f48a05d950 SHA512 e85ae27399cf1b555a084f4b9a156bba4d4e065fbe45fe9366497438ec2510647de1939d8ebc6dd0207302a34760503fedd89c2f977ed41a103a388174fd2281
+EBUILD redis-py-3.5.3.ebuild 1729 BLAKE2B db3ed4946abbcc7759cf464a0973d7813a8fb1e5bcdfcbdadb290bc4155038fcefd6ceb2a2d643a5327be93c3dc835f4eab9936880158fcb22c98c68e9a4da82 SHA512 78a4901fb4e2e12d96617f3931637d8eb5765fc7e4729c8484cca59368f702103f7937444c31498af5e5640907e9d772427e0fea85d40dadd9888b2d3384499c
+MISC metadata.xml 511 BLAKE2B 6b9a364015a9b526496a892cb8d65ff20a347b7781813312272845504c36db9ee2a351169c306d0130dcb6cc71365d68ba1fc327140f5dda290c5e7281f0d6ed SHA512 9fba3ab00a43d2b876b6cbce7be1946a4fadfe22bcd360af49b738632583385f9607bf28fd828eff543f7b8877b6c86e8492367536dd44239800f3ddcd4d0bff
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index 6ead82e64b28..0d56d7eae1f1 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/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>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
new file mode 100644
index 000000000000..bd958cbad2e7
--- /dev/null
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} 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 )"
+
+DEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${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:' \
+		-e 's:from .test_pubsub:from test_pubsub:' \
+		-i tests-hidden/test_*.py \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+				pidfile ${redis_pid}
+				port ${redis_port}
+				bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 804af80fd54c..25e03bfa90ab 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,6 +1,4 @@
 AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
-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-2020.2.20.ebuild 885 BLAKE2B f0de99b16a108fa8f8482715b6bf5f5d8c7c9f4bff71e99639a3d237ff82ef8b7780ff09809cfc242330b634ce49da7923acde092a14e989f4d806f5a5353c85 SHA512 e7cd546f566465ed6604fe4f72533448e7291bacec1f068ea40e81c8578a2deb93d0c50437357d2c303dc15ae503a675377f1a06aaf58c4587b0d7cba916e8f5
-EBUILD regex-2020.4.4.ebuild 893 BLAKE2B 5875deed47eda7c90cf15b19012caaf9483bee3f9b42f7c33008663fb09f6effcc6aac5a2391b5cedc9feedd66b910ed1509583dbca83ee997c4323823e4749f SHA512 f8c28aea15eacae904ac7bd136ed554352069108c68e4c094fc7a167ed0d486475e208ab53d9a5853fba8b9f4ea50cf8ad41146bf34c7d54314c4d23e440fffc
+EBUILD regex-2020.4.4.ebuild 884 BLAKE2B 887c9215e1a9f7574b1ab65d4d798c3fcda668f0a897e8043fb0be005bf9398de5690aa78fe1d035d611fd37d56e5a9f9413e977afea6f79e18705af0a074cff SHA512 677ddb3380776e6839382d46e4573a1548adc61dcab70e6bbf716651a8ea97de82d4ad89f449bd2630482cd6afa39fa9f9d33db14beedda4b9d4d614ca71bada
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.2.20.ebuild b/dev-python/regex/regex-2020.2.20.ebuild
deleted file mode 100644
index f0eb090195cd..000000000000
--- a/dev-python/regex/regex-2020.2.20.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 )
-
-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
index bd9de2dce63a..af9059b06afd 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.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"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index bf32e75886ef..7549e91c64e2 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,5 +1,3 @@
-DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
-EBUILD rencode-1.0.5-r1.ebuild 507 BLAKE2B e77e29feba0823350f3abd5f0c65301f3d52eb35e80574b9c992f8da8ddc0cf8ab2f4448d7d0342171a8ed01720caf70877886df67993148725960699ce3e5a2 SHA512 3b4cf0843befc39fb1a634f1ecc82bba4afb413714ff90c50e9c57decf70e9e4d1289e582c29776bdbce1cca84d26afd418c8c23ffc855112e2fb6e86d835c81
-EBUILD rencode-1.0.6.ebuild 545 BLAKE2B dfb3e0cd92f76f8e5cc277049a75701ac6570061a5c5cadb2d08099e2cf40f509f4acaa3e743549f80ceb32ff92ca28a82a39ad3f9b62159bf7e0af0570d7e67 SHA512 aab61ecfbae26968f911e382d4d7294dc96933e645efbe75f830a954499850a761ed2c8137df38017ad35bffcc95338e64991afda4e00632bb5d79cae3f63ad7
+EBUILD rencode-1.0.6.ebuild 543 BLAKE2B 261066eb51a5e054437aeda364ebc59807af0c6ce72987d1f0d5f3cf8ade17755ec85e900741a20db2b0006b1e401b7792406cecaf9a7b51ff695751b54a446d SHA512 515d3dd6df27a4e12476ae07b04cee05199b450c6b59ba7e4602aad79004329676057250e66358bbdfdf97f55c1671ca2c2130b0a6cf1943f2f1f5c4a051652a
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5-r1.ebuild b/dev-python/rencode/rencode-1.0.5-r1.ebuild
deleted file mode 100644
index a18a687d4905..000000000000
--- a/dev-python/rencode/rencode-1.0.5-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="similar to bencode from the BitTorrent project"
-HOMEPAGE="https://github.com/aresch/rencode"
-SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/rencode/rencode-1.0.6.ebuild b/dev-python/rencode/rencode-1.0.6.ebuild
index b1eeadb23af7..31f20413b8ba 100644
--- a/dev-python/rencode/rencode-1.0.6.ebuild
+++ b/dev-python/rencode/rencode-1.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 17eaeae5383c..ee6dda7ae567 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,3 @@
 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.3.ebuild 660 BLAKE2B f8ef3731cb902f8c15dc554d97f77ae0fd5b7caec41f04a15ac900b2c58935564a078602d9d659d03fad651608a570ff2491bb173ca356c480271eb15198a986 SHA512 00c361e8a9e5277db4f75430f187ef4f502f9bd9b66d8276bf108ea24164fe42ddac705730a82d4dd69f33f042dc172590505a4ed05aaf2c3b42ef439a22cb75
-EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
+EBUILD reno-2.11.3.ebuild 652 BLAKE2B 6e60f1d5b65887b505086ed5368d25f196b7bdbbaee0c958269bb713036856dcbfe08a624228ac40995b3b39fd722d224e020ebb4d74d45645067b2a572cf5af SHA512 98fcc650b583f2fd36c09bb8f8bec6c01be9f8984ebd1ece7f51cc2f89d98fe1e31772751f216ff3d722f228f4f6b8db401957f84a0d836d66519b01745296af
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
index 627cf75489e2..9ed1b48a725b 100644
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ b/dev-python/reno/reno-2.11.3.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://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
deleted file mode 100644
index a23ec8d58ca8..000000000000
--- a/dev-python/reno/reno-2.7.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=( 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 d556cdf025e2..8636a084ee46 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,4 +1,7 @@
+AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
-EBUILD reportlab-3.5.42.ebuild 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
+DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
+EBUILD reportlab-3.5.42.ebuild 1347 BLAKE2B 4da7e80b0fcfd338baab66c92ae0d769980174c2bc40bb85f226f30b1cb3dbbf2a8cfdc02f0c7a004732f1957f25ebb0534f1e6ea899c9de81cce72e25ae723e SHA512 f6da0177fc589bc60f8b21b312ed08913fd30f0811f0510a621c46d3f91c125ef8627bce5ddaec9ee2d41042ae4329159fa37fe8461a8617d79fb95bd4c399da
+EBUILD reportlab-3.5.48.ebuild 1437 BLAKE2B 4dda551899e2d199aa8d6e444e237d305d1bddfb52bbc3deed7ff6a6cd43d2973770f9886023cb1fc2203f6348a621bf0acbaacde882dd350592e397528df41e SHA512 1b3637077286cfc8635ca4bd0c7da8ea9b1acba63c80b2dd40343085d1f985135cb0e1ebc97c75ab0363e74b71a082fb0be69c25423e70910edbc2e11e2513c5
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch b/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch
new file mode 100644
index 000000000000..09ae9675eb58
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch
@@ -0,0 +1,34 @@
+--- a/setup.py
++++ b/setup.py
+@@ -163,22 +163,6 @@
+         if self.L is None:
+             L = []
+             I = []
+-            if platform == "cygwin":
+-                aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config"))
+-            elif platform == "darwin":
+-                # attempt to make sure we pick freetype2 over other versions
+-                aDir(I, "/sw/include/freetype2")
+-                aDir(I, "/sw/lib/freetype2/include")
+-                # fink installation directories
+-                aDir(L, "/sw/lib")
+-                aDir(I, "/sw/include")
+-                # darwin ports installation directories
+-                aDir(L, "/opt/local/lib")
+-                aDir(I, "/opt/local/include")
+-            aDir(I, "/usr/local/include")
+-            aDir(L, "/usr/local/lib")
+-            aDir(I, "/usr/include")
+-            aDir(L, "/usr/lib")
+             aDir(I, "/usr/include/freetype2")
+             prefix = sysconfig.get_config_var("prefix")
+             if prefix:
+@@ -574,7 +558,7 @@
+                                         SOURCES,
+                                         include_dirs=[RENDERPM,LIBART_INC,GT1_DIR]+FT_INC_DIR,
+                                         define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+debug_macros+[('LIBART_VERSION',LIBART_VERSION)],
+-                                        library_dirs=[]+FT_LIB_DIR,
++                                        library_dirs=[],
+ 
+                                         # libraries to link against
+                                         libraries=FT_LIB+LIBART_LIB,
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
index 9b97a79d088c..14abd20e320c 100644
--- a/dev-python/reportlab/reportlab-3.5.42.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.42.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa 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/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
new file mode 100644
index 000000000000..292bdd0ebb40
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.48.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl:=
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 774ab819cc7f..cce7de336456 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,3 +1,3 @@
 DIST repoze-lru-0.7-r1.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
-EBUILD repoze-lru-0.7-r1.ebuild 719 BLAKE2B 4fa1208118bbbcfd6389a161318376b6132cf52d3ddd2d3c5d4dbf4a4e2b7fa06f5e90a5aa8d22647abcf7ab2d36bdd3f76ef60c1e36dfd6f60d223c97554691 SHA512 70c20a3c1b6624e34c7cf1c6f4a88bce5456792b15c679157515b5101491f2a4ad3e9302c5c2ad1d1f8d7f91aa235bd8d08e98f4247c053d8a78381fdea742dd
+EBUILD repoze-lru-0.7-r1.ebuild 717 BLAKE2B 28a0d4452bfd3611964806983f14ff8e2fe70ea1bc3265d20a9b72414977471c07624377618ad32d1c6ecd90c4b42b4870f7dce08967a10f2bc642bb58236ee8 SHA512 ef4786ef46de445fc59f5e59494bf9ed2ff473e8a6ca73069820533649261ac5fda1542b566476edcf167bba09c80230870da2c65ead4c408e622f1738d12894
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 46120582cb05..8427a6dce803 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index e9339d7317b0..ab2e2de8fc7f 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,5 +1,3 @@
-DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 BLAKE2B 8c7ca3faed9ede599c4d1a7c36cfb6fc2666d2a88ba75d6d903bbad2306bd6d5f2ff9c39a149a2a9e9171a4bba23a7211a3e8d4c9620f6777928e032e030881b SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4
 DIST repoze.sphinx.autointerface-0.8.tar.gz 8987 BLAKE2B aeeaf23f18394eae8ff817e7f4838a332d34e3c7717a67bf123c02a6bd7b6122d727a0120922b0471d6d6d7a1b2312058373a2498150b36446edc049a178773d SHA512 40aa3401a5f542329dbce6b8b27fad0b94d3077ac9a0e01cf2f1f43da5bcb9202eb76eaaa8b1b81edf51a391ebe32eefde59afab1673d86b412995185a4866f3
-EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 968 BLAKE2B 0705850f0e8c10401747fc291bbf96a94a5676d2e57cbb49da90d6378894086a9da4d9e8d3da4dbe3cfdc25f4d522a131ae4c72788e731e55653aa6b7536b19c SHA512 0013e81b94fb866a61bccf8b97b5985aad625ec028a1db7f0c0d65cb2d8f34c34843d3f1447e176555bfca87f96116212a8c6eee0cec34ef3ebbbaa85ddee7b7
 EBUILD repoze-sphinx-autointerface-0.8.ebuild 933 BLAKE2B b0bd9cccbcfd210e1c94b79a94db71679eb9a5165eaf91b950a5512ba3ae77d3cf3e0384d893074cc0b147b616ec340b1c8bc85618351430d05931557686868d SHA512 2d87d7204389fecff6d411678863863a15f6ef504ddec0335a28af7ad6b474de646988b5b5079da84bb58397d94d36003fb77d56f16c7485740592f71fe1726c
 MISC metadata.xml 335 BLAKE2B 6935bfb58617ad78e5f0aaf3febaf7a629c0470cc667685662f3434a34c40568f63f89cb49e6802753475a665ab13caa56e6d726fa5a34f070ed409bb403841c SHA512 689a11f848984c58defc523d400a834c228adab649c1f0d197752696bb73a5962053c55b3938bbdaca94da6a063d7dfa853898c0d51222d5cddd3911809bc3cf
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
deleted file mode 100644
index 2994cc995d42..000000000000
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-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=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
-HOMEPAGE="https://pypi.org/project/repoze.sphinx.autointerface/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-repoze[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install the namespace (it's the only subpackage)
-	python_moduleinto repoze.sphinx
-	python_domodule repoze/sphinx/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index c1c9c5d3209a..9c026f5ee981 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,4 +1,6 @@
 DIST requests-cache-0.4.12.zip 44767 BLAKE2B f328d8ae8e3377af626030a6e3617c78e488024fa4ada9894576d339e571ba8ee6d905612ddc2802810bbeffbd8c94d90c743889e80fbf21418a7c67c5a005f6 SHA512 784d630eec99b607596d6ebcb7e51b0b4ed612b131437000391ecea6f3a684d1f61d169d57266ffc044a3939dcd4e7d6f85b9538165ae3613b1d3e55f18585fd
+DIST requests-cache-0.5.2.tar.gz 31159 BLAKE2B 4fca146a751064baf70954a71df64dbb7f8c9a4e27fec5dbea3620496ce78e7ccfb3785fb63705f513ff6fa938376b0c6acc4a2f584856060b1bc8388517df46 SHA512 355cc571a46b768615606a907a69ed065b3c4b5e74bb6c311abc7a28d9406f32fdea1db0dfd2b1c32dcdc82ed817ef7e0b30086c069de57307254617604c5177
 EBUILD requests-cache-0.4.12-r1.ebuild 660 BLAKE2B 14efb1699ae8bb1ea2680c3798c4f50143885325ec74d9b15f8cbbf63150e74aa4b0972095e12799c73dda31482da6c25c70467ec40da5c62cd69d2173307838 SHA512 3add4369d3b8716f9aa89985d69c973fe99dc1d28b02c12a9b4768f493edfb5a5b9e843e9a7ca9360b94ac9d01c5e8eb7e6f033d1023083ab5b8606ab59406ed
 EBUILD requests-cache-0.4.12.ebuild 837 BLAKE2B 6784908d623e3d0cb4839ffc6d50b53e0dad3b37e1e9469773dbd6a3a793ed0c677965a8ca2a04c8e160df8a4e0ac9b4f19319184060c9b4cd99f399b69d01f9 SHA512 a89a3b2a4475a910167fb67284e08a7b1e30e90e3358ac340f3fced156021c9e74e31265398cb76d21c0f40d0c85a49fe981d84deebbe34fc44883ca04fd78f1
+EBUILD requests-cache-0.5.2.ebuild 2836 BLAKE2B 3c83e773ed1470a22c792d395ee460bf06ff38f6f1a63cd3812b35e6debb1201749e32c1dad0c12bff1a7f5a6d9a8df0b57d143a5885fe5457067eb5ae09f3c2 SHA512 479c04691d3a9d2343b752e6f55b8890f7a463dd74e78016500f76e4c6fb0d94da06fb6148207531e43c8cd4af267e5859598ce9d997e6c20e2cfcea4b7cfb91
 MISC metadata.xml 444 BLAKE2B 6008ac86bdb3740724aff487116d542902602f70670735ac2219b72db042b1974ffa6b4eab0254e59d16fa0438e022d8b9f675899b0ac181d88d4f82dd78d04e SHA512 0cc1b4cee3f1aecef89eb15ffd1e03a0ff4887f9b87a10ea90b6d11e3f5144b8d8d67dcad8c1dd26df3cea9e07140ed1ec76c4b1587d0db1b0f9c60b6daad41f
diff --git a/dev-python/requests-cache/requests-cache-0.5.2.ebuild b/dev-python/requests-cache/requests-cache-0.5.2.ebuild
new file mode 100644
index 000000000000..b6d60d1a513b
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.5.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,9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="https://pypi.org/project/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Ships with incorrect mock import
+	sed -e 's/import mock/import unittest.mock as mock/' -i tests/test_cache.py || die
+	default
+}
+
+python_test() {
+	local skipped_tests=(
+		# Slew of tests that violate network-sandbox
+		tests/test_cache.py::CacheTestCase::test_attr_from_cache_in_hook
+		tests/test_cache.py::CacheTestCase::test_cache_unpickle_errors
+		tests/test_cache.py::CacheTestCase::test_close_response
+		tests/test_cache.py::CacheTestCase::test_content_and_cookies
+		tests/test_cache.py::CacheTestCase::test_delete_urls
+		tests/test_cache.py::CacheTestCase::test_disabled
+		tests/test_cache.py::CacheTestCase::test_enabled
+		tests/test_cache.py::CacheTestCase::test_expire_cache
+		tests/test_cache.py::CacheTestCase::test_from_cache_attribute
+		tests/test_cache.py::CacheTestCase::test_get_parameters_normalization
+		tests/test_cache.py::CacheTestCase::test_get_params_as_argument
+		tests/test_cache.py::CacheTestCase::test_gzip_response
+		tests/test_cache.py::CacheTestCase::test_headers_in_get_query
+		tests/test_cache.py::CacheTestCase::test_hooks
+		tests/test_cache.py::CacheTestCase::test_https_support
+		tests/test_cache.py::CacheTestCase::test_ignore_parameters_get
+		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post
+		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post_json
+		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post_raw
+		tests/test_cache.py::CacheTestCase::test_post
+		tests/test_cache.py::CacheTestCase::test_post_data
+		tests/test_cache.py::CacheTestCase::test_post_parameters_normalization
+		tests/test_cache.py::CacheTestCase::test_post_params
+		tests/test_cache.py::CacheTestCase::test_remove_expired_entries
+		tests/test_cache.py::CacheTestCase::test_response_history
+		tests/test_cache.py::CacheTestCase::test_response_history_simple
+		tests/test_cache.py::CacheTestCase::test_return_old_data_on_error
+		tests/test_cache.py::CacheTestCase::test_stream_requests_support
+		tests/test_monkey_patch.py::MonkeyPatchTestCase::test_requests_from_cache
+
+		# This throws many errors with network-sandbox, but doesn't fail the
+		# build
+		tests/test_thread_safety::test_thread_safety
+	)
+
+	# Redis tests need a redis server running
+	pytest -vv --ignore tests/test_redisdict.py ${skipped_tests[@]/#/--deselect } || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index e6714988a60c..b2a2d3b2f1f8 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,5 +1,3 @@
-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.0.2.ebuild b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
deleted file mode 100644
index 9d23c06de361..000000000000
--- a/dev-python/requests-credssp/requests-credssp-1.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 )
-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-mock/Manifest b/dev-python/requests-mock/Manifest
index b430d1bce2c6..585eab54a174 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,3 @@
-DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
 DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
-EBUILD requests-mock-1.7.0.ebuild 1238 BLAKE2B 7947c44ed2addbb388d0f7b7d9fafbe8d99a451b8b9fa84557d9250d9f465e80de6e1c94ab47a01223d19cbf85a16a56810c63e13fe1c8d5d8b5accbc0ba788b SHA512 d8e4d920e4113e5a2ffbe1acfcf49bc040c3b8a57584d0aa1c26d7a69f5f4f55dfddc9ecf53ea484c9a52af96828cce82ccdea0f8719593022809f135c422b36
-EBUILD requests-mock-1.8.0.ebuild 1283 BLAKE2B cbb24a681301ed2719c89e3140faca77b58d14e97d06e3a45d58fd85892790dbdf05bc4aac921224ae68636b60b77b1fba31fa4f5c3e292d6388b47855b60a38 SHA512 4630dd8b77092879ade5729f6e7763f9d3e24b90b1ad981229c69fd4c0e1d78f35b3d0bd23ef42b2144da1e172180026150ea5276c0f413a6a60f36e82f47908
-MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
+EBUILD requests-mock-1.8.0.ebuild 1316 BLAKE2B b9fc8f2c13d182df93c77cdce54ddcca0b5082b3949cc012ee2814f620f6d83491d5c9431288600eca1522c3148a401c4328ce661b43952ec142e23649b0fbbb SHA512 4fb751219d06b466c91b92b167e394f3532fc0b8d107772f53aaf558c6664bbdb60e024b89ac8b6aeb196bec9b6690b343f0ce974a1fad672972abede3f8fb68
+MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index 8041b506dd0e..ef5f17b47770 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">requests-mock</remote-id>
 		<remote-id type="github">jamielennox/requests-mock</remote-id>
diff --git a/dev-python/requests-mock/requests-mock-1.7.0.ebuild b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
deleted file mode 100644
index 2a7ab3015eea..000000000000
--- a/dev-python/requests-mock/requests-mock-1.7.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 python3_{6,7,8} )
-
-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 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" 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
-	# Disable a test which requires purl (not in the tree)
-	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index 09cefc3c1402..d841c66f5efd 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -13,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"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index abc10ad98388..9f159082942d 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 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.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1139 BLAKE2B 2afc0d788d60ada5755d86e5576ecb8ce9c679f37e15a09b083cd1f8041d15b7615db9b667a65bd3e5641457a026bba93ae99f9cf8715240322cef8c24f4609d SHA512 66fa30fe16690d147f39a7bc39ff5511b1655369e29eb096f4e88235a07d2f239e56d1a78256c48c2ab116979daed818ba21fa7edb1eb03b552c909fd862a073
+EBUILD requests-toolbelt-0.9.1.ebuild 1130 BLAKE2B dd8d47b87931b1606181f2f79115f07f72721e4d3b9027bcfbe754b4c3db5fac4810e5508d02d3f2fe3b4d8229b903eab165e10533a79ac274ebd8ae144f71af SHA512 3eb41cce66f59c81b069110a26b58b07d92274dc7ede46f2c5740dceb337c0d9b7bc5c08c4387d25524969bcf6f9828a1cfac005b1096a7757dab966a46dfa8c
 MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
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 811fe75444f0..7a5a93fd5717 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.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,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index f93b26c0ffb6..0b00e3deaf03 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
-EBUILD requests-unixsocket-0.2.0.ebuild 723 BLAKE2B 4e4fa04ea8d940a644a31b4edd0711a51a11744748022322b7ab101fde768c632e22591ff6f5c7a1f6933b17214264bc568e81322760a821b8c06c3c952ea081 SHA512 356781a05e22111be9bab14dfa59d21de7858bc3e49ada4ea9c821f061e816666bfb750012b7e7580d275c378e79a2f042d4ca20596e412480541b6f65007499
+EBUILD requests-unixsocket-0.2.0.ebuild 718 BLAKE2B a334af3bd1591500f017080336a5ef34a3ca15259ca99903616afe8b6faa2ea47ccd706b12d6ee257d2587660e9e4453fa22875ea167b11de99b8282605fbb8a SHA512 4359eb328c440cafa1387d2e05ac50e13e6574f65b8e855cc7d547377482bb3fe410e6a5541bb8781ec0a613612b19573517b3f68217740c6eb849e1d697d348
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
index 473151bcab89..e00a47da530d 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.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 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 7771bc3d0ecf..eb06269cd2a1 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,7 +1,5 @@
-DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
-EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B 99f0a4cfe05110aae07cc2f37614331a31a0434d2210329c01bc3625e692c2b87e2ebaabfb1f614ebfa5bf1a561c2a0de84699d4c05baa877e59b03bcb9d80e7 SHA512 c086ec4cbc080d4e650dff189482d84cffbf3ad3a0cc7bcaa2cf95c09a8b78f70839dd414ce35fa7b5b35cc22e69927844cc07ca9d58384944f49c1ad950039f
-EBUILD requests-2.23.0.ebuild 1732 BLAKE2B 01f605e552fe11e164a98fca79f0f3c57bb33bce116f1ce3459b2834521c63519bf35c517e074116e8ea3c308ee85861fd2c7eb8263ec0f884223bb3f66b4563 SHA512 abba3e4e19049ec50def900418a0acbcbf0604e5f125a3d96e1a80696bd98570df6a88a384b6992b987e9bf3456ed08720acae0e2aedc052962f090f4b516c29
-EBUILD requests-2.24.0.ebuild 1495 BLAKE2B ca34e3efee6d0ff88b612a16ae0646c43d7e7f3fac352527c8434a90437308d56d172a4173157c3c04875c91d5a054fdac964141e100d40c634d051065b21993 SHA512 3fb9ca3018b4e812b52d3c579d76560d17fa9982b1d67702eb8a324d87d0e5215cbd93c9338af43970c76e92d91d9e63f0af2875216b31fc570dee0c74e0cbfc
-MISC metadata.xml 744 BLAKE2B 19542f217a9eef39ef564113f3ca4e4c6d443f15cbddbeaf3f6f388a883bc5c4c580f3f3a9d61c72e2f3176cad8550045b3c22a845c8ffe0a5489fbcd579e9a2 SHA512 4f2d9ed98b518691b0153f35b7e46cb065e2b89a738a337c5204b3da484df4a148cd8f770dfa631ee002db9468512f165ca9c5e0bd505a367adbb59d4a6b3ec9
+EBUILD requests-2.23.0.ebuild 1734 BLAKE2B 283bb4889f5d8609ca75afd8c1cab7eaef7733308b6dc804b2bb94fc6df7e8706496727b181f3663bf1a6b1448669788576c3c48d52aa86292a6d77309d61bfd SHA512 790beb81a88ac5b44d720fd04160db94d1bf7eded7287e69e38d013500650de6c920794d7bfebdd14e972e87fe79b9d1930ad19ab3e67461cea51076818fa3ce
+EBUILD requests-2.24.0.ebuild 1503 BLAKE2B bc4214375ea420b17caab74480625ea35a9b8dad44f3ce1646771d73848b3635c9d69396545302055441e3de2c1986512ae945213f43e6afc3986ebb41755600 SHA512 4d39cbed421dcf4277af1fcea9ae22054019f41cd81e5d4e63ce7766066224f4af2a1b436821e35f98e75eaf097607eb77230bcea3f669c4afc1c27da4e6fc85
+MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index 6d040d3d3b6c..505a6af962f5 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -11,6 +11,7 @@
     capabilities you should need, but the API is thoroughly broken. This library is
     designed to make HTTP requests easy for developers.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">requests</remote-id>
     <remote-id type="cpe">cpe:/a:python-requests:requests</remote-id>
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
deleted file mode 100644
index d6647c3d37bd..000000000000
--- a/dev-python/requests/requests-2.21.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=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-2.9[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.25[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-#DEPEND+="
-#	test? (
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-#		dev-python/pytest-mock[${PYTHON_USEDEP}]
-#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-#		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-#	)
-#"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/requests/requests-2.23.0.ebuild b/dev-python/requests/requests-2.23.0.ebuild
index 06a4849162d5..28ef5b6c04fe 100644
--- a/dev-python/requests/requests-2.23.0.ebuild
+++ b/dev-python/requests/requests-2.23.0.ebuild
@@ -9,12 +9,12 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
+HOMEPAGE="https://requests.readthedocs.io/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests/requests-2.24.0.ebuild b/dev-python/requests/requests-2.24.0.ebuild
index 51621d6caab8..abb1b5f16cc4 100644
--- a/dev-python/requests/requests-2.24.0.ebuild
+++ b/dev-python/requests/requests-2.24.0.ebuild
@@ -9,12 +9,12 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
+HOMEPAGE="https://requests.readthedocs.io/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 4d596d6a9171..34b11d097eb4 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,5 +1,3 @@
-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 572 BLAKE2B 6cae730be2fce552b2fbe3fd5e85c5261ba43d9f7bdb1aa5084c5042601fb469fbd8bbbc6710aa932f91420a2fd40fec0c77a79498afddd7051d4835cb18a480 SHA512 d89773f95db0e747b6ec83349680cf10e00fb9e8017cb7aad992ddd7ef3138ef69143a7ce24265b29915e83ac86e2e8f9771b6bcdf848ec556670b4a22842326
 MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
deleted file mode 100644
index 4e6a9dab7e5e..000000000000
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.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="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 140ea2b69ca6..1df4efeaede4 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 560 BLAKE2B b769c1545b27c579213a5524d591e12a55010c549cf328a548407c6ec261b09749b1832b0c1e0adf396a2d252dfb76f8d237e46b2b9cc3a83a6f5a88f819c15f SHA512 f2ea012e6fb207c6f4c6fe4ad1e6cafa6b3cefa1874b8835c9d0dc0d03cb811d1703acacc49eb943ff168eb80817be8e22d36dec11f969291fd4e156febf870c
+EBUILD requestsexceptions-1.4.0.ebuild 565 BLAKE2B 98e4fa751eb2d299c10d3347399d9785559a31d9dc3cd456bd150f27f5b4285f0e844f75aa88afdb30b23ed9282cfe0e1865170cb118fec5c2d46c4b31036cf2 SHA512 7951590bb598fa4dfff3f7f293923df002258395cddfaeb0bc3be20ad83b8ee59f901fb2663491e10bbccbf810d3dde102fd785b565e2b80ccb8dcaa5de27467
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 44dacc0e238c..5c3d976f6a4b 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.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 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index a2b823900c1b..cc116a0a39bd 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,9 +1,7 @@
-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.14.tar.gz 24782 BLAKE2B 2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c SHA512 f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
 DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
-DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
-EBUILD responses-0.10.14.ebuild 891 BLAKE2B 9baf6db2b12499e56f721a5dce659df8b4c1dcc62e99693074a69c3482d9a41a99010471b93aa3197c1a5362fd4b0d6efad8df409cd30a3bd1d16b19de48c039 SHA512 71013aebf6c545f207574a33f2eef76dd74cb146f6530cdf707fd2f99c77d2a2e0d1ae87900630430341f9cd57a3ca2b2f12d881f913d9496748ad753a7acf7e
-EBUILD responses-0.10.15.ebuild 681 BLAKE2B 4320c6c1a575e494734792000f4b6d978d5b24e0555b4b077f291ef42cce0f739b91018c4042d9c50583205ee829875055f447710861e5bffd47c8dad4bb9f3c SHA512 6c55687cc49fb0d5505b3528ad96403b72714ceffc22fbb1cd868460799fa205631542424d5e3a76e908597788a3cc5a664b4f2bba2cb77fa6956615b7cd492f
-EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
-MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
+DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
+DIST responses-0.11.0.tar.gz 26534 BLAKE2B f4558884bec08c21186f4b79dbbce1b87fac27992cc5dae5f4eb50291daa1fb3f69253309eeb25f5ed84419ac06290e3e81e3b3ea85aeed2691aeb975e91734d SHA512 8594c3a85fa43c1464e30620e8f323084cb3d9e528936abaa8a9b81a5f719511c032941e90a4e03170d066bc90b9a12c2ad0a804cb43f9d616b0f9735dcf90f5
+EBUILD responses-0.10.15.ebuild 679 BLAKE2B d645fc1d382f505a1e6edc028ea85e21aabb3f3af20748affa0cb9ee5da00cd814b6becc8dfe064636ace682c88778620aee83f8716e79f215b1725a752c8312 SHA512 20d427ec114cb68fa7f1a711d21d489797ee8f9d9dbfcdb281be0c99c6e7920d54b7a3376cd8b761cfb7af5f3eceb404d9cfe6475d68f7d607e60f40d4e2e031
+EBUILD responses-0.10.16.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
+EBUILD responses-0.11.0.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
+MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/files/responses-0.10.7-fix-cookies.patch b/dev-python/responses/files/responses-0.10.7-fix-cookies.patch
deleted file mode 100644
index a744e652ea7f..000000000000
--- a/dev-python/responses/files/responses-0.10.7-fix-cookies.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/responses.py b/responses.py
-index 9c57301..83fef83 100644
---- a/responses.py
-+++ b/responses.py
-@@ -23,6 +23,10 @@
-     from requests.packages.urllib3.response import HTTPResponse
- except ImportError:
-     from urllib3.response import HTTPResponse
-+try:
-+    from requests.packages.urllib3.connection import HTTPHeaderDict
-+except ImportError:
-+    from urllib3.connection import HTTPHeaderDict
- 
- if six.PY2:
-     from urlparse import urlparse, parse_qsl, urlsplit, urlunsplit
-@@ -309,11 +313,11 @@ def _url_matches(self, url, other, match_querystring=False):
-             return False
- 
-     def get_headers(self):
--        headers = {}
-+        headers = HTTPHeaderDict()  # Duplicate headers are legal
-         if self.content_type is not None:
-             headers["Content-Type"] = self.content_type
-         if self.headers:
--            headers.update(self.headers)
-+            headers.extend(self.headers)
-         return headers
- 
-     def get_response(self, request):
-@@ -372,11 +376,20 @@ def get_response(self, request):
-         status = self.status
-         body = _handle_body(self.body)
- 
-+        # The requests library's cookie handling depends on the response object
-+        # having an original response object with the headers as the `msg`, so
-+        # we give it what it needs.
-+        orig_response = HTTPResponse(
-+            body=body,  # required to avoid "ValueError: Unable to determine whether fp is closed."
-+            msg=headers,
-+            preload_content=False,
-+        )
-         return HTTPResponse(
-             status=status,
-             reason=six.moves.http_client.responses.get(status),
-             body=body,
-             headers=headers,
-+            original_response=orig_response,
-             preload_content=False,
-         )
- 
-@@ -402,13 +415,22 @@ def get_response(self, request):
-             raise body
- 
-         body = _handle_body(body)
--        headers.update(r_headers)
--
-+        headers.extend(r_headers)
-+
-+        # The requests library's cookie handling depends on the response object
-+        # having an original response object with the headers as the `msg`, so
-+        # we give it what it needs.
-+        orig_response = HTTPResponse(
-+            body=body,  # required to avoid "ValueError: Unable to determine whether fp is closed."
-+            msg=headers,
-+            preload_content=False,
-+        )
-         return HTTPResponse(
-             status=status,
-             reason=six.moves.http_client.responses.get(status),
-             body=body,
-             headers=headers,
-+            original_response=orig_response,
-             preload_content=False,
-         )
- 
-@@ -619,11 +641,6 @@ def _on_request(self, adapter, request, **kwargs):
-         if not match.stream:
-             response.content  # NOQA
- 
--        try:
--            response.cookies = _cookies_from_headers(response.headers)
--        except (KeyError, TypeError):
--            pass
--
-         response = resp_callback(response) if resp_callback else response
-         match.call_count += 1
-         self._calls.add(request, response)
-diff --git a/test_responses.py b/test_responses.py
-index c2a4f01..65904de 100644
---- a/test_responses.py
-+++ b/test_responses.py
-@@ -657,8 +657,56 @@ def run():
-         assert resp.status_code == status
-         assert "session_id" in resp.cookies
-         assert resp.cookies["session_id"] == "12345"
--        assert resp.cookies["a"] == "b"
--        assert resp.cookies["c"] == "d"
-+        assert set(resp.cookies.keys()) == set(["session_id"])
-+
-+    run()
-+    assert_reset()
-+
-+
-+def test_response_secure_cookies():
-+    body = b"test callback"
-+    status = 200
-+    headers = {"set-cookie": "session_id=12345; a=b; c=d; secure"}
-+    url = "http://example.com/"
-+
-+    def request_callback(request):
-+        return (status, headers, body)
-+
-+    @responses.activate
-+    def run():
-+        responses.add_callback(responses.GET, url, request_callback)
-+        resp = requests.get(url)
-+        assert resp.text == "test callback"
-+        assert resp.status_code == status
-+        assert "session_id" in resp.cookies
-+        assert resp.cookies["session_id"] == "12345"
-+        assert set(resp.cookies.keys()) == set(["session_id"])
-+
-+    run()
-+    assert_reset()
-+
-+
-+def test_response_cookies_multiple():
-+    body = b"test callback"
-+    status = 200
-+    headers = [
-+        ("set-cookie", "1P_JAR=2019-12-31-23; path=/; domain=.example.com; HttpOnly"),
-+        ("set-cookie", "NID=some=value; path=/; domain=.example.com; secure"),
-+    ]
-+    url = "http://example.com/"
-+
-+    def request_callback(request):
-+        return (status, headers, body)
-+
-+    @responses.activate
-+    def run():
-+        responses.add_callback(responses.GET, url, request_callback)
-+        resp = requests.get(url)
-+        assert resp.text == "test callback"
-+        assert resp.status_code == status
-+        assert set(resp.cookies.keys()) == set(["1P_JAR", "NID"])
-+        assert resp.cookies["1P_JAR"] == "2019-12-31-23"
-+        assert resp.cookies["NID"] == "some=value"
- 
-     run()
-     assert_reset()
diff --git a/dev-python/responses/files/responses-0.10.7-tests.patch b/dev-python/responses/files/responses-0.10.7-tests.patch
deleted file mode 100644
index 764b22ab3af3..000000000000
--- a/dev-python/responses/files/responses-0.10.7-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test_responses.py b/test_responses.py
-index c2a4f01..2b85172 100644
---- a/test_responses.py
-+++ b/test_responses.py
-@@ -928,6 +928,7 @@ def _quote(s):
-     return responses.quote(responses._ensure_str(s))
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="Broken on python2")
- def test_cookies_from_headers():
-     text = "こんにちは/世界"
-     quoted_text = _quote(text)
diff --git a/dev-python/responses/metadata.xml b/dev-python/responses/metadata.xml
index 555ddb8d41be..79b9c53250f4 100644
--- a/dev-python/responses/metadata.xml
+++ b/dev-python/responses/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">responses</remote-id>
 		<remote-id type="github">getsentry/responses</remote-id>
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.14.ebuild
deleted file mode 100644
index 6010ef70932e..000000000000
--- a/dev-python/responses/responses-0.10.14.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..9} pypy3 )
-
-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"
-
-RDEPEND="
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/responses-0.10.7-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9, doesn't look important
-	sed -e 's:test_arbitrary_status_code:_&:' \
-		-i test_responses.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/responses/responses-0.10.15.ebuild b/dev-python/responses/responses-0.10.15.ebuild
index adae6e7ab45c..aab1f45c9db7 100644
--- a/dev-python/responses/responses-0.10.15.ebuild
+++ b/dev-python/responses/responses-0.10.15.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.10.16.ebuild b/dev-python/responses/responses-0.10.16.ebuild
new file mode 100644
index 000000000000..7dc543a4597d
--- /dev/null
+++ b/dev-python/responses/responses-0.10.16.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..9} pypy3 )
+
+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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.10.7.ebuild b/dev-python/responses/responses-0.10.7.ebuild
deleted file mode 100644
index c3ba60ec5686..000000000000
--- a/dev-python/responses/responses-0.10.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,7,8} pypy3 )
-
-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"
-
-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-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/responses-0.10.7-fix-cookies.patch"
-	"${FILESDIR}/responses-0.10.7-tests.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.11.0.ebuild b/dev-python/responses/responses-0.11.0.ebuild
new file mode 100644
index 000000000000..7dc543a4597d
--- /dev/null
+++ b/dev-python/responses/responses-0.11.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..9} pypy3 )
+
+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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 0341777579db..a92f6709187f 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,7 +1,3 @@
-DIST restructuredtext_lint-0.12.2.tar.gz 19141 BLAKE2B 69e0cf57540d5ccce8572a8c619506e3b76fd08e88019bb66c7a18a3ca2c2b91e72797c70428156e570143d6352d529088c324b18e2a08b67a8acddda7378352 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870
-DIST restructuredtext_lint-1.1.2.tar.gz 25061 BLAKE2B 5be51fb40ac3eb0ba58c053d5b54d79e0d1c0687786a877cc37d2e617dec788782e3d4aade62828a267c139b7e311405552cb61eefdbaed458c2c1206245a422 SHA512 f44eff61df3581ba345fb953a09d9bf6977003e05078bacbeea27287b0b14a6f16298db0bde5be4ebfd0843eac33de623db1e47ce6475b30dce47cdd3e9ea5d7
 DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
-EBUILD restructuredtext-lint-0.12.2.ebuild 620 BLAKE2B 002dbf00cd66b1c9bf808c2d703f5d9a8ed661c6951ed255bf898760a812698d7c76442fedafe840b20bbfe3a6035c1239186257a4f2114fb8e37cf5a69f7100 SHA512 99921e193fe519121d28fd1cd8c6f13a0b62d585ab95467804a7209f58155209b80a826dcde7f03948d224ad97cd777a64457f7a7c0524dd3b195e049e364184
-EBUILD restructuredtext-lint-1.1.2.ebuild 783 BLAKE2B e989b21092500a41a17c41b9e0f5e389fcfe94fe1946277166c195cfc20e469bd2e93c99418206beb1e3b02bfeab99c747a025af990cef1588bdce0cda5d29c5 SHA512 643762dfe5d82538321e0756690d201023ca35ed94210d4e11b2092caf68b8bffa5a1c07ddde0ef67a3db4cebd531427b4efba217eb50c810aa057f696c8443a
-EBUILD restructuredtext-lint-1.3.0.ebuild 783 BLAKE2B e989b21092500a41a17c41b9e0f5e389fcfe94fe1946277166c195cfc20e469bd2e93c99418206beb1e3b02bfeab99c747a025af990cef1588bdce0cda5d29c5 SHA512 643762dfe5d82538321e0756690d201023ca35ed94210d4e11b2092caf68b8bffa5a1c07ddde0ef67a3db4cebd531427b4efba217eb50c810aa057f696c8443a
-MISC metadata.xml 338 BLAKE2B c30f38fd31f802cfdb9dfd57839acc4269c793aedde4a2c17e937f62da0f04e94ccf2cd309b528f9c5753fdc747951ace9fd27a403d32907751ca1640955a3e9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265
+EBUILD restructuredtext-lint-1.3.0.ebuild 781 BLAKE2B 62a8791cc4b06c2544c447712b2af7d1b21c666a7089272f95da0dbe2b4458d6163983af2c1f86b1ebc1ddbcc86d29ed9819c856ec59ea2a4a44eb661207e090 SHA512 0b0391b92144e1ed6add18c7557c4418a4db504c2df6e62cfb99601a11fb15f0b0a2203176b62705237c6fe2450d5173d08853d25dd7f942d9cb386acc19bc99
+MISC metadata.xml 362 BLAKE2B 85214c8f24b266c39043bae4b132291512732e292127d9c6881e87c79f22f88b894955e75b0fd3ac29ea4aaa304581f75216ebc58f0761c040a2d3339a2ce62e SHA512 a429638f5f54808c69ec4fdd0710ba540279df44ef0de542014994e71222d1f39afad098b189b7cd01ae0ec0ac9a4a33c3425a32a5c6939f23e2008bc14f39cc
diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
index 88898d732029..eec22dc496f4 100644
--- a/dev-python/restructuredtext-lint/metadata.xml
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">restructuredtext_lint</remote-id>
 	</upstream>
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
deleted file mode 100644
index a6b14f3668e5..000000000000
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.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=5
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Checks PyPI validity of reStructuredText"
-HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
-
-MY_P="restructuredtext_lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_P}-${PV}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
deleted file mode 100644
index 7821756a7efc..000000000000
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.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=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Checks PyPI validity of reStructuredText"
-HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
-
-MY_P="restructuredtext_lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_P}-${PV}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	 nosetests -v || die
-}
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
index 7821756a7efc..6e6ed25ed5f2 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 35c88ad1ad1d..3aa84a90f6d0 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,5 +1,3 @@
-DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
-EBUILD retry-decorator-1.0.0-r1.ebuild 535 BLAKE2B fde6bd53e466761ebef3603d9d799f14a2d2ba2f3911d139fb949390941796f94695ca68bd6d10a7725cffd3c18a7ba862affbfaa23bd897e56efcd0424f98ad SHA512 04bd1ba82cb187ba68e878a3b4c2ee7600ba6187fd109942934365f63f4b77a0c0e4af092146dc56b56020a537a7f7e2d09d1cd8eaf31668f34ae262b694d935
-EBUILD retry-decorator-1.1.1.ebuild 464 BLAKE2B a90603d5c53c1d388f7d78a2581120e30e811ac8fd335ca358489cb7f7fe7b3bcb21d789964a26b86c7a9a5661360563ca543d390552ac29d971ea483614ff82 SHA512 34f47a88fa2eedd39b69014db81f581821cd8bf73716daf9b38aafd845932d62aaf894da0c171067568f7644fbb8b03c73841c47cddb3a4fc9f47923820b914c
-MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
+EBUILD retry-decorator-1.1.1.ebuild 461 BLAKE2B 571e0d58e52fc4c70de8767b9563c22448ae8638b26115b136b2f875501956aac8634bf82fa86fbaa95d38f2b5e2e35b130aef2f191d8431b03da08167169767 SHA512 e280501a6d9e67cce959fed5b87a2e1bf227e6760900f00c6e9c715ee55bf71b1f2ede7f8b36dd2dcc0da1e0d6eae9d9cb23acaec11907cdb0a93eadcbf71549
+MISC metadata.xml 362 BLAKE2B ac70448e6e6c1e38df6333a21190fdec09bd0af6706d473fbc15326fadd69a4a20f14f53c3bcfc6e77a9817b89b91e4b086ab2bc58a7739579aa362a79d4c927 SHA512 40746b6e7bb4ba806d047cf38a6fda25f3f0dba12f011d3b6177bc99d0678d04e5db838a2846eff3edbf1e8d5519b9227b4f90a1e3f662dac8bc031becbb020a
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index 17f1f731c3c8..3ebcb7e2d26a 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">pnpnpn/retry-decorator</remote-id>
   </upstream>
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
deleted file mode 100644
index 9ac6d9ac2089..000000000000
--- a/dev-python/retry-decorator/retry-decorator-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=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-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/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
index 2903f122c5fb..d3f2b05d7ed7 100644
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index a6d595702d42..cf052681ed91 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 737 BLAKE2B 3d9339dc54af42737e3944e6ed1d40bd15c44e4d5db2c8ec24e255869b51ba62b4fe9cf48777c789d205e317453d2366045b4f29a0b21b9b22f0f53624b44bb6 SHA512 fb0f55aaccabd16a1e1f141032156d8b80e246ebb71013a2fe91e52003bb0a3c9ec74eb89078e31f419bdf9b36652385548426bcddb82aced4fe32baab08f22b
+EBUILD rfc3339-validator-0.1.2.ebuild 731 BLAKE2B 2734336a498eb036e56664dbd6062bac83ea1fea7a295809e9f70f037ced43b42f06c93ec26cea922732320950dadaadb01dc54a3a88faf511ef94536ef3f641 SHA512 51ecc4a843bb41a961a82838cd4e2f67f929057808644b52de58ea3f1b395b1b4b194256db77c642e5ac0b8f6b8ec035c8f7114563a0b940ed9012e4533f01b7
 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 9032aefde556..bdaa367e8500 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pure python RFC3339 validator"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 4ffd19f2f65b..37628f4b6f40 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 919 BLAKE2B d9d855517c51dfea8b75d6849682ec0d3e52f1463628cc401cc1578fde3250040dc54b7a865d2e6a2f82844e2f21cbeb73824422a20ed65051ee22d6d4c56f6f SHA512 3c05d4fe0584d438f8232e187658e566ad1548044062689e2b84fdd58114c7c7b0bb25e31467e70c5f290146cdd53b56ffa57438d5b92067b595e3a3f7411c7a
+EBUILD rfc3986-validator-0.1.1.ebuild 913 BLAKE2B e5c865e5c1827a4e055cee2ec0e2a9ca8970d1261f33eade628d4bf5a4ee6378a5f1b5cfcd3f8f589812eb2a2ddd3a92e429ee7d013c74bf6f41cf439f69c76c SHA512 834becfe9920ed2783801d1b31d3fca6fe71d1a34e028cbc680d0f4b8a090eeb44eecc7ce99a7bc929925cff37ca75bc8292e4f2576b471e84cf004d015cae62
 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 e8f5dce4a832..c49fb089fec6 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.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..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 2684d3312daf..08196bab5a45 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,7 +1,5 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
-DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
-EBUILD rfc3986-1.2.0.ebuild 705 BLAKE2B ece20ae0f22fbf2613a84c3850ff059729fb5f7303ef889b550d6af4d0ad3fec096d3ccef91080bf9a7e5343e12682bd1043be238d5b93d9adf3b9e5ee5f5fc7 SHA512 73dfda5986bcdc5f1dbb55e5e3b31bd5a9446921929b74b04dc4c7257fc1a0dbb0d9f0966f8e6b93ecbeb54a449b564919d18f5e05e3084c0155089c4eb66024
-EBUILD rfc3986-1.3.2.ebuild 682 BLAKE2B dd3a897b8c8d85ebad11d5a4e60f915c15a7928e80b62ffbc553f9821011d932f47c20cf4f61627bc064523b9dce8e5788d81f7f9501373377e1e43e7b52d200 SHA512 d0082e2014abeba57ef3e8bcc67857189a26ae3ff2244d0169b606a7db2cceea9352f2277cc540312405beaa95a98241cec2178a8cd5af51bc8938a132ca7bea
-EBUILD rfc3986-1.4.0.ebuild 682 BLAKE2B dd3a897b8c8d85ebad11d5a4e60f915c15a7928e80b62ffbc553f9821011d932f47c20cf4f61627bc064523b9dce8e5788d81f7f9501373377e1e43e7b52d200 SHA512 d0082e2014abeba57ef3e8bcc67857189a26ae3ff2244d0169b606a7db2cceea9352f2277cc540312405beaa95a98241cec2178a8cd5af51bc8938a132ca7bea
+EBUILD rfc3986-1.2.0.ebuild 695 BLAKE2B 95fe3ea442f935fece537c2f9f734505da65d160b86760fea67632660831b0d270d65b23987ffcae61df03e7ece9f172ae1a10e0b1279b7db2886332f909696d SHA512 3a2f6f515b046b9a22d83ccc33ff7aa6f5c6dd004931f938d26d902b9d3368cdb7ad7679e58c340cd4a104ed260e81d7669e76267b99e0e355b38bf8d5bf2b0f
+EBUILD rfc3986-1.4.0.ebuild 666 BLAKE2B 64e5a81df7d6ba6fa5fc5c7add12c4427391a078fcafcf5634c6ec4801ec62d177333787a7b5e69324dae4d7cabfeb70b85d7a4c96ccc7d8bed9b30b986332d0 SHA512 0898d752e55ffc867e775e0382889d4cff0a5620b50fc9857dcd352bba91f5ba8ff4d048ea364551b8f66f60a029622b5aab93bda5af0877e873cf1a0c9f2707
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 7473707fed29..48477afdb570 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.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} pypy3)
+PYTHON_COMPAT=( python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
deleted file mode 100644
index a132830441ff..000000000000
--- a/dev-python/rfc3986/rfc3986-1.3.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=( python2_7 python3_{6..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/python-hyper/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 ~sparc ~x86"
-IUSE="idna"
-
-RDEPEND="
-	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
index a132830441ff..0c700a7a936f 100644
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.4.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..9} pypy3)
+PYTHON_COMPAT=( python3_{6..9} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 8b1725e12868..43004722b3f7 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 663 BLAKE2B 26febfa435d075da3d85e7c182579f9d75424db572538e09c6b59da2118bc66f6a54e00fa00368944e26dfec3be4cb57a35a176eb0b2bcd14aa782d085796f79 SHA512 fe637a1c985ec586a65bdf0de7224d628a1f32be71e9a6818937496df0663db0addf769935ec35a6283ecad8d55a947bd803b770a03b13ca8a7d930576d3ac2d
+EBUILD rfc3987-1.3.8-r1.ebuild 657 BLAKE2B 702f1be94f1a22fe549c323a5b0b3362e9aa61e53dd1ea617ec49219b70f9cd224d11cce9c068aa03a88c8634f1ac5218a3d780263f5249a1cebe97b810a6a7f SHA512 c98a1c3bdc00c3f3c5d6125e1dc3154c29e3a7e73d93d15c461999e369c6aa993b8b7039f238325381b73566b7c2551acf60adf0dcd553b0044e40226018613b
 MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 2dc8f162d241..13c0c19af804 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/robotbackgroundlogger/Manifest b/dev-python/robotbackgroundlogger/Manifest
index f411c54eba8f..2a0364c698bd 100644
--- a/dev-python/robotbackgroundlogger/Manifest
+++ b/dev-python/robotbackgroundlogger/Manifest
@@ -1,3 +1,3 @@
 DIST robotbackgroundlogger-1.2.tar.gz 3910 BLAKE2B c79d848f8fb0767b966d5e152755a37c28bcb37af45a90a5583176a243c8a7258562c6be34aaaf6c8063d3c757b104d0a846fa2e5bae4c01ba166e2305eb7414 SHA512 29546cc810b30a4c87ccf2e0a5b1fc186d176d8b50d1fcf18076d97042e7f0123070d9988a795d9befedbe201007dbca30dc8b83d9543f30e5036e9f8795dcee
 EBUILD robotbackgroundlogger-1.2.ebuild 547 BLAKE2B 53994a29ecb994127be638814d75775479a348af4957b8dcf44882dbf4461f9bdf7b344c71e491a6b1b5a0b41d656223999e9fdf60353506fd294a5ffb928f19 SHA512 892e886e3c0dabeb72c1399343ccd8690fd6b3e8b67dd2feb5a81ff261cb26ea3c241cfbb63e8039fca559d160f446d2e96148d66e94377f97ba0ef0a4d550ab
-MISC metadata.xml 378 BLAKE2B b0f4a1531c4a089912736a057f6664e06755b4737e0fb6fac825a3f361bceed3146254fc5649ee909e33dbf934afc4c3c7cb30344cd0a70a0a33615adbb2bee5 SHA512 0a61e4c19a9505c0d2d918448be4de95d4eb7c7bcaec57095cbfaa33e74a3ebfcbce25c7afb2ae253a584f6624f66a41c7764e21473108b2b538633e8c9bc921
+MISC metadata.xml 325 BLAKE2B 90594951bd5592942e9cd003feae1e77a820d8f738f6f4c2f28e86d9ac5351f9b4a5a0976c0aa6c391132d483d0eb4faf07303bb845861db0de5c27e076a52ec SHA512 c63221f053c4eb3e9a168950dce4d39756fa769d57d8932f0bf9dccdf01a8d931630947eea47e99e38128a6a44d34c669d31cef4fd244f9f26f9aa9f8f66a112
diff --git a/dev-python/robotbackgroundlogger/metadata.xml b/dev-python/robotbackgroundlogger/metadata.xml
index dcf74e41c610..d981b8a9830c 100644
--- a/dev-python/robotbackgroundlogger/metadata.xml
+++ b/dev-python/robotbackgroundlogger/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">robotframework/robotbackgroundlogger</remote-id>
 		<remote-id type="pypi">robotbackgroundlogger</remote-id>
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index d25993abf306..76c72c804333 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,5 +1,3 @@
-DIST roman-3.0.tar.gz 5184 BLAKE2B 0951e15a1fbf0feecc98c4318fa631a535d24d9559d21e800f065923c71d094c387b18c5926ad55322ad8417a2db97626ada1e110549938d73243ca410e3ab87 SHA512 468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08
 DIST roman-3.2.tar.gz 7156 BLAKE2B ba7233366ab9bea9f0de4ab02ddbff4a3fbcc35792165d59f291dc837f4a8a7e681f1be89bcbb9746beb88fd7ae57b4ab57934e8d72a73bbdf223840e37cc18e SHA512 142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab
-EBUILD roman-3.0.ebuild 614 BLAKE2B b8aed4b01dffc47c3bb878af8062b865bf9a0cce0a31347abfeaa5ff20593d75f043d9c3b1c98f48707a235b1284315f731dc472c01b512c127e9b804390c28c SHA512 dd5c7f451a18f933df98f1b140e536df2f3814e97eb0db8c7a775d072dfabfebfde4accf3944245964c7666da78903e9291ebe184e0608dcbebd1f727f7e7346
 EBUILD roman-3.2.ebuild 498 BLAKE2B 538b57b6ed51699d2ccec790cf2e89500949a906f461ae3469b53fdf83cfb7b5bffae4779869fbd463b857104d253c7029d5a02f828598ce1794ffb0ac659715 SHA512 588f87efa7e7ccd4083e10b09ccdcdf40011e46853847ed04896f460d1e10c2d26fe2969adb2c3d28d86e22979b28ac9f99c7c91aeb0f2854be4580c11dcefb6
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-3.0.ebuild b/dev-python/roman/roman-3.0.ebuild
deleted file mode 100644
index b55a9c010fcd..000000000000
--- a/dev-python/roman/roman-3.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="An Integer to Roman numerals converter"
-HOMEPAGE="https://pypi.org/project/roman/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-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}]"
-
-python_test() {
-	cp "${S}/src/tests.py" . || die "copying test file failed"
-	esetup.py test
-}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 4d590d097481..b71a1af944e7 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,4 +1,6 @@
 AUX rope-0.16.0-python3.7.patch 9140 BLAKE2B 911b730957faa7828252f3e4c58ff9d3dfee41c1d2ed841f7df95ba9fb890207a57b5e44ad641f75d5a14ed03112c0fb5c6202d7d5c3fb29e679fb5356fac4a9 SHA512 629deb4f13c207afeb570dfde81c28d8cf623d83dd8b9b004627e50b6634834f308ac7bb450c37d4ffa416b4c5f01d20ba6f071a567b82a4a7647204257f7c59
 DIST rope-0.16.0.tar.gz 243304 BLAKE2B 2c41572687ef245eb20abfccebcc9f12ecaa177be313cec59c85be5102b7358566570730a7140f952b0a1c515b479c3d21740d32d4678e65c4c572acf86f4e27 SHA512 33ba57b246337e413126309a521c54e861899b03fd250e148b97d9789cddf6eceab36609ea6e36e84ad1ac514bc3363f4937b01bcb96b6103c2a33bec1d4fb75
+DIST rope-0.17.0.tar.gz 248629 BLAKE2B 7c9276b5f400dfa9661f81d365eac150a124620824d400131d5da7361475e5a2d548c8b53a88e61e7ae6e483a47c8ca4b8ca773235e209e8c6fb47b0088327fd SHA512 c27a17fdf73ed0ae85fe417132acd999452ae88a7b779d84fdf73134094fd34510ae08017dc24ddd7c34cb70353b5a43021229b88819002371790e7717b8ae46
 EBUILD rope-0.16.0.ebuild 975 BLAKE2B 89c9f51d3778b6489640f0d4511392cf86443fd1f2b0213eed77977e60dffa1d586e38ba03b9fdf6f4781385aa18d9015313344718e0bc1f410cdad38d8ece7e SHA512 10cb6f677aa258cf00853fa75564a6166e093579cf7ee6f3054a213428810379760e6ee2fa87adaf25b47fdd9685037aafc1e63a1aa1fb05ab4ff518022e2dea
+EBUILD rope-0.17.0.ebuild 926 BLAKE2B ff270efbeada8f97f33e2c0029960505361f5da37ddacbb5913120e3655737f3dc8eb35e3d2609f7f2ef89686aaa17361993fd071c8cc8024d6c4588bc9a2af7 SHA512 0ef0b660b8cfbe018fc23c1fdf566c4699d47b573eae0910b00bbd69ae8070c8e0ec97912dea46e6fee753ce68b9e0ffacbffc1da950b0977f6bf0669096e3eb
 MISC metadata.xml 426 BLAKE2B a90ca25878154783f5448189564061f85cc6dd9f92855046a0965b864c496d5b0c608c128330b7cfcb395b615666aaaf6298b1f0f729832e4be07aa0d6f14f01 SHA512 aba585c9733078704e38b5474b1e3dc29a5cd1f8e07501d00f025136ccf4c65656c967831ac2901f8f0a90b9c3240e5cb4b6ee3fd34846bde17cbd1932853697
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
new file mode 100644
index 000000000000..c5d96a7c3916
--- /dev/null
+++ b/dev-python/rope/rope-0.17.0.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_{7,8} )
+
+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="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+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/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index c0a0a97bc545..307fdaf76f06 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,7 +1,5 @@
 AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c4c2e3a46395d406d212e6526e89f31ed95412f370ef79cc8934671b0496114776ee325b340dbc SHA512 2777345d1008698092a76c8d6783b372627c0e872895c1d4b0536816fbf12fb8719d3f3c48251ede194646076c4cacfb50ded3d73b360ae2b1c7a7f0b09e5905
-DIST rosdistro-0.8.0.tar.gz 60527 BLAKE2B 9404452dc62c9f7d1482de3c13df0093ac26a60554c97fa097cb14548cdb814fbdc96a26db2d24aa1f2eb99de86f27807ecdc50e0e00a8fa727af8803ab5d644 SHA512 1f4620454f78bd03f75a8b1b8535588a8d6e50aeef17dbf346e8d0443a6fbc5ec83646767bf86521fb65508e205fc3edb8f0c97a81aec8d6b72088d9d78a14f0
-DIST rosdistro-0.8.1.tar.gz 61268 BLAKE2B 16de2f747eab59f0d2eb880cfa5cde8b62f8f6b71773f1c72665c5b58bf9f63f8e593b2dd0924b104488ce5e7e5bdf930a52db677180542806a899970ede5b37 SHA512 3d49aaf460904e2cce635443cb95ca54bdd429549016a614da7038703752187a00b98916e2826193897048753a2b2727eb153296d30abe66c56bd54d68648b08
-EBUILD rosdistro-0.8.0.ebuild 1185 BLAKE2B 194195d066fa2ada7e8b10f1da51c9778f0e783474247a36f404465bd83e7cedf9742f260aca0fdffca5be85d7bb38c76cdb4903068ebac8fab608b81b8d233a SHA512 8ef09a80aac008452994b2405ff7306a4b1afc3494901d01ad18d8ee2324598b2fe5646b204b8b727c18703d693501073f69399def3c87ff020ba6e34e302642
-EBUILD rosdistro-0.8.1.ebuild 1179 BLAKE2B e356b548ca724822ede2f5bbf294cb5870f615683bcaf2276b485dc34af03dbff986158fa8270f569029a646c7d5b68d41a515c0da859a8e2b2dc73d1ff30652 SHA512 f2b4690f9858155c35d667a4536ae6dc039e045fe43f090d401503f94ff94043ecd41e30a0a56d7f9cda2483436a79017308dee5c0a71345abb00961f39b84f9
-EBUILD rosdistro-9999.ebuild 1179 BLAKE2B e356b548ca724822ede2f5bbf294cb5870f615683bcaf2276b485dc34af03dbff986158fa8270f569029a646c7d5b68d41a515c0da859a8e2b2dc73d1ff30652 SHA512 f2b4690f9858155c35d667a4536ae6dc039e045fe43f090d401503f94ff94043ecd41e30a0a56d7f9cda2483436a79017308dee5c0a71345abb00961f39b84f9
+DIST rosdistro-0.8.2.tar.gz 61328 BLAKE2B 2eb9c4ffc7eedaa040c48d3eb914ea08540adc4ff76ef83eb0fcf8d3d83989b499408953d76c7e9e7951488b269eb9bb3cd6b9db15650924e9c814c7aac60a6b SHA512 b96565dc8fbc000ed6b18285b04b435c7e3455b1e0938c7959cdd7f78749e1a0cf02b2eecba47077bec512d4f8b22923012a6496fb06a5d58ae97a859f8bc6c3
+EBUILD rosdistro-0.8.2.ebuild 1184 BLAKE2B d3b94510af03d0073e69b1503b907ab00773007854c3065588a77232edc94a7f16986ce727b733aaa4489c1508e7b5d6e0179c4a584548674d5989910be0cd57 SHA512 d29cc06ef70b2cb4a518c86ad37a61c0da1fef7e70abca829a32403d2c11fe6578d54eca6bde1432dcb690859f8d0eedd5ddb3547afe2ef5edb592aa385a32e5
+EBUILD rosdistro-9999.ebuild 1184 BLAKE2B d3b94510af03d0073e69b1503b907ab00773007854c3065588a77232edc94a7f16986ce727b733aaa4489c1508e7b5d6e0179c4a584548674d5989910be0cd57 SHA512 d29cc06ef70b2cb4a518c86ad37a61c0da1fef7e70abca829a32403d2c11fe6578d54eca6bde1432dcb690859f8d0eedd5ddb3547afe2ef5edb592aa385a32e5
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.8.0.ebuild b/dev-python/rosdistro/rosdistro-0.8.0.ebuild
deleted file mode 100644
index 7455f6d0af0c..000000000000
--- a/dev-python/rosdistro/rosdistro-0.8.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} 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}]
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-src_prepare() {
-	# Requires network access
-	rm -f test/test_manifest_providers.py
-	default
-}
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.8.1.ebuild b/dev-python/rosdistro/rosdistro-0.8.1.ebuild
deleted file mode 100644
index d2cbf7643d5c..000000000000
--- a/dev-python/rosdistro/rosdistro-0.8.1.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} )
-
-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}]
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-src_prepare() {
-	# Requires network access
-	rm -f test/test_manifest_providers.py
-	default
-}
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.8.2.ebuild b/dev-python/rosdistro/rosdistro-0.8.2.ebuild
new file mode 100644
index 000000000000..13f4c2dec919
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.8.2.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=( python{3_6,3_7,3_8} )
+
+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="https://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}]
+	)
+"
+PATCHES=( "${FILESDIR}/yaml.patch" )
+
+src_prepare() {
+	# Requires network access
+	rm -f test/test_manifest_providers.py
+	default
+}
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index d2cbf7643d5c..13f4c2dec919 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
+HOMEPAGE="https://wiki.ros.org/rosdistro"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 50ac5f8c5350..09082b705189 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,8 +1,6 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
-DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db
-DIST rospkg-1.2.6.tar.gz 90944 BLAKE2B 26bd4a9deb3c6876b870ec6ccb11dfdb7820d0cf23fef2fcea8391543c58cf8e916253316df443cc9cc7e364ab790a8915e77986aef3f400785f50604fbd2a45 SHA512 6c88c8789927d72f8f882930aeef776dbec3c4d1343a2d4143d920684c8d2007021397a42008521c87dfc637302b9266615e13623ef5dc5c076e6e8cfd9e957d
-EBUILD rospkg-1.2.0.ebuild 1201 BLAKE2B 84ecaab7754b2edf95e2214339d454357f8320a33d41b67bcb145c767e0dd74ac6a135d8cd855f4bf6578f1657778229128e8fd91f8dbf6d4066616fb444807b SHA512 a75413c1ab7ca7fe7b3dd00dc372480719da705cd561a5c205efd7d217cccd7a312278b08a96cfc8fde70626f11ea9f0f033812c6ac931d16f13e4c1893cb1ef
-EBUILD rospkg-1.2.6.ebuild 1195 BLAKE2B 664bbb5850422bdc243a33bee0d8579d2f28368111dc45f00438d0f0f4e213f9116c8b9e747391013a261c0322881a8bde3be245cf483842d491751467f6d55c SHA512 f42d08a6a69b29f362387f2f35abd7f5e895b07ddcc7a15ba19085808b1d395fa92fa112eb983e34162151f6d45c6fb3e392f9591d36382eb939b865f7580c43
-EBUILD rospkg-9999.ebuild 1195 BLAKE2B 664bbb5850422bdc243a33bee0d8579d2f28368111dc45f00438d0f0f4e213f9116c8b9e747391013a261c0322881a8bde3be245cf483842d491751467f6d55c SHA512 f42d08a6a69b29f362387f2f35abd7f5e895b07ddcc7a15ba19085808b1d395fa92fa112eb983e34162151f6d45c6fb3e392f9591d36382eb939b865f7580c43
+DIST rospkg-1.2.8.tar.gz 91042 BLAKE2B 4c4640d45a06214240a80d2ea15a09799eb892755c7c4410761e2a3505115ee1914a542886385bcd6996ead46e46a3e4d22bf79ffc38a0d2d8f2c7ac295eb0bb SHA512 c4f0c1992597aadf395effd4e6db65c20bf19501a19c569de57a2b9977d9ba794c3c68ba16b2b274ec865caffe6ec98b8fc0e88ad13ea3a9bc744e9ab6adb3a6
+EBUILD rospkg-1.2.8.ebuild 1238 BLAKE2B 505cef50002e9aa98d3f1f42ee55dd926c8f66cfe12303a64ecd03d6448378deae6ae8d97c494d3c83f01d54beab930570c725db461de92cfea55c3d14b7b150 SHA512 2ed24419ed29c01f044e688aa39ce528fbf605d8372bcc7d082022ac2af9579c5dff31f644f7f32b3c16e00b5b16f086312970da815de4c45e17ad454ce1cf77
+EBUILD rospkg-9999.ebuild 1238 BLAKE2B 505cef50002e9aa98d3f1f42ee55dd926c8f66cfe12303a64ecd03d6448378deae6ae8d97c494d3c83f01d54beab930570c725db461de92cfea55c3d14b7b150 SHA512 2ed24419ed29c01f044e688aa39ce528fbf605d8372bcc7d082022ac2af9579c5dff31f644f7f32b3c16e00b5b16f086312970da815de4c45e17ad454ce1cf77
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.2.0.ebuild b/dev-python/rospkg/rospkg-1.2.0.ebuild
deleted file mode 100644
index d3245f8cb2a1..000000000000
--- a/dev-python/rospkg/rospkg-1.2.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=( python{3_6,3_7} 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}]
-	dev-python/catkin_pkg[${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" "${FILESDIR}/yaml_load.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rospkg/rospkg-1.2.6.ebuild b/dev-python/rospkg/rospkg-1.2.6.ebuild
deleted file mode 100644
index 3dd32f0afe6f..000000000000
--- a/dev-python/rospkg/rospkg-1.2.6.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=( python{3_6,3_7} )
-
-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}]
-	dev-python/catkin_pkg[${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" "${FILESDIR}/yaml_load.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rospkg/rospkg-1.2.8.ebuild b/dev-python/rospkg/rospkg-1.2.8.ebuild
new file mode 100644
index 000000000000..9fe2198838eb
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.2.8.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=( python{3_6,3_7,3_8} )
+
+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="https://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}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/distro[${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" "${FILESDIR}/yaml_load.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 3dd32f0afe6f..9fe2198838eb 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
+HOMEPAGE="https://wiki.ros.org/rospkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -31,7 +31,9 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 445cc7f4e1d1..189597b93406 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
-EBUILD routes-2.4.1-r1.ebuild 1433 BLAKE2B ae23df3b34f073727894eb74a76ca27e1ca326b1371e147f62191322f93ae1a26663f6cd5b11e0ef2f14078a7d311a17f45561c2d4a0afb4b637c00da0522102 SHA512 e7db0cc738ceed78e1a4612468dccade02d03dd3b7869464ad91e78c1afc8077f44e8e0c7f7f2c1ed60781dc83ac7c4934f6135ed2fd148fea9330e778b63652
+EBUILD routes-2.4.1-r1.ebuild 1431 BLAKE2B b489d9abc5e70583465a91c8ca0627da22ec544f3f1fd9c8bd9952373d56bf1101400edfa9fdbd6e905050d30eb2a7004ce6021e0ccb9d4c954dfc4ca73855f3 SHA512 ced53f2c05208b231d1b26f0972b0f2d8f7532f2f039e36bec855c38d89a67b1461d93af81724349c3b06a6ab511de6b11c753f47367c3374aacd83d16d96911
 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
index 4af90af70c2f..7f92c712c814 100644
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ b/dev-python/routes/routes-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 4b6a6ad2b6c9..5a62603362d4 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,3 +1,3 @@
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
-EBUILD rpy-2.9.0.ebuild 1171 BLAKE2B 2d98dce71464a932c7b1503f7aef3e298cabe7867b85af8cf84f2a82da8906402e6bee31f43ae1985d315c321a9175e1801ab964732ad2b2fbabe1b86021ba35 SHA512 0d743f8a3488870e404e43375efc7eeb1d158a0223a1e7ae79a37d9c219e8c2acc947fd81fa8582386320f37fa7cc2fbd7525d075ecba03b8e02a14a3ff9c9ae
+EBUILD rpy-2.9.0.ebuild 1075 BLAKE2B 387a97aa43c20e06d1135b3912a192002ddd550bcc9ef994e8ea7d51f68813545832cb1cd99db5184da7c2adc6b9719d1dfd61f3bd3172fc936c558c8c2ea438 SHA512 9da579c69f5e29d713c77c63637b8833e03d9d07d87b98d8e32e6b3b8464583775680a7b35da58c9e52c280cee513545156ce998204bc9459b05da4c5c57fbdd
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index c81957215420..8b3c5e715474 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -38,10 +38,6 @@ PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
 S="${WORKDIR}/${MY_P}"
 
 python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index b7f6609de5fd..dbaf78314a1a 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,6 @@
-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
+AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
+DIST rq-1.4.3.tar.gz 52258 BLAKE2B fd2bb19239ac3011005b34cf041e7736794a27b2097a7ff1808a716d45ad224ad349e316f172308175174f59ff0d3d2bbe0c6778bd66cdad6755da2740898c0d SHA512 177c748148a109efaeddf14b3847e7980882f385ba0e346ccfa72983d584f1c739417383c6eec83370a66f1ceeb5f955de9d5ccf87e4136074aa52e2f9144bd3
+DIST rq-1.5.1.tar.gz 569967 BLAKE2B 9de43fa2d88a58186e8889163f4c1ea92da068c3652c5e32008a39c0e3b27e06f4a1c696a88d1dbf5b05d280bff9c1c56a1995673e9d0ff3fb3a50498729e96b SHA512 2a03b79c7f1b253e2974007616ad3342e0b98ef9f57b0ca9dd41ecb4319074cec3ae4ba5f8958f54a1c2a6342062d74a33ec6d03689f3a89074854483af74b4f
+EBUILD rq-1.4.3.ebuild 590 BLAKE2B da2d1cb2e88e755f6a5feb62a6183e0cb9368d81de90b028c28d8d3bff4650b3b98bd04a0203e555ddc17276a1d27291a04ffcad9590da5867951d49978dbfe0 SHA512 777bf196a20ad2266bbdedc1b37a6176c07e25a6e0defe08fd693b8ab5fa4ab599fb40b81414138bad6b7004bb4dfac5d6dad55954f196bd7d382b4827568a76
+EBUILD rq-1.5.1.ebuild 1705 BLAKE2B b44f5c73f0ac7fd44508e033a53e73969e96ac47d3ed18925fa48b9436455fc58dcd5997f64ec77d2645bed8925ba1557269e8d91aab5e0d819db3876126d34b SHA512 962f1f6d4ef16b9fa0f0a13657e8f7ecf430cfec7c67a16b6004f55a75c209993a74cf4fb061444a647f04b1ac8e97aa4566e5d36739a2cecdc43eaea2b5f3b8
+MISC metadata.xml 537 BLAKE2B cea9e02497c7b7bbb6201bd29fba755b56a3202e7442f3995eb33d7d7467ed8f52f6448fd351963e350bb3c7fd77ed94d3413f84a6cdaac0878d5872964b1076 SHA512 abff6d380c7da5b198297b9804e1ab8b950a051226f8f2c7bbbbc875dfe6a6efdb73f58800b21658406000280d91c401342552319e124b6fdc6c3e72d2c9cb32
diff --git a/dev-python/rq/files/rq-1.5.0-no-install-tests.patch b/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
new file mode 100644
index 000000000000..0c7aa7aacc4c
--- /dev/null
+++ b/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index ac40818..b67b25c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,7 +36,7 @@ setup(
+     description='RQ is a simple, lightweight, library for creating background '
+                 'jobs, and processing them.',
+     long_description=__doc__,
+-    packages=find_packages(exclude=['tests']),
++    packages=find_packages(exclude=['tests*']),
+     include_package_data=True,
+     zip_safe=False,
+     platforms='any',
diff --git a/dev-python/rq/metadata.xml b/dev-python/rq/metadata.xml
index 5d3d9dc0e2ac..87176f9df319 100644
--- a/dev-python/rq/metadata.xml
+++ b/dev-python/rq/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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
@@ -8,4 +12,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rq/rq</remote-id>
+		<remote-id type="pypi">rq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rq/rq-1.3.0.ebuild b/dev-python/rq/rq-1.3.0.ebuild
deleted file mode 100644
index 8fe00a9e7b89..000000000000
--- a/dev-python/rq/rq-1.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=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-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.4.3.ebuild b/dev-python/rq/rq-1.4.3.ebuild
new file mode 100644
index 000000000000..64bbcfda25c7
--- /dev/null
+++ b/dev-python/rq/rq-1.4.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+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.5.1.ebuild b/dev-python/rq/rq-1.5.1.ebuild
new file mode 100644
index 000000000000..d62e57cf1504
--- /dev/null
+++ b/dev-python/rq/rq-1.5.1.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_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-no-install-tests.patch"
+)
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+python_test() {
+	# Tests needing rqworker:
+	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
+	distutils_install_for_testing
+	PATH="${BUILD_DIR}/test/scripts/:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index f35bffe46d21..4eca5b70a9b9 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,9 +1,4 @@
-DIST python-rsa-version-4.1.gh.tar.gz 68748 BLAKE2B f7f80fab701e52db0949dae709a8ac01db773ecf721427536a4cc5a7dedae6285eab12b3377daa15e0ecf23682ba800fc8601149a98277331b1cc19573a94596 SHA512 93d80050d7c249285e8e05e2d9d84940b15f08380c3108da3463c1625fde18884189757e480ff62cc2b65d1521c57f8aee15aec501f3f1b9961ce053b304c25c
+AUX rsa-3.4.2-cve-2020-13757.patch 5806 BLAKE2B 45f87653e3c0cbe29054d0a2d4e4838dcd1e91aeb921b3abc540d1f9dec157a75559ffdd933ef406f053343721b0963e3e647ee1e71cccf28946b2a1a4a0f97d SHA512 075ce7a8c6a4eb3716e51c9fc1ca446f5a922d701158dab5beb745887083c04b9e434f2cd4c8468fb71c814a51e5b7d96161d44dddafc539fcb5dfec4bf2602b
 DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
-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.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
-EBUILD rsa-4.0.ebuild 572 BLAKE2B ec1267e4c5a6eb7afc9a43c6ebf15c0e48a5ded77a5a72c17255fc307c8e5f06e33c3f3ec215c7b21e5af2bebe3f451f6adc69a3a3dd4973da37873b2de412bc SHA512 04c0dc8141c7c73c59cb3aff94a6a7f64ed536c3aa07a8f25b14469586cc6727204344a296776a43bb8a315382bb3972aad0b1cd3caad6543ec93f5cc3f80fe5
-EBUILD rsa-4.1.ebuild 796 BLAKE2B ad8c9f68f5d44f5b212629b582a8f601268aba602af848e8ce5bff52f44c9bb1a7916843f9c4cec654e18eb343b27f405069c058b46d064449b129c784819357 SHA512 2c926e6b8d5e1d0ba325217d18bb86d8d8f2878750935e7aec3a4e74e6a3bf8f7a3108b0486e54710ceaff2e610e601ad9a1f5b70bde79c3762398fc241d9138
-EBUILD rsa-4.2.ebuild 753 BLAKE2B 7f5ab2828d5af07a4bc278639a1dad1d45ffa5b8cc024285b1450a83c2a31c524e0e2f1700a5d82cd6e038989dd16b414db80cc8c145b42260da09ba5e363d9a SHA512 b79955f7dfb28e429153259cce481defd5e3e2e68b64733a45d99f40adaabd27469b20a94e63f822d372b430d0db8793a987706201725e89d44d27ab12a297f0
+EBUILD rsa-4.2.ebuild 772 BLAKE2B f4f0579fc70d638c8bc5f67ae953cd0d41aef5093e40b52b2785fc027ffca52b07ae99a376fcee4d7f937d2407ffbf872cb1dcfe0a8740987d2311f7c0194c19 SHA512 3f655483b66b8820f86f3dc8e748b38e99c27357e25d3cfbbc241f7d8aeb5c792eb56162e6c3197fe51fedb61afa05429abd5df0fd7963362758eab3ce05ab60
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch b/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch
new file mode 100644
index 000000000000..ccee6c0281bb
--- /dev/null
+++ b/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch
@@ -0,0 +1,95 @@
+diff -Nur rsa-3.4.2.orig/rsa/pkcs1.py rsa-3.4.2/rsa/pkcs1.py
+--- rsa-3.4.2.orig/rsa/pkcs1.py	2020-07-05 10:28:57.622204136 +0200
++++ rsa-3.4.2/rsa/pkcs1.py	2020-07-05 10:30:28.103672033 +0200
+@@ -232,6 +232,12 @@
+     decrypted = priv_key.blinded_decrypt(encrypted)
+     cleartext = transform.int2bytes(decrypted, blocksize)
+ 
++    # Detect leading zeroes in the crypto. These are not reflected in the
++    # encrypted value (as leading zeroes do not influence the value of an
++    # integer). This fixes CVE-2020-13757.
++    if len(crypto) > blocksize:
++        raise DecryptionError('Decryption failed')
++
+     # If we can't find the cleartext marker, decryption failed.
+     if cleartext[0:2] != b('\x00\x02'):
+         raise DecryptionError('Decryption failed')
+@@ -310,6 +316,9 @@
+     cleartext = HASH_ASN1[method_name] + message_hash
+     expected = _pad_for_signing(cleartext, keylength)
+ 
++    if len(signature) != keylength:
++        raise VerificationError('Verification failed')
++
+     # Compare with the signed one
+     if expected != clearsig:
+         raise VerificationError('Verification failed')
+diff -Nur rsa-3.4.2.orig/tests/test_pkcs1.py rsa-3.4.2/tests/test_pkcs1.py
+--- rsa-3.4.2.orig/tests/test_pkcs1.py	2020-07-05 10:28:57.621204131 +0200
++++ rsa-3.4.2/tests/test_pkcs1.py	2020-07-05 10:32:26.858286153 +0200
+@@ -17,6 +17,7 @@
+ """Tests string operations."""
+ 
+ import struct
++import sys
+ import unittest
+ 
+ import rsa
+@@ -64,6 +65,35 @@
+ 
+         self.assertNotEqual(encrypted1, encrypted2)
+ 
++class ExtraZeroesTest(unittest.TestCase):
++    def setUp(self):
++        # Key, cyphertext, and plaintext taken from https://github.com/sybrenstuvel/python-rsa/issues/146
++        self.private_key = rsa.PrivateKey.load_pkcs1(
++            "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAs1EKK81M5kTFtZSuUFnhKy8FS2WNXaWVmi/fGHG4CLw98+Yo\n0nkuUarVwSS0O9pFPcpc3kvPKOe9Tv+6DLS3Qru21aATy2PRqjqJ4CYn71OYtSwM\n/ZfSCKvrjXybzgu+sBmobdtYm+sppbdL+GEHXGd8gdQw8DDCZSR6+dPJFAzLZTCd\nB+Ctwe/RXPF+ewVdfaOGjkZIzDoYDw7n+OHnsYCYozkbTOcWHpjVevipR+IBpGPi\n1rvKgFnlcG6d/tj0hWRl/6cS7RqhjoiNEtxqoJzpXs/Kg8xbCxXbCchkf11STA8u\ndiCjQWuWI8rcDwl69XMmHJjIQAqhKvOOQ8rYTQIDAQABAoIBABpQLQ7qbHtp4h1Y\nORAfcFRW7Q74UvtH/iEHH1TF8zyM6wZsYtcn4y0mxYE3Mp+J0xlTJbeVJkwZXYVH\nL3UH29CWHSlR+TWiazTwrCTRVJDhEoqbcTiRW8fb+o/jljVxMcVDrpyYUHNo2c6w\njBxhmKPtp66hhaDpds1Cwi0A8APZ8Z2W6kya/L/hRBzMgCz7Bon1nYBMak5PQEwV\nF0dF7Wy4vIjvCzO6DSqA415DvJDzUAUucgFudbANNXo4HJwNRnBpymYIh8mHdmNJ\n/MQ0YLSqUWvOB57dh7oWQwe3UsJ37ZUorTugvxh3NJ7Tt5ZqbCQBEECb9ND63gxo\n/a3YR/0CgYEA7BJc834xCi/0YmO5suBinWOQAF7IiRPU+3G9TdhWEkSYquupg9e6\nK9lC5k0iP+t6I69NYF7+6mvXDTmv6Z01o6oV50oXaHeAk74O3UqNCbLe9tybZ/+F\ndkYlwuGSNttMQBzjCiVy0+y0+Wm3rRnFIsAtd0RlZ24aN3bFTWJINIsCgYEAwnQq\nvNmJe9SwtnH5c/yCqPhKv1cF/4jdQZSGI6/p3KYNxlQzkHZ/6uvrU5V27ov6YbX8\nvKlKfO91oJFQxUD6lpTdgAStI3GMiJBJIZNpyZ9EWNSvwUj28H34cySpbZz3s4Xd\nhiJBShgy+fKURvBQwtWmQHZJ3EGrcOI7PcwiyYcCgYEAlql5jSUCY0ALtidzQogW\nJ+B87N+RGHsBuJ/0cxQYinwg+ySAAVbSyF1WZujfbO/5+YBN362A/1dn3lbswCnH\nK/bHF9+fZNqvwprPnceQj5oK1n4g6JSZNsy6GNAhosT+uwQ0misgR8SQE4W25dDG\nkdEYsz+BgCsyrCcu8J5C+tUCgYAFVPQbC4f2ikVyKzvgz0qx4WUDTBqRACq48p6e\n+eLatv7nskVbr7QgN+nS9+Uz80ihR0Ev1yCAvnwmM/XYAskcOea87OPmdeWZlQM8\nVXNwINrZ6LMNBLgorfuTBK1UoRo1pPUHCYdqxbEYI2unak18mikd2WB7Fp3h0YI4\nVpGZnwKBgBxkAYnZv+jGI4MyEKdsQgxvROXXYOJZkWzsKuKxVkVpYP2V4nR2YMOJ\nViJQ8FUEnPq35cMDlUk4SnoqrrHIJNOvcJSCqM+bWHAioAsfByLbUPM8sm3CDdIk\nXVJl32HuKYPJOMIWfc7hIfxLRHnCN+coz2M6tgqMDs0E/OfjuqVZ\n-----END RSA PRIVATE KEY-----",
++            format='PEM')
++        cyphertext = "4501b4d669e01b9ef2dc800aa1b06d49196f5a09fe8fbcd037323c60eaf027bfb98432be4e4a26c567ffec718bcbea977dd26812fa071c33808b4d5ebb742d9879806094b6fbeea63d25ea3141733b60e31c6912106e1b758a7fe0014f075193faa8b4622bfd5d3013f0a32190a95de61a3604711bc62945f95a6522bd4dfed0a994ef185b28c281f7b5e4c8ed41176d12d9fc1b837e6a0111d0132d08a6d6f0580de0c9eed8ed105531799482d1e466c68c23b0c222af7fc12ac279bc4ff57e7b4586d209371b38c4c1035edd418dc5f960441cb21ea2bedbfea86de0d7861e81021b650a1de51002c315f1e7c12debe4dcebf790caaa54a2f26b149cf9e77d"
++        plaintext = "54657374"
++
++        if sys.version_info < (3, 0):
++            self.cyphertext = cyphertext.decode("hex")
++            self.plaintext = plaintext.decode('hex')
++        else:
++            self.cyphertext = bytes.fromhex(cyphertext)
++            self.plaintext = bytes.fromhex(plaintext)
++
++    def test_unmodified(self):
++        message = rsa.decrypt(self.cyphertext, self.private_key)
++        self.assertEqual(message, self.plaintext)
++
++    def test_prepend_zeroes(self):
++        cyphertext = b'\00\00' + self.cyphertext
++        with self.assertRaises(rsa.DecryptionError):
++            rsa.decrypt(cyphertext, self.private_key)
++
++    def test_append_zeroes(self):
++        cyphertext = self.cyphertext + b'\00\00'
++        with self.assertRaises(rsa.DecryptionError):
++            rsa.decrypt(cyphertext, self.private_key)
+ 
+ class SignatureTest(unittest.TestCase):
+     def setUp(self):
+@@ -105,3 +135,21 @@
+         signature2 = pkcs1.sign(message, self.priv, 'SHA-1')
+ 
+         self.assertEqual(signature1, signature2)
++
++    def test_prepend_zeroes(self):
++        """Prepending the signature with zeroes should be detected."""
++
++        message = b'je moeder'
++        signature = pkcs1.sign(message, self.priv, 'SHA-256')
++        signature = b'\00\00' + signature
++        with self.assertRaises(rsa.VerificationError):
++            pkcs1.verify(message, signature, self.pub)
++
++    def test_apppend_zeroes(self):
++        """Apppending the signature with zeroes should be detected."""
++
++        message = b'je moeder'
++        signature = pkcs1.sign(message, self.priv, 'SHA-256')
++        signature = signature + b'\00\00'
++        with self.assertRaises(rsa.VerificationError):
++            pkcs1.verify(message, signature, self.pub)
diff --git a/dev-python/rsa/rsa-3.4.2-r1.ebuild b/dev-python/rsa/rsa-3.4.2-r1.ebuild
deleted file mode 100644
index bc2b7755ef5e..000000000000
--- a/dev-python/rsa/rsa-3.4.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~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
-}
diff --git a/dev-python/rsa/rsa-4.0.ebuild b/dev-python/rsa/rsa-4.0.ebuild
deleted file mode 100644
index 10c836a9a58d..000000000000
--- a/dev-python/rsa/rsa-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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/rsa/rsa-4.1.ebuild b/dev-python/rsa/rsa-4.1.ebuild
deleted file mode 100644
index 0008a7fe97f4..000000000000
--- a/dev-python/rsa/rsa-4.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..9} )
-# TODO: +rdepend, when supported
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-MY_P=python-rsa-version-${PV}
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
-SRC_URI="
-	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	rm tests/test_mypy.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.2.ebuild
index cbdb124567de..f5a735633254 100644
--- a/dev-python/rsa/rsa-4.2.ebuild
+++ b/dev-python/rsa/rsa-4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 45ef009beaf2..6c248878a808 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,3 @@
-DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-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
+EBUILD rst-linker-2.0.0.ebuild 1336 BLAKE2B ed8e449b771f8966411864d042b230d5bdeeb551c94128261acb4d225bed55000ed9add55a72957869903cef3660e13361a10186e01b8cd2252604c700929208 SHA512 a884f0591febf613f9dbc7f2b1215880b7adda69ba57ae6adccb458493521a63194018ca65a44e85d95ccdd00352d6956e3732a138a0bf63a97301da7190f370
+MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/metadata.xml b/dev-python/rst-linker/metadata.xml
index 90d48cfdfbca..20d90b34f8de 100644
--- a/dev-python/rst-linker/metadata.xml
+++ b/dev-python/rst-linker/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">rst.linker</remote-id>
 		<remote-id type="github">jaraco/rst.linker</remote-id>
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
deleted file mode 100644
index 70c0776a330b..000000000000
--- a/dev-python/rst-linker/rst-linker-1.11.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 python2_7 python3_{6,7,8} )
-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 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	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/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4[${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() {
-	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
-	# Otherwise, ImportMismatchError may occur
-	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
-	# Override pytest options to skip flake8
-	py.test -v --ignore=rst --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
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 5986d16e187a..fd3f73e3d1f0 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -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 ~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/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index eb66f39ce15f..61a71bfcf29c 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 538 BLAKE2B 14d38ae66375714a967e1a702fe09657b4d1b6655e2248c9b053cb4fdff7a0c7a8e6f56b899a16fcaeee50bb6fa9176b78b92f108c2ef39056156b7600534228 SHA512 85447ebdd80b81161fde5813cb3c4d22b4fb3dd0b9d18ea73b3b921ba27e3ffd85fa6235b786c6746a333febcbe334edf91cee4a183b1d598ae2118a66425b8f
+EBUILD rtimulib-7.2.1-r1.ebuild 537 BLAKE2B dc368737037e9f995790878e217597ebe837d175164eaadca60d635165cc97ad266d97340314760450dc274061e53c5e7dc1e42ed9b95c4970fb39f07cbdb580 SHA512 2f57bb84ebab8374685727a61ade7947e6f47b6e6a10c3ab34daa12336d50aac9bd28d209d6967c62c4f8c503c5ef5835a1adb0f8c593fe3ecadf31f191e8976
 MISC metadata.xml 729 BLAKE2B ae7173f56cfccb78e8fdd6e193e1e49c67ceff9b0c09d2acef7b39a72c0301a9606769519001d5f5d54c931333644af9933f23af16b7dc274db4e17aa2ef706d SHA512 c4463d749d453f4ca85bac17309b9948912dc5fd67824e71cfba6ba1b1a6519e39c8bcd8d1c8a86fca6348b18d60d8431497a906caf187f16564e657cb57833c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index da28deedecf2..b7840c8524f2 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index ae2a3b1b354d..4ee08f163007 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,4 +1,6 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
 DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a917aa1c29450a54a4099fc7b97f9b3c3b8d623158bd02f8c1080e5b646c5f67f673496b1bd5bef5aa664df43eeb74 SHA512 8ff956c8b593a1d0a79a9a527502ddd1422bc27f272bfa708d145a66779de1af65adb20d822bee59c5b60282fb16f15429c10477d3523c04b215f963ec850073
+DIST rtslib-fb-2.1.73.tar.gz 73883 BLAKE2B 2e1a9306386b019ed7d4f89dc976959020f981812a28f0a8f4c520f311ec6ce08da2e45115d394cab272296bd84e16fd1c15a6aecdf4650d52f96e294aed4cc5 SHA512 70bfad6a055af1242f989fcab706b5a49ebe8c1ed7183ac3f739eb54e0c628cc27efe9823dd017c33d735847888a142a791fdba3e5f4d4817290df7f8b6347f0
 EBUILD rtslib-fb-2.1.69.ebuild 675 BLAKE2B 74e94a2ed8e30b842a86c896f0c60520a620bfa74c2e78520ab918e4cb0fbdb590f75b60acfc1a17c4b3cb735f8b029ab4eca6490d48cf784407d436f9854667 SHA512 a2490189809ff5ecbb573503d3725bd4f525b34ac1d921fc6d0ca5484c83b7ed9a4868f549ad283cf6512761b2e5e89d2343f1e2daffc0b9ad7225d16219bfda
+EBUILD rtslib-fb-2.1.73.ebuild 622 BLAKE2B 3b3038ebbe1b35be0c094db9db78a1048281a98ba699ec479aa66cf82191e035da47f517d9a045dcd8bdd2b75222e5929cc3f60b0ecb104f1198f1e949a57d62 SHA512 4611d48e3c2add45f0477f6cc04f919d37e75a530316922742ad2fbda7d89bd380a6c6c89cfa1fd4e89b019cf0e6076cdb729176383009af3af77872a2595f02
 MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
new file mode 100644
index 000000000000..f8dd492afa9e
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.73.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 systemd
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit "${FILESDIR}/target.service"
+}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 64cfd431d1c3..f141dac48741 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
-EBUILD ruamel-yaml-clib-0.2.0.ebuild 689 BLAKE2B e8a4ab74967fffab25bb1e00d11740e7662f0b1f71ec3c8e1c87b2c6a047ae6583bf851f68aeca0f0237e99305e2e8856922db91db94403fbbf1a1ab0ade7b94 SHA512 4b7beb3666959bb068d4111686cee9dbb26f96cdeea529cd93fe2cb1017c70cedc382329d64b341aa661b65b9a8ecb2017a0fae68ce13c2814fdd495d6f9f33a
+EBUILD ruamel-yaml-clib-0.2.0.ebuild 707 BLAKE2B 2c52504f04ba2879545a949e14fc8757a8a4cb60e3a668aab4a0544c0d99867222504f3ff9e3f80762536e0018af5f08d7ebe6e84493e7dd3abb86495100eee4 SHA512 4c3738eb78d2a977beb0afc4ca7ceb99eecf45bb074b2dcf98ebe0c190c10b374f21d59d2a00cb3cbeffe0a15a8f61f0672232c7d51903e0ae3b946ca8934ad7
 MISC metadata.xml 925 BLAKE2B 9ed79b613e946d5f1fc006c818e1435e89b6eb74fd3f83d42fcb8cca906a52625a720616ceab67fc3a0cbed2197b52e7d3b106b2a7ee3d4f8fa8e837c856a2e8 SHA512 3ef363c45a12827551c44d4485373d50a1fabb27b20a6b97d014405ae7d5138916008bdf47af831b7ce74f58affdb5c7ff87ebff1336d2574cd897e8a3ce05a9
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
index b1a52c4c5edf..7b010bcc2706 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -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 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 86845b406490..b608d46ab5a4 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
-EBUILD ruamel-yaml-0.15.35.ebuild 1109 BLAKE2B 1e949f71a37435a5e3e1f5919a3a0cf0a04b8b3b0cab7d7578aa9c6a65e21365b0e37998b531db98b7411c67b0058792c68bec7b43d3975236ac3ffd62335fd9 SHA512 4eb2233b1194f99b4a8a73f129402bfe2ac380b15582b99c0cb99010c3ad61d5b214ce1506589d2427757f9d3a817546d367e3820192203214eee1f33ff1de16
-EBUILD ruamel-yaml-0.16.10.ebuild 739 BLAKE2B 80670bb74b5c76c521e93e85e8d7d3195de3669d81a5b655091e39124f7a129c12ce774c456b8f4877aaa75374cdc05646b406101f767f857c7f0b57ce082410 SHA512 8f515f395cb80679ab4b84f1adfbdda6381a78125346aaba66b6bea5a8a1e5cf73be2e11fd89405a4703fbcb3588b8fde82aa5ab1868738b3b7e13f7c8ea6ff8
+EBUILD ruamel-yaml-0.16.10.ebuild 757 BLAKE2B 5f9da2d74aa18c112227ed94de2906e51f907f91605c3ac67737a599717f12c5540f31c46aab27cfdb83b7fa9ef32d718aef9735793b8437a5717f80bde54dc3 SHA512 31fbb89dca722ffb3648c3a99027de52161b491fe5c68a0d661dc9c2da99ae4e421e07cc34d0a7dfc3f36dbc842f89930908b5e8e48cf14c5393584dd913f607
 MISC metadata.xml 487 BLAKE2B 3e1f4ab68d168ce3e2136df34bd8576dd18d083e84a33936cfbf542474f0c28523da626a339fb8b1ee8796537c61b4c129445b6c42df79c3214fd1c356891a07 SHA512 ce5c8374b80cdb2c5548fd3c1ce3f9a121aa99ca589bb8869a53cc4f846dcd345b13480c85225aef5cda3fce349cf995bbdd4a46d709ea461a123d0813406169
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
deleted file mode 100644
index d4219db1524e..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.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/ruamel-yaml/ruamel-yaml-0.16.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
index 48f24d33b5e5..6db10d99034d 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -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 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index b48de6ee7dbf..2c570923cfe8 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,4 +1,3 @@
 DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260
-EBUILD ryu-4.26-r1.ebuild 576 BLAKE2B 31e23e06517f1d4015b8581da8053a99f29ed821d3b166c87f260312dffbf57eb9c70210aba1a67ed72a9d69e1d4e872060ad5ff3ef169d4bf7d32f53ee06fc0 SHA512 7489227069352aee509c4ee410b1b294117e0fe3ecfb6f7ac921b49c971732d128c0032b5c14aba4dbf4359e4a7a5694c8bdce24f8572aaabff941c2630c12f1
-EBUILD ryu-4.26.ebuild 483 BLAKE2B 6961ef9efd27e41c646b13480976f85073ea99777e81856fbeb670626b974ba7c3e490ffb7a26c378843b7b18de8a79bcf9bc7b4e853d8ace1abc2e8281babf8 SHA512 c99c3e274f2afff175d9966ca07cf35289c5491340e13dd22dbbace90837bd55931634a8339bdfdb445c9cb04dfc38a08f48a5bd1b2dea00d32ddff613b8d416
+EBUILD ryu-4.26-r1.ebuild 570 BLAKE2B a9e0e2890d8e73ffb71608313d05ef9056232cb0d9ab599688f5e5f7445e34be11e4cc8b2d5ed34fcb34aeb0fa157af9337f29f1ae4463c55d7013a07edd2df9 SHA512 ebfa4625c704c9a4857e77dfd7e1f8c1a37add2797aede530bdb7a8e6525dc9137d6d549d6b06c0920e52ed6e20ff3ba7b9a03cb4286ff26278edd1a3afa74ae
 MISC metadata.xml 320 BLAKE2B 53cf3eb4dc8485edcfb30a28d51e9191a4c24a3770fe376e3df73534e0ebf7481b5eac783a3bf8d8ffcb6f963c5ec22ca49a568f66c983a6d619b8505d2289c2 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
index 8c8d1c0a7f7f..2db1d6e99e72 100644
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ b/dev-python/ryu/ryu-4.26-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="http://osrg.github.io/ryu/"
+HOMEPAGE="https://ryu-sdn.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ryu/ryu-4.26.ebuild b/dev-python/ryu/ryu-4.26.ebuild
deleted file mode 100644
index add2b410d1de..000000000000
--- a/dev-python/ryu/ryu-4.26.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="Component-based Software-defined Networking Framework"
-HOMEPAGE="http://osrg.github.io/ryu/"
-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/pbr[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 1064791cfa46..adc2789aef3a 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,3 @@
-DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
 DIST s3fs-0.4.2.tar.gz 57527 BLAKE2B 74836547c270e00daeed55321a4d685a638a30a27ab65ea34ceaf55e0c44f1fac66a0802e602c052a5abc8e4a7bca778df7167751a6cf7a177f6a382012741de SHA512 7571a2d3ad998aab7dceb334bfcdb27035f21bfca04fd0828e75c1d860c2662f0a1c8c49317dabdbf2d7c21371c5dd6983a5aea760d2f71bff5ab0dfa9c9a14a
-EBUILD s3fs-0.1.5.ebuild 659 BLAKE2B 87e2fd184266b4ea2c9bc310603e7b8deffeb8e044cd8cd59308885f761e8592e565054788d57d0e8e753687dddcd032ff42e7ec6b25cf2d1dfc22897af078e6 SHA512 c1c253ee6931e1040d9a80672a0d70ea7ae01cee7cc5ae93b40fa58ac0f10f6d73091590d48959596c4c2841fc40dd3003e98e117583e2d306d2fb6349b0de97
-EBUILD s3fs-0.4.2.ebuild 794 BLAKE2B 4b10316b4c6dd3f7dbd6ea04c2309b5cb0959e623614ae7f5e4cc577eebb1d7ba9f4dddf5c445aba43cd4513637e03e0112393148dae710b2c843a6c040a6a52 SHA512 9867912bdb5b14c2658a8bca5de75c3eaac5849e7e031b63e8325a0e2f544f4de8332f353a90f6817e42181f24dd5f78b9838a25aecfba5775ea59fdbeafc69c
+EBUILD s3fs-0.4.2.ebuild 804 BLAKE2B 35e5595363b4b212b666af9e95ca7180043f66e7bf14d651c03b97c7b9739fba0f3b45cd5b9af4ec406ecc06929e9d6e28e66140b89c3f567e4078c78c4a3ae2 SHA512 9e9de224e8a9e5609e8aae0158602c39e803e62bbd95560099b5a8cb3e4cc473534c6684f35e5f6e2b9f33193d5aba16c6feb677a466aeeb2c16de9bba6997b5
 MISC metadata.xml 383 BLAKE2B dd7df24dbc399b716f8611c1e669109e394371d6dfaa1c5e126c46c18e92d6533a5f8fc6d67e332e4e6e0a5db5e9324b2771fc9111a71a9942ff00b8bc69086e SHA512 e3a9960695a141ba0abe3be9fd8827fe6ac76363c48accdfecd551d876db6089d3c3b595f2a6e0351ab1ea68c59b3e73667a3d757fa0a5b989cbba259e113680
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
deleted file mode 100644
index 67bad6d489d7..000000000000
--- a/dev-python/s3fs/s3fs-0.1.5.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{3_6,3_7} )
-
-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/s3fs/s3fs-0.4.2.ebuild b/dev-python/s3fs/s3fs-0.4.2.ebuild
index 55ab54b3b1e9..091fbd457e52 100644
--- a/dev-python/s3fs/s3fs-0.4.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.4.2.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 457d567ded22..d684ade54615 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,8 +1,4 @@
 AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
-DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
-DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
 DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
-EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
-EBUILD s3transfer-0.3.1.ebuild 921 BLAKE2B d6b4d663dd55b4a54138d30f42d1c51a1c1937f4cd9d56a0714dbaa769274f06faf4e665f363ee6f38c72bbd2d766698e7b8619864ebeca2fc9dadb5ab3f851a SHA512 516346376b7f405136f7b8f0eb534e7273bdde69cb1d5fb7f8b8122fce2fc5a9cd765067a65e9fa2be7cdea80b7c6f0c9e5b5236e576ee285d6d8bdc4f31a4e7
-EBUILD s3transfer-0.3.3.ebuild 716 BLAKE2B 50de27aeab0e9251b793edaae04ed1e0cab3ef0c88f730b4e5b843b2e288f95c0149a645f20e7aa3fe2170e0fe8d71158322bfa4a3313d88911cf2d6952dab2c SHA512 11413cbab02052b563294a0f986cdbd72107273c379c00d215ed699a80536c5e0e7dda753812f75e89ed3fff866baf9c8d79e2ee40d5d399c3ba91ec49a5fae6
-MISC metadata.xml 478 BLAKE2B 8494fa51829bb778df3e7e93d1fccca86530c3577fe848f00b8f1c52dbfec8a56cbaaeedbdcd7db9eb5b542c8c2a73fbdceca9f46df3758b9f8636ee0fabedea SHA512 ba0e7c92da9cb77e61bfe7887fc97853f02379ebbffed62c08237bec954be080a64cc02e3d3e214b59c7a22e25c934fea3db5589c2f78462cce37186f63cea17
+EBUILD s3transfer-0.3.3.ebuild 719 BLAKE2B f533981558a4dd6124dcde57b877cdad2b23ae0d97e11e58b6134f45d10c8d4a70f3dfbe93eeebcfbab05c65825f92f36ece87b9e588edc85716bd89d09d7862 SHA512 17cf4baf253e4bba89c370cd2db739f0f3ec1b54457e7c947f0473af763a52fed972f3a07fb91cdc99f7ef1a4effc1399e3cc5608571bc4fd23ec85e0adf15a3
+MISC metadata.xml 502 BLAKE2B b996c37a4c744bcd72c760026bcc710ab8e70df0f9866167ac2628303edf5bc795943e686947de7c2c01a35c13a0769ce79f43efcb9d369cf0b1f2dc3a2b28a0 SHA512 8dc4c948f34912f6b4160afbffdfd9ed4f148871f4add56010943db1185fcd7d8af27e57e97a0ed293bafbb7c395636958218e023ba4507989aee2eca308ab24
diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
index c2621bab9aca..fcbcd1b6cd19 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">boto/s3transfer</remote-id>
 		<remote-id type="pypi">s3transfer</remote-id>
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
deleted file mode 100644
index 633b1ff5ad76..000000000000
--- a/dev-python/s3transfer/s3transfer-0.2.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 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}]
-"
-# 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
deleted file mode 100644
index d81234e7f387..000000000000
--- a/dev-python/s3transfer/s3transfer-0.3.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=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-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}]
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	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}"
-}
-
-src_prepare() {
-	default
-
-	# Incompatible with recent Future version
-	rm tests/unit/test_s3transfer.py || die
-}
diff --git a/dev-python/s3transfer/s3transfer-0.3.3.ebuild b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
index 843a42f09de1..8dcfca76eb77 100644
--- a/dev-python/s3transfer/s3transfer-0.3.3.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.3.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 96b2e1fc5985..949dc2687376 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,5 +1,3 @@
-DIST sabyenc-3.3.6.tar.gz 19578544 BLAKE2B dc196618578b213fa8f1ffc2c29340d9f9765d98942c354ef7510a6472c4594431448291d19153b1f51606d27c4e43b34d12623ca69dc366aea3aa0483713489 SHA512 bc9a1d1cd487dc0a1a0cc8ef690cef67de70c211dce520896888c3d37167e83439002f4ab6cf0cef14a27b45b0ee08ad349d34e1609abb45f33e2f2f7b5ac074
-DIST sabyenc-4.0.1.tar.gz 19578540 BLAKE2B 9a67b26f59b584e91459c19d3e226cbfac1952e5810cd367a6f12f808cac6cf104675266f2c21c83fa199f6ea62b703f427d57d0da9de27b71eb57235b0377e2 SHA512 c90dce9a54e847588c09aebedf349b2d54a87ab2ad9c3555b5c30912d8b57cbfd990ebcccbc0cd7ed1f5ac9e4bb226ccd9d500f27abaa9ca598bd89b46c6e90f
-EBUILD sabyenc-3.3.6.ebuild 628 BLAKE2B 2506879714f3e2a623e61979e44a9c62577ebd07a73c618f83e7618b2f57b0038b1b13db67e47515785df28609588f479c7e2129fe21d767155e87f2d8289a1d SHA512 8509f1941b4ca9ed8b5ff4a3de2ce011d22e7d8a119e2fab8a632fff39c0a2df536e681f9755a103a1ecc69e26ae99df93287422eee7ff6bdfa8eec2a84c94ba
-EBUILD sabyenc-4.0.1.ebuild 601 BLAKE2B d5d391dbc1b51f736ca4bfc12a8be45a68a428cbfbb03e5f27e7be7235e29f496dff5aed2b126f40429dd4ccd5bac08700972d98c665d9d12080c1e80d9f3282 SHA512 ec2febf1a4550769d523d0620800d044306a7b42e88f9c03f1d990e06971322ea2ad15ec328a27eb81dfa479a648c81f96f5133e658e052932110d1f5ba21769
+DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
+EBUILD sabyenc-4.0.2.ebuild 601 BLAKE2B d5d391dbc1b51f736ca4bfc12a8be45a68a428cbfbb03e5f27e7be7235e29f496dff5aed2b126f40429dd4ccd5bac08700972d98c665d9d12080c1e80d9f3282 SHA512 ec2febf1a4550769d523d0620800d044306a7b42e88f9c03f1d990e06971322ea2ad15ec328a27eb81dfa479a648c81f96f5133e658e052932110d1f5ba21769
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/dev-python/sabyenc/sabyenc-3.3.6.ebuild b/dev-python/sabyenc/sabyenc-3.3.6.ebuild
deleted file mode 100644
index 2d3ffa014e07..000000000000
--- a/dev-python/sabyenc/sabyenc-3.3.6.ebuild
+++ /dev/null
@@ -1,27 +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 vcs-snapshot
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="https://github.com/sabnzbd/sabyenc"
-SRC_URI="https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz -> ${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/sabyenc/sabyenc-4.0.1.ebuild b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
index 6c6fdf9e58be..6c6fdf9e58be 100644
--- a/dev-python/sabyenc/sabyenc-4.0.1.ebuild
+++ b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index 2c2b6a94ce15..616b39400a86 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,3 +1,3 @@
 DIST sarge-0.1.5.post0.tar.gz 17860 BLAKE2B 484a5498a34a1e5ffa313ba012271898fd7634faf42a4574fad86c8252005ee91511f7c7e2c34c8836daa4e07f5558afcf88473ef7cb8d90c3a8e2b03ff32e30 SHA512 b2bef7bc3d5b4f5540f77cd3ed26342106557498b556ffbcac6aa74e69b719bc2f132ebc6f99d6539c1ce539ca3c7c45bf0735960b8a25ea6237a4a1a8d65a72
-EBUILD sarge-0.1.5.ebuild 498 BLAKE2B a383f048492b4c34ea2c7c9158b6de0ea3b17cc39815e941fa49ada8719aab29700582cec5dcd17ea88871f5f9a5f1f5dca2e094c1e7d891c6c3c2e6168c12d6 SHA512 8577ce2487a88d8f2b5b9dd7d1e3f398e1adaad40b565391eba4c1b262d35a86789494c439981eb3b5cb01c13dc0d92c24b4538fc0f68febf7a31536f323aff3
+EBUILD sarge-0.1.5.ebuild 499 BLAKE2B e0ae468b87b57eb520cdee085c68057afa242928afc24419743eb4811eb44b6be06b5e30d4e28b308ff4b3b137c2e3c62bac50deb366865cdffcb7b04ec4abb8 SHA512 ef887344f57f08e2de04d79a678ade398646c36f7e130a57f7fd5dcc93e0f06659c7b949ff8fc151a49723f925b924e971684fd7ba44b366f69d711548171385
 MISC metadata.xml 417 BLAKE2B 32c706dc738939ab32aa43ccffd08f455ad15353832bd22c88dbd357a08b6bda75225660264c2e9ab70c40ec8388f725d8ad4f8709f9c8937aa989a71cf8b8ec SHA512 eda55800a88a402a19a1c0e2de74c5209a3b69f6aa3ba5047c02effe2f84a7143e6e1ad09346dea1229d353f44eb757714ae943287744bdf75539c1b02067ee3
diff --git a/dev-python/sarge/sarge-0.1.5.ebuild b/dev-python/sarge/sarge-0.1.5.ebuild
index 725b7b072db8..0e5c8bd6a3eb 100644
--- a/dev-python/sarge/sarge-0.1.5.ebuild
+++ b/dev-python/sarge/sarge-0.1.5.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}.post0"
 S=$WORKDIR/$MY_P
 
 DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="http://sarge.readthedocs.org/"
+HOMEPAGE="https://sarge.readthedocs.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 87277784b036..0a933a0c0bd7 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,7 +1,4 @@
 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
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
-EBUILD scikit-build-0.10.0.ebuild 1165 BLAKE2B 50ebd4a84506a5e7e6a10823c1c7a9bf94269be6d951a61c574576e1bb049b4abcd6c28dbe6f39c9d412f43d50d01846f5792cde1d904650d614ba2dd93d2e7c SHA512 75101db969a0005d48ac73a1b530192c82b038611f793c72d9a85f0ab27d5c8c885dab35fa47f57368ba4c5225d5bce77ddeadb14cfb5db2674292b0c695c1d7
-EBUILD scikit-build-0.11.1.ebuild 1440 BLAKE2B d74c225c42df37298d0d13fabfc3c2635c0472b705662d63311c368e683a9dff6729704212e5ade25c691eaf9aba02272eb208be937ab76b075019289986caea SHA512 06259b2703d87fa12a050bcaa2bf0634e63b601d554190d0e61f5a5bf98a6e8e7183f272cecfda2e27f664822f8a85933d235f934f99f899a528252ec9e88bcf
+EBUILD scikit-build-0.11.1.ebuild 1455 BLAKE2B 7a54da66fc0b212711c09cc134a2463f8e09b301c518ba821bb0d3f1039c2825ca2aa84c3b01c7c3ada4c470104672eb5e336820c753b54c670463b8b94d0d0c SHA512 a38cf45e68cfa560d37efdc0cf464cbf6fc925d23ff76239e23ee24749bbf9eb22d6807366d24933248547e476a2bda1f690e2b5bc20998b52934c816ed173f9
 MISC metadata.xml 333 BLAKE2B e446041c433ac52a0762f0f3624504f95a636bb297a41b098171b3b2d275f8d0214c60fbb0b86e6b892a4953de3bb9bee2f12504671dafd698529b724e4229aa SHA512 635413348c10790f6edb48236dedd4e5e90497b2654aeb3ce344666561d5de3107fb079652976ac54b579ede917aa965cd024ff3c113a5dc885d78fe9cfdaea5
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
deleted file mode 100644
index 9148db88660e..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch removes coverage tests (dep on pytest-cov which is deprecated)
-It also removes the tests that test the setup.py file
-These tests give 'permission denied' exceptions because it calls commands like 'setup.py install'
-diff --git a/tests/test_hello_cpp.py b/tests/test_hello_cpp.py
-index d39c8ef..0419b88 100644
---- a/tests/test_hello_cpp.py
-+++ b/tests/test_hello_cpp.py
-@@ -182,24 +182,3 @@ def test_hello_cleans(capfd):
-     assert "removing '{}'".format(SKBUILD_DIR()) == clean1_out.splitlines()[3]
- 
-     assert "running clean" == clean2_out
--
--
--@project_setup_py_test("hello-cpp", ["develop"])
--def test_hello_develop():
--    for expected_file in [
--        # These files are the "regular" source files
--        'setup.py',
--        'CMakeLists.txt',
--        'bonjour/__init__.py',
--        'bonjourModule.py',
--        'hello/__init__.py',
--        'hello/__main__.py',
--        'hello/_hello.cxx',
--        'hello/CMakeLists.txt',
--        # These files are "generated" by CMake and
--        # are copied from CMAKE_INSTALL_DIR
--        'hello/_hello%s' % (sysconfig.get_config_var('SO')),
--        'hello/world.py',
--        'helloModule.py'
--    ]:
--        assert os.path.exists(expected_file)
-diff --git a/tests/test_issue274_support_default_package_dir.py b/tests/test_issue274_support_default_package_dir.py
-deleted file mode 100644
-index 536f7b2..0000000
---- a/tests/test_issue274_support_default_package_dir.py
-+++ /dev/null
-@@ -1,27 +0,0 @@
--
--from . import (
--    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
--    prepare_project, project_setup_py_test, push_dir
--)
--
--
--@project_setup_py_test("issue-274-support-default-package-dir", ["install"], disable_languages_test=True)
--def test_install_command():
--    pass
--
--
--def test_test_command():
--    with push_dir():
--
--        tmp_dir = _tmpdir('test_test_command')
--        project = "issue-274-support-default-package-dir"
--        prepare_project(project, tmp_dir)
--        initialize_git_repo_and_commit(tmp_dir, verbose=True)
--
--        try:
--            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
--                pass
--        except SystemExit as exc:
--            assert exc.code == 0
--
--        assert tmp_dir.join("test_hello.completed.txt").exists()
-diff --git a/tests/test_issue274_support_one_package_without_package_dir.py b/tests/test_issue274_support_one_package_without_package_dir.py
-deleted file mode 100644
-index 6612087..0000000
---- a/tests/test_issue274_support_one_package_without_package_dir.py
-+++ /dev/null
-@@ -1,27 +0,0 @@
--
--from . import (
--    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
--    prepare_project, project_setup_py_test, push_dir
--)
--
--
--@project_setup_py_test("issue-274-support-one-package-without-package-dir", ["install"], disable_languages_test=True)
--def test_install_command():
--    pass
--
--
--def test_test_command():
--    with push_dir():
--
--        tmp_dir = _tmpdir('test_test_command')
--        project = "issue-274-support-one-package-without-package-dir"
--        prepare_project(project, tmp_dir)
--        initialize_git_repo_and_commit(tmp_dir, verbose=True)
--
--        try:
--            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
--                pass
--        except SystemExit as exc:
--            assert exc.code == 0
--
--        assert tmp_dir.join("test_hello.completed.txt").exists()
-diff --git a/tests/test_issue284_build_ext_inplace.py b/tests/test_issue284_build_ext_inplace.py
-deleted file mode 100644
-index 78dd3dd..0000000
---- a/tests/test_issue284_build_ext_inplace.py
-+++ /dev/null
-@@ -1,15 +0,0 @@
--
--import os
--import sysconfig
--
--from distutils import sysconfig as du_sysconfig
--
--from . import project_setup_py_test
--
--
--@project_setup_py_test("issue-284-build-ext-inplace", ["build_ext", "--inplace"], disable_languages_test=True)
--def test_build_ext_inplace_command():
--    assert os.path.exists('hello/_hello_sk%s' % sysconfig.get_config_var('SO'))
--
--    # See issue scikit-build #383
--    assert os.path.exists('hello/_hello_ext%s' % du_sysconfig.get_config_var('SO'))
-diff --git a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py b/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-deleted file mode 100644
-index 2285bfb..0000000
---- a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-+++ /dev/null
-@@ -1,7 +0,0 @@
--
--from . import project_setup_py_test
--
--
--@project_setup_py_test("issue-334-configure-cmakelist-non-cp1252-encoding", ["install"], disable_languages_test=True)
--def test_install_command():
--    pass
diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
deleted file mode 100644
index 34b03d32ce72..000000000000
--- a/dev-python/scikit-build/scikit-build-0.10.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-	dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-docs.patch"
-	"${FILESDIR}/${P}-skip-sandbox-violation-tests.patch" )
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-issues
-distutils_enable_tests pytest
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 9fced16258ce..e70a87ef4954 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 8ef699e56b71..be52caf724e0 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,3 @@
-DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
-EBUILD scrypt-0.8.13-r2.ebuild 606 BLAKE2B b442e0dcbf31374ac144ec6ddeee12ec62c478474436d0e6f6503fb725ac646c480d8d8d21824fb3ade6630d9cb68e245b7693085d1dd27ba7f1578583e46fee SHA512 712a4a3a29775db557302b8e8b32fe54872392ccf46461cf64d415fe6522da828379f4700f8bf468ddb7b81b4220e74c2e447b3e65d1dff2b20067fbc054cd11
-EBUILD scrypt-0.8.15.ebuild 608 BLAKE2B 2c0bcb42b4489a580781f45a7137ddad465c80335055bdf7a2a304a1fbfa8903a57b82608eff91b587f2428a8309d7e97bd5c13a0667909de4456ce469b06fbd SHA512 7bf524032a6a974e2ea05be229f522a0e4bcf2ca782beb2c0e2ec9293ebb3cf34766418ee3d594f78afd8aed8caac049162e5cf558913e63fca4996f89c63015
+EBUILD scrypt-0.8.15.ebuild 594 BLAKE2B d01247d9c618e2083b9dde83215f2ea588b3b1c03438f5f59c5472e0e1e3d62433edf1c632dcd1b252f36561ec309a9cb1aa736216c8ab79c053e8ef8b12f17e SHA512 8e1379e65f1ecea2f62dd142d7cfb28a3b3ae075387173ef8e2ce8148eabbd78d207c349fe05d9ebec77546eb2173862652e524a70eb052ab8457bafdaf24198
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
deleted file mode 100644
index d4759a77931c..000000000000
--- a/dev-python/scrypt/scrypt-0.8.13-r2.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=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-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="~alpha amd64 arm ~arm64 hppa ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild
index 3c8fb67edbd8..006aeaa01cab 100644
--- a/dev-python/scrypt/scrypt-0.8.15.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 2a24243b3d57..e55ab7f1347a 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,6 +1,3 @@
-DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
-EBUILD secretstorage-3.1.1-r1.ebuild 902 BLAKE2B c25c43653eb02e9263471876f07a14c4ac1c4cd8b63a5e1309f1fb17f633ab10a9ab126435ac022a4820b4fc9a95a7cdad89810f139c86e04c1857cc4b4c5738 SHA512 b091db11d231f939ff3c5f6f9350cb863f65d658ba1989c868dad3505eb804438a5c319c9dc4b64a7d4247ce33b17f9da22985d685f414f063404f34c1a59624
-EBUILD secretstorage-3.1.1.ebuild 1092 BLAKE2B 306a34a53d76d868ca010032bd6424158fa9775f7100e55eb2ec33acf53b3afebf76310c023eb55df64f4ab8b6a10495fad57a24ffb765496b3de7b4b9b1be72 SHA512 c123dd74c6f0ed3a29f6c0c165c4ca9a7a998de27ceae12cda2b14b7372c8be7aeb00933c2e5c96d8cacad04b85bbded7ffb1923af7849343669ed26a4473c95
-EBUILD secretstorage-3.1.2.ebuild 1146 BLAKE2B 4c654901e897ec1f95783071c0f6c79c30d80e28773d44bd4c77b912804b021e23741ccc0fd3e7e4a0e4da79a0536637f8008b04e61c5d2cef1e66c78e63ed0b SHA512 93c1da70864ab15d70a226ea5fc973dd5b2cf3f6c323000b0978e0bed2a65abe2776e7c21405a85007c03fa7aba706b129306e83721ae395a1f86dfef9fe14ff
-MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
+EBUILD secretstorage-3.1.2.ebuild 1139 BLAKE2B 0fd6c169a3424b00178eb6e6b941bfb76cd1cbd02f1803b8500832599ac2ac8a97fb852ec730032bd40558ad7ec65c4c43204c2a26c9e980ea68fc32cd7b69f2 SHA512 7ffd826f02305c3d95628f0ea7badd21135f7720b085469ebc2cdc9b5eb7add5cd8b51aefcb1b1f39213f721400af333887316446b2caeafae0c5aed7dbb69f7
+MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/metadata.xml b/dev-python/secretstorage/metadata.xml
index d0020afc4b26..6c2d0a0d1cf3 100644
--- a/dev-python/secretstorage/metadata.xml
+++ b/dev-python/secretstorage/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">SecretStorage</remote-id>
 		<remote-id type="github">mitya57/secretstorage</remote-id>
diff --git a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
deleted file mode 100644
index c2c16164332f..000000000000
--- a/dev-python/secretstorage/secretstorage-3.1.1-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=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-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="~alpha amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-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.ebuild b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
deleted file mode 100644
index a70df4c44296..000000000000
--- a/dev-python/secretstorage/secretstorage-3.1.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=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.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 571eb1a98f0c..88740afaaf2b 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 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"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 0652da7e0017..944c34e58590 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 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.141.0-r1.ebuild 1154 BLAKE2B e5f120b6d780e19a1dc4efc4d959e60752adb6347ee0bd7ab27784dbcda920b4b29c7b5fc146ff251bccb4140639a40d39b2ea6a7d62cc83e61eeae061d77040 SHA512 a561dbf3b23a3bf3a91a1b7902fad5375ccb41dbc134f28d64e2d89cee0d778e3c47ce73e5fc27bc3beb6e6e2951a442bd54ea9eb81ff233e13c43d854004d36
+EBUILD selenium-3.141.0-r1.ebuild 1153 BLAKE2B 4bdd29affbec3534008cb2ce82b46939e4f1f735765e604cb6770b82192dc52df0ebe6644e8d043fb014657a614c5fd584e2b890e2c8a62ec298b476a5ea8242 SHA512 5a3dceedc738d7ab2f8a84547eb9c0ca46834d30916a52b5ccdc5dc60ba2520dfc864656b325f68b9f76ac40054569da4474041ebd8a1ae40813845882c89685
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index 9fe259faec8e..a65c1f33f536 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 0139b48c1224..e376578fd6d4 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,5 +1,3 @@
-DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
 DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
-EBUILD semantic_version-2.8.4.ebuild 913 BLAKE2B 8a63689d3c6e31eb89971c0d613fa43f839a93f133405195975ebbcc3d81a8658540f6eea289cc4660cf93888c856d718620ab605c1f2f40dbd29095975b5fb1 SHA512 d418d38fac8b30d3930784838e8b280c8029c2ac0561f06cdff23edd2aaff24f90e436a524b2e792b0155db792c5e8746323ae13f5662874fe8c18e446ddd4ee
-EBUILD semantic_version-2.8.5.ebuild 605 BLAKE2B 2054ff12f50e81844014206a02783ff8f83e0e7555882d30f6032a25fc11798702c730ee55568041c11cbcd0829ca0c9b055df2a7304624823b5aa66b5770fb3 SHA512 c45f25248f947ff3a060fc6ae4ffea36024f213f62537989e10c3cd6bf47f6b92a8b704ae2a2d50b7074eaad2478811cb2120b1958c794f5c6ea76841845c861
+EBUILD semantic_version-2.8.5.ebuild 602 BLAKE2B d29dd42808dbceac897723e1b4d63d6c5849974dd28ae6e1ee7ad6c9260b2a0b8a7a0ea85e785ac4951cdaed30f149742d2ee13417384394361bcc0a9532b716 SHA512 c74524022ffa1b1b1e771e331be31720f94f8f984f3e718cd6a9ba20509cf60b16e995bdb727e746237c32e843c8741c1d51450942acf99d945aee77f5c9edab
 MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
deleted file mode 100644
index 31cf61f76904..000000000000
--- a/dev-python/semantic_version/semantic_version-2.8.4.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..9} )
-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 ~arm arm64 x86"
-IUSE="doc test"
-
-DEPEND="
-	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.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index cad82361d1cd..8f96204566eb 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.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"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index 4ebe74fef249..35697e4b7fc1 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
-EBUILD sentinels-1.0.0.ebuild 421 BLAKE2B 2e5d5006c423672d13fe98a4416738d21426759e607845466e5913205a74cebb0aa2128f921d7adeeb572a177d6e9db34f8c9d477db093418791c9f9a95fef25 SHA512 7fabe2b32d39e654184a4f65eab1db28af652c4ecb32c7b383cadae84b83ff3a8aa719fb27e47d6171d25de6c58d00effa1570370601c0561389ff156031b25c
+EBUILD sentinels-1.0.0.ebuild 419 BLAKE2B 7d1ccd2f7fb8d56c507e863b938f6ee7ed5ba214f7aa0d676aafb350fe0d9965a95a08306b3612168fd8e6321ea484f00daa6c6b2f53f708045121a2fa58d017 SHA512 7b9034870315d619818c69a9c6549ec1fceed25acac3d405b8bf9e83da8078e28f259dcee0f1368b16efcd28bba59f5c2223c3b335c6d402ea59f59009da6e5e
 MISC metadata.xml 755 BLAKE2B 213fb1ce0889204789436f59fc25774bcba7cacc2d51e3b7490dc913057a4b6d4a315d802421d7090239aa4706ab52b8c18c90a8c18ae101eb78d1758aef9f30 SHA512 d095b29efc4477e3f31ce24f6ca61800074bbd868ba50e891b1ce4ee7508e487d565f0d13e1b8c78b77a27c4621918baf37e1bb3d31f241dacf77e8c25f1adb0
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
index 8d4b43fed50c..e742520a8599 100644
--- a/dev-python/sentinels/sentinels-1.0.0.ebuild
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index a65dcd8b6265..885a0c1bdcda 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,5 @@
-DIST sentry-sdk-0.14.1.tar.gz 66829 BLAKE2B f675dc46d300c68ecbf2fd0d698daeed2e48645ae69df249aae79557d9a80dafe5eb9fe8a22f6087019eb416d9e760e12f54926e4767a2036278bd6311788de3 SHA512 bcbd478715abfdfa8c583af2ee6fd1110280cca4cd54cdf425f49e22acf7351871c304dfa25b8932fd0fae9ea981db6786c5dec7acf352b98c00f2cca7dc6c1f
 DIST sentry-sdk-0.14.4.tar.gz 75420 BLAKE2B cbc5f401fae8a4a9eaa8f6fff8ca16a61cf2d339f14787610646112f67d7b0694d95a6076d2810968d28eb176d447fec6cf49af9a317bb2c30b4e6ab2d89a4f0 SHA512 66886df71a3d8f9f86f41bfc4078bf80f217bcb0a27fb9e93acee193b482d3045db44953f6f0b4d05e79daa91dadb56c2784b13d1308e7bc00fb40f485537dab
-EBUILD sentry-sdk-0.14.1.ebuild 613 BLAKE2B ddce300835bd6a2e00615b22932b6efa108fa5b4e54696e9ba2271079ff8aa7341cd86634746db3fc4298d3b013835e32ff4d1742325c4298c089aa678832c3f SHA512 5c82c142bbad5788c059f20411cdc9b5a1c71057a111c145b25a3a2cbf4638bece1f77c97e42fde2068028951f13aa7fceb927edceaa5e0523f924247fe4cce7
-EBUILD sentry-sdk-0.14.4.ebuild 613 BLAKE2B ddce300835bd6a2e00615b22932b6efa108fa5b4e54696e9ba2271079ff8aa7341cd86634746db3fc4298d3b013835e32ff4d1742325c4298c089aa678832c3f SHA512 5c82c142bbad5788c059f20411cdc9b5a1c71057a111c145b25a3a2cbf4638bece1f77c97e42fde2068028951f13aa7fceb927edceaa5e0523f924247fe4cce7
+DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef4bb030c5e038a485a8861a733a537ee7c834c8c200a2244335c3c61e7d564005b81d4e5c5f603d2864b2a943a5384 SHA512 e8589f7bd433d4aff068099e860c0cf012fc88dc63806873573a338bb91848d73e0a2af76dad0a5e023a1b25b0be85507346b77dec5c5a265942005219541699
+EBUILD sentry-sdk-0.14.4.ebuild 630 BLAKE2B ae27b8659b9e7777f1f125cc5ee15f2afab351e0d698ad46daf6f6c8e4d9ccfd4baeb2714be7453accf82df65b2fe2c28583b945a16332916a795333bafadce3 SHA512 fd379211a4f3de92ab9c6339d9c20aa2e51d3e737a7328aa7c97774d10d446ce0bbc20773d82b42893e30cc41ed55ef97961895b3f64427c37d632f24fdfda91
+EBUILD sentry-sdk-0.16.3.ebuild 625 BLAKE2B b3491389bfd9776238f2f7a753f415b5b72aae6d0612a3b77b1e36da6ef74936e3ae9074233902a4ec9e25b5bc6b9b133e2239af918014fd443f3de83e97f3a6 SHA512 0eab64f46ec556365cf3d4b7bafeaa733f5ac3f392380272266f263ab5c71601c219555713059b04b4e307349b6033ad781a17c29c65540bd7e62a5714bfaa56
 MISC metadata.xml 422 BLAKE2B 40203c82cbd2c3bd3a7fb0efeb325573895e00d57131355f501aa0bcd8ea2fd431521f43be6f0fbc35e663b4d009ea6fe14afcac432f052570a4e4d2eb5eaf90 SHA512 5167cc4004c64227502da603869e7a92f1efd52c334807b057607dbfd77cb409fda1a54b1eb6a1e18085844f88e04b5297e7dd1d8d0730e7d80648fa5e50a91f
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.14.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.14.1.ebuild
deleted file mode 100644
index 6687c9c45aa7..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.14.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_{5,6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/urllib3
-	dev-python/certifi
-"
-
-python_test() {
-	cd "${S}"/src || die
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
index 6687c9c45aa7..7cf55716208b 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
@@ -22,6 +22,8 @@ RDEPEND="
 	dev-python/certifi
 "
 
+RESTRICT="test"
+
 python_test() {
 	cd "${S}"/src || die
 	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
new file mode 100644
index 000000000000..c23ecfdbfc37
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.16.3.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_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+
+# No tests for now
+# Need unpackaged: executing, fakeredis
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 882cd5b44b8c..fe3669684c7b 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-EBUILD setproctitle-1.1.10-r1.ebuild 910 BLAKE2B 2e06441c2007be29447c5383db16da1af3bc72a18a1b0e68261b6ce5faf6935b405179f08e9c68005417a1f774e0bc456060e32c86d860ab3c4e2e8457eb6866 SHA512 1ae15d308a04d36a06d201a221661d16a0b80497905a60f19df2d3a215f521430b7d04ad5612723a98d175b66b401d56293b1d50915266e1f33df5007ce82f88
+EBUILD setproctitle-1.1.10-r1.ebuild 974 BLAKE2B 97d9a2b2637937fc95ff54956f96ef01e327de016777ce5142a8db96e1e7c1dc1bb2bb53fca70599d8522bffb8b1a8a8cec467950c98f4b5e2ef3e567d0c0bf8 SHA512 efb2af33c6f222bf3e62db97d2e2bf3b4108a83529ea07f3fa2de0a2ac739bcba46be0f7a1176fee5ec6cc0c71426528a4e162a3aa2f2017ccf01d8f07a4b6a0
 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 a0662118eee3..b6cec2019595 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -13,21 +13,22 @@ 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_configure_all() {
+	2to3 -w --no-diffs tests || die
+}
 
 python_test() {
-	# prepare embedded executable
-	emake \
-		CC="$(tc-getCC)" \
-		PYINC="$(python_get_CFLAGS)" \
-		PYLIB="$(python_get_LIBS)" \
-		check
+	if [[ ${EPYTHON} != pypy* ]]; then
+		# prepare executable for embedded interpreter test
+		# (skipped with pypy)
+		rm -f tests/pyrun3 || die
+		emake \
+			CC="$(tc-getCC)" \
+			PYINC="$(python_get_CFLAGS)" \
+			PYLIB="$(python_get_LIBS)" \
+			tests/pyrun3
+	fi
+
+	"${EPYTHON}" tests/setproctitle_test.py -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1952bce8ef81..eeff8aaa2bf4 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,6 @@
-AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
-DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
-DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
-DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff29bf069a859ec7d6a91588456455df611f962cb90650b23ba269bbedcb81dff568b4498431cfa20f46ece828dd SHA512 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
-DIST setuptools-49.1.0.zip 2170689 BLAKE2B fa5f9a8955ac4206396c653a3c6b5926aeb7f6f4052de7b67698ad39edd3d49c7bad13bc65720b5a40a906d06eaf3e6918cfbc20a2a59e100f75400c2caa17df SHA512 a5734742a6d2409f41c62f29dea35c58f480756ef8a66f70aaa607a6927a64487f92d20def6791860ee508e713b44d800e41e2cf8b5abcffd7e1ed1058374efe
-EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-44.1.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-46.4.0-r1.ebuild 2296 BLAKE2B 48222d0fbae7bcad855839b6f2434047f7acbbd3e3192d0d5125b63d4ae5f14e31210e364770903f1d617f94baa543a7cc998b055777acc634707c75e4281b11 SHA512 5ba89846ef28a7972c0a9c38e9bcfa4d54ad959fbacf3340bf4f1283c14b00db3b7d89719aa4eb6447f0406e9fed3ed4e58f1cb7e994429dfe45279b10c6a78b
-EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
-EBUILD setuptools-47.3.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
-EBUILD setuptools-49.1.0.ebuild 2043 BLAKE2B a3ed7a61eebac6fd12c831d2d5f28735ba984b1522c3db39c8608615061b00e10df4601c34dd1d1cefd6870ef997afb2fa025a5ad1783dca1f50eba3bba9cfbc SHA512 985b4e11bba757e58aca75659a32fa7fe0923ff36b0437b506b6e99434ff352968e24d4e417c49464a915fac27dd6585a593de021d172112cdb84a13f484acfb
+DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
+EBUILD setuptools-46.4.0-r1.ebuild 2349 BLAKE2B addf1d5afe6cc50865cab5c470a759a09be4929960fabebb8e76b2f467153bf58939a7800e3b5beb91d2c70a3e8944a9d9968ad68bccbf6dbd3514d2f8b15a4d SHA512 e8dc79476786ec15580f12a272e42cb3f862fa384102bd4928bb3798d341cc5247603f573fa86cdce9d815b20e2c844ded0d969c393cb40fabf464130e219cd4
+EBUILD setuptools-46.4.0-r2.ebuild 2478 BLAKE2B 28b4e7fe8f73e5161ad5ec6d05614e7907115c2c6ea9c2a62da6c3170e55a3e6cd21848726cd28218c84d85b99c5049753eec5f9f7c42d92a7127a17f657727b SHA512 415cbe43a31997249a945fb69635c2e4be07607aca2305a7edda480438fe920c412f9235a41a90fdcf8bda0bdc918e3c1022276a5bd2da768b3800a38461a8bd
+EBUILD setuptools-49.6.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
deleted file mode 100644
index 5c96016c92c3..000000000000
--- a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?=
- <mimi1vx@users.noreply.github.com>
-Date: Fri, 15 Nov 2019 08:52:35 +0100
-Subject: [PATCH] Fix _imp module behaviour if is defined paths in find_spec
- call
-
-fixes #1896
----
- setuptools/_imp.py | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/setuptools/_imp.py b/setuptools/_imp.py
-index a3cce9b28..6ccec5799 100644
---- a/setuptools/_imp.py
-+++ b/setuptools/_imp.py
-@@ -19,7 +19,10 @@
- 
- def find_module(module, paths=None):
-     """Just like 'imp.find_module()', but with package support"""
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if spec is None:
-         raise ImportError("Can't find %s" % module)
-     if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
-@@ -60,14 +63,20 @@ def find_module(module, paths=None):
- 
- 
- def get_frozen_object(module, paths=None):
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if not spec:
-         raise ImportError("Can't find %s" % module)
-     return spec.loader.get_code(module)
- 
- 
- def get_module(module, paths, info):
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if not spec:
-         raise ImportError("Can't find %s" % module)
-     return module_from_spec(spec)
diff --git a/dev-python/setuptools/setuptools-44.0.0.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild
deleted file mode 100644
index 56fd5bdf49f2..000000000000
--- a/dev-python/setuptools/setuptools-44.0.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
-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-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
deleted file mode 100644
index 56fd5bdf49f2..000000000000
--- a/dev-python/setuptools/setuptools-44.1.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
-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-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index 07b818e2943a..c6933e0ee478 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -14,22 +14,21 @@ 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"
+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}]
 		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
+			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}]
+		' -3)
 	)
 "
 PDEPEND="
@@ -63,6 +62,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
 	distutils_install_for_testing
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
diff --git a/dev-python/setuptools/setuptools-46.4.0-r2.ebuild b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
new file mode 100644
index 000000000000..fe0f241c6160
--- /dev/null
+++ b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
@@ -0,0 +1,82 @@
+# 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,9} 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 ~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? (
+		$(python_gen_cond_dep '
+			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}]
+		' -3)
+	)
+"
+# installing plugins apparently breaks stuff at runtime, so let's pull
+# it early
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${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() {
+	# silence the py2 warning that is awfully verbose and breaks some
+	# packages by adding unexpected output
+	# (also, we know!)
+	sed -i -e '/py2_warn/d' pkg_resources/__init__.py || die
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	sed -e '/xfail.*710/s:(:(six.PY2, :' \
+		-i 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() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
+	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 ${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-47.1.1.ebuild b/dev-python/setuptools/setuptools-47.1.1.ebuild
deleted file mode 100644
index 69172f4815f9..000000000000
--- a/dev-python/setuptools/setuptools-47.1.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=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 on py3
-	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
-	#	-i 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 ${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-47.3.1.ebuild b/dev-python/setuptools/setuptools-47.3.1.ebuild
deleted file mode 100644
index 69172f4815f9..000000000000
--- a/dev-python/setuptools/setuptools-47.3.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=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 on py3
-	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
-	#	-i 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 ${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-49.1.0.ebuild b/dev-python/setuptools/setuptools-49.1.0.ebuild
deleted file mode 100644
index 3f1c94d2fb6d..000000000000
--- a/dev-python/setuptools/setuptools-49.1.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=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 on py3
-	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
-	#	-i setuptools/tests/test_archive_util.py || die
-
-	# avoid pointless dep on flake8
-	sed -i -e 's:--flake8::' -e 's:--cov::' 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 ${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-49.6.0.ebuild b/dev-python/setuptools/setuptools-49.6.0.ebuild
new file mode 100644
index 000000000000..0d8d2e8bfb98
--- /dev/null
+++ b/dev-python/setuptools/setuptools-49.6.0.ebuild
@@ -0,0 +1,72 @@
+# 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,9} 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/jaraco-envs[${PYTHON_USEDEP}]
+		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}]
+	dev-python/setuptools_scm[${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 on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || 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 ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 8c3b5cc07c09..d36d41fbd7b7 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,9 +1,3 @@
-DIST setuptools_scm-3.5.0.tar.gz 46272 BLAKE2B 132711c8312dfbe48f9e2d3d7fcd0a86b057bbcf9a5f6b2e61afe018e116a4df96c3bf5cddf067bc92b96915f70182013749ce65b8fa5feb92ccef903859ee3f SHA512 f7e2cdae7a8a3d5ef3d12effcda5ce7f362c426e11aecaef69ef604bede9abbab2aa1eee6f5310cdd72a9bf11a927dbd1f42671e28bd467ad7b15f2dba5b81d9
-DIST setuptools_scm-4.1.0.tar.gz 48740 BLAKE2B 70c7530af963ad49c013f65a2279a76aa8f1ec6809fe463f95803011ecc6725cb18154f6c49f0a976e86a8c60cface13d1caecfa61a51acfa1775df291870e30 SHA512 96f8f3668f4efdb47f422ec33a417d8ad67697b953788757f7557ac3c8910425ff6f9438e2b724bbbd542da1f736dc1f5e02eb5305935d87bb9c4b943aff2f16
-DIST setuptools_scm-4.1.1.tar.gz 48784 BLAKE2B 3e9fe54ccd622ccb6fbc48edc0ad58fc32f8b81fbcb985c5308ac2cd6721544d16f704b0f8cc16393aaa9e034638fb8ee974f010a08bb37b5af936f48a6a4888 SHA512 acc44de4a5096adc34ecb67bbcfdaf7fd80954b1595c34a0cb8291ff5bb351a4e3dbbf26832f7f1973ddb834d8bf1caac5caf699eb1b864bf00aeff963bc3fca
 DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
-EBUILD setuptools_scm-3.5.0.ebuild 1116 BLAKE2B 9db6626cb3b863e3c124cc7a7e62cfbfeb0b2adf2467c1584503eff8af76d451f6ff68509cf222ac801bf2e35f68b61dde0b7f486f3d5d6cfd9564cdb835cf20 SHA512 de6c02fb68607524ec31fc9d053249cc8f5c05c010d64915cd219c07ef6932adf3ee809f3faffcd5300fcfd93b3db92747c793ac0c5cf541dbb6237967872662
-EBUILD setuptools_scm-4.1.0.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
-EBUILD setuptools_scm-4.1.1.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
-EBUILD setuptools_scm-4.1.2.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
+EBUILD setuptools_scm-4.1.2.ebuild 1128 BLAKE2B ccf0261f067448cdac2abfcfc923ccfa482b644270d420709dfd0ae366cb24441c0fddcbe7609b48d8d5a33e7188f02fa9ad94f9f4b3069151523be13b7842c8 SHA512 3082b7cdf790e0c543a72eccf862d4f27ac0d4a4f3de41a3cf0ed5413a9f1cf443fb45dc524152b9bb1895fceaf483483ebb06ffa699ba43cdd90810846205a8
 MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
deleted file mode 100644
index d433cce41592..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-3.5.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	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-4.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.0.ebuild
deleted file mode 100644
index f28a4689c959..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( 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-4.1.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.1.ebuild
deleted file mode 100644
index f28a4689c959..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( 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-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
index f28a4689c959..c00fd3c90d9f 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.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 ~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 454beed84f8e..6d3a0d0883c4 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,5 +1,3 @@
-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 755 BLAKE2B cc33b923713fb7176bbbb5a698d96d8a413fa8ffd7515eb15043787f1c2617c680348206f4d48e515ef9120a7f08ebe4cae551e289bd2955fac380b3f56ce0d8 SHA512 a7856edf5dbb1a4afe4378e087629e0937890e4d8a54c108c77d0655fc411c3038aeeba82e92ceebabf978cb7667d6345edf80883cbe98ad866dfc8cd3d1f1ba
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD setuptools_scm_git_archive-1.1.ebuild 754 BLAKE2B e7f909e687de49beab0d834855da80a79a6e6f38739f323e987416dc1e54286f31a4530789fc5a4bda071db5a31e5dcf59c706d43a8931b29f4666dfb2a2af36 SHA512 a9160fd7e2a3d569f16a2e9801a53ce5323e14facf02724feff41df098a5af7602d464ae9c8c64f5b35fd3c89a0b3ba78c1dfe9d1341b52a9d560a42c36bfb90
+MISC metadata.xml 267 BLAKE2B 2d8b57fd5de0132fa382ac268575d15aea1f698eefa99b03a35c07ea1eb798dea4d25a1fba9deda173404f29cc99c8d519aed5ff5fb60d0779768fa53411542a SHA512 8c8abb99f1567921f504df5c39fd2f54a0cdc5ca1b5c348fa5b0a9c6a3822b474bd489821195ead44237f3ac873b0ac0b05597632a546a41e0bbbb97e71a2357
diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
index 3da97a9953cc..1f54352252db 100644
--- a/dev-python/setuptools_scm_git_archive/metadata.xml
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -5,4 +5,5 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
deleted file mode 100644
index 02288254e43c..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.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=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_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
index e187d19e5ea0..152a88835a2e 100644
--- 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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 53867e735577..34ec3d379645 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,5 +1,3 @@
-DIST pyside-setup-opensource-src-5.14.1.tar.xz 3217008 BLAKE2B c02a79ecea0ba8c7f5547d16c842437455f7f7fce9b7993849919b593fc50b70661e1fc7c1e01eb6a505807f05e17696b2e7727f6ada9ecae2ce30a9ab37a4aa SHA512 6dfe8dc6f302a35a6448c4facb2b98d638506381638c8bda69b75a47ea6cb3168b11515faf0000dbfb5e36bfad5d14488ba5a9bd914adb3f5c38ed18714521d4
 DIST pyside-setup-opensource-src-5.14.2.tar.xz 3238036 BLAKE2B 454f19ae4e154747bad2b833727ab62ded15bbac495cc0bef112ce6cccdd69bb5bb541c9b31125bd05090bfce042bac2ac8b47690c695e82b5c901e45e87f681 SHA512 6708c4ebb115119796756ccac89197e111eb27c4a91f52875da04eff4ca6f9e3fffefc18cc0219a8c3a3c81a667bf7509909a6d1d9ff1ee2cc0d957453cceffa
-EBUILD shiboken2-5.14.1-r3.ebuild 6681 BLAKE2B 0a4c330900a69cf21c0e4d04357a053d8d6e5c81bb4fb45509d147b0b90b6b26ee930df4b621e95a45e615d935d440f307f21e3b7fe69f1d71df08c3b6785ba1 SHA512 02c7f0adad9c9a2bb7b9aa5c5184b751bf6da1d004e477c19e4d637a3c6e563277a6cc8f2e3dab5c770c7f4f6762ff6382e43b9312c819019663db5f6010722c
 EBUILD shiboken2-5.14.2.ebuild 6621 BLAKE2B a16591525ff4396498d4d57c6f513b548ba5b39454927cc2b51ea108f390c0d4c981448a4200bcdd13c17a360134be540adcc3d93c14f305f230cd4461a9310a SHA512 90266606d682ac8543d8e4db03606b35e8cee17df9ec960836983d3947e901b14fd618bcea85842cf66a48ea1a27aa81971d937b5f3860bf94bf878a0c270bf6
 MISC metadata.xml 503 BLAKE2B 37ba81030aa2393583ae7eece0a0f9a542d7bc7d4f2b8e8a434e366d7fc8a24045b6fa0bc667355cd36fcc9866333c30efaf5da026b567f02357dc69e411a202 SHA512 ab55f2d1d33be0746ff7a2056a6dcd774089d356f8162338f8f9071a03c5e6a2cd09d665aae2232b32c53ef9b50b86e7726210376ed38d981397c522620639bb
diff --git a/dev-python/shiboken2/shiboken2-5.14.1-r3.ebuild b/dev-python/shiboken2/shiboken2-5.14.1-r3.ebuild
deleted file mode 100644
index 72c24c2bd8a8..000000000000
--- a/dev-python/shiboken2/shiboken2-5.14.1-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Remove the shiboken2 5.14.1-specific "sed" kludge on the next bump.
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils llvm python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	>=sys-devel/clang-6:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-S=${WORKDIR}/${MY_P}/sources/shiboken2
-DOCS=( AUTHORS )
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. This requires us
-	# to temporarily coerce the "${CPP}" environment variable identifying the
-	# current C++ compiler to "clang" immediately *BEFORE* calling such a
-	# function and then restoring that variable to its prior state immediately
-	# *AFTER* returning from that function call merely to force the
-	# clang-fullversion() function called below to return sanity. See also:
-	#     https://bugs.gentoo.org/619490
-	_CPP_old="$(tc-getCPP)"
-	CPP=clang
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-	CPP="${_CPP_old}"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake-utils_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py
-}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 3ffc0dd6ad3e..5119ca7a168b 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,5 +1,3 @@
 DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
-DIST simpleeval-0.9.8.tar.gz 24554 BLAKE2B 92adb2de03e2e70be99adef625de54c02c39305475f8df4517862c9a2726ef5c36e3e411f6cd1b4e47d57ed20ce66b3fc55ef402e705c4f3d49b8b2389919e18 SHA512 3aedb78571442283bc7b2bd1754dcc2197f81b264c6e629acdd8307a0adb7a4f06e084bb121caa0c36711153253b884942cb5c50614afb58e0e895247f8c20aa
-EBUILD simpleeval-0.9.10.ebuild 514 BLAKE2B e01d622c9c0a1c2d8648c6f1fc40dabe395ab9b35b9e6e4d32be2516a939da2a701d15d55bd1793d6e3c0ff94a0487572df0676b773984e0591d3d26dd4c37b0 SHA512 fca490c1d49dd2fb41184f2d9e30324ff0f68f90c9453527135c68702127da5072470f82018301cfe7e998b27666bd24c3f0f68323f92bdd3d7c802ed1a123eb
-EBUILD simpleeval-0.9.8.ebuild 510 BLAKE2B 1d2c41c755e70df8031b1f498bc7661bf00e90bfd44359de445be0b3a434c11a4ab7a4859a39511807398053fe37c36c5018efc4c9276b9b150726f002ae4c64 SHA512 55d5c26a9a078096c0c76af8dd85611fdabdf9a2c8bb5f05dfad93cec780d7df90a58bea94bba77d237ecea9517e5484f1f33d19f3cb7250144f1d754d0b17c8
-MISC metadata.xml 483 BLAKE2B 5ca6ac5ffec78efa1b4c14df21173e15050efd7a024d87cbbbd86e59835afe2dabd4ac44c277a23276eed79dbe889f0f5a5a514048aebce42aae9c46f8d832f0 SHA512 a2f3d2ad7fb0d4d887022003498692c18db8e4ea6de1f5c5eb2a10e48af624a887dc2a06d91a73023c17a2fadb52e30e9e14b9686f0c0d73b60b6fe35ac39222
+EBUILD simpleeval-0.9.10.ebuild 512 BLAKE2B 303af215e13c965f3f3443cca0d40dff858bef8396e4139039507eba0ee362e13fb3f9b684771e0e72c169c44daaf96d40b61b3eee31e5093daff33c866e2164 SHA512 813130aef92f60c3a6e192936c514e8c8e769de3f34d5cfb0b67fb07b100e66e25314f740862d40cd4dab8aa758b970b1c08808c8cd25a561b9aa6fed719759d
+MISC metadata.xml 404 BLAKE2B 67311501b2868bd8b408afac33876a6f1c22668e928211f689d30a597a64b6aead900e67b6c4cc6c4aceebb97ca40be49ddbde771e1207a55f8f31efbae6866c SHA512 882e0b28786a05a956f57c1b3bcfc9fab815f602b360d185380a7f51ef663631ef3e18c5bc565c94bba5b07f6a307442fb097912494cefe404b5f18664e9d511
diff --git a/dev-python/simpleeval/metadata.xml b/dev-python/simpleeval/metadata.xml
index dd01d5037e96..9df4a33d6d3f 100644
--- a/dev-python/simpleeval/metadata.xml
+++ b/dev-python/simpleeval/metadata.xml
@@ -5,9 +5,7 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		A simple, safe single expression evaluator library.
-	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">simpleeval</remote-id>
 		<remote-id type="github">danthedeckie/simpleeval</remote-id>
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
index 082108d43d4f..406fe902d731 100644
--- a/dev-python/simpleeval/simpleeval-0.9.10.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/simpleeval/simpleeval-0.9.8.ebuild b/dev-python/simpleeval/simpleeval-0.9.8.ebuild
deleted file mode 100644
index a21024cd9adb..000000000000
--- a/dev-python/simpleeval/simpleeval-0.9.8.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 simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.rst"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index d156dabea6b9..7d00d76fa8c9 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,5 @@
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
+DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
 EBUILD simplejson-3.17.0.ebuild 774 BLAKE2B eaec307788c130d7e32ccc3760379e3712f1407b9180c1a087daab1327ac230caaeab92fe6a32df2d58219c11264b9c24317fc64b536a67e24ebf870fcb49a37 SHA512 69226587cf94ab5de79b4a1a0687ca2554b545807d9796ea23a9c82419b53d0d1ab6f36ef73a51936514a66c773f3655cc6c2b74eb690e1ac1a2763929d6eb03
+EBUILD simplejson-3.17.2.ebuild 776 BLAKE2B a938820f8aa423bc364b9ff1911c57aefdee6abf8bd2267ad54a1e09cdd83c81c77b5b3276e27bdcb2b7a21d5ef1fffdae08ae925f656ec8f3b61504196d51f2 SHA512 0a843a997904484049c71e683bf7effc17e1bc17311a48a7a99740a3aeca885bee92c45ad872fe82d9e7d4e65f63d747222c46bbcc4035ed3e27c880e6759be7
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
new file mode 100644
index 000000000000..262c80842335
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.17.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=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+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"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index e669ef2d247b..0958e1cd9cf1 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,5 +1,3 @@
 DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
-DIST simpy-3.0.8.tar.gz 402664 BLAKE2B 434f0575ed2b5c99f29e9e403bfbd07da23b6abdc5a8fc183933a503ec574d8726535e727f5c15b0de7e1f331fb332d6b79ed933d5a2f3a6eafd3e840039f5fc SHA512 c8c468ab60da1b357a1c62ca516a0cce51c6941f7b7795ee57c905cd8457f5614c5ff1f6d7586c0b9d9148e03251fd4f77b4e2c3c3d438e532e49bc4583fb08b
-EBUILD simpy-3.0.13.ebuild 848 BLAKE2B 258deaa9bc9e725a5f31c3784504e005bc1dff0834904d11fffa270364657f282df1cab17fb4eff123f994e23f564479018a5ce9c57d45ebbf12021931842a48 SHA512 9f0112868381887b9ff5201f818320d787aac0d6c95d58d3aec755ae1e688abc32414461e8175359d9dc1f78b9cc787d0821bb208fafcb8a9890c6203abc52c8
-EBUILD simpy-3.0.8.ebuild 958 BLAKE2B af1f5f720335c58db0cbf3521ddd67d7048dd635ef2f16c2abe5725909879939afe5ec9b22d2dce1b4e78fc6ebdd245ac0f255308c041ba8550e48fa375da3b1 SHA512 c00d8c453943f692ae2bbed66234398c358a238c04ee4012ac135a6f7192470929bea429cc5371291e4d04795d757185eb0d7af04d010e79e5c99e15441ba3e3
+EBUILD simpy-3.0.13.ebuild 838 BLAKE2B 558e15ab90d8b720df95dad32459e1f443c07b05636adb468067ab3d74650fcffcb79398f5d611af1433c4dfcc879b06451b722bcfdfedf3a5671db97e494f19 SHA512 1e1681c20765ccdbe78fa339e027bfee49ea56b7aca036dddd29025906374b54ab779d945311c519cf325f16c05d84819ad51f385348138fb94c03c58e2deb02
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
index c3151ab6865f..a0f8108c456a 100644
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ b/dev-python/simpy/simpy-3.0.13.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_P="${P/simpy/SimPy}"
 
 DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="http://simpy.readthedocs.org/en/latest/"
+HOMEPAGE="https://simpy.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/simpy/simpy-3.0.8.ebuild b/dev-python/simpy/simpy-3.0.8.ebuild
deleted file mode 100644
index 089f4eabe048..000000000000
--- a/dev-python/simpy/simpy-3.0.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=( python3_6 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="${P/simpy/SimPy}"
-
-DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="http://simpy.readthedocs.org/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -vv || die
-}
-
-python_install_all() {
-	DOCS=( AUTHORS.txt CHANGES.txt README.txt )
-	if use doc; then
-		pushd docs > /dev/null || die
-		PYTHONPATH=.. emake html && HTML_DOCS=( docs/_build/html/. docs/_build/doctrees/. )
-		popd > /dev/null || die
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3e9f08829860..3d3c7c2db2b6 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
-EBUILD sip-4.19.22.ebuild 2381 BLAKE2B 814fd23dd089d9e9abd815bf5305ca0d3c95acf9445304d6dc945f6ac916ef44c5f1fd7a7ff00f68e9a779b0a6a76af8920d621fff11a45f9984242b2c5fb47f SHA512 e230257d2a8d13f36946dc04a77f163c4e90ceadff7f320ffd05cdbe85049bf5e9f26c99139e21f6ee1bd748661a073554d0190d18513d6fd1613310a8b4a10a
-EBUILD sip-4.19.23.ebuild 2387 BLAKE2B 13c52156cf2cc477403fbbcb2c75998b6b67ef1ee4920110938c3c5917483ac9ee223ae646fb868795f01d62180326ba49f94e48a7a937287d7090f590af9d23 SHA512 049b482664ed679713f0f734f18a47eff2173f2894a41150b577c5fb7d8687d98b6000934ff357fe93d6788ecabe22e3ac1f365a484e333a81f82fe287c51f9b
+DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
+EBUILD sip-4.19.22-r1.ebuild 2285 BLAKE2B 2b15308bce64f79811922bcde1a6832ea45a77c19a5def285c8b7daca845391a35970f39a57e9a571219d096c2780b27ddd5b3ae297d83015c87f414f6daed68 SHA512 95c13cfa036323147ca7e84d1943b1c4d30304078465d5a77199d2098d84e6347844cb05044d0816f59a7b76efc4a6d9d0e07c9fc0285c0f1b85ad9a1931e9b6
+EBUILD sip-4.19.24.ebuild 2288 BLAKE2B b42acf534e97112a6fdd63944d6856a7152b259129ce0b0ad5f32e8970b7df446e705f2b80ce387b1331145c6336d35842c30392fa60438753a480f555950e9b SHA512 8969dd85d3846779aa9db3269b7ddf72ce7c76acac92f6766c6435b163b8e2b1ebce24df24b004d055d9f9c00da3d07f8bb5ccc7c32a5c6289795472b797ccf6
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.22-r1.ebuild b/dev-python/sip/sip-4.19.22-r1.ebuild
new file mode 100644
index 000000000000..0990210585d5
--- /dev/null
+++ b/dev-python/sip/sip-4.19.22-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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() {
+		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.22.ebuild b/dev-python/sip/sip-4.19.22.ebuild
deleted file mode 100644
index 6dfdf1956711..000000000000
--- a/dev-python/sip/sip-4.19.22.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,8,9} )
-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.23.ebuild b/dev-python/sip/sip-4.19.23.ebuild
deleted file mode 100644
index 1bb8cb20eabd..000000000000
--- a/dev-python/sip/sip-4.19.23.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,8,9} )
-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.24.ebuild b/dev-python/sip/sip-4.19.24.ebuild
new file mode 100644
index 000000000000..5771751b2f37
--- /dev/null
+++ b/dev-python/sip/sip-4.19.24.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+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() {
+		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/six/Manifest b/dev-python/six/Manifest
index 77b6484bcc50..a8060e4612ac 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,5 +1,3 @@
-DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
-EBUILD six-1.14.0.ebuild 689 BLAKE2B ff4f54f7fb3e48bbea4fd2dc414668e95cd55cb78ed55f91934e304de9b9ec95b3c70e60e144aaaa36d39ac8351f324293803deecd35e8b13bf096435e39a499 SHA512 3b89249aff7ee4847e88a3343096ec4cbf5930b16c1dba3d9dce77a8359157e7c2c45d2aef508d6a34d3349a1ef5973b496db898478339bc16fdbd7f574e8159
-EBUILD six-1.15.0.ebuild 700 BLAKE2B a3d6710773c64fb242887345ceaea95ad8c88de4d43cdeb2d73a7f31e76dfd6fe87e24c40877a5e5ca1d2ef5fc5793d5b8b9254b82dcdb79f2dd8a6b66d3b443 SHA512 ea9962f66ae2732c681f30d1141d8a49ee30d44ae26371fbf6ac5cb2808784b5d264476e936daca2b1089daccc9adde3dd8e70c431f619904c634b595c56bbd0
+EBUILD six-1.15.0.ebuild 691 BLAKE2B 49ca8f129495ebe8af17da6336f454de3f5ef97dd8805c97f74f4cf1d8b88a1944a9426def28d111091b1974fde659880ceefe7d02078fcf988d5c03650bc4ae SHA512 226f52169078c7a4d4d62d2917372812bc11fe5ea311c5fa62af874b5c074467ca8e4037618517b471df4143913de852665d81e725fb9e37b1162b860c15f265
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
deleted file mode 100644
index 2b7b9e966813..000000000000
--- a/dev-python/six/six-1.14.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=( 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 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 --no-autodoc
-distutils_enable_tests pytest
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
index cd8f4891597e..685f6840a365 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.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 ~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 --no-autodoc
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index fe6d8897e5ea..4179ac339b18 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,4 +1,3 @@
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
 EBUILD slixmpp-1.4.2.ebuild 798 BLAKE2B f0017ed0f6e8b8c88f418f3f52a94270b36aa6fce0b733b7ebb4bdfb29759637009c07fb8c0e068b8eb13ff1f5855be5a840b3737f800a0ec935e08c04975aff SHA512 2ce8bf3a9b47dc64fdffb86bf4e80ce9f74c58aba0d21414fc23dd850a018bcb4771d6abac8c59a5abb2e734c985c15d002b38a4bf0fe44537dfe7d1d1791ace
-EBUILD slixmpp-9999.ebuild 794 BLAKE2B 3d0739f1dd3e23e7df08e87bed7b4217c654f0a6cc2deb9fed87942817a9e850501ca63760e09cfad3dfdf22dc2a61a6abdfeb96a6016a4c6532f84685b39c82 SHA512 518d53ef2613a87f883132e52d53be67b8cef8af414b3d317f62314845f4dc218d5f9da273080af8a7d76ff9bf5c2fda564c0cfa57cdc9790c86c65ea256af8c
 MISC metadata.xml 321 BLAKE2B 263ceaeeaf4eb1405ad1fa44a5a064ad778b1759e9b4f72dd4e110b28c4bc904897029441ea4c5b1d577472f13dc1baebd2bca0dd11ec7f624708eefed6d4db6 SHA512 1d3070cf4fbf0feaf8473e8f9e354f401c64cbd526f94bf42721528fa94852146084219beee4c344138a1d1241783b12a47e6a4fd9de95cb330dd82baaab92e5
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
deleted file mode 100644
index 60a233b71f8e..000000000000
--- a/dev-python/slixmpp/slixmpp-9999.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="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/aiohttp[${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 cbf2bd3d90d1..7b203676fb7b 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,5 +1,3 @@
-DIST smmap-3.0.2.tar.gz 22511 BLAKE2B 26aa528628d9f923b883481e635292c7eeba70d37c8258dd242a5ff875ec4627c57c753e4ce72de6d19ef7227540689b6c410d941079ef5c1b279c30f65e50a0 SHA512 52db538f16b9d0bdbbb932c7eb67510facd0638ea69dec21e9d503c3381195130ac0bc1f48db24ca76b8e31b07279799a767dd7e1bf1d755e7f7684f3285b8da
 DIST smmap-3.0.4.tar.gz 22459 BLAKE2B daccd2cfa4d448297d1a0b2c33c1a316e8c84ae5dbe934d688fbdf034a660214c98d428206b8e9ce1cab3e5f3561309a1e7f29e3371b7358954f0fe7ea37092d SHA512 da7e5c0257f29b487eb5ee18f29656340f7f6999dd625d93560444d526df8036a8fc4452242a2d01203907798709d82a0015709e097bc22acd3d0a8b976ef9fe
-EBUILD smmap-3.0.2.ebuild 465 BLAKE2B e298af1fdf3cecea7bb88d9dc57a6c053b3c292a36e68f314cbf27fb3a4d74a26ff8b36a8f05f42b18e2f75fd3e80356881a24d56692a1d16219cab6faf4bdf0 SHA512 7510bba2a28d9d1bf54bc09b2eb4a52532dfb6d2d9627e94cf9980e4b3ec0ca631dd6dafd368d62358b22ea04160ba49e3f4ddf6cf524d65e2adf8381db37bf4
-EBUILD smmap-3.0.4.ebuild 467 BLAKE2B fbb4d7c7f7004dc6e7bea9ad9ccaf2c85824f88da61a5a6f947abadd6ffa6612291cba75cfda3bf54d231049c365acb51e11e8714aba8aa9dffdb32d702d3c1a SHA512 4e9045bb8ff5f83d023ddde1815f294e085703c6688eb6e687e31f0e2e34f7d3f7dc80bd7800d9e9f1b8215b6b8610eec771a0d5775ddce4939735d9cbdb06aa
-MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
+EBUILD smmap-3.0.4.ebuild 464 BLAKE2B a9a0c1aa02db5a4e7ae87f4f27117a7eb9860149587d0bfdb38e34d84648bbb97e854a68a6636c17b7ff141f46ed0b9f5cf967c6518e0697ff746dbca397a889 SHA512 9a30a29ac2a9e63109f11c486d80556cc1de4649c13ca42e68213cfea21e96e2679a803c2c82edaa766a9acc71f41cc86462e32d2ad55c66040c4ff716f4c53c
+MISC metadata.xml 396 BLAKE2B 5c97e05fa9c1976fc6f12f6a4ea3bef317876c1f329ed31d5a6ddec7c5fb177cabcbc80b22532bfcec545a5847e58e3605f39e08d2a1ed80969da5dcbe3e2a93 SHA512 c26a7a644c3cfb8c537dcbaa5c031cad1ea2a4b085960348be069376e7bf9b4d402b0f899091d7fcedaf7f578d457e39bed5c993d0e394e466430f49fc86ebf2
diff --git a/dev-python/smmap/metadata.xml b/dev-python/smmap/metadata.xml
index 3aaa661d0ecf..f90c32a7838a 100644
--- a/dev-python/smmap/metadata.xml
+++ b/dev-python/smmap/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">smmap</remote-id>
     <remote-id type="github">Byron/smmap</remote-id>
diff --git a/dev-python/smmap/smmap-3.0.2.ebuild b/dev-python/smmap/smmap-3.0.2.ebuild
deleted file mode 100644
index 06e92b29a153..000000000000
--- a/dev-python/smmap/smmap-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=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/smmap/smmap-3.0.4.ebuild b/dev-python/smmap/smmap-3.0.4.ebuild
index 90972aeedae0..64dd85dc7151 100644
--- a/dev-python/smmap/smmap-3.0.4.ebuild
+++ b/dev-python/smmap/smmap-3.0.4.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"
 
 distutils_enable_tests unittest
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index 340b07f1d646..f48d3528346c 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,3 +1,3 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
-EBUILD snappy-0.5.1.ebuild 696 BLAKE2B df9f14beae046f7ea4b7e557b44e0c69f78921884d61e50f19605c6d18c087bbc99b0ce24dfea5f29fd3398e70473c2bec9cc49fd3d6829f53ae05e3c35a190b SHA512 89d4b82fd82c0b70e5a7f903e7e07d77c8e99169b8fde5d28c61fce8442e86044922a4152582bebadc10c5f16e080c2b635b013e4b3755ee01911e36ab0cc232
+EBUILD snappy-0.5.1.ebuild 695 BLAKE2B 99c26b79d67089b03ecb0c2448b712c47de70bc57f0b535dca599cea06ca0f8c368fedfc1404f0978dd25a077d07499412874b8b51e7fc2ccf1f2c71f3a2eda1 SHA512 9349e48d14db7c7dd1c98b7251e5d0dff12cb096ca316977e53130c4b3e7e54d711b75854e86f9f09b256cf7dd5ac2707e51e2e8f304a3b5626c6f5e2280ed86
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 3a61a54d1ec5..402a64bcdf02 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 c65f4f4a2c9e..f08c6847fa54 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
-EBUILD snowballstemmer-2.0.0.ebuild 545 BLAKE2B 1e0055980f751bb439ded4f79cdf460cc21de8ae69dec2c7cbfb958012eb20b7d308e810c3326eb7754cfa87720f97ba6a3b7a187de68fcaeb9c7b2011c02f23 SHA512 743bcaa604a6bc29d25cd12830d3fc8c04d0160daa9f1ac77914eca791c370977a6a00dafaf334f9498e7a07e9257cca2e9a2261d66a354efdbca5c43242ad26
+EBUILD snowballstemmer-2.0.0.ebuild 535 BLAKE2B 78e1373cf44cc024c126175cce8d7dc416e69c56e1c8d698cf91bc3589e94d98094b4a17bd976f93357f83cf03061524be6c11af2b6f3ef9df559af58eb3c0ec SHA512 8c0991a35da0f9e12b28cac0a16e150ebd41c5430659aeb4b1d4c3dbd97bf8d05dd7bf6a3bce26b6f9a8d9b807e3a017c46e47cdfa4e3adf553c5060ddd0338a
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index 00ccfbaeb113..a6f633ad3dd4 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
index f6bd00320593..046ff7177a0f 100644
--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@@ -1,5 +1,3 @@
-DIST socketio-client-0.6.6.tar.gz 21829 BLAKE2B 72e47f9aa4bae06767aa1860fc7d57f7f2ae78dd037e46aa50a8672f4e168982d6e602ed8f80f203081e5747cacb0f6fa2959311271bc578c1b8b5bf70ec506a SHA512 aa21d31bf9e9062578fc6892a7624ea41ef3437eff132ff3ef2829a589c0fd19953fc514ab05161a32d06578708fb7f41b2f636d3d60a2700094e676d72cee47
 DIST socketio-client-0.7.2.tar.gz 23488 BLAKE2B 8c638dcc8ed30fb01a31e36f8175ef7e6b77b37dac0a66f1ef663a372458ccb34bac2ed58fce31a3856eb3d067ad8dc20f7d4a332b2af10ae12717bbb786349f SHA512 850839f804953c706458467c9e35c4c3637d3a61ff55042ef0b6f98e39a277faa97a0a3d7b1e18210e68ec32bb4ca793cd404631e0e2b533e61ad5d05cbc18fa
-EBUILD socketio-client-0.6.6.ebuild 1456 BLAKE2B 54f225fd0cce72b7653fb96169a1b7b4ff0371c9aaa53bf148ad82a6d6964e27b235f46be347dd2080ca5a86581c15b44aecdabf5ee13cef1ec971088fbabf82 SHA512 5fa5ceaff2b3b80b1cd134bf90c2fd3c05f4cbcb4cdaa327fab724fb65ba20d9dade94a76189bb8fa844eaad26fe4759229f56718cc198f337e9de98f8ef8add
 EBUILD socketio-client-0.7.2.ebuild 1708 BLAKE2B a310d6f05cd4ec2de9c5514b3cbcf63b5ec8cfcc90a70eef5e27f39f49f9be2036fb3c435f36323f21e1e7ec6882a69c04202e5f0bf39e3fb1cb7df813778d1c SHA512 67767e34cb5004ae94d1dc4b535f2af8ad93a8821da4f3d90bdce699a896453f54575784ad45b8c937aee94a7675941d3256a6c4956e027555011df5ac2f86f1
 MISC metadata.xml 466 BLAKE2B aeae4a6f57347d31b7eed388cc7beeb819174f5f07b438a418f99532eb01ae092e6fa9a5758512de10f96f9e8aecef0e234d6e893ba39a353ddb1e42f1574b41 SHA512 a5d48ac121de3b0334d12ff4e472aa04be849f87f8ef39222a5a112674d36390d1ca69936d675cb7a42d11e73cdc5019540091ac64b727842d515b2c96b68c09
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
deleted file mode 100644
index c96272130c69..000000000000
--- a/dev-python/socketio-client/socketio-client-0.6.6.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
-
-MY_PN="socketIO-client"
-REPO_PN="socketIO_client"
-DESCRIPTION="A socket.io client library for Python"
-HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${REPO_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/websocket-client[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${REPO_PN}-${PV}"
-
-python_test() {
-	# https://github.com/invisibleroads/socketIO-client/issues/90
-	# This runs the suite but has nill output to the screen
-	# The bug filed will hopefully yield a more conventional testsuite
-
-	# The import of SocketIO need be made with abs path to run the tests
-	sed -e 's:from .. import:from socketIO_client import:' \
-		-i ${REPO_PN}/tests/__init__.py || die
-
-	"${PYTHON}" ${REPO_PN}/tests/__init__.py || die "Tests failed under ${EPYTHON}"
-
-	# Return to original form for final install
-	 sed -e 's:from socketIO_client import:from .. import:' \
-		-i ${REPO_PN}/tests/__init__.py || die
-}
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index 57b80994e6a7..d86a970562f4 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,5 +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-r2.ebuild 1264 BLAKE2B df47285d2e83bc22500c18577d77997329eed569a6c5ac6d769599fe4343e666d27ea61a4433ac084fff5ab1ad37f81ae80c0c43686d2c91e4c50c33b6472cba SHA512 4b5fabf30d93ed2c1704881bad65d40806e98aa614d9b264c099a922747df64629164c4c818e0d5470b3a270cb82d85d095c5fa8dc926915cba79435170757e6
-EBUILD socketpool-0.5.3-r3.ebuild 1488 BLAKE2B 9f92eead8a705f3896520c24c26a3b9747b362f7225ef81860ae5f118307ebac1de48745ee6ecd18ffecef1988ebab3671a038d871c2583149be7f9fc0483118 SHA512 a6d9e284ddc1bfaf695a4d2dc5c44412baadb935cd93338ab9316c90c5ee9c1f34192958a78a8b819d6dcdc3ef078dd658b1cedbdbcac908db30ada1894f9181
-MISC metadata.xml 646 BLAKE2B 78d8d0ff3cf4c225a6f36e02c1ae604b2bc7274d2b3d1f5b13dba09e4111ffb1177cd9008b0841e1f22a5a77426dad7a6f7ff39b9475c7944e8becfaecc1499c SHA512 e0845d25b7c518c035e44094d6164d2184556e8e4c82691efb8c79401835a924ae3aebc271e29c756169bdcadd3a1b9db8fc8666aca65d79f5c10ae45848e1c7
+EBUILD socketpool-0.5.3-r3.ebuild 1478 BLAKE2B 4ebd9ab64c131e3c1c9e1d04f607f732986197cc5577d7fe698d5eba447c83aec7b32c073cab7e616dcda9dbb86072d2b150d37fe83fdca41e0bde784d300872 SHA512 6f7ebadec763bb288e736e2e7e30da2d223023fc6d0fffe8d8a104164df94801d5bea84aaf6939f862d47c68f63afdd1645e45518573f6a0e875f36ebd3f2cf1
+MISC metadata.xml 671 BLAKE2B 4830d3dca5040e6a7b64449c56d35b91421a96c703e04a3c22ae10d62d4f9f262a7025cdbfe3c7589bf2b5adbac90684f5d0c9b26bd9ca80708bc9d5fe7bce48 SHA512 8b9aeda2388b10c703b3266a206e04746204d3b66334a902adad17fc794458ffe3e12116ddd4628724c323a6f6e2620acd0d5c36055271f56bcded01205acad8
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
index d83b6559d4ad..c8eeb1deeb2f 100644
--- a/dev-python/socketpool/metadata.xml
+++ b/dev-python/socketpool/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">socketpool</remote-id>
     <remote-id type="github">benoitc/socketpool</remote-id>
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
deleted file mode 100644
index e0fffe7af7ae..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3-r2.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=( python2_7 python3_{6,7,8,9} pypy3 )
-
-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="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 ~sparc x86"
-IUSE="examples gevent"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="
-	gevent? (
-		$(python_gen_cond_dep '
-			dev-python/gevent[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
-
-BDEPEND="
-	test? (
-		!ia64? (
-			$(python_gen_cond_dep '
-				dev-python/gevent[${PYTHON_USEDEP}]
-			' 'python*')
-		)
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' socketpool/backend_thread.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -r examples tests "${BUILD_DIR}" || die
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples
-
-	# package installs unneeded LICENSE files here
-	rm -r "${ED}"/usr/socketpool || die
-}
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index ec04b5041af9..43c365e9493c 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="eventlet examples gevent"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 6d18ae05bd2f..3dd4bd2f2806 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
 DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
-EBUILD sortedcollections-0.5.3.ebuild 582 BLAKE2B b7e8677827247b44d65105dd8e2bb6de461f5743e60a8b9e46344942748e4fafba11f97924a825f37c6388fbef160517cd413bc3616028662ef94a29820c135e SHA512 ef29f878f32fcdf15b6c32807e9c9befab30dbe5736279ed79f57142ed0650dd1fe4a8625b91cfc98e3fa7ac15008fe87ab6514d5a1ba5d9588d912f9c3f7d18
+EBUILD sortedcollections-0.5.3.ebuild 594 BLAKE2B bababcad1f7c0a7adc8a9abd31659b5830b14a6a4b3456c779a4f5d19870d94ec2aea6a49b24b9397a07760eeee70f7ccdb89a65b94b596a853eee91b29ed5f5 SHA512 3f6678d0d42f8fff823d5814526bdc975105fb1be3abd850b9fffbf47918b38160dd994fc40d7b2cab2cd933234a9db17d4496b253bd9518b80095ef6eaa750f
 MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index d21830553a57..e19def8ba3cb 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 98641ab7c2f2..2c451584fb7e 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,7 +1,3 @@
-DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
-DIST python-sortedcontainers-2.2.1.gh.tar.gz 9228694 BLAKE2B ccbcaf8ef1582c3229cfd82699b642c9cd86db69f68cca56d35fab05fe6b8bef5281af53eae3b697b1a8d7aaad9140d2f3de611eeb5774319a64ff9c5fc602be SHA512 d4a45c4db9ec86c83c71506525a452fd5716818326635f69fb6e830d86803c5d39821678cb67e142ddd1ae9d093f9bb583c29b6bdc59a18a5ec0213eea4a1e29
 DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
-EBUILD sortedcontainers-2.1.0.ebuild 826 BLAKE2B 795e8c35540f5d0edfb4cbcb6096ea5dcf5e100a51d18ce89762e47e1d75790759d88cc845fb54ef15e82b73e6a55556438b024d44f25bd371fb3c4f7395380b SHA512 bfc26051835b628a39496b1ef8e570dee729d6c20b68c5f4fa845f3ca025788d3ab30f2e7d59b59768f955d3aa074cbf9e94eb62ec18da97c12b9f69b257f9bb
-EBUILD sortedcontainers-2.2.1.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
-EBUILD sortedcontainers-2.2.2.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
+EBUILD sortedcontainers-2.2.2.ebuild 829 BLAKE2B d118d1902b9d19a473aec17f2f5635220881c5bcf3710c4a1ae1fee9d400ff4b7b18b38d8c7a547cdccd7db451ca1601a1e422952bb5ff085b2dea29e6e181e7 SHA512 0259df22aaf0f336777e4e9f732d586f2b31ef9e03ab7c2c68015ce60637bf63c970c641f1a1736edb2f91d00fe5d931bd135a71cb75fa37c12fd597d05b6820
 MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
deleted file mode 100644
index a32b17db5076..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.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=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
deleted file mode 100644
index e70f737c3eb3..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.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=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
index e70f737c3eb3..7b0ae5192bd0 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 79c99c50a2bf..297110d42220 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,7 +1,7 @@
 DIST soupsieve-1.9.5.tar.gz 99119 BLAKE2B adf2f068ca536583557dff5b86fbb8020de8139c346ab124c8f78d91d2c0db49553cc9b8580a4e8af0fb74e19a8f8b6e5459b654a900034d76a677e60ea0fece SHA512 38cf37c7080ec6054291a076eb4b152bbf5267b9fed25f933a340345cd7807f14f4a5300707090fd233382e96841f6a33305876cf02740c96dd6aa9d2af06868
 DIST soupsieve-1.9.6.tar.gz 99276 BLAKE2B 2bd2f74e6974ad73c79c018f704fef600594c568471062c503a7fb1248e2cc1840011d31550f7573654f015016f0d3272778b0100e4701318a829f916f06698e SHA512 44954cdedc16a51c794ebe6770caeb8f179167ad2f0a0478cb1efd5878d6cc49fffd6119125964b19184afa6d0d7dedadb81dee020a48c5128ccf56e36a78f61
 DIST soupsieve-2.0.1.tar.gz 96436 BLAKE2B 00fe9390569886181d484c5eb3f2a14352c16c3807d4e2eca8b5fe0ff0fdc1ec77fcf6b32885d76f3a085c149848bdeafa1fd2cabdd4fe4742fc175c34aa72c4 SHA512 f4ef4deee81bb31952e1d3216250712f09b425e7a2253e15bd1b38cb74b680e421e7d086a8770737898f6b57867f07f2dd07b8a98108d05e338bce92b274b85f
-EBUILD soupsieve-1.9.5.ebuild 853 BLAKE2B 11b56eef0938bceb42c8153f1be1ce3589490bac313589ada997d08449fcaf60bddef4e9e0c0ed621ff4c35a666dd0dd3209620b55a2aa25440ed29d13445d4c SHA512 f0708c5a8b9ba6c4f86034f2f26ffdba0ba2732f599442820c8a59449c956809ffd0da0e1be5f47ff1e3a0b5fb7b33c3b3699247b1d854fce671a17da2ace306
-EBUILD soupsieve-1.9.6.ebuild 861 BLAKE2B 8842b6935d6fa60fca98d17a5d67e99cedf006ebd25e9e5785c8a15896b5f47dab3d37391a073073c758e254f824b73b8689486ab142e88cacf3cff22ce12c77 SHA512 e977f0ff00670919a72caf1a858ef1576744af03fb2d5965097173f9a916c9443c2ab529947bc43cda2aeff557268c1c177dceefb9ede9d44dee5a4e3f4ae91e
-EBUILD soupsieve-2.0.1.ebuild 755 BLAKE2B c358c642a1e07821a703c859bb14a0f60c00d5567b21a8ba0091ceeb2f4c0678cf472ea8df8cfce2a5a6c812a4e3d56794c5fb9cb4e57370b2db8625a996c380 SHA512 a392261ccd32045e3840a385a48614b974e879b71d1d00b4c925276fd8eb9186cc8975367ce1f3e618fe4d1b866bab3930b4ada644dd8e74bf881bff90f583fb
-MISC metadata.xml 374 BLAKE2B 14941be3b61b2a2c4cdbd3f488d5ee9043a01d2b5d216947d41cc96822a80a34f435ba0bbaaede5ec6bfa21e01e3f7a6ab09d2b79bdc58b843b7da794ed92d25 SHA512 22a17406eaebb4e49a1a78d0edb8c155a8416fd92c21fbfd277ec74f54b65c55de1d08c046c979f1e3a3742900d853d5c820032e22e5e61e4624f2b1bd0c5b45
+EBUILD soupsieve-1.9.5.ebuild 737 BLAKE2B 32010ff6c26cc0dd0d96d7c56e43d639640838c82b85b1f8ce447095a39f17e48d6da95573aa5747aa1d36cd6c8c07ba979aa6fe15eb57a307251166a062e8ef SHA512 4912989c891ccdc2344c077479a6821ac2efe68b318387a45d7c7763188dc710efb2d3902b30c9c3e876abbd763ed5c5d50254f2b215796778fb7218a94a5d0c
+EBUILD soupsieve-1.9.6.ebuild 737 BLAKE2B 32010ff6c26cc0dd0d96d7c56e43d639640838c82b85b1f8ce447095a39f17e48d6da95573aa5747aa1d36cd6c8c07ba979aa6fe15eb57a307251166a062e8ef SHA512 4912989c891ccdc2344c077479a6821ac2efe68b318387a45d7c7763188dc710efb2d3902b30c9c3e876abbd763ed5c5d50254f2b215796778fb7218a94a5d0c
+EBUILD soupsieve-2.0.1.ebuild 753 BLAKE2B 2ea7c0abfdc014f0ea218f1f12a9bec5d6f0ec6791ecbdbb2cd039d1711e830062dd1288ed2145fe04c8cdbc554226afa4274ed44132ac8446375162c8e37d91 SHA512 5a144e46fe22663519b6b20b7899ccb6b7cfb3258131fe622788304dfaf72eb95ab3cd516c35fd31fd70c36811f791a7ccc99d5b2c97e133861ad6e94fb6bd15
+MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/metadata.xml b/dev-python/soupsieve/metadata.xml
index de74db44b00d..d601a0517373 100644
--- a/dev-python/soupsieve/metadata.xml
+++ b/dev-python/soupsieve/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">soupsieve</remote-id>
 		<remote-id type="github">facelessuser/soupsieve</remote-id>
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index a999810d15ad..e9b9e28680a3 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,10 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/soupsieve/soupsieve-1.9.6.ebuild b/dev-python/soupsieve/soupsieve-1.9.6.ebuild
index 2fa1722f0971..e9b9e28680a3 100644
--- a/dev-python/soupsieve/soupsieve-1.9.6.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,14 +14,11 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 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 )"
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/soupsieve/soupsieve-2.0.1.ebuild b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
index bc7d0fd6f292..5034426eee77 100644
--- a/dev-python/soupsieve/soupsieve-2.0.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 43e4f1700c1a..eca3fdcd63a4 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,3 @@
-DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
 DIST SPARQLWrapper-1.8.5.tar.gz 89117 BLAKE2B e36f90b0bc8adc789750e7db588ada22e369d10e1ae94777b627680070f4ac8da3e7575c7858121386287034061b6fcfbfbb529f9d8de020ae65a7c6bdb2ef80 SHA512 b0cbe9f7f13a8a0a1c88a17b5966b46e7811acada2712ee03be97808dcb17ba4a71990c07df5d213d21815d7deaf3526381a2cc864d839e561e242be797b6bb2
-EBUILD sparql-wrapper-1.8.4.ebuild 607 BLAKE2B 3ab5fb334faad4b73436911d66111517893bb966d3a723d1499e922eeca30c6acfe43df6598a0d65dcc0cfc29f76dc0dd1c0f44210499c8700a1ada4871a9d1e SHA512 5ea1cb3097b9633988da26b43b54b7f38038544024d92744a8740f68f60cc2530d0c9ccd830c7854a102615b35a36b6dc9c4f43a30371268ff2adc8d3c381879
 EBUILD sparql-wrapper-1.8.5.ebuild 1381 BLAKE2B 430c7257df00ca47163a0d91b82c98e8fe10b5c261d83634cddd5f62a9afba6e9795686661f1954de6517a940c87b03e150b4ab89858e4663a99812c323b075c SHA512 b8b7fa48bba5011a1e7519010bc7965b54ed8df4c5b73b90c0b22aaaccdeeb59399cc1f30aaa619be4d5e09cc29b13970adfd6079f990d0113c12b27135656c0
 MISC metadata.xml 351 BLAKE2B c701bb1843f62813bf8aebc5dabe1f4ed1f9ee610acc20cf9ab7ddd9bdebafb056063748579ac644a9a518f9f3fb51eb552ab5f6e4abc88434e1fa3f4be13d5e SHA512 5bd96f30563b46e9005b8e295038bd2ca340f6c2b0eb75f9f238a508d43d1bb066017b583cd8ccc243261d14314aa044cac9f27ac8cf1cacfc0e785b00aeb33a
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
deleted file mode 100644
index cf3d616cd242..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.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
-
-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-4[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index a47f02edc0d9..67b3141867ec 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,5 +1,3 @@
-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.5.ebuild 562 BLAKE2B 262862ad29b9f6f856ebe82522823d8a632deba86e5b00f88868e8db1685d113edfcde385a87d7aaea0f2c14c0345a105c47c5576e6e32b993e2aeac9d2632a3 SHA512 3084fed85d481ad806b828679af3ee7d736a3e6d94786005ba4e1bed5894eaf482d53a14e7f176c7b78a9132384d6bb8587d1a7db491170d4ab264a757e6c18a
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 564 BLAKE2B d30c02f298b2018a3b58c99e6d1a53f7f5a575ae52bb20ad530c9a989a76470db91a284c0b3fd6f87974249616cac1f9239afde855315dd9a1ce978edaa0678c SHA512 4db4d0f7cdd222f171aed012b540bcade9545203a444a5954cf7c6d24f3e1f7291c68db358a82dfa9d2bdd3c64f7dfd807e2ae55a2fc25850a1b2b4989d61d66
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 577 BLAKE2B d7a11e9af275ec134d26f8dd943f9984a4f2e36abdd9d245b604be30a026c5187a525ebf4776e839268287a198a01df66e58117865f7d385f6c1eb1c9dd30b91 SHA512 00849a488c07eec6b24c955afddca04ccb3fd4bb3086e94da3aa93e33a5eff264f20d06d391f258f7ac2896c9a1a193828d8a3d4a713c55a7868c8fab6cd3524
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
deleted file mode 100644
index c9ade4c3ed3b..000000000000
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.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
-
-MY_PN="${PN#sphinx-}"
-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-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 79b697213802..5d7f1a975ba1 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ 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 ~ia64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index ae8650a878df..dff09307ae9d 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 546 BLAKE2B bc53794aca0969eb6e57c5573797af6a0169df139bac0617d5c1e3abd1f4ff0f2a15207c067becaa371c2de8b4fe608e3a4c656734774b73d5af6ffa073246c6 SHA512 724ead9515f3ea558b8f9cfb13e1729eb265d278904950885610d3897da0e219aae61ae660e90a7f19e45a3167f06e2423dc371ebc8634545838b62e63ec2517
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 540 BLAKE2B 054a89f55c2bd1e35f5d08eb123690e2cebeafd7e050aaf4333dea70d781af059e059a918ed35c2df6397cf04f5fca24c269cd05f23d8a80cf1b203499b39235 SHA512 15e81acf82758d508a22619585d134239aa362d0501560c47a69e30e68d4c3a378b239239d0d006fc9fc2b5600841b6aa9c7810f837e71e63bc2d987c57626de
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
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 efce491f868c..43b367986633 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 6731fe166c4b..0b574781ba6e 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 705 BLAKE2B 2e41e82c83053b9a439d7e23ce3dc6f7e1f1082983bef8ff4906c8dd6948c919bfeecb0fa1d21f1ed95115007d424a113ede5d52c821d956d9bdb7381017e1fa SHA512 4bdb3f93f31917dcaf7677bb93ca2b318ec885b0385e1de74ff32e5d963be33ed983e1cabda0b1e1f7ef40d9811f04a07485098294ae12331c3e2d945b7ea563
+EBUILD sphinx-issues-1.2.0.ebuild 695 BLAKE2B 437fa34dac4fd51c9faa61a41b7358371041bd38cf09649aa22e524364fb7034d00607090c5a49b2443954055c568bfae5e956193d7c0f2cad7c88be6c497be3 SHA512 5f6db7d4e21fe62d84031988b2568356d4f7caa2a935f2b9e746abab9d89bfc75f2ac62f1ab0d59b49faa57cb01d1fb413bdd8d09323d28bec5a467886bd334f
 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 caea3beaf700..e6a71a86390a 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.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="A Sphinx extension for linking to your project's issue tracker "
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 1d877d17eb59..459ac8ca31d9 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
-EBUILD sphinx-jinja-0.3.0.ebuild 863 BLAKE2B 4bc1eeb99066f900cf48c4eee342072ee5bac5655a3fec8a876a3666318c7b17833a83bf507fd8f8519e482617a3e1c490b79c0b56a125ee837f6faae0caea3e SHA512 a1768ebc8f169dcc6c5e2af2661c1d3eabd25a3204e45a6c3e096b129f2b19ae96c456eb1a8964bb2ec9c45016c0bf6ff2177a3a8d3a12cca8c764aada613a6b
+EBUILD sphinx-jinja-0.3.0.ebuild 834 BLAKE2B 27100f20ec09277088bfa85102e6695980be6ab433f5251115fbbb03e8b801e6f3bcf4edd232b4ad164696d355a74e372d9cd195f8a064c30216574fa912dc10 SHA512 5f50857c1247025ecfc921cec94d1dae83e92cd90cf985412848dc7aa77f921f2f0bc2f1d9fefc07d84ad9acfea801a85127dd28bd9d84ca0ec9e43f46a7519c
 MISC metadata.xml 396 BLAKE2B 4b17bd02a1f95c07c4e1c87f74cafa857e804f5e6272a1098af96e728f4387221b0907c31a5b7f11b7d56a6681a75732a449b992d47bb6b945f3178e5ecfb99e SHA512 812b4a106b9c49afc90ed1e1912a9cd3d26c39346f61f952c792ce2d62cb16bbbc23863c0acecfc87c6ad4f6a1f5e0e5bd84b36eb1fc70cf4be7795a1f628897
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index bc90a9dd2048..45fa7d860890 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -26,9 +26,8 @@ DEPEND="${RDEPEND}
 		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
+	sed -e "s/import urllib/import urllib.request as urllib/" \
+		-i sphinxcontrib/jinja.py || die
 }
 
 python_test() {
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 92d3eb968cbe..137c2633079a 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +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 561 BLAKE2B 0a57a865e3e7845098647f55574cb05617c7016a73c197cdc89b8356cc325761f80655d89d3fc59cc75e69a30e4c87a03e28e26cc74614d455e18379ba2e509c SHA512 81d93118606b6d72c0861de0381f14e6bc524b6f2e3c4aaa37b9915721226883d8bb4bc4d004f7059d05151d0a8d9a35bdb2c3c369a2a8e174f06c2171946356
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 551 BLAKE2B d6ab7419239e139a4b44a6f019b7ac5a253767534c076714f7b3b4ac32ac9147f1046a2c3973193ce8a4503d739394ae295b1a0c63df382dceb19e8c649b548f SHA512 84a91583bbbdbde755b275866c5a5ab0d6ddd3e5f4a65869150a76205ba8a78c6e38aa4071cd583bf586f06277c118f8017dd719b82aa616a235b2f4bc8d75e6
 MISC metadata.xml 539 BLAKE2B ff83809c3ed8818080adfb13e16a4f97964a1c4a3f455fadd22a374ddaf01dd5a55d13110aee9b44e14c784eecdf4bbfdfe44992990a3f41ab2558c188c4d741 SHA512 7880c83b91cf5d2760157ab1dba1f869084670ff0fe51a477545801dbaa1bd70861ea90860953e9eb3ee9b526acfe33eae931915b7ad990213db05c4d829ad54
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 cdcf29a265df..b49feb99203b 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 7bf8191195e8..2da9efeb0675 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 796 BLAKE2B 03f8ee794d26238a3a4cbb451adc228fdfd1aaf3aefa53456bf3fcf87139319c7042850edfe897d818c252b6671c9cf3f698b8cbef2b6521228618b844802e76 SHA512 c37b1e9a359417a110f3269602e1da45ff28de28a80764fa03a07afb758eb60fa29744562e4b0d6a274ef439534f472b41481d3290366c4451ca466659f74cb0
+EBUILD sphinx-testing-1.0.1-r1.ebuild 809 BLAKE2B 37a0e7c1cd5396e63fe16ab8b94e37ebd01a7a7b71716e0b3b434d080f38ef5108923a2e626716f22e548fe418ad097de8f5bc626eda6dafb43023f0a49d0259 SHA512 4663d1b199677a7f1f364939a0f563870adf5096af879fd109a72d179d44159a8b5cb19af4bd6b1be3606fdb626d30395413f9ca4f4499dd374b893d57fbbcf2
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
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 97e5a1167468..2df49f6ac02c 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 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index b06dd4ac6d4f..eb84a7cef5d4 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,15 +1,9 @@
-DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
-DIST Sphinx-3.0.3.tar.gz 5905054 BLAKE2B 048e449603f171d72b24be5bc0fca3465819e78cc9e9e6c66e76457812a71fb2fbf85e7c2d4849541ab3a8980eb91b8f6948654c42d08e46c75c9841f5f840d3 SHA512 1e37224d04f0a7836a7132cea55c67b9d15a22f941a790288438b39d455973f254205ffd1e99e6e2305430725a6a623b9a85fb95b495a9f6f912fb94825fdcd0
-DIST Sphinx-3.0.4.tar.gz 5909229 BLAKE2B 892b435642be2a6334f93d9f230ec1aeeff8cf7b374570aae66eb341614d4318125920ef0c5593e7eee64e0b8781f035635af71aac34e9c2c6eb20a07ed68d48 SHA512 ec0c2487f098f774452b58d4fb67be7850b4a54b80f2b01dcee990298f59bfede3ca43b28fa992181cdceb07f261abce186862afd75c889c6682338049db6288
-DIST Sphinx-3.1.0.tar.gz 5931678 BLAKE2B 63f9d78ea46832fc9ca7122826888abb5b8a6be55e6b3e9015a34bc4186b0544a6c5429be010622fb4794b720a6675b3a89f101446e36327819d5db07dceaa03 SHA512 8660061f3617b00eaf19655256d1b164eb24cc10c7c8016e32cd28d1f81903ef8def0c5da202066c477448f4ac6d764dbd8b1b7179edcb9d00925e35596c4714
-DIST Sphinx-3.1.1.tar.gz 5932445 BLAKE2B d98d4e1d546a60217779a071d642cef8c4b703715e212344d904fc343928afe4b21722d953afb67add0c0390633f3c2159b2235d0a5dd0148946ebfbf473c215 SHA512 0c97cab085b1d8152cefde73a7e2116e83426a1ff071c8be9b37ae8e8cf82e9abefacad2cb37a86e1754fbdf57a8dc05ee3041d7dde506fa103babb82c380293
-EBUILD sphinx-1.7.5-r2.ebuild 3214 BLAKE2B 6cdc38d318aa3552077cd38f7b73511cd9348f4e227f828ffdb8dee700ccb3261be15bcf74306c098010b8f901507f7445c292741dad894cd94da95838444c27 SHA512 233f3487d87b8954edef1b141d21501fed815f50f129348094d5e1f7fb12833912f8e06c4eef508190a75c28f4afeb5dbf3a6af6f4caebb8cc0290134f043b01
-EBUILD sphinx-2.0.1-r1.ebuild 3448 BLAKE2B 4c5ccdb0c64bfdfaf758d462196746fbf3e3537148ff11d88e323297128cfa6643929465b9ee0874f744934e62aca5b22abf5029ab8435efb37578f5c949a861 SHA512 d68634bfeb6c5f1961d1e55eb7e463ab458a0fb155fcbdcd961386fcfbec789bcfa60611566f30a9d803cb3aeb5ae36d68101838f1e582c86cb54f2bd4573613
-EBUILD sphinx-2.4.4.ebuild 3647 BLAKE2B 827407c970ee827b569ab6f1bf7df1e39363c673e0b83c130869bae04a6a6f8d97dc1cbe18146b8127c4a9496812ea5505a7153047ceb753added94fd613913e SHA512 b699382de2e3c998ae1ffafb8093b4bbd523015011fd945aa4ec3568591703fc184ee689256e79d07beade29a9a4fd4173d58828abba0467088ad9eb94397e58
-EBUILD sphinx-3.0.3.ebuild 3996 BLAKE2B bac1a6c69c3d97dffd38981bb2def7434ca96dabd97852f9148943b1cb10da8b41764cd6e40aa625193c7eeb0dd4e77c849d859fbf0007129906d0a89fd9429c SHA512 59d3ab0cb1c9c0ed0f07ef3f4c70d528ae1da65ea258ad1b6702f68cf3bd9a1d94064386a48d8a36ad7349a8c6ffea5e8677a123c745f4795b69f4ffadb28299
-EBUILD sphinx-3.0.4.ebuild 3955 BLAKE2B a800fa8c0dc2d6e9f6499a688888f397fe4e6d929ec7cb3e5e7ba427c549438b9a7f363be926c214496523a41ecc58bae20d58ab7a852b5496bc66381f2b56cb SHA512 bdf19e8fc0b2ba18ab36724c887b4f2600f00162cccdd8b94733c9077e7915bdd91e387856f533c4e9e31c69bde9becd1df91e0810692ab433ceb32af5655436
-EBUILD sphinx-3.1.0.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
-EBUILD sphinx-3.1.1.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
-MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
+DIST Sphinx-3.1.2.tar.gz 5934433 BLAKE2B 4ed04dcff4db412ea1f749c0b90d0c38197bbc95607bcc719522f0690d6fd58aa59b87a053c036e9b3c982e9c0f6fa9b6b67f903cb7d9e6fea3a13d99b7be297 SHA512 d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9
+DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
+EBUILD sphinx-2.0.1-r1.ebuild 3449 BLAKE2B 2111f0525ba29ef2e6c0fb7001ca49b52e645f1a8f884391a85418d040fb4a90a4a1df2a1896d7eeacb86304aded025bb043afd748fe8e0fae349d7d80bc8970 SHA512 17051761d94c11eb95cc1e3e4b946407432b895ebe1b2fccf1cf9187fb859e5edd525bd52c79347747b0a8dd93c0d32e3c9fcaf1577118fc3c97ad71118445aa
+EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
+EBUILD sphinx-3.1.2.ebuild 4766 BLAKE2B 88bbb6fd8d6fd89e4aa5b57d0810f115825d72c73a7db612cd2c9ed18b82e65b0b6549d1d51bc6de136002f9aa8af7e282fc2dc7a4563137149d66942f5da2c6 SHA512 bd06851b66530079903f95050be806b872d86603f8beb59f7f598567cc43f5e43c88b2f98c76cd5e7fc393da5150df8aada0f2b37b01265970ee85d95687b9cb
+EBUILD sphinx-3.2.1.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
+MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
index fe4bfd29c81f..87aa42aee055 100644
--- a/dev-python/sphinx/metadata.xml
+++ b/dev-python/sphinx/metadata.xml
@@ -6,10 +6,8 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or other documents consisting of multiple reStructuredText sources).</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Sphinx</remote-id>
 	</upstream>
-	<use>
-		<flag name="net">enable internet capabilities</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
deleted file mode 100644
index 1f2aa22be731..000000000000
--- a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,101 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-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 net test"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' -2)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(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}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${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_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.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"
-	py.test -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index d8b720cf8cba..4d651f7dfe62 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
+HOMEPAGE="https://www.sphinx-doc.org/"
 SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index 8048479c65d1..6335844c2058 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -16,7 +16,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 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/sphinx-3.0.3.ebuild b/dev-python/sphinx/sphinx-3.0.3.ebuild
deleted file mode 100644
index 3154c9ce95ac..000000000000
--- a/dev-python/sphinx/sphinx-3.0.3.ebuild
+++ /dev/null
@@ -1,119 +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(+)"
-
-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/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-fontsextra
-		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
-
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.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.4.ebuild b/dev-python/sphinx/sphinx-3.0.4.ebuild
deleted file mode 100644
index 1f6b617345ab..000000000000
--- a/dev-python/sphinx/sphinx-3.0.4.ebuild
+++ /dev/null
@@ -1,119 +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..9} 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/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
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		${RDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		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
-
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.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.1.1.ebuild b/dev-python/sphinx/sphinx-3.1.1.ebuild
deleted file mode 100644
index 02e54fb7e8fd..000000000000
--- a/dev-python/sphinx/sphinx-3.1.1.ebuild
+++ /dev/null
@@ -1,133 +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..9} 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/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
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		${RDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		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")' \
-		-e '/def test_automethod_for_builtin/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc.py || die
-	sed -i -e '/import pytest/aimport sys' \
-		-e '/def test_builtin_function/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_methoddescriptor/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		-e '/def test_wrapped_function/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc_autofunction.py || die
-	sed -i -e '/import pytest/aimport 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 '/import pytest/aimport sys' \
-		-e '/def test_autosummary_generate_content_for_module/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autosummary.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
-
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.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.1.2.ebuild b/dev-python/sphinx/sphinx-3.1.2.ebuild
new file mode 100644
index 000000000000..2d6fcc770e7f
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.1.2.ebuild
@@ -0,0 +1,133 @@
+# 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..9} 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/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
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		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")' \
+		-e '/def test_automethod_for_builtin/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc.py || die
+	sed -i -e '/import pytest/aimport sys' \
+		-e '/def test_builtin_function/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_methoddescriptor/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_wrapped_function/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_autofunction.py || die
+	sed -i -e '/import pytest/aimport 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 '/import pytest/aimport sys' \
+		-e '/def test_autosummary_generate_content_for_module/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autosummary.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
+
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.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.1.0.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index 02e54fb7e8fd..02e54fb7e8fd 100644
--- a/dev-python/sphinx/sphinx-3.1.0.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.ebuild
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index cf90c17bcb6c..e33d5d15ebca 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
 EBUILD sphinx_rtd_theme-0.2.4.ebuild 530 BLAKE2B 24792fa3bc71996a62c4a6ffff9f13e821b3840c4f69837424be49ec310b6c9aba88603cb117646499bc53c545ea222c42549ffc2a6e685ab56d551757f1147a SHA512 db6eca3195cf032522a5efa413f2009133af06f9290aa6d04d6a5e624253eb761b40af9e2206cb20c5f131c48a9efe083a8d4efac9f9c425afa995bbaa575ebd
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 634 BLAKE2B 2a78f55798905b5bf73c178e16a28d2a61c4806a60b076df17509ad047d97969f6739354d4979db3edebfb115414d54f670f23e8f04001fa6091fe4257b62c6d SHA512 4475afdf91b8eb61eb0792b3f67e01d6f386f8a656c4818ea51fd7419419d67a7c20110b81df731b3efb7f0073defa59d9ef6f44a1a1ca626246d8ce917e6e32
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 626 BLAKE2B 284d4a2dcb38cf05f97c55d2ced83883203f9f59cdfc9ddfec1b80ca7d4191cde3c7d35a550d5f0f84d3795edd54d66636cbabfe7ed5f3e092d5324b22768f68 SHA512 f3178584456a509e6d7b682df7f94c83f4a86ad150f3183f889eb1a09b77cc7674cf5d32446add7b7eb6bbff95e8d1b9be3266606bd6b74c04b045f5e1a9a3a8
 MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
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
index ec86aac66c3f..12c5cba90b2b 100644
--- 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,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 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 9784c6efb8f7..e74c584a71b1 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
-EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 723 BLAKE2B c1536cd89bfa2cb95753667073bb8f5b754e92df4355064dddb8d022ab3b7064f0ff7bdebc58a536907cbfa54c72e87aaf0ba7e01b4f1673a6b53cbe01bbf5d6 SHA512 314cf487afb93e7c65c64ab037ad709e2c4649663b2a9b66e584ffb937e5de171242d59c821629bb03b1c5682351fa04226790b7af6d5a0d67bb6f7fdac1940f
 EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 843 BLAKE2B 4769c8e43b1721fbc4cc5b73348595f2936cd0d12bed591b54564cea51de0cdb0a08a13f9e6b0940b297f08199c9eb634f27373cfff31c23c90bfc2fe64ac1a4 SHA512 60628f107b7149d02da9e377b41bd227448b3eb69692426a0bdf32551eb3cc4de2ca0737bebad92f5a430b35431fd015515a43b5c9fff73c7d9d0c5a80f553d5
 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
deleted file mode 100644
index 24d18f3e930e..000000000000
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-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=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Apple help book"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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 8afd37bb2cd7..13f3c4ddfaad 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 1040 BLAKE2B acb4d1a2decea53e0b1925ea1dfce618d8eb487f96e8a47ff8ed9ccdf21ca4639511e517386125b870e8e4f9e73893eaeba1fb133d54bcde44df09f8ab8c1d31 SHA512 510f537ef4779cbfd969b171442d9bbbdd2ecd5c71269c80d1a703202ce31c9e5b912f81ce06b5a271c8cade8b6d7cc5492d925fa5c15214b1987870da7d2a2b
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1045 BLAKE2B 11be1bf7189c7304df93923da4692f48f6c7700dce24d002f4edeefa5cf025eafbd7e2ad0911c70df6cf153024388f73a5c3181ff2e0f2e5ea6a0ad7e741c3e2 SHA512 db8ba66c491a64c7b0cabeb6b4ffa1f96b333b559350785358d29ab7fc58928d145674b34fe63608db287007ff745a0be8ccda4c58df615d013f4b87f13b986d
 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 c7a68fe3a95c..e0d25754fbeb 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="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 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/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 86bca40b40bb..a909cbed67aa 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1175 BLAKE2B d8357f47bf454ecb5a09391223e4ad92221c2daa566fce2c34ee92f3fcfc0e59e2648e811974c2537548aac158e124978e434889bc12e37cd211bddabd935c92 SHA512 7260d2d332833515bbad47c966eab7ae763267c5db1f4ff8c27a009906e9c033d959231778df9280d73ba73d730802de602013e486deaf10f5c0e0fc3c02f508
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1181 BLAKE2B 5fc0896f03f5bbac88d023e89400ad96a0fe9b2efce0bb33358aeb00eb8ab43a02df18f6458c1061e7c69d04688661a8d9cb63f52403904eb0073754fb9a0441 SHA512 1fd706fa608424ce1401b50485d07a68404ae48f9cd578cc5c34c5680236b6967fdf9c257ea4e6e29b975732b1feebe9902d5ebeac2f14f82ddc35b03c920c5b
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
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 75e9b6ad5829..40e89f1c6438 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 ~ia64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 0ff33b0572a4..104dba93f2c9 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
-EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 725 BLAKE2B 4d337beaa20392e1f910efa4f884720c260a6fe7783f8871444e83ae4710f09bd0aecc19356dbf79463ac721e42a3a2dc50bbb8074d02bd1fef79c75d95fa2f4 SHA512 7110597554f766f1a2ae3e15f9ac627aa9ce8017f5a6d5ec3427c055e24c757fcda89594f4ee886a83c98a015fbad9137dc1094bbc5f4bd10251aa1ca81b9611
 EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 843 BLAKE2B 4afee752764f0a787b399732c4c39fd727d02ec490fd4c9013582528d3a9878a09519a298abe41bf4d3f494a0d59645e019c1feaef2783ee4877105ce8d5d7b9 SHA512 851122a62035547148ce610f479aafeb46106bc5c18044479277b8ee4ab1e6baa39d0ea1074844f93a1dac50fd06b5133fd082b43b3c994471d2ac57beb50360
 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
deleted file mode 100644
index ccccf414f3b9..000000000000
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-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=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Devhelp documents"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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 94649b3d0847..2936dade52a4 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,3 +1,3 @@
-DIST sphinxcontrib-doxylink-1.5.tar.gz 11391 BLAKE2B 569eaba41a2cb802d05b0e7da28a00f41399175e2103979eeae35750e2935f66670c20bb0a560980d553a8a751ab57c0e200d0110983eb474eba60b3a2bfcc10 SHA512 caac418ed2b11f1b72bc3cb2e5c6bd22a680f9e6debecf6c0028bc1e92fc41e017996be05a7ac7c2dc96c907e59ebfda32bf8b7715c92c33c39404ef356c2a13
-EBUILD sphinxcontrib-doxylink-1.5.ebuild 918 BLAKE2B 3928cc2102a76a26660edea37fb33a821fb7c9801abf7f6d5b38d33a457f0f0df932d237924950e25f05541c5f921d6dfca9c9df0fe0eeb4d0f92ddf8e276d0c SHA512 145ff0353683cb41bc81778716941759ea84c24fd6e6aa258b07c93528b1656461c103ab46770ef4c70dee4b3f56bfbf959b46207cbc6ac7a7a3092918dac4f1
-MISC metadata.xml 599 BLAKE2B 2734ab4f50acffa42b0eb381e6236b1b675480b54152f653430d560113718da2533bdf256c8a49817fe7cca950b36a764dc7615b8e0ffb0d73eca3118ae243fd SHA512 5f025fc40b2f4a0d36600d98dc205637abab07dc40bef0dde88babb5bb676734882145e087b7f6c4d11374d94340b226b5c37271044a70c9cb1ceedad3864fee
+DIST sphinxcontrib-doxylink-1.6.1.tar.gz 10173 BLAKE2B 2bb341576c459715a8bfc0a6a7b971e76afdcfba6a082b3f95844678e54c248e814e1a45a1a5d63d85407dcc6d2f7e56e4211b9603014b8478c7eb35e8b9a73d SHA512 c27983cbd54d6ff2c4110b0269d630cd81b8aff6bf7f6b1b006dbb18fc3643d59a25ecff0ec9c92785c697e38861e755fb44a95382314b8b2888da9e8e191637
+EBUILD sphinxcontrib-doxylink-1.6.1.ebuild 839 BLAKE2B 39647f55c4278972142cd58d9101a7a98e78776758eb75b8f427d408678071c2aa73f8f5543b3c4fcce10fcbcf6c26a1bc98f45c2f1ff1d58ee44ad77829a398 SHA512 101f28088539b6185683e15999d790006ff2c229b32d53f90a8fae58aedd39c049240c874565a88a0bef773629a12c8e7e2a4afd45171e795855a0fc2fccf273
+MISC metadata.xml 594 BLAKE2B 86632671564dcdc1232b188dc82e8b871671a3b45e1f221da4a2ea47129b9435d5a3d4dcd0baaff7df50f63b50c144474ad825f99de2d8a14d50adef761097fd SHA512 8251cbf356a788a1b34d8666007a91471669ff956348b18569c062fa8f09b8dfc685ee27fc6fc5066c41ca8f8da36b42b2a244f5232723bd39e26207148bcabf
diff --git a/dev-python/sphinxcontrib-doxylink/metadata.xml b/dev-python/sphinxcontrib-doxylink/metadata.xml
index de11f8437f1d..8dc68b4d5938 100644
--- a/dev-python/sphinxcontrib-doxylink/metadata.xml
+++ b/dev-python/sphinxcontrib-doxylink/metadata.xml
@@ -12,6 +12,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-doxylink</remote-id>
-    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+    <remote-id type="github">sphinx-contrib/doxylink</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
deleted file mode 100644
index 5de1168d83de..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.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=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 arm64 ~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-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild
new file mode 100644
index 000000000000..83c37cd9d47f
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.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="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
+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"
+
+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}]"
+
+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 de4fe678f158..9077a86e71c3 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,6 +1,3 @@
-AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
-AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 640 BLAKE2B 7da032195c19cda1ea14dc0b97a61ff4b1be5a9163d5f383f55ac677983e19b79b66a01588c685151f149f095867da857fb1b4668f1413895021203079d51305 SHA512 195f73a7df7c81e115a39f320d98382442498e3a11c1cb58c0916970e4db6803b1cf535d554d6f95653e594211fbf75a9c8936f34ee60c9443f0bfb6f77e8bc0
-EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
-MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 643 BLAKE2B 8e0eb3932578725387df22b211bd353ad6a39f465f6fc1bbb72fa0752b250b27a9fd165ad112e68fadad0bba30f40ffaa4afa43dadbd34036910019f92fbd77c SHA512 7113e7c0b5909c71d80083446a35655702f36eeb6f957d550d004421ce70953ba01c29575eaf48be0cbd9a222045995bffeeec81e8bc3f46dcd169a5b091ab4b
+MISC metadata.xml 436 BLAKE2B 66cbd7a712c5d961f49809b3cc95dc80f3f10300ab36c0a91c636a514c52d46a4a31fd3d24665fc2d1dd44ed859ae35f8694193bb5fea26fa8f1e02c39546898 SHA512 9c198eba6ed705786f266b89e1313dd2a4427eff716ec0698ed3cc6e25eaa9b168216d8c46e48009d3e67ad820628820566bdd9184ffb1b147d942349bc66d4f
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
deleted file mode 100644
index e4274fd429ae..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-__init__.py for sphinxcontrib_github_alt by Marius Brehler.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/sphinxcontrib_github_alt/__init__.py
-@@ -0,0 +1 @@
-+from .sphinxcontrib_github_alt import *
-\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-setup.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-setup.py.patch
deleted file mode 100644
index 37269d0373af..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-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.1',
-+      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/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
index 169949de27c1..9804edaf8c8e 100644
--- a/dev-python/sphinxcontrib-github-alt/metadata.xml
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">jupyter/sphinxcontrib_github_alt</remote-id>
 		<remote-id type="pypi">sphinxcontrib_github_alt</remote-id>
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
index 1d814e6db085..da0d731cb39b 100644
--- 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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~s390 x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND=${RDEPEND}
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
deleted file mode 100644
index a03a020135f1..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.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,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}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-1.1-setup.py.patch
-	"${FILESDIR}/${PN}"-1.0-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-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index f6097b03a8a9..3fb02185776f 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
 DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
-EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 722 BLAKE2B 417317b490ea6656a7cabfb707c7bc6ac552e3c4da9b305109ad3bb773d804f01836cb0ffc38d887e8c4cec4d10db3cb038e626a59181b15d1e1bb71b7997d84 SHA512 d64fbb0a38791b94ce9ba6a284c50ce6a36291f598c5aaf30e94b62874dee4b7763c584e3c9542e058443a26a358cd1b3ca1aab7118f8de6b601ad0ef31a3836
 EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 884 BLAKE2B 268b942029557887abcd59d7a7a11b7eb44981fa868e47c12c36303f28689f3ae59e965efd2b7705ad38dec5929d0242adaa5c3815fa8baa23bb4d1182c35d3c SHA512 091cc78ba8a363ca4c85235081e0c8390cc20e58bdd90889df89208e2ee204e078f52b58f474d204b8b48cf9ba468f533051a29c4f5df19c54ab0269348b9117
 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
deleted file mode 100644
index ea5fe0bd103d..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.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,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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 22f0cb90ba61..ecc056feafce 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
 DIST sphinxcontrib-httpdomain-1.7.0.tar.gz 37493 BLAKE2B e34682029ed2f59cb8c70b2a5270a2f89c4cb08179fdf3a53c65f1ad23eebba71bff5385b5d3fd971a6e3341457b253e4187632a8bf856ca208843938bbde056 SHA512 8c6e40dfaa29a552164078fbc96de578b2aac269cb0ce5e228293a85f87c4db4ef8c902868caccaca709df938d4e3917cc77b3da9bd889b9c6f8c6fa242dcc0d
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 800 BLAKE2B eef5af929417398dad90c696df9bdfe95dbbf1daa9e751db894af5310a27f6b5b4de7eaa54aa5a41256da940ec37149b9e705e1c9060556e2eb71d8d5b8171a2 SHA512 732195d97558f0a8b2ad135f051214c99a46d675bb74a6262cee3ad011743f5658e7a2915f3f187459a98cf069979ba8572ef99edfefa8e00287d17e4e24ed75
-EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 903 BLAKE2B 10567eb00bba0d6be66949ed28c831a14cd5a70f54d5f0c60aba05b8a15c465792082b840a1cef73e4dfc991488681057085bbf9b822718e751597389a1f3d7e SHA512 3be197d3b07754936da4293ce9f6f9012c90f2349d9a1034dfd0478d4960c757c9755eb8871efd9072c1144059f990548c2ec2335ff4f50e223c8983546e730c
-MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
+EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 901 BLAKE2B 8de5e85c5dee313a228ef327406862958789a08a4867303fe31150731b238d797b931a4994dacaff586affec3036ea40e44921faeddec086cceb86ddbad2592a SHA512 959e75e12aba40c8d78ac6aa360cf1d69799ce69312a31914df80af827d8332c6c1e78f3144329f670ac63b9c9d7011faaee016caff9eda94ff2573dca4d8ced
+MISC metadata.xml 432 BLAKE2B 009d252a01afcea39e9f202b22d9f20ce8bf3babf8cdbb840f7b5733e1944503944e7ec1acd3b9d7672bc14addcd062215209b9e1756d92c32ac6772d5596ece SHA512 fe2aa32bdff424a9a8fc5ef8aa136bf5db9161eefcc2ed4e67f099216c0524572de4229b7322fb47cff11974ec14b07f3f017d596d4450bd39c0891cc3e38984
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
index 592df77578dc..d83bf47b2cee 100644
--- a/dev-python/sphinxcontrib-httpdomain/metadata.xml
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
     <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
deleted file mode 100644
index df99960518b9..000000000000
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.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=( python{3_6,3_7} )
-
-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 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
index 9fc457a4847a..7db673b1b09d 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN#sphinxcontrib-}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 9165b97c88de..1bb87e2805ba 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 1379 BLAKE2B 395a2ab8c1ad84da7f0332f3c593533d49067710f80ad80deeb43ede5d72187eb338aea8dbf960423487f6f3a19b86aac4a93ac2fd71c572bea7576860468d67 SHA512 49e8a09069cbec8906d669cc022b6943e96406dbdfbb167fd57051c87ea011d017954e51da91720d60ecbe947f436ed54ce16eafd6dafbfce560bff7d4efefef
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1553 BLAKE2B f8761fff3f034af58ffd27d2cef10ad5023abd6514539ffb4b9ba0ec6ae0f94e5140e455e48017fbb187569c9e47353f279bd098f3e28cf3d459128df34354f8 SHA512 eb05f7b553643638588c8f5b5d7e22252be65b695716f26025f3524f978e280dd6f4b7a6efeea787d2e2809228c5331329864ad15b147a8a3d62d8c335607e77
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1374 BLAKE2B e47523d115c14016cc363519f3641203d5dac71a9981235b2bebf7bfd28b01b2d00f90d547e23d46cf0d117f41b647507f3818d2017fea7deb5d569dfb3793cc SHA512 100156dc35d3829a290c9e1b70ba91f5ba699915d7eef7f6358584ac2dbf6f90b5322439b590b2d672e5e4211552cf6eac1b4a682f63dde3ed5b5d856b4d861b
 MISC metadata.xml 254 BLAKE2B 5631905be15b8e2a50e4ad6c9d74ac6ca52a48dc470757d354f3a1a7b7cfa57f8bd9a2598c002a74088b84f8724aea98914e15430f83a24dcf0019e99c4bf37c SHA512 802bb4521ef941c7965f90668559d1a935ac922903521c0e65ee933360be2854415073ec46e874dc34092e35e0520a701186fb809940e2e2766c09cb8003ae3e
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 5c20acaa206c..a9f2c5d53aec 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.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_{7,8,9} )
 
 inherit distutils-r1
 
@@ -13,21 +13,28 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+
+# ImportError: cannot import name 'SphinxStandaloneReader'
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+# KeyError: 'refdomain' with sphinx-1
+# AttributeError: 'Sphinx' object has no attribute 'add_description_unit' with sphinx>1
+#distutils_enable_sphinx doc
+
 python_prepare_all() {
 	# test requires network access (bug #425694)
 	rm tests/test_builtin_trackers.py || die
@@ -36,27 +43,9 @@ python_prepare_all() {
 	# and virtualx.eclass.
 	rm tests/test_stylesheet.py || die
 
-	# Avoid redundant objects.inv from downloading, sed more lightweight
-	if use doc; then
-		sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
-			-e "s:^                       'sphinx':#:" \
-			-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() {
-	py.test || die
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index b94e6443ba71..04b37c2c8faa 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,4 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
 EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 860 BLAKE2B e03373aa94cf707b686796a7b831622130259220ac84767dded95a742229f5a789f6efdbcc195bca3c624b2eeb41e4545d9c66a7f915feacd7f8964463608e70 SHA512 96a968650c67296d1353deb3f086bed3997663d3f118205fb4ff48e1532dbe4c4635854510c495246cc2f087a572bec80dbc8e9884f447dc2448443cc59b6b86
-EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 743 BLAKE2B 130b57fcfc45f3905743c28bede65e68c69a77fc24f26bbe6761a050f2869271f2d1c9c1d07de66d2642d04dad0561b81b3aeb978aed2adc7c3faf0e08c778aa SHA512 7cbbb84b6b037896219da0a3ebccc0af280d1e08975d1ebe88fa509444b0d99812cc0d5800459b4efe1d4661320bd4ba1447c1aae5aa9f1bbe99713571ccf531
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
deleted file mode 100644
index 01bc2f6f704c..000000000000
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-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=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 463120860405..51bb782c5b51 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 815 BLAKE2B a0674498660106f63d69ac39ab3a0df4141fa24be1b0c6b0317e83250938dea90457b99e943fb47bdd4c8b8a6161ea08bb38b2f7984d12b3189c4d0680b12d9c SHA512 38d87300c20f50b1cb5af18e28eb9bbb00273055e6ae6de89f8e5a0fc8e8edc1bf2fde110c709ea8d19c642074c50a08f2099668f115754c4f4b6f8702725d0d
-MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 833 BLAKE2B c91040d8bea8f6ec03295ed1efaaa75384f741405eb35a370b2d04860b22826183456985df51f9cbe65cd53bad8787a88750bd4563548ac9e0641828fcd96bbb SHA512 d57668d9c558e3d67b61f415f84941f973d05cbf5fcc755224780cfdee9d8f30148c2dc84b4fad62920c01cd4d0da4efcecac2e598e2643068910ff879f9e629
+MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml
index 8958a646ae22..a2e7b7c0c1f2 100644
--- a/dev-python/sphinxcontrib-newsfeed/metadata.xml
+++ b/dev-python/sphinxcontrib-newsfeed/metadata.xml
@@ -4,6 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-newsfeed</remote-id>
-		<remote-id type="bitbucket">prometheus/sphinxcontrib-newsfeed</remote-id>
+		<remote-id type="github">prometheusresearch/sphinxcontrib-newsfeed</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 7c66e8d5cfdf..cdf4593a1534 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="News Feed extension for Sphinx"
-HOMEPAGE="https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"
+HOMEPAGE="https://github.com/prometheusresearch/sphinxcontrib-newsfeed"
 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 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index e5aac9429f24..23c305d3f966 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 BLAKE2B 790483b09a00199e4f6a4bb723827001e3dc252b294244ddb5ed3edc78cd8dde41fd0c5cab6d4fb715c85f8c447bf25d690b4f921341769de6d7d1c9dc7f4a71 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf
-DIST sphinxcontrib-programoutput-0.15.tar.gz 21772 BLAKE2B e3bf609315e0298e73bf37db0d7e4d5175121fd0b0c612083427d60ab10cbfc1bf65c572b9ce561b05c9adffe288df7f0b28d6f2daa44af197d22b99ec8d00f4 SHA512 08444118daf09e05c1318ee87a22fcccb7822b99d58d18cf46748aa32338f35519017839c233cd5176a5426cb5f55047039ee28a26f6f4ebd99a35b199c0ff19
 DIST sphinxcontrib-programoutput-0.16.tar.gz 23714 BLAKE2B 1e5136faa89a2f303008fb0e24f99f544464d30f5c0c072db4e2e25cb30bfc3cd4af6157f6c8dc7ddfaffd8f6587435c5947b6981c34daf2d6029736fdc22870 SHA512 6003b8ce43ed468b01f6bda02c6f58c0518b38c43a75f1ed0869dd8df2ee215310246b7feeba90f213547644c1bdb0164cf1f44f44879ac054dcbd6d6f48a69e
-EBUILD sphinxcontrib-programoutput-0.11.ebuild 989 BLAKE2B efaaf074b62993e4d4290b46b52ede381d6355386bffdf8294274e45eaa8b7a6d018f8d9b2ba14eff336aa93add0a92e7157dca9646a927f6fcfca24b19622ea SHA512 c92c72416cb952b61b00fa365335ad2e5342fa9dc6bc85e18b05e5957a128ba1cffda62a440940cb6a62807e9ae6a74ab6b4bd457cfd6ca3cadda4d8991fec8e
-EBUILD sphinxcontrib-programoutput-0.15.ebuild 859 BLAKE2B 86b1d256daa1a1589b07d4e4ad70f9264b5c6362773cfbc9e62e039f77772b38724f40b8252730204eeed6a77814694bf0f99916b1e96087902bc3ecba47fb3b SHA512 c8f350ffee8fbfdb47b300a946ae6daf4b966cad589545c07617733c371441ff23944be42266d76b5c8e8b8137b99e827f78860444059f50de44856228b89fc7
-EBUILD sphinxcontrib-programoutput-0.16.ebuild 817 BLAKE2B 797b7eb6d7e9d3eb08cd7f978dc7cbb5d4e7862e287bc90e7c84a25a36935d211a9c8bff093a6c61b29996d55435f58f2278f370af0d148f0b543563a11985be SHA512 80585e30dcd25507a5064269013cfa6b8591cfbbb4a71a9607ad58db4855eed3a092761c94e6a6b848656b21f1abc04df6fe0fbf02eaaaa871753cedab62f019
-MISC metadata.xml 1301 BLAKE2B a06888ae7ead57744b4fae443fd5bd9cc56c0edbcd6fc970da654f0a0a637753ba4bd91f3a4d8d947d821e0ef81db0a4e007cb5428fe80a8390712dd4259b521 SHA512 1ba0ff36a8a2e57fa17b34e7cb6435fdc90ff1cdd2cb655caefaf9343a4e87009d6eaa25de35124bfaeb93a255c815c99c277ddcd1159b99edf6bd2ee57a5f40
+EBUILD sphinxcontrib-programoutput-0.16.ebuild 815 BLAKE2B 37d723562eb46a6548491d0079872032c2c27909e07a5d337cee7906e1fc017be3f1a5cd5c105013470bb29d32e5e3ac6a7eaf676df46d8a60c00b85a018b955 SHA512 63d9a284d5e71c42868330959606828924d8050d1f7ff067f6049980f7e2eb6df6961b4eb36303b61ae77f09db19e7ef938935f921b1d9064edeead57f205714
+MISC metadata.xml 1326 BLAKE2B 0964e588730512016b32f10f2d78f13944b82f70681f532d0573939a564b0175bcfd740dc867e9f9dbf1cbb6229d4a318f056887fdc419e5e072d871d4b1f994 SHA512 a1dcd016a6e38dabf5530628e5c4624af094e11efd0b582ac2c01f1960d22e7fee1c2b5105ef1299f8a6c4708885bb34d2c4a68f7fb946fe15ab7615994c9389
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index 201946fd5ca8..1c808e6aef1a 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -18,6 +18,7 @@
   commands into documents, helping you to keep your command examples
   up to date.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
     <remote-id type="github">NextThought/sphinxcontrib-programoutput</remote-id>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
deleted file mode 100644
index ef0b07abddcf..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.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="Extension to sphinx to include program output"
-HOMEPAGE="https://sphinxcontrib-programoutput.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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	fi
-}
-
-python_test() {
-	esetup.py pytest || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
deleted file mode 100644
index 950fa2dea781..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.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="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-programoutput/sphinxcontrib-programoutput-0.16.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
index 61213711be9a..e2f5a3d4e624 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
@@ -16,7 +16,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"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 164ff77fcb73..0aa4390f90ec 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
-EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 724 BLAKE2B 9da64c605ff4edd21e5c3b457d6a651a7a1ebd3f72eeac8fa9a1319f0f5f6fff1a78c239175f5bca98e4761df31de38a536416a2cd45457b7d429728e036a70d SHA512 8ff3a400950af9e50c63a8f521bc10965f7acc7606a78994b8946266a24ea77bd8541e7fc81a05d92ee3485fd7cc3ae1eba2e2cefabd0a9dff8ed43e6ac7f840
 EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 841 BLAKE2B 4b5a16e50f7148e6e43425326d4ae11e0376c59ae643d264c659739d7802a7abe51c6b1a6d98605b00d4c48b4b5432c26f3cc3fc6e6fb3bf2655dd348f2547e3 SHA512 4db33388feb73122d5a842595bfe7b2984caaf04bfe51991fa58a0cdd2c909f8df9cae0d20c978d40ba0e0e7cba0f052ed3df75c701703e528a9be004b008194
 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
deleted file mode 100644
index 79fd7aeae874..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.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,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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 24e1a43ab82b..934a3d4b9b7f 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
 DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
-EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 737 BLAKE2B 981338f2cd412753974a98b2ee7f8da962c8225354ce1127093d3e3e9f6e571e03355bf449c232f07d4f4c2949d8f157f78d3cfce0d0dd1f78cdcba68689a73b SHA512 3ae289009dbc0f4eca5f9e58935d3cbb1e7f14ad58e775a7c7bf30795788b3bf8b735b225afe67035f433f0cb99032a9543484c246f7f4c9c2096e7b8cbdf8b6
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 912 BLAKE2B b0c7e26c0b482cff02e6f4b7955490b15c343cdab11d2095a4c2ee0497ac38c82627f63867e42135fe4078559f15983b69a418f0eb4369524622b1a374d13701 SHA512 d9b5d048675b00315a17dceb2047a2bbae3eafe63b0a7ed1d05fc66d5755c28465797e048c1253a6488d81b0820136fd29cae2ce298f30e80e0e030119807f24
-MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
+EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 903 BLAKE2B 5cf605fe300daad1e3082ea53bb2c9e9bd4f36aa36fc52e10cbd0012e878df5107ee304d658eda853ae20d459d438dd266789a5bb783a054768605d914f29ea0 SHA512 126f4db2a672efd622bb4df20f2732d264b8932e02670d95cc952143606c66ca45e08f53f2e2d874ab05b782db19a80a0c495c601e3c96130ff8a000f787ea95
+MISC metadata.xml 356 BLAKE2B 6d800ff5be26c447eac58bee688f218526b5bc6dcbe53deb3e5d4c7f0dc9ee394f50d9c2aa9b057c1246bba9704584725b1230abd13f99b676457558148ad478 SHA512 fc2bd51cb07ffcc9d3970af8bbba54e66e0e23192477d7cea8ccf8e2515feb625d0418343b2e1f67ad28b07c3853ae74a3c3db8d1f5c2833fad2e272ca8c82ff
diff --git a/dev-python/sphinxcontrib-serializinghtml/metadata.xml b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
index 7d1ab6496a5c..147a7c886eae 100644
--- a/dev-python/sphinxcontrib-serializinghtml/metadata.xml
+++ b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-serializinghtml</remote-id>
 	</upstream>
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
deleted file mode 100644
index fcb9866433b8..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.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=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="http://www.sphinx-doc.org"
-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=""
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 03118bb40338..127ed1ee7e54 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.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 ~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/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 691017ab0351..b7a81b3b35ba 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,11 +1,5 @@
-DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
-DIST sphinxcontrib-spelling-5.0.0.tar.gz 38479 BLAKE2B 5fb20cb08529e1db9d5df25a31f09849dacf41003893dcc74355d70161269b18b3bda7eb2dcc279250190e6eb2ead7a3bb1d40ac4a4d5db1a390f339a22da777 SHA512 bd608e13d1643924d69336da6a5fedac3f60ffbbf0d367c203936395270b2504f45db2ec0d2fe179a86dc91616e458c6fa0d2a6f66a20ee956c5f52ece1140ce
-DIST sphinxcontrib-spelling-5.1.0.tar.gz 22942 BLAKE2B 00861b429b66667ed45791f9dd8394b23cf2982875a9e3470c1e2dee22ff0500515d409821a73e46b49bcf397e9ef40f377f933e460b8673579b1f234bf157e4 SHA512 22c5c4eac56c0138e33aae38c2ed1d254211c502087e4c0ebebf2b3b7df69d2567cacde394abb2d8385eab48ea6e3ac9282c980bc8b52408f46bc06ab9634fa4
-DIST sphinxcontrib-spelling-5.1.1.tar.gz 22883 BLAKE2B eb5d13e73221dd4de86ebddc5222ee75b152a0e7681e93c0cfd66767903a949cb3d967c12bf553a67bfcd2854133f1164b965711781601753420f5f6a132bc7e SHA512 79825228d35e98fc85e4d1d6cfcc3f720df68b7f1493a0907e712369fcb76fc30d96de44fbbcc092e6978a797646da532489f420af42566ca4f9b5b932d85292
 DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
-EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
-EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1232 BLAKE2B e25fe65bf383da4f7096536199c81372ad500b5b16174e9a61604f92edea230cee154455603ba434cdfdbe1c228849476be831979a7689c6a8bafb874a8d017d SHA512 ae2ccd4acb5132afdbc16f2685652d91a20d713abf256fde34753383184fe6c3737f93ca8a8513c46dbf62e9c733a5e9656a5874c6aac37031e5864f56cae0da
-EBUILD sphinxcontrib-spelling-5.1.0.ebuild 1231 BLAKE2B 3971148c1c3e13f254e4242920dc371ed336229408f01428c7704e97f9c825ab4d40172bfbfc32df2354ddced287df2be4f5cad306769534abff6554fb7b79a6 SHA512 26d3fd133d270786cfcbab7e568fab1cdf61e3983ac366c5915e4e36c3148abe77fbe9fc82058bfdcd1e47de5f6b4655bb23671025ec88a4abedd4f65214f544
-EBUILD sphinxcontrib-spelling-5.1.1.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
-EBUILD sphinxcontrib-spelling-5.1.2.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
-MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
+DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
+EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1084 BLAKE2B f9ecc44c2059755168211a5e92f90009ceb360f16c4d585337dd4d3abc322c41223afaa566915f606210327b1b87233eb2998914a68065cdebefe4fe915038df SHA512 60a7d40b6dc3b99372ec43f34d3881d0e4db7da32f691ca30c633fea9aef3f3279bb59e3d5600979b42a7494b131976d3b57a8fab38ec81a6ae1498d047eb6aa
+MISC metadata.xml 390 BLAKE2B 8d41fe5d3b7602e6f29d13d8059ae1e942991659b4681c8d2a6e62fa32816690289c4183e28b2cc0abc14ea2078368f87cd1d82e71f1c4ed9fb684fb7d2e1449 SHA512 8407fc4fa34e474aa5f74fc1623004bcfa4f6ba451d56e62704366e8c21919e8617a54b5f7fec31318c4b7b34c4eb064c18c9d448c04d28430aa4e961ceb28af
diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml
index e91b686e0033..7aba54512913 100644
--- a/dev-python/sphinxcontrib-spelling/metadata.xml
+++ b/dev-python/sphinxcontrib-spelling/metadata.xml
@@ -4,8 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
-		<remote-id type="bitbucket">dhellmann/sphinxcontrib-spelling</remote-id>
+		<remote-id type="github">sphinx-contrib/spelling</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
deleted file mode 100644
index f897fd1fd866..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.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,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-spelling/sphinxcontrib-spelling-5.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild
deleted file mode 100644
index 03e7ab2f7de0..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.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=( 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}
-		app-dicts/myspell-en
-		>=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-spelling/sphinxcontrib-spelling-5.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
deleted file mode 100644
index 232987d99eef..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.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=( python3_{6..9} )
-
-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}
-		app-dicts/myspell-en
-		>=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-spelling/sphinxcontrib-spelling-5.1.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.1.ebuild
deleted file mode 100644
index 5b51077280e2..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.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=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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"
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-dicts/myspell-en
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source --no-autodoc
-distutils_enable_tests unittest
-
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild
index 5b51077280e2..b51f53167f5d 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.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"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
new file mode 100644
index 000000000000..f0af7ff34fe1
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.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..9} )
+
+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 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source --no-autodoc
+distutils_enable_tests pytest
+
+RDEPEND+="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	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 da4b607f8d8b..89151e35bdbe 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,7 +1,5 @@
-DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-DIST sphinxcontrib-websupport-1.2.1.gh.tar.gz 599593 BLAKE2B b996db8c799399c8830cc984a7aedd5c4c259085d5eafbb020875e86a79366c154e7f2d8c02f82139e83135cb728e6b8c906d88c2d93dfc0346a9d82e81ba67f SHA512 b22cb7e2ef87da1a4be5da90011fd6aacbff440b9d2051fd9fbb4c9354be07e600af9e59d5843c5e9053bbb2f09a152d6ff6d695b6fa093b741379b3520055d4
 DIST sphinxcontrib-websupport-1.2.2.gh.tar.gz 599606 BLAKE2B d7e5754491d0f4e4b508bb5ed58f41d6f57c8785ce2d658cd4beb658b9a01a453bd791e73deab703ebf17d18ddf0a3adc7c72a49e80c33475daca41666da694d SHA512 39d7d688515440fcf7a0df9cff60402499956da4c4d5de4e7b38982ff23ed837e7851a3c747135b9298d0df59f3055a8f588be78f10d98110ab50b8ab434db34
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1174 BLAKE2B 27464db31f09b246efd1aac60af5a10156b2d3d920b5c792302a8c149f4efd244de1e5153480d6358910bbcbd38dde71a517ef18e58b64e2011bd5d8c9d7d405 SHA512 7c4bad117252a35c2aa92a0a7c432e3f298aa54627a3af45d2ddaa481035076fd3439aa080331e122d3487ae6cd200c7383817b6ebf85ec1ad35f3cb318af9b3
-EBUILD sphinxcontrib-websupport-1.2.1.ebuild 1226 BLAKE2B 04c3ad496a43aa227d7f54934028a5c278ab813c4dd41d57e068931eecfcf8f1e0f39b047db1f3349dd68fcb50ccf379da477f49d4548b2151663747af4191ec SHA512 b64cfaca1c9239c00c5e5dca3f99cf457fa413ce06e6211135b4f588b2adf8f4b0f3524c828ca5e0620660ac9b5b3e9c6bbbc17c99ace0f5c9151b639cab4f98
-EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1234 BLAKE2B 22649b4b4b10e1e59541ba23dbb25f85d6cd9066156a6d72b664f347cdbfa01030a988d12f93021cea18e6090ae574ea040d0180fbd6b81a0b6700e821b42050 SHA512 72c29f46fd1ed6509f811b3110f2977f91ea8e188bb9e0b95e1a433ff419e6832155a064e7f0815a39f56a8e3984e430527920d625d2c20f532c02431361e0ac
+DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
+EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1225 BLAKE2B 4cd54828fe4766891268d4e1130bfaa2ad3299484dde71f5d585e2885f164d4b90590e58e65f6fd6e3e37d75ef9c76eb850cfd26b610ead1be3de9ebea0a4fe0 SHA512 5f585408436608543bfc1d8655aeacf20eb99d89d13196d9112f780744e7fa56b7946a7aa65dd3703c8710d83a49fcb041163e48f5c337d29d1b5b84dedfbfbf
+EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1294 BLAKE2B d7e1b53723f97e736de5f5c5d7602314e85a5418264968da231b4dff6f431ee581d6ca365dd48e860843cb7b04d1dd8efb54ce30af765a1026b5ff80d6486e3c SHA512 bba10deb82a6b8f1ed8c1dcfaa550dba88782964ca047d1ab04e2fef749c3f0a71830b3de1517c2daf99e77441cac8f0dff2affad1ddea2769bfc578bc9f3c96
 MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
deleted file mode 100644
index d8b651aa25fd..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-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=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="http://www.sphinx-doc.org"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	>=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}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.1.ebuild
deleted file mode 100644
index c6bd0145e4f0..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.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
-
-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/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
index 600953456c9e..298a43160ac9 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
 
 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"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
new file mode 100644
index 000000000000..a2aab86657c2
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.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=rdepend
+PYTHON_COMPAT=( python3_{6..9} 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}]
+	dev-python/sphinxcontrib-serializinghtml[${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/sphinxtogithub/Manifest b/dev-python/sphinxtogithub/Manifest
deleted file mode 100644
index e9db16ff0764..000000000000
--- a/dev-python/sphinxtogithub/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxtogithub-1.1.0.tar.gz 11103 BLAKE2B 58cf7209da147df161aaf447131a408a9f2a9e9b8673e95a11fd2f8f6e11ec71d2904a2cd077c460088a6889515461a419627ff08562eda4101148c9f0118fd4 SHA512 190c57535c58f86a84a3e80bde61f99d35b8d3826d18d77d9eaf857be853c84b35e49cbb517fb13d8993934757892cbda4a820ecd24f3e5ff2908e814e53d664
-EBUILD sphinxtogithub-1.1.0.ebuild 761 BLAKE2B aac2f2781c5f6e09633d475be7702e359ffc623a1d9b104bfebe1bb913684f4ac1f4800f2582b7cf8e76cb4eb9d4426880581378fad5740ffce0ed88db5489ea SHA512 97ba7caf963fc7bf1e7023c4d5cca6688d46bff1111368a54202b583311b92aebcb198eaf28236286278590471336e8dcce0d2a097572ef5ff20f2d26c880325
-MISC metadata.xml 398 BLAKE2B a668d73ec1bf324753827d3542d37faf1fda5516f0fa13774ede87ffcecc9f08ca75f248f036a218a75036fabd1eaef2bddb58890079e0f7d9a046605d777332 SHA512 e15d63d81faf57bee3099a25418ec787c0e89b68e12a217d1748156f43598b56b5f870916c14728bf3a8749f68cb9cc8f3c6c8041639407642bad9bf7cea6d86
diff --git a/dev-python/sphinxtogithub/metadata.xml b/dev-python/sphinxtogithub/metadata.xml
deleted file mode 100644
index a64594a5468d..000000000000
--- a/dev-python/sphinxtogithub/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">sphinxtogithub</remote-id>
-    <remote-id type="github">michaeljones/sphinx-to-github</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
deleted file mode 100644
index db9d06f4ba3c..000000000000
--- a/dev-python/sphinxtogithub/sphinxtogithub-1.1.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script for preparing the html output of Sphinx documentation for github pages"
-HOMEPAGE="https://github.com/michaeljones/sphinx-to-github/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-IUSE=""
-
-RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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_test() {
-	esetup.py test
-}
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index b20ae28cfc87..c5452b9eefa6 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,3 +1,3 @@
 DIST spur.py-0.3.21.gh.tar.gz 17666 BLAKE2B 0628417e6b5f4c744041693445113a59daac4f89776bc39849a2e1fab21826f3c6783bf72bf528a262f05df08d0680044e69f119c367f29ca4d6f0df554fa49d SHA512 7cd49690b989952707629fad5682201dc7f00865d8120da9e84eb9046e7a8fe7b7183785b4c2eac996d2743025cc09508b0ceb7b762b7bddb5447ecbc42d00a4
-EBUILD spur-0.3.21.ebuild 1114 BLAKE2B d88073e0e89b74c513f40fc7dc6a046e2cec66f207185b84a64e0107eb2bc848f447d6f65f8d9adc245330fb62dac8ef68af4f0396a4795392add9baf05ad116 SHA512 ac720f0560f6d15052725a4cf95bb072b9fc138216f1be4e4055a7cd650c52b90a257d6ec6d514315b1c5d1b998ede433eba30f33c57a8bb2c590a1023623d03
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD spur-0.3.21.ebuild 1175 BLAKE2B d2e7d602a67fc0d1e9efbf8608cc52a637dedec643ec8e5cca1c34f1407037f10b6f9f9ffab4cd4e3faa205c03054d44fa34337fbe113094355b048fe18c6700 SHA512 1e7e2656be35f31865faa8bdc17168714153784db6d97771811b610104f057a3a5bd51c13e990ab91f768e22dee9ac1556bb698efeafb9ed98d0ebfb0ce43742
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/spur/metadata.xml b/dev-python/spur/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/spur/metadata.xml
+++ b/dev-python/spur/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/spur/spur-0.3.21.ebuild b/dev-python/spur/spur-0.3.21.ebuild
index d5660abfffe1..f4219634c4e0 100644
--- a/dev-python/spur/spur-0.3.21.ebuild
+++ b/dev-python/spur/spur-0.3.21.ebuild
@@ -16,7 +16,10 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]"
 
 distutils_enable_tests nose
 
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index df76e392ea0d..dc1592373350 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,3 @@
-DIST spyder-kernels-1.9.0-gh.tar.gz 70947 BLAKE2B aa9d5a26da6e1783b5e9b1363813cfd8f2a093c6382f0a7de3d3d4eac801320327bee117d5e93f09a46ea14dd3432a6d3022d8e21089989fa57fa2f461360f68 SHA512 a4fe038cb1c888bc26296d7a0d7e876598b4b4de672d671d383242fa8aa2de6db89d498ae08dfa2da0f2a03417ba814df034ab3bc32c56c82cbac478764078dd
-DIST spyder-kernels-1.9.1-gh.tar.gz 71106 BLAKE2B f6ccabb86d0b594c586215ffcd55697aaeca6b038178a4715df206dd77676e75e6e51d1de799d5d5d1e07cd935dc4bcf2c7c7d50417813391ea3b655bfa910b6 SHA512 856931663f7d3e964831e96bce8c3b6ea81596604dc5f53be132a536612c63d98e6b3862d4153c5ea64e6dee5cb1e27156d30b94edd7b7010ba7c6596ed6e5b1
-EBUILD spyder-kernels-1.9.0.ebuild 1296 BLAKE2B efc6e7d60286c9215e620a87c181275ec3ff3156dd8055a79e76d125278e20a4cb9a57a916ca38f1ac9b7901be7e780305647e9e30657b4218fa5980f1f2d534 SHA512 40808cc9fc9a77953004ca12b8d39ccf708e675c8039cc4a86dc9e8b9c6c87333213ea2f8e1aeb049f1cb043fb63cc4e916ac35f04cc9021c24df4146dc27319
-EBUILD spyder-kernels-1.9.1.ebuild 1220 BLAKE2B 6e75b9282d3170c0cf4263b00b8008b1ac9a2c2db8f3a51b15b7b02e8585629077bdb5442fe025c36304eb97d4bab1b89b8238aa73698fee3b0886a838d7e313 SHA512 dae76ce065076f3da0dad78f9ed4f8a09bafe000ce299013fbdc1ddb8d6e6c419063199309db7e802beedfd871751c95114d1741c74a136d55f4f8fce6a2122f
-MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
+DIST spyder-kernels-1.9.2-gh.tar.gz 72034 BLAKE2B c6ba0f911ecc7ae000ef57605276cf7a089eeee580d78d0b9ba5b4a667f493754d0956690a8ee14e3e5031cec0407915ee4c8526e815a2226a7d50cc849cb414 SHA512 f7aab11bcfc746d56d67c28162ebadc5d583f0e05a5dda27ec30f5ac37f736c1f8d785371b5080bb19b964087d6c730d5f377c29781b7bd7bee273ec533799d9
+EBUILD spyder-kernels-1.9.2.ebuild 1241 BLAKE2B ad7f9b1d68ea4fc423f5d04c416d66396f4ed40fb05e05f1bc5b82a2db045e23b48ee8738c586fd20d9709d386151ac5bff790d5a604c743ccd76f64295b9c59 SHA512 ece1339283b209085a507d9b7eb0d0b3c134a66a441e6b06d42a4c602e035c01a183f7393573e33f31e7c7654cd56b5fb77a8f9cccbaf45cf6067d217bf17115
+MISC metadata.xml 535 BLAKE2B 48c4e591e65dd5ae7180c4834379783b32a9cde2c899531252e7eedb990291399d33eba01c4bba9137ab6f426bcb7a5b443812094b9fa84fc9e8102b8c44db72 SHA512 d0c67672928b7aa931f8b50ef75ba7bb60c2531e6fa8285cd1e3aa2817f60286274b35dd6814409b6366a23bebbd8572a2c5ca4376ea34a74e92dee4bf66e202
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index d6e17923787d..39b4f66c4ef3 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
   <upstream>
     <remote-id type="pypi">spyder-kernels</remote-id>
     <remote-id type="github">spyder-ide/spyder-kernels</remote-id>
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.0.ebuild
deleted file mode 100644
index 256d0cc3bc19..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.9.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_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-kernels/spyder-kernels-1.9.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.1.ebuild
deleted file mode 100644
index 3051a687b417..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.9.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=7
-
-PYTHON_COMPAT=( python3_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_prepare_all() {
-	# assert False
-	sed -i -e 's:test_turtle_launch:_&:' \
-		spyder_kernels/console/tests/test_console_kernel.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
new file mode 100644
index 000000000000..5f51d2e2363b
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.2.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_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_prepare_all() {
+	# assert False
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+                spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 8660d0414a4d..3d62d1351de5 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-notebook-0.2.3.tar.gz 3692690 BLAKE2B 74fa380233155ef411f1bc6018111d94eb03cdf4d4d3b75937b4e63047320bf2292bb2e4b058efdfe0b2ba78569872e1dbda110b9b7b29c4948a787fb9fde399 SHA512 b2a8f256ea304150477df98f5e6c16c90dbfe42c0bae7eeef9fb25a9de02433a7d8b3bf448926a94df69d6adaeb91e277ebfe7f1a5135d9ac9f9ce2dc9bfd804
-EBUILD spyder-notebook-0.2.3.ebuild 984 BLAKE2B a812d5214eb1061ab65065c23ef6c60a4eb610c41c9ba7ac689d4ddc572ed006cb44797148d72560999b4d2e10c3ada3adbd8eeebc1fe57d377d67789a50eddd SHA512 8e6be2046e51b67745a1ddba7b5b9fe775327eb0ef0656f3fd8aa9d1ed7d87bb55f1fb9c3143e6c8b41dcd053c4fc9f0322ddd13f707574a20865bcde72e0bed
+DIST spyder-notebook-0.3.0.tar.gz 3862097 BLAKE2B 12f9edb3b49373419e491ae3f123b8c325dddefe5a55e8bb853d720aba2c28fbde0be50ec1e5f74198fa1e21faee8a7378218b3e7b3e8378c82be5ee3a10b9b8 SHA512 9259ccfcd79b7d86d49eda74182e3f1e66188f644ca7560a8929dd07c1a453f17bb976ab325ed55df879a00cbc4d14d3724909fb49c56cf1bbf9665ad69b9ec5
+EBUILD spyder-notebook-0.3.0.ebuild 1181 BLAKE2B 98d16232b35ccc2cb5761588fde07ea4f9a31c124c6e9c6b53c26a07d6bf01c72d2180b97212590f620b4f5bf7fa6b7dc8f5cfbb55c2e0eed122e076a6f92ba6 SHA512 97e79bc6cf5759ac83fbf3263bf2c6f70ca5fc1ab1ce9bb831b9ef81cc05c1be9dd6a324b31595a408677f757e2e46aef85a795c053d6ebe3920c823048ebbb3
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.2.3.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.2.3.ebuild
deleted file mode 100644
index 5c52581419f7..000000000000
--- a/dev-python/spyder-notebook/spyder-notebook-0.2.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_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Jupyter notebook integration with Spyder"
-HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
-
-DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
-
-# Tests do not work inside virtx/emerge for some reason, core dumped
-RESTRICT="test"
-distutils_enable_tests pytest
-
-pytthon_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
new file mode 100644
index 000000000000..2392d07aaefd
--- /dev/null
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.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_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Jupyter notebook integration with Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/qdarkstyle[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.1.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
+
+# Tests do not work inside virtx/emerge for some reason, core dumped
+RESTRICT="test"
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 653d4ac5f432..45c7f666717a 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-terminal-0.3.2.tar.gz 9063459 BLAKE2B 3682f8f4feb252959d7364482c1b8e20498c53b8a6d035d72ba0353fbcc09d19b2bc45e38c36c2e309170cbcb89d2ecf524e2b3d22b6fd4aeb1ee17334d3cc8b SHA512 72b092418b2240f0125dd38a1154fe80b400df1cd983d722240c866653bda2e578c679908c16b89aa78f8a022ff253aa45ef41721520646ceaecd798b9b1ecb4
-EBUILD spyder-terminal-0.3.2.ebuild 585 BLAKE2B b6d2a06a57d8c7f65d9b59072ad997e37f476f5ea857eaec0f1c0b04ae0eee8a82a56d9bb4d2e996407137a5823ab47cce9c8789109997a2ffe684d06f630703 SHA512 f6f85f6f0dcfd15e328c677ee1e8856da6f3121ebe64ca27fef96c617256b8ba58053262e708790e4527c189aa1a0461ee9a038a69a009aaf07df56a5a253d35
+DIST spyder-terminal-0.4.0.tar.gz 9099944 BLAKE2B ee8dd4d896e5afd0610c7bcc8c33779431a8f2a36873f25132bacf66c2bdaf6d2fee85603c213e3cc60ae5aee51f4a99449abb5903e12adf43a2a2f2900ad418 SHA512 e3531f9439c8773eaa74b64890583398384673868303c5413052c99d5be711ea63f977d714e8f4854a426c2154a62df8c272d4b262400f3f4b4d627074d8f2e5
+EBUILD spyder-terminal-0.4.0.ebuild 585 BLAKE2B b6d2a06a57d8c7f65d9b59072ad997e37f476f5ea857eaec0f1c0b04ae0eee8a82a56d9bb4d2e996407137a5823ab47cce9c8789109997a2ffe684d06f630703 SHA512 f6f85f6f0dcfd15e328c677ee1e8856da6f3121ebe64ca27fef96c617256b8ba58053262e708790e4527c189aa1a0461ee9a038a69a009aaf07df56a5a253d35
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.3.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-0.4.0.ebuild
index 3c158e86cddf..3c158e86cddf 100644
--- a/dev-python/spyder-terminal/spyder-terminal-0.3.2.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-0.4.0.ebuild
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index c998d2db008e..78e22894da78 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,9 +1,6 @@
 AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
 AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
-DIST spyder-4.1.2.tar.gz 11125567 BLAKE2B 38591301fa9d97836341c9e86134fee1515ce901f42aeb45f606f23f5da7411e45e98e872dda0f0de4504e062eb6aa188d3db15181074220e69624a6b28dd8f6 SHA512 a0aeb1f7eb66f2efd5bb7da6ed7401668ca76e968b9b651882567664925be22ba0748914477876e2c62761442c57fa69c19a9fc6556251ac6db83bcd6088d000
-DIST spyder-4.1.3.tar.gz 11610111 BLAKE2B 5cc25a6a8c6609dcec8e5e0d4beddfa582b2f632a4d1c61ef68e68e82f3cbc2b29694ddc7cdda216e4a8143254e6c1cca1e817a3f72be324671ff0196f3f0842 SHA512 0d0568c500c5b153bcd0073897eaf4e526e62bbc82c4a795683185cdac86f00c24d3b2efaa1f6bcd2f60305e387cda46bb732fbeaf21391e9d80ca4b18787b7e
-DIST spyder-docs-1022fd8.tar.gz 3539049 BLAKE2B 6d54a990ab681e9ed8a5f1a03e59e86c29eb94af18f29dd6c3b8b782230974cf057d25993b0e0358d0f32aba3fd8740dc94fb173766c094e7954d9f39456e6a5 SHA512 84935fb0665e1981c319484ba97096bf6996cc618d073417d06f3dfb703366429be333203af3ff2fe124cf00cc72e416fbc97734be4e21e9200b104fea167933
-DIST spyder-docs-6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd.tar.gz 15821929 BLAKE2B 843510c87dc9ca616a6114159445894d2f4728201a93f424131f2524c8bc833d1b1540740d1e7cf473c4aed501cce775a073a9ee8748fe29b4193c927da70820 SHA512 c9161a7dc4bdef8e9a1ebe84ee7cc01fb9083965b54fc421d006a999ff753485c3d4a615e9646a6be47826663a64dc9af7f442dc2e4c81283c6eb5de55a8a3a9
-EBUILD spyder-4.1.2.ebuild 6243 BLAKE2B d12fa7cc66a245731f2b30c07017aa8f58671877a5f8abf6d9b3d9c95ab7cb3859ad9cfdb20cf0d38a368b8398f0d8f774b63339c8780f242cb705d47e1fe1f1 SHA512 3f4a3045836607850215a9010603c91945f2fae33a2ea068ca8843bcab883f141a7f1258525abc49e945cc30f6a869cafe9ba634636f04f839a95efba3692b3b
-EBUILD spyder-4.1.3.ebuild 6278 BLAKE2B 23e63cbe40558640b4dee615d8f7149ce031295fa8217dc3011ad352e47198f008ce7c9af0ea9584528aa79fcad2a1c04765a165d74625c9bfd1b7bd8bd80f66 SHA512 02b75ab6a973f80f079e5a0dff490605624eab3cb30d56a537a2c172861560dda569c1f17a5879d2e05a0e608bf181d51e76b3ff9f78bd84e8e7388eef4553b8
-MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
+DIST spyder-4.1.4.tar.gz 11699453 BLAKE2B 208ba4f32fa548ef8478d72c046e70ba43a2fccd2040629af03f7f56c379ebefa1e90594054f15a92aebdd14307d001c68ee5e6d2401a841e408c4af42436c33 SHA512 8a5f63b11648002838e0b4e5427b1c7cf9cbe4a4fd20af7e33e5e789cddaf6393bb7200bfacf8c7af19d723f12d99d2e962a769706b806335f7146ddd6853735
+DIST spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz 29749238 BLAKE2B 9cf655c2a6fdf84278eaeb2e6f13c92eb4e585f213fd4f164a2707bc3cf8cb8abaaa213c5e781414fb0eecb3cf26b1f1708b394cd1ca12fa353ccbdd33f01dcb SHA512 8ed005cbfc32d7c68cf633790446d5d271f4d38ad190c09b2bcfd3ee96f24af5443d911bcdea90dc6ad94c5dab78437b9db02d0d4a7ceb9afa37a31e4bad24ae
+EBUILD spyder-4.1.4.ebuild 6065 BLAKE2B 60946f019296720480b43224beec7608b65a96b06bac0f7291443c18c38b31535831b18452f2d8724186d20f9430e1b4a3910aa4accae0e5913d9818af3d95ab SHA512 f773bccebff54a16d00f74eaf97a11e44a5b49bd8c327a0c83ce34c94eb61cd763e6025fe6fe327c4318062612b018ab9422128dcc7a1cd9396c7441cedfddce
+MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 46303e6157dd..47504714a176 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
diff --git a/dev-python/spyder/spyder-4.1.2.ebuild b/dev-python/spyder/spyder-4.1.2.ebuild
deleted file mode 100644
index 2123862db62d..000000000000
--- a/dev-python/spyder/spyder-4.1.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit eutils xdg distutils-r1 virtualx
-
-# Commit of documentation to fetch
-DOCS_PV="1022fd8"
-
-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
-
-	# 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
-
-	# 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/spyder/spyder-4.1.3.ebuild b/dev-python/spyder/spyder-4.1.3.ebuild
deleted file mode 100644
index 40dfff6e2109..000000000000
--- a/dev-python/spyder/spyder-4.1.3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit eutils xdg distutils-r1 virtualx
-
-# Commit of documentation to fetch
-DOCS_PV="6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd"
-
-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"
-
-# Tests succeed, but freezes at the end, installation does not continue
-RESTRICT="test"
-
-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.1[${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}/${PN}-4.1.2-build.patch"
-	"${FILESDIR}/${PN}-4.1.2-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
-
-	# these deps are packaged separately
-	rm external-deps/* -r || 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 '' == '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
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# assert 77 in [71, 78] assert 45 in [43, 46]
-	sed -i -e 's:test_objectexplorer_collection_types:_&:' \
-		spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.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 does 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.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
new file mode 100644
index 000000000000..184855914157
--- /dev/null
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit eutils xdg distutils-r1 virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
+
+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"
+
+# Tests succeed, but freezes at the end, installation does not continue
+RESTRICT="test"
+
+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.17.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/parso-0.7.0[${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-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-1.0.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.2[${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}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-4.1.2-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
+
+	# these deps are packaged separately
+	rm external-deps/* -r || die
+
+	# some tests still depend on QtPy[webkit] which is 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 '' == '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
+
+	# 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 does 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 a1557eb75d8d..bc063a64741c 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,7 +1,4 @@
-AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da342bb43f1a3bf3ca68955bb4c809b5f821246963eb5afa56c7425bab0bcb2ecaa3236225ba38a61868f6fe5b2ef75c1f05f30c209dfb87b4e18 SHA512 20266450a59acd595477466df49dd430db17ac4b4010a7b247bd962a880f48e97298efb0617892ff0f45a14b18bdc88a47f6be7460ce6a931e72c85a0baa4e09
 AUX sqlalchemy-migrate-0.13-disable-sphinx-exts.patch 497 BLAKE2B d66dae755df49a2347e09045b72e85559278011c814c4ad209a193fd2912effab5a281e449e72e3185380e50371eba3eab5f3199cc280c4e84487fbcd02ff74c SHA512 8a8d3f4b075cb2dfd46ce32b228180826b93436da7cb9bb2ebdae14dc74a0a82817af1543862ef11d980efe7f37e3b838f3170cde6bcf2e03c388d91f2bf018f
-DIST sqlalchemy-migrate-0.12.0.tar.gz 128499 BLAKE2B 352b34f0c9490019748183dfd9c4b7e0064fece007de9ea46da88bcb7187b55ae3b502b45c919aac0d89586e4b9a19955be2df3ef81dc8b8328a0e9da7177e46 SHA512 bbab28a67afadfeb33a0a3c303c7e623de051923fef7c30b1896cb2f34fe325036c3730d93ad5f88ffb35aff25de22e1c770dff68dedd6acfbc4027e127857fb
 DIST sqlalchemy-migrate-0.13.0.tar.gz 131424 BLAKE2B 925ee05144360c469d714342005c8b79dc0f1ef7c07ec641c00ec39e4aa18046b3afa7524f4e5afeb292cf78b2b85bac714f44102e0daf799ce09f0af40f3047 SHA512 1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6
-EBUILD sqlalchemy-migrate-0.12.0.ebuild 1361 BLAKE2B c6c724a814f18a4bff5d48b7e1638e6662b1d53ec6941f62fb27b42e87988f0dd3f721df9743981457bbcefa3cbe6e92d183b18f2cccb49391a662170844a6fa SHA512 aff3a4ae4ef7b75ec890da6b8075b860cceda00dc04189fe3d7d34fdbf263f3873fe4fac86538a1199cebf2e7a9deccdda4970ebaa375476ae073094c3b5f48f
 EBUILD sqlalchemy-migrate-0.13.0.ebuild 1322 BLAKE2B d9e8eeaa7f36d4fe463aaf2a61ef009d41013277cb8198cd87a34c692042464dfe4711709aa4ffaa8dcca2642468d25d2e8b6b4f544313c9a4e6616984a5fce7 SHA512 bb0aaeb431bc7c53ccb97e94063fb226448b328e34e75b81d4d3be8e29bc52a58be49ca02a3af33f29b047318846afa222d394f5b4d087e84952e4e55d7840b8
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
deleted file mode 100644
index afb8ff6dc461..000000000000
--- a/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-intersphinx: prevent resource downloads at build time\
-issuetracker: broken. see bug #527188
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -28,7 +28,7 @@ sys.path.append(os.path.dirname(os.path.abspath('.')))
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinxcontrib.issuetracker']
-+extensions = ['sphinx.ext.autodoc']
- 
- # link to sqlalchemy docs
- intersphinx_mapping = {
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
deleted file mode 100644
index 4ba81e9d0dba..000000000000
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.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,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${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/sqlparse[${PYTHON_USEDEP}]
-		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
-# Testsuite requires a missing dep and errors with poor report output
-
-PATCHES=( "${FILESDIR}/${PN}-0.11-disable-sphinx-exts.patch" )
-
-python_compile_all() {
-	if use doc; then
-		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
-		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
-		emake -C doc/source html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 136224c8c49b..c0969683f882 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,6 @@
 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.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
-EBUILD sqlalchemy-1.3.11.ebuild 1598 BLAKE2B 6fe7989cee639c1299f36553fb1af8c2b94968622db2ce909d3a7af2443fe9ee8875dd5ea2c0fd862a62a42e58e18425c7ce3f7b7db74e3244f6f2cec85edc80 SHA512 c18a8f06666afd03c7852e5bbd5ea380ac28684f26af01b656cdbe8589754cf0ad6dbd57a2a059616a0bc55c02dad0130afdc265ed86d7ec41b3c7e37e1791fb
-EBUILD sqlalchemy-1.3.17.ebuild 1481 BLAKE2B 7e80fa096e65dc95caba7112f9f870d74d983bace3a16b3a836b6fe7eb50ab4f07ef05c8c16aa5bf615ed317a76fbc73943de29ed208c1e095e9f87ff70f2b45 SHA512 f85616ea8aeb83ebf1e70a9b95296fc966fdc5152dfe7e29325703649c7f37a801017ac5eed55359acb04c530fd808fed70d71a4f8eaeb5fb34156b0efd669b9
+EBUILD sqlalchemy-1.3.11.ebuild 1588 BLAKE2B e1165a050cf6e2f08135698679c94e1ab14b20c6b3160326349350b21fd97fa1d88b8c2aebddf984030236ca4b879cc822bc16f12e8842ff288cefdb0d314b0a SHA512 affca1b12188fcb6ff6b2919ce93c05413661e50b2b68aa6b7980ab5a416e0e82d1fcdca3621fb2202d12772df24edaf38a40e783059eb0c567bc44cf63242cc
+EBUILD sqlalchemy-1.3.17.ebuild 1463 BLAKE2B 46a4a523d014fe7b948f04b2d4fff22ea68dedbe54230fa721e2a1eaf4f6b25dc91158016c2b450b095597a383451162c0b18e4be0fd69dd7431789b67ccb2aa SHA512 560b879d1eb17684e7a5d53d93a2c771b7839868e7fc5fe7cca903898d44d675384b97375ee4b54569d4ece9c768e1c7a269ed8ef22cd72d984864b17b899f0c
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index d2b10bbb28f3..0e10b45ac3d4 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index d73c691aa0a2..3e4038cfff5f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~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="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index f6c80a577d4e..6df3a228f741 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,3 @@
-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 635 BLAKE2B 963f921e76fc971a005eaac7105ab75489bc1749cace130b06fff3241d6b023ad04da7bfc636551acefaa622c291ac2ad8ad9873aa49e32d6f0e402973747f3a SHA512 200c5bf66e86f4f6812191df4d4cd2b10ba7857f8985ea4470a6410998843522d9ad2064655b209f7307c15463775bc86edad8eff6e4f20eaf696db88bb21667
+EBUILD sqlparse-0.3.1.ebuild 697 BLAKE2B 7691daee92bc6bd2a334bc65aa8c2725c2dc2c83abcd39b753c64cfa00d10b73b625e559dfcb9bbbee3d09c01483014981833e794f9c3e1d4f51c65639d32129 SHA512 722d1608d0f5c8c291e76d2478fdf9fba4a49a99ff9ab3580d48657e91da9c45d3a35c342a5c6b291a27d78a70653ccf31394f1d37a47eca0dcbd9b2f30fb520
 MISC metadata.xml 384 BLAKE2B b35ba3bdebba668141b296a8e2c0d54b68015d6a6fbb0daa682e115ae0544da0fd588b3197dbc26e798214e5caf09dd01a46cbad9ced306a1052912826c41f08 SHA512 b54567937860fe8b488bdc27710f66692efe134520e32070734fcee1fcdb25e96a09117f43a5edc9f70bc6d7213814344fecb98b5576cf46ea85a3b5fd90b51f
diff --git a/dev-python/sqlparse/sqlparse-0.3.0.ebuild b/dev-python/sqlparse/sqlparse-0.3.0.ebuild
deleted file mode 100644
index b009b59c5486..000000000000
--- a/dev-python/sqlparse/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=( 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
index edaec538f391..aa01d5650d65 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -18,5 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
+BDEPEND="
+	test? ( <dev-python/pytest-6[${PYTHON_USEDEP}] )"
+
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/squaremap/Manifest b/dev-python/squaremap/Manifest
deleted file mode 100644
index d29895073bab..000000000000
--- a/dev-python/squaremap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SquareMap-1.0.4.tar.gz 7439 BLAKE2B 34b5e5eaf45c597c4591eec291f0fa2e001f6df432eda0a3b98f8e596af257f1261d083b25eea25fedd9d415e00cc20e318f94fe2ce85b3abd2c20ccd51f2d3c SHA512 d01e61697571360b58e762787237bb8533b3de238f26323380a8b0b90d72d2f00e2a43e7f6742fbbb3483573493b0d83568e0651cbf9bdd463b911d09bf27e76
-EBUILD squaremap-1.0.4.ebuild 537 BLAKE2B 98963d7f9da7b85457eba69c9eca16b33dfff89c322e32ef40aa57671adb859e40def138c8b674ffec25e69036b554c0b82b927dce25fa4bf691ec12a54272f6 SHA512 552229f07fa551813bd1ab1a29d445de42415b5d920129b02ce52687e8177815be1a3c5259259bb88c4305b69938f234888606eda92fb6cd03af474fe82a2a79
-MISC metadata.xml 436 BLAKE2B 18282b39ca0f1b7fc5982d2f29b65148f6333de3a509a478374b86b2f078aae8d0f2d200cbda0616d7d4018cbcaaab3fb03ce13889d3419fdba14a52c245d0de SHA512 dce36b184260ccdea3585f5f688006a438347cbe18b2358d95fce4f96f3675d5f0f9a8080a814ac56bc58332d901dc9272f00b6085b8e3e0f0ccfeb9e25f497e
diff --git a/dev-python/squaremap/metadata.xml b/dev-python/squaremap/metadata.xml
deleted file mode 100644
index b6d7cc2ced82..000000000000
--- a/dev-python/squaremap/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>swegener@gentoo.org</email>
-    <name>Sven Wegener</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">SquareMap</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
deleted file mode 100644
index 0262a588d836..000000000000
--- a/dev-python/squaremap/squaremap-1.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="SquareMap"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchic data-visualisation control for wxPython"
-HOMEPAGE="https://pypi.org/project/SquareMap/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/wxpython:3.0"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index c701747f5dbd..81439a8969c9 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -2,4 +2,4 @@ DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c9
 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
+MISC metadata.xml 277 BLAKE2B f1f50c34f6cd6f4e01a299e2fd72bd63dcb98f1aa4c61bf2325e26b4eac35add9f8de3303ad4cb80418729c098f5341f812148f5fb708605f756adaaec0a2f38 SHA512 1eb2a8563fe03e2174183b9f546541550d2a1689f5e710ce75a6840fed412c5244391584d30986a08624ac9a7ff13170231bb4811cd08faba475f1bbf50cf768
diff --git a/dev-python/sshtunnel/metadata.xml b/dev-python/sshtunnel/metadata.xml
index b3c1d365eaad..85354d2bff69 100644
--- a/dev-python/sshtunnel/metadata.xml
+++ b/dev-python/sshtunnel/metadata.xml
@@ -5,4 +5,5 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index c567b65fe28e..9ce9d5b595f7 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,7 +1,5 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
-DIST statsmodels-0.10.2.tar.gz 14065612 BLAKE2B 0df1268de5e4108b3cc541df87a5b9d2321bd3062d4daf1cc1aa62ab08ee777bace2f10bdfb51f088a66f15287c62cf851b3f43efa7eb1227e71c06632e80d55 SHA512 bd1c0784b0b17a3ca69fef5848f5eea8dcf76b1943599a5e5c285e45b7fcc7e44c0e388f007913d420ff6f3cb66a653d1c43e6e8addef534ff5572fa69ffb54a
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
-EBUILD statsmodels-0.10.2.ebuild 1853 BLAKE2B 3ee1ea4e063f910e9c33864d9bb71287410e754d1b805f5fc82f13415985e41eff0e885b11dc8343b229a4e15cb3841b9de56ce98038200b457a9770e0bdbcf9 SHA512 3486f76fb0197f505f1c3cd140d89664b3aa5a4bd3965c54d77a91dc8dc8083f789aa6687b0e8daa0370af9b87eb0e087558319f43791e5abfa9048a7f5e8369
-EBUILD statsmodels-0.11.1.ebuild 2190 BLAKE2B c2b301e26cf1415c954406958348694670a762696a84d3810c9897a8181b4e65d6a22560f196aad664713751861deb24cd39fa432b301a7c25d57ad36bbe6011 SHA512 d4b9e564747af0b109d1ed2057f5646d323172898c4eb532ac07f18a45cef0174a4c99317c15142da081a0af0dfdf7c1b1cdfb19452e91c611ac54918bfee127
+EBUILD statsmodels-0.11.1.ebuild 2200 BLAKE2B 62991021e4489b3923fb03164d8f6ed8176a469543c8d6661abc282d54a4147eeac5981a12e259855d313aa4e1f5e2726498fa6dc30b9b0ef2e4e502190857cb SHA512 ab2ba2a1fa3a151150ba17993e14882f9bc87fdff26492d36cc83447edf118d4e1ef8855c48d9446834c33f3f832e6ee298190a003bc525008a3e1527cbc0da8
 EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
 MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.10.2.ebuild b/dev-python/statsmodels/statsmodels-0.10.2.ebuild
deleted file mode 100644
index dcb371cf4e57..000000000000
--- a/dev-python/statsmodels/statsmodels-0.10.2.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=( 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 )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	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
-	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
-	${EPYTHON} -c 'import statsmodels; statsmodels.test()' || die
-}
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index 1e97a2638b10..f7a12631400a 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 5e45e3596c99..436510e4b9cd 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,3 @@
-DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
-EBUILD stevedore-1.31.0-r1.ebuild 1231 BLAKE2B 1d3b70997d0c968acdc791eadb19b5792f6f7a112fb7bc6bbb98c7f27c40df122d1460719d5201a0731bbd9b01539a1ba7f033bfed87b859389374c8c732f447 SHA512 7ba44275a50e9a70d996b2056d60d80e20c47371e3a11282dcd2d0287707042413db665e358f24db063a501d3c07f3d222ce4b75926a84bd33715087232ee12a
-EBUILD stevedore-2.0.1.ebuild 975 BLAKE2B a1214a513f6d8e9ce1169a75d78de1acc88d1a18bcca671364ba3431c2293830532967dcbb2f3f6f5b80299d93d41a418272c98b96c3394f4a7ded23581e23a8 SHA512 c72a9db74ad2cbbd020ca4e2f363f836735cdcf6d440517b452661953b62d8207e8ff71928c4849d0e22190ed8bb5061da0a0cf4e3d1688dc6c05e9b00269723
+DIST stevedore-3.2.0.tar.gz 510559 BLAKE2B 69faa75eed9efff36a0dd5f91730dd22936af646bd54e1f8c47da5d3bc3d33e949714ac81898747336bcd8acbdd1bb2addc68fb64add825493ad29fb22393fee SHA512 89b6c88ff41bd9429561886fa2e7cbeef1658e955266b61e1ac9809812ee8e290ecb39819618a12b1a6e080d2e86ea03d951a0a31f7ff4920d8b22bb55420439
+EBUILD stevedore-3.2.0.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-1.31.0-r1.ebuild b/dev-python/stevedore/stevedore-1.31.0-r1.ebuild
deleted file mode 100644
index 4bfc1c28921a..000000000000
--- a/dev-python/stevedore/stevedore-1.31.0-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via setup.cfg as just [entry_points]
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-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="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-2.0.1.ebuild b/dev-python/stevedore/stevedore-2.0.1.ebuild
deleted file mode 100644
index 6095da755c55..000000000000
--- a/dev-python/stevedore/stevedore-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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.2.0.ebuild b/dev-python/stevedore/stevedore-3.2.0.ebuild
new file mode 100644
index 000000000000..7241a0c841dd
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc64 sparc x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 28bfcac5bfe6..65020d11ee90 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.7-r1.ebuild 703 BLAKE2B 69bba38d044622aa0f4cf31792d6d7c6f8d2262c70e66ad0b8e2ea2cc1e86ae7085082a21a4a34f661ef88cd00b347d6ff12a3ecabc7235e61a46ae6ad95569f SHA512 5895fdb660dd26d55ae2292742c14723ff2f387158644504a13707d4c296eebfb242fd05f5168b099dd996c2b6d10a570f88e12f5a0cfb0abdc4bc62c697bb98
+EBUILD strict-rfc3339-0.7-r1.ebuild 697 BLAKE2B 441a1ee5ed3568c1514b1a398ffb94273dcfc52f62f03ac940f80b2eebecfa62ab5ef7955dfc502383cf75cda89f6c01930bde41f06e7a7640426323542806eb SHA512 78240e39e0fe5f91390c8bd74d254bfbbf39150a635fade4471e1ce887e0e75f8ea5b0b889a107762f017acb2848d3a99959f47aa64d59ae76406fc27e9e96f2
 MISC metadata.xml 409 BLAKE2B a83170ceb11e9949cd533ebdd75312b3944ff17f263d6ade09a67bfddaa8c51b86b64c36f29ce3f940d165b968f60ff61d198e9b1035210f6e0ea07fb286725c SHA512 cebb7901b80fa821caa7d7421f1701664176a16e4f3c78c0a3ab6d71d3c248720cd7f2c6aa9412e3770ca62a3a7f22a09f085093decf301b94d9c22aa9938a1a
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 c12a006c9b36..a62e52e2432b 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 106838dff09f..3cae3f762c53 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-2.43.0.tar.gz 211400 BLAKE2B 135371f793af291e1c43179bcb325a9eb84c3258d9013009f920077fbc783569b6384fa76dcf464aa9fdbe64a4a297d6c232f3719729a81e1d62c74b769ff5f7 SHA512 a91f4f268b5c533cdd378c3169cf6e29b11b3b79492cd8b01b21970459383d63fa726fb206aba111ef8e57c2b98eecd6ba3ef9fdb868efc2db69f0cba8f74554
 DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53fe830a10938355cac10287542284a73f99332878225388a3c28ba431baf96fa4e6e745345c9fa02e64a7e33c0f SHA512 dbfa586cfe7897b32fe95b7230fca5ccb8a12b429982776ee8873878fb6b7284cbb924e8dc6031d59647cc6080115ad541fda02d320c091b6c1bb374679d2213
-EBUILD stripe-2.43.0.ebuild 2029 BLAKE2B 51966095057589fed71b98e1adefeec61bc968ad09ce1e99c75f4705d4ea266b0e7a9a808b36d3700c66b8dd3fe9f18bb2998ddcf56a68279a08140575614b4d SHA512 2e475ea7c089564bff6fd356c51da7808cf9a58a6ab1f40c5eb61adab7034fd2a9c253155061193a72a0df0d100a6e616504db822d4a2a8ac426d568a1f123ff
 EBUILD stripe-2.46.0.ebuild 2029 BLAKE2B c768e553dd74bcfcf2956c09a68f126b62145b70e6deef0539a1bc85b04d056ab1b66d56eb7ab86ecdd75e75e10e93888333dba780a9d43587c43f5179c0cb1a SHA512 0d0aee9f4dc7f5bac41ad0ae09f96c08cf578ea9532551ca5a0653a6a9e60ad99ab830413b5139b88dee8a06cefaca5ac4397b9729ddbd34599dafb42fbfce0a
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.43.0.ebuild b/dev-python/stripe/stripe-2.43.0.ebuild
deleted file mode 100644
index 1f83dd5a9391..000000000000
--- a/dev-python/stripe/stripe-2.43.0.ebuild
+++ /dev/null
@@ -1,69 +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="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/subunit/Manifest b/dev-python/subunit/Manifest
index b630308ac337..acb8c4d8f6dd 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,6 +1,3 @@
-AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
-DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.2.0-r1.ebuild 2621 BLAKE2B 4e4f4caf6ea78a783a23ee20c251051bc78fcc933b099e4729c1ecd1a3d9b63a86519ec76d29eaba337c932ab969bd0493419ab2eb50436492e7894fc3ac6bd9 SHA512 f0d0a2053f0f09155605d1fdbb2fcdb089d4b6bf1881c61e8caef4d470bd6281f1ef8b11d2202e1b0ddf8cb90f7cd0657570c777694f707b7396d69a0d1da320
-EBUILD subunit-1.4.0.ebuild 2402 BLAKE2B 2b23d8e6cb91ea563724e49ee40270574e67efc183f8ecd446f4df67f789395c25e7622c98585848c153f161a2f10ab4053edd5f779dcb3a66d73a93e3dd41a2 SHA512 409bfcca1ef18bb4ee01291f3598e6d31b2e3df56bc5ac6aadfc00d734aa7f494e0ff5fee86531111abf868925aab90bddd0921ed0fe6b87730b1e7f19b12b0b
+EBUILD subunit-1.4.0.ebuild 2393 BLAKE2B 63ab420a93aca76d9d7c92a6f3fd50ced3267a6bbe076688e904220a6e9102de3138944faa63cdad2bbbf441233659e1076003d0c55812e8a9c9ea276849f106 SHA512 990b8897a6bd8b3af9f101bbd23677bf18e265e2089e793d2c188a5632abfea4e59f5dc10341800b7e01fd1701829f4aabe19c7282bddfebb60253704f41cbd4
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/files/1.0.0-tests.patch b/dev-python/subunit/files/1.0.0-tests.patch
deleted file mode 100644
index d83a1900cbe1..000000000000
--- a/dev-python/subunit/files/1.0.0-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur subunit-1.0.0.orig/python/subunit/tests/test_run.py subunit-1.0.0/python/subunit/tests/test_run.py
---- python/subunit/tests/test_run.py	2014-11-18 16:59:26.000000000 +0800
-+++ python/subunit/tests/test_run.py	2015-03-26 13:25:19.193341069 +0800
-@@ -77,21 +77,6 @@
-         exc = self.assertRaises(SystemExit, runner.list, None, loader=loader)
-         self.assertEqual((2,), exc.args)
- 
--    class FailingTest(TestCase):
--        def test_fail(self):
--            1/0
--
--    def test_exits_zero_when_tests_fail(self):
--        bytestream = io.BytesIO()
--        stream = io.TextIOWrapper(bytestream, encoding="utf8")
--        try:
--            self.assertEqual(None, run.main(
--                argv=["progName", "subunit.tests.test_run.TestSubunitTestRunner.FailingTest"],
--                stdout=stream))
--        except SystemExit:
--            self.fail("SystemExit raised")
--        self.assertThat(bytestream.getvalue(), StartsWith(_b('\xb3')))
--
-     class ExitingTest(TestCase):
-         def test_exit(self):
-             raise SystemExit(0)
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
deleted file mode 100644
index 69fe77e2dca1..000000000000
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,96 +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,8} pypy3 )
-
-inherit distutils-r1 eutils ltprune multilib-minimal versionator
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
-SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-lang/perl:="
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
-	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)"
-
-# Take out rogue & trivial failing tests that exit the suite before it even gets started
-# The removed class in fact works fine in py3 and fails with py2.7 & pupu
-# The setu to restrict this patch is just those 2 is not worth it.
-PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
-
-src_prepare() {
-	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
-	# Install perl modules in vendor_perl, bug 534654.
-	export INSTALLDIRS=vendor
-
-	# needed for perl modules
-	distutils-r1_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
-	local -x PATH="${PWD}/shell/share:${PATH}"
-	local -x PYTHONPATH=python
-	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
-	# DO NOT re-file
-	# test_add_error test_add_error_details test_add_expected_failure
-	# test_add_expected_failure_details test_add_failure test_add_failure
-	# https://bugs.launchpad.net/subunit/+bug/1436686
-
-	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	local targets=(
-		install-include_subunitHEADERS
-		install-pcdataDATA
-		install-exec-local
-		install-libLTLIBRARIES
-	)
-	emake DESTDIR="${D}" "${targets[@]}"
-
-	multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 65fdd6aed637..0719cf5c65f3 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 031f23fa4458..4ba69b1ddbee 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,3 +1,3 @@
 DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
-EBUILD subvertpy-0.10.1.ebuild 696 BLAKE2B cfc7cd380872bbf22ce69afd8ee89f50d7477a18420d96ae132aad76e5ba79abaf370cd32d2f4b0e0e13d18e968e16a3d79560c770280da63bdc6c6c9bf35c44 SHA512 a167f4c79c1d648c25f26da6fe2c340867fe076e6d670c2c8fe7eb574df8cf6d27719a7a94e05ac96fb9c6bc77457023c5096ac64b0803f00340482191d45376
+EBUILD subvertpy-0.10.1.ebuild 690 BLAKE2B 2ac7ed4b2037f94d1707b8c88ecda5e9e85fac03f7969438a39413f474cd9575c07761ca42b392c4b7242ece993fd482e7992c831e42ae2423defcf9cc09ab8f SHA512 16dfb991e677b52482df45379eda103e660ff5fbcb552119eb90c219631f48db4db4d0cd449965b9f40edbae3d29d653802bcce8f7a5a926b88958e1214a750a
 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 40de035a89c5..f5e3b86695a8 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index a4a1f9383ae2..f3876daa57b9 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1,3 +1,3 @@
 DIST suds-0.6.tar.bz2 143985 BLAKE2B 3d97d51b4e719102ab40a6a95a35eaaccda15a47e20bedb0297203576949883eea253ac6f382c8849a522e1720393ec517ec1ff3514329b504c83a928a260881 SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b
-EBUILD suds-0.6-r1.ebuild 1639 BLAKE2B 259197421ae183242f64180ffd1b0bebd432e335ed52cb0f3b29e7fb3144ed4db462422ae73e5b22d68359450e2425ea337a49d7ab6ed512799004bdfd890b1d SHA512 7bb80df58c77c08a67224f0ddb68e13040ad6a9fd73c994c7e220be0d023454970c13d1135a3f53d845fbfd0aa85a9eb321386955e4e2b53688967f46df099d0
-MISC metadata.xml 285 BLAKE2B 13cf359b1c6616b43aefb3cb64c63a00fbe80ac2dab0d14104dd2faec9bc768a8d4a039b4fc480bcc6d0aeeb13a670c8548174b5e847e70f80bdb62b7aa46ce2 SHA512 3cd0ef82ee41d65c41e026ac83ebb1ecf72cf8a143314a80f8f4a45cd8c07f19204fcd70d7ecd934776026ca55af31f74a06b718dbfa7f0c555f06a9427d858e
+EBUILD suds-0.6-r1.ebuild 1200 BLAKE2B 99cfc0c87cfe73d64e7b3ed94e2657c4555c194c4a377d1771ba20f6ee44eaa8cb1c2f4f974d9c3e6f51ba80cbe097091bd9e12f19f5db3c75b4cdb7a6289865 SHA512 49e1a6a46031f7c8b8ead4768448c9f28263d25384db23d74eea0504babea810cadb99b29e4b61e0a86440fd345fb34ecb0b22718a0cc9ebd5100c268e1e58c9
+MISC metadata.xml 232 BLAKE2B eec396dc6420f4403574b182ef0cbc8bf03d467532113a500770ba820b23da8da5a2f38648b1a5dffa0bf7b127997458d8e5427138069fd84e69bdd279320795 SHA512 7c8e7d193f2e5f8b4d3378aa43b636e47cc3d3acf272323a5bc3e469e607c60671cfed81544e60e93b86d8b203987f26c3262cd3af23e2b41215eedcfbf5768f
diff --git a/dev-python/suds/metadata.xml b/dev-python/suds/metadata.xml
index ec6405a68d0f..5d836184a864 100644
--- a/dev-python/suds/metadata.xml
+++ b/dev-python/suds/metadata.xml
@@ -4,6 +4,5 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">suds</remote-id>
-		<remote-id type="bitbucket">jurko/suds</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/suds/suds-0.6-r1.ebuild b/dev-python/suds/suds-0.6-r1.ebuild
index e243f32a0a7e..7b30e8c490fd 100644
--- a/dev-python/suds/suds-0.6-r1.ebuild
+++ b/dev-python/suds/suds-0.6-r1.ebuild
@@ -2,49 +2,32 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
 
 DESCRIPTION="Lightweight SOAP client (Jurko's fork) (py3 support) (active development)"
-HOMEPAGE="https://bitbucket.org/jurko/suds"
+HOMEPAGE="https://pypi.org/project/suds-jurko/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}-jurko/${PN}-jurko-${PV}.tar.bz2 -> ${P}.tar.bz2"
 S="${WORKDIR}/${PN}-jurko-${PV}"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
-
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 DOCS=( README.rst notes/{argument_parsing.rst,readme.txt,traversing_client_data.rst} )
 
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_compile_all() {
-	# to say that it's both, because it kinda is...
-	! use doc || epydoc -n "Suds - ${DESCRIPTION}" -o doc suds || die
-}
-
 python_test() {
 	esetup.py test
 }
 
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
 python_install() {
 	# test folder makes for file collisions by the eclass
 	sed -i -e '/^tests/d' suds_jurko.egg-info/top_level.txt suds_jurko.egg-info/SOURCES.txt || die
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index f96fe58bbef8..77a633f09c92 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.4.11.ebuild 696 BLAKE2B de93f69feff21b87b9079eb17ddacb36323228935977532715bd4ed124bbd364ef682212c3335b19939beabb64714858aa989438df4a242fd0065350e842b10a SHA512 b2f3216384ee83ba57dd1294474ac1697381b969e5539d814dc671563e84519ad694cf93dd4349cb53a73cf5cb8afea1d3ff0125bce2cc9de1361a5c3dc34493
+EBUILD sure-1.4.11.ebuild 701 BLAKE2B d0c5072f378145f357415e3b93ed220b25a6739fe0760cf9934bfdde5c0b6f79d940f9c432c2ac166e128c870ee2ea2ae26fad194ece0e1399c0de1abd4f203f SHA512 4d263dcfae644e5769a42d21afde049ed748e4873b249b9a7319d3b250fe7e12cc9a2d2592a340ba39c540a5b7ca0ef685e4a7a906cf710d1f2c2b434d91211d
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index 7f62f1ee8062..c4e6f87b891f 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 1587b64ffe2f..dfe60196995c 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,6 +1,3 @@
-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
 DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
-EBUILD svgwrite-1.3.1.ebuild 638 BLAKE2B 32dc0f666922cae2707ce09fcec43ae78b800bd0702d27e0840237620ec028266815945547a33a05722c4549f9905d577c9c280cbb0e4ff4b31eaed4283f55f0 SHA512 ee5bdfc5f1d3a1acea7f5e06a91443135addb8f545efdd2fc1f63702bc318e6630f136f70bc572efea92d0c784e880e5792e55e0c177464fd4b3fcafb73d54b9
 EBUILD svgwrite-1.4.ebuild 571 BLAKE2B 65961e96d7f5a69231ff90e45d6406f127f5b3283fb897941fbcd5f8d504e997dbf813993a52157e9c76144987f54a5b5aec5f90eefc40c19e799aa98ae8be30 SHA512 98b0aed58c6a7fc981b422ec0a2f796e612512975a0229f353e2639625e4df5f69d36a3bc79157d08b65ec77805690d85b10b6391ff92218ea878be64077b22d
 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
deleted file mode 100644
index 872a113a2a3d..000000000000
--- a/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.3.1.ebuild b/dev-python/svgwrite/svgwrite-1.3.1.ebuild
deleted file mode 100644
index 77b8babdc570..000000000000
--- a/dev-python/svgwrite/svgwrite-1.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=( 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/sybil/Manifest b/dev-python/sybil/Manifest
index 796599aabaa7..b10d646cacb8 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,5 @@
-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 546 BLAKE2B 6280824f7e99a0bce279d149789def456c1f56fbcbb8eb5e2ea38235a47dcdcd74cf8294b66467821120982a76c1fa7bb61ad3b0ff4f09bb7089d1b6eaa05364 SHA512 e94a848bd73e0ef36fb68e2c87f3ab76916f2358b935071e766ac18de72add7a950cdc78d85a75487b2e34c784ddb768f556a54f4333d76682f5a63ab1c2aa0d
-EBUILD sybil-1.3.0.ebuild 548 BLAKE2B 0391a5c7a2d5f2149a422701acb8e832d3e06b8167bb1b6ae27942eb29ddff87d6d7f42aff31ee7348897d04d2d026d18c0e5a1db35829110219e04f87eb20ae SHA512 441f8ebc92a0a01c94da3b02f580be1b6f7b02f779183279fd8b653a35f44b72f8c9337fb359b668de2706f7f956668db55785e2d042e879e65dcce46fd7f2ad
-MISC metadata.xml 372 BLAKE2B ee52c5344be6eac7a7a79165e71cf7d198d8ee21591c4bbe5b8ebfb830019aa9bd32cb4912e6aaa59ca9e2147262278f2bafa3b24a89fcb67e930ed2a033c281 SHA512 c586f579a99f202fc403523fa870bc7aa31a437527091c413abf4c47795671ebbb783c74afe32790e25c75c9aeb19dbd0e6dd7367cdcb69ebf128367502b86de
+DIST sybil-1.4.0.tar.gz 30062 BLAKE2B 86a01b4c8c10512f3e2b067f4d1007e60ba46f23f22ad80ff7a30a4503db06fd91d841b33bc54f0f7acbd2539e595f8b0201f9a8e8ccb7577f8e9f422562e02d SHA512 f385b4e67cc5a4b32c7563d98f36dab6e5320966563eb341395e9327c16f92a63863558bfa795b6531819fa6038234492d4d19c1d9286e6306039e8d4abec0b8
+EBUILD sybil-1.3.0.ebuild 546 BLAKE2B 6280824f7e99a0bce279d149789def456c1f56fbcbb8eb5e2ea38235a47dcdcd74cf8294b66467821120982a76c1fa7bb61ad3b0ff4f09bb7089d1b6eaa05364 SHA512 e94a848bd73e0ef36fb68e2c87f3ab76916f2358b935071e766ac18de72add7a950cdc78d85a75487b2e34c784ddb768f556a54f4333d76682f5a63ab1c2aa0d
+EBUILD sybil-1.4.0.ebuild 548 BLAKE2B 0391a5c7a2d5f2149a422701acb8e832d3e06b8167bb1b6ae27942eb29ddff87d6d7f42aff31ee7348897d04d2d026d18c0e5a1db35829110219e04f87eb20ae SHA512 441f8ebc92a0a01c94da3b02f580be1b6f7b02f779183279fd8b653a35f44b72f8c9337fb359b668de2706f7f956668db55785e2d042e879e65dcce46fd7f2ad
+MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/metadata.xml b/dev-python/sybil/metadata.xml
index b56cda1be741..c77e3873525d 100644
--- a/dev-python/sybil/metadata.xml
+++ b/dev-python/sybil/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sybil</remote-id>
     <remote-id type="github">cjw296/sybil</remote-id>
diff --git a/dev-python/sybil/sybil-1.2.2.ebuild b/dev-python/sybil/sybil-1.2.2.ebuild
deleted file mode 100644
index 3e88978fa0f7..000000000000
--- a/dev-python/sybil/sybil-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
index 3918a42c35cd..3e88978fa0f7 100644
--- a/dev-python/sybil/sybil-1.3.0.ebuild
+++ b/dev-python/sybil/sybil-1.3.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"
 
 # nose is used to test nosetests integration
 BDEPEND="
diff --git a/dev-python/sybil/sybil-1.4.0.ebuild b/dev-python/sybil/sybil-1.4.0.ebuild
new file mode 100644
index 000000000000..3918a42c35cd
--- /dev/null
+++ b/dev-python/sybil/sybil-1.4.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 a08ab6089fa8..aa1b1b389fec 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,5 @@
 DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
+DIST symengine.py-0.6.1.tar.gz 112123 BLAKE2B 3b55ddd834c7401a5a211e5e20bafbea68b172738c6388e72b1e6a6e62719e19f28356fb6156caa6cfbad59d051de45c0e103a89d675e3453136cc85e638f327 SHA512 09f452757e3c99dc9d896a322a07d58f57af6d57a9eaa615b9f4f3d834cfc91f6a79de955a36ad94bc30c962365272ef0afe401570583af49c015295ccd7c4ed
 EBUILD symengine-0.5.1-r1.ebuild 1032 BLAKE2B 0f0b252a6086209b2984348b014ea124de628280206653b9e88cceba01d8e745a778d83ade77c0fb74290e866d8ec009b0985e29d5eb5ff63c7225d044ef7e0a SHA512 11cab6c58220cd636aa2ca27b4ceae17ea1ee6ccb7fe43fdef941480ace25fc1391e38a2425781b81cfe6359a804e2ef24c82c6fa9767f79be365b97aafba7c9
-MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
+EBUILD symengine-0.6.1.ebuild 1164 BLAKE2B ba014aca708018bc54331e1f2b469136e281f96b1d2e6ea91ec825cb65b5e1dab84dc362550b8f86a35416422bdf123958e0fad90d46465a39c2a0f685b046da SHA512 7904d972ae564b1abf6182f78d539a8a58b769ae8c8a2d4c45aa6668474c0a230f59843887e1d04a905fd516d21b33024791c69f6ba9c4981659f2b4babbc59e
+MISC metadata.xml 366 BLAKE2B bbf2f9c38d569a0575af808f60add4a61f2065fbc28d9bdd44fbc85a7e24fe63a4cd3d7f3abbc4b68cca8007d9cb742cce1249a6d0f8c9eef8f9446f29dd2121 SHA512 a7ee1b2afe1c934cd83e57e0a1b09d53e73b5a060f342f020ae4785c08808da9762a58f08c04020bb4c61f9d5d925dc7f212afc16d7412ee52a0188b3adfeafd
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index a7413ed86c45..202e3195339e 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -5,11 +5,7 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <longdescription>
-    Python wrappers to the C++ library SymEngine, a fast C++ symbolic
-    manipulation library.
-  </longdescription>
   <upstream>
-    <remote-id type="github">sympy/symengine.py</remote-id>
+    <remote-id type="github">symengine/symengine.py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/symengine/symengine-0.6.1.ebuild b/dev-python/symengine/symengine-0.6.1.ebuild
new file mode 100644
index 000000000000..f75bf9e3ef38
--- /dev/null
+++ b/dev-python/symengine/symengine-0.6.1.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=( python3_{7,8,9} )
+
+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"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/cmake
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/symengine-0.6
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Don't install tests
+	> "${S}/symengine/tests/CMakeLists.txt" || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_optimize
+
+	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 dfe365ef05df..f95783c72669 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,7 @@
 DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35b397c8b87a1bcc4e316d00c456f576baf57d1b4a6175e056dec58f05fbb05893519775ffa252ac018452d2ff SHA512 3c4220243d2cbcff9eedb2a7986431b5b4d7d0007c78208a60b21830c9a3528d2171086874c42205c1227f779e44c19b9562943e2935d329bc352e7ea85396c7
+DIST sympy-1.6.1.tar.gz 6811393 BLAKE2B cd19946fc726b5a74f9ff0af07f07f8f76ea28b20818653d785848e331c126d634d8167e3506d8b87c12ed057df4a59551f0a0214b7d1292e199c6a3353f70be SHA512 95630b6fad1e41f2d58d1f4f4433ef76d4553f3e119bfdd36048c5880ac7f07d572e901eaae0b5c6208f598989a86ab5e03932a851f8048c584154973be6982c
+DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
 EBUILD sympy-1.5.1-r1.ebuild 1850 BLAKE2B e2f08e54dca354747252fbe8746a163b93731a54c3bd2da1b8bced7ed8a3a94185eef5d3c5d7c71a7cf00dc8eed8b041253a451acb682eb3ace923a20df442b7 SHA512 fdc6a748fe63dac5f904b36ea51beaddecbd074ff1ae9497e0cf30481d505d0d48eea9732342f9033aed6d24a740aaf3f9f53586514f4fc2c3e89db111813a98
+EBUILD sympy-1.6.1.ebuild 1770 BLAKE2B d6099d50f37f0bbf766b3f4f5ccacb1f98ec13bd28cbb2034df2a676a9ccb3c36b56199afd4d4b2242ac1386c93b73db5bbb9569eeeac62ba176d214f86acf89 SHA512 9fa463c7de1d7e7622e9cb2d97750d9a9da55ab187a4a5bc3adb92dc40da90c518d495f2d743c10a759e146e1adf93a8389aa33e05971812d57879503ccc6444
+EBUILD sympy-1.6.2.ebuild 1770 BLAKE2B d6099d50f37f0bbf766b3f4f5ccacb1f98ec13bd28cbb2034df2a676a9ccb3c36b56199afd4d4b2242ac1386c93b73db5bbb9569eeeac62ba176d214f86acf89 SHA512 9fa463c7de1d7e7622e9cb2d97750d9a9da55ab187a4a5bc3adb92dc40da90c518d495f2d743c10a759e146e1adf93a8389aa33e05971812d57879503ccc6444
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.6.1.ebuild b/dev-python/sympy/sympy-1.6.1.ebuild
new file mode 100644
index 000000000000..adb5f1ab365b
--- /dev/null
+++ b/dev-python/sympy/sympy-1.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://sympy.org"
+SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+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}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	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}] )
+"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.md )
+
+	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.6.2.ebuild b/dev-python/sympy/sympy-1.6.2.ebuild
new file mode 100644
index 000000000000..adb5f1ab365b
--- /dev/null
+++ b/dev-python/sympy/sympy-1.6.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://sympy.org"
+SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+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}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	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}] )
+"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.md )
+
+	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 84e35f672573..9e02554ee4b4 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,4 +1,6 @@
 AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
 DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d848843365605ccdcb8ba0b307f1448967a124d57b0f6264169104c9cccc84982fea666a035a265a3c9f10cc43 SHA512 ec4d7a7f20db306be1a460276e0b1b1e63fd1ca14b208a45a297508bddbc07b034e03fcb5ff67fe5e2b9419f308900675994a6dccef755c975ad0b1e9124072f
-EBUILD tabulate-0.8.6.ebuild 943 BLAKE2B 7405db716474e30def291b4bd7986cbc59aebfa78c3a0e7147c81a418811f29a88600958888444eb6b69456c479fc35816ba185fb02312611c02669e46257526 SHA512 fd0c81ff842b0b3783e9aa4cb799e2798e2905b773f901fbd117f23ded055eb987c234d7a074009d78ff358011e08c85f046c1302582d23ebacd46d77f1548fa
+DIST tabulate-0.8.7.tar.gz 40800 BLAKE2B 4e15ef79d152ed6a01fcc88496aed81462e2ac5c5aea1a9977eca955d3c6d743019f8c56a48ef268217cdd7c2780505c4837020ff8cb1bda442304d82e560a5c SHA512 77eb619d3115bbd574ff72b82d55e09f1e2bfe29da0b937b72930b3e65423135722bdc54bed818adf2e25cb49a58f8f85d0ca3b3ed0fcfcfda34a25e54781d0c
+EBUILD tabulate-0.8.6.ebuild 897 BLAKE2B 0b1cb786af5d36b5bb38e0c7e9f62de8443d09c5f631fb9bc27092ccb7d72b824bbff3a72ca8f5eced2b7dca96650cd79d16752753e6655a3e3eca009629c5e8 SHA512 4cef430fb5b07e44bffbe165248efeaf2681d5954cff51632995f1d63eea55ee19261ec9b9ce563fc80211cf1603cf93748cd4220d3e85485d66cd2cee8a7048
+EBUILD tabulate-0.8.7.ebuild 899 BLAKE2B b6a64377bf99713802019f353a55018b8d22c1d476297d705b604c8c3e3def0194102829d9c42fa653d4a0fd86b9be52ff50c5a247321d6d6f2e3c3ae1fb748e SHA512 3e3862147fefaa76ea9c5c4bf818735b60961de5b921a3de62264b2d563b1212b90226b1c7b6421ab7ec38c6bf0a079097b1b9f63be4428294844f765ee0928b
 MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild b/dev-python/tabulate/tabulate-0.8.6.ebuild
index d8c753700d32..845c0f609e16 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,9 +19,9 @@ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
 		$(python_gen_impl_dep 'sqlite')
diff --git a/dev-python/tabulate/tabulate-0.8.7.ebuild b/dev-python/tabulate/tabulate-0.8.7.ebuild
new file mode 100644
index 000000000000..0a33126ae8f9
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.7.ebuild
@@ -0,0 +1,37 @@
+# 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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="https://pypi.org/project/tabulate/ https://github.com/astanin/python-tabulate"
+SRC_URI="https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-${P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_impl_dep 'sqlite')
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tabulate-0.8.6-avoid-pandas-dep.patch"
+)
+
+distutils_enable_tests nose
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index a2ffbe849424..e9a83c87f189 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -5,5 +5,5 @@ DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
 EBUILD tappy-2.4-r1.ebuild 966 BLAKE2B 23e0bd2dc3e5d034163f0c6062423b2e6dba97368321d0c4a96230381f2a281d1efa26f7e051572e0c12be2268782d23bf1e70854774e173c9eca4992b7662c9 SHA512 7ef744f84331b3ecf541a3301f54a301aa87b229f3e801fd84cfef65de446deb4e343bbc9dda3c50f888d1bce3e2725331e43850c310cc4848592dd2ee15664c
 EBUILD tappy-2.6.2.ebuild 973 BLAKE2B 4cfca43a10f5c625293fe2d54765bf983f62148276cd7ae13efb0ad7e4428564ef1bfb2a5765e0ca5fe70a6daea1790a35ef77e6ecb650d331e5670b5fb8a4c9 SHA512 a349e8985b100286badf3282b63241d8d418767d5fd4694628371c5c94e386e59f21b85c2294baae004fbb7f769547c66da2988376f3b8ba5e1111c7a85247ff
-EBUILD tappy-3.0.ebuild 848 BLAKE2B b3022a0abd98ffd5dd49690e7fe56942c849461606b3fd46da8c8a24d6863755f6aeb8fab06084192b6c0ec6df97525ed024ffc59606d6e94bd40ecb08af5d4d SHA512 915f6004d1232e880a75ce901929aa43b223ae187704149adfb0a1215ede71026960e9fea07b94956091213fab1d340e18aa3fb3f244409d809d73b512fc8eea
-MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
+EBUILD tappy-3.0.ebuild 840 BLAKE2B dff0fc2703d6390de31e57103427a7c71a3549f51614e56e2060416a422c5cd26576f065e38412cbbd850667ada0a7f28d21cdfa573143638201e498fb6f99b4 SHA512 20fab45edb254d29ade70f57aa5e5f810c4b11ae188585831af78cfffc7170b078c2ee138dfe4e1488c5714d7c50421a45d9b5ac45c7aaf6d17b38ca7169e7e4
+MISC metadata.xml 490 BLAKE2B 153ff2aacd864fb1099440d2eb72f5bfcd21363d59f65cf14f5ce0ab8c77e7d3d5c83ad386173f20380fde707b704d8b16acfda67bd5949aaec9d5efba2c25f7 SHA512 5971f431b6f188cfdf8b4e3718e5f3ae85826e1a7d1c02bbb5b93475048a3ebecdca38840e082aa7fee18612a654192281db59f29dc66b47251407dc0dc5fa55
diff --git a/dev-python/tappy/metadata.xml b/dev-python/tappy/metadata.xml
index 2cf31a2dbdc0..bae44b5a6697 100644
--- a/dev-python/tappy/metadata.xml
+++ b/dev-python/tappy/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name='yaml'>Pull dependencies needed to support YAML
 			blocks associated with test results.</flag>
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
index ffad5f6ae398..eadd7f6683bc 100644
--- a/dev-python/tappy/tappy-3.0.ebuild
+++ b/dev-python/tappy/tappy-3.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 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="yaml"
 
 RDEPEND="
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 6cb6991fa1f7..66e33e3c6f81 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,5 +1,3 @@
-DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
 DIST taskflow-4.1.0.tar.gz 1063167 BLAKE2B a6a8c745d88b72a6c2bf23a7263acec204c0b29c61095f87e7f866b067675db3bcacd39c52318db7fc2671a84059fb2f72a047bafbd1d522ea9035db6e473baf SHA512 94d572901126bff16b82e5ff1ffbb289fe165414ad0457d1282f7100a9f21bf9ce5afbbd76d68e60b96e9661bc89c95f50ddc99e77dfc47053e9d7a684c503a1
-EBUILD taskflow-3.5.0.ebuild 1398 BLAKE2B 516e02c65ba213ca4e0e21a06a440cf7bc45810a26d5a67b57ceae6a6a0f27f720706d159cd194dc32d7cefa7959e46baede66ef79f76e0aada7e8a027cf5fee SHA512 838b28d5010213edb7be15e5765dd7e5ee58d92d650ffd01144f479e44a77009f834892faebffb02bd1486ca035539afac985da88f9aaa783bc358b49a6a3e7a
 EBUILD taskflow-4.1.0.ebuild 1299 BLAKE2B ad6340379e0ca60ecb80b320b37f6760dfc1875e39fc6560b43a02ca5254bb70b1a5252477c3a319c7acd7a425de486541fb0e52223972500fb4e5c92b24223d SHA512 d3bca12a590dfff324871b8e395a7b2af584fe1227cb343e64abbfa551f3e4f8b4febaa0b175c7f9cf2b29ae192c374eebf35c0267ef543a005513a3660f9445
 MISC metadata.xml 508 BLAKE2B c95568ffd128fb5136c780edf2b1f97ce10aaa96cb309634f4116fff00e830856c4aaa03c03031104839ef073d8cc18c1f456bcdb29d0645a33905d926e3fdfa SHA512 250e7af3cf5c87c88cdeb05d1f212f35de0f09396d4c7d54ca85005bc5d4282739abf1f8b71be0c7dbf3d218fba96c292300ad69377043eab1905e445109efc6
diff --git a/dev-python/taskflow/taskflow-3.5.0.ebuild b/dev-python/taskflow/taskflow-3.5.0.ebuild
deleted file mode 100644
index a1e509e0977a..000000000000
--- a/dev-python/taskflow/taskflow-3.5.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 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}]
-	>=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}]
-	>=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/tblib/Manifest b/dev-python/tblib/Manifest
index 9cb85a3a44b5..4a6746989114 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,5 @@
 DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
+DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
 EBUILD tblib-1.6.0.ebuild 548 BLAKE2B b5cc563baa22a6e78b60c55c6f64d8ec87173c97a439f1c49454385a79857e3221035b1fc2e15211c932b16fd546212e37ff58525650796714197d459dd9e775 SHA512 2f8c68a8ec6205586a7a9e0bfbc0bea2cd3f187a78219e2f6877596054e48c2fd766be266bb591cd697e872e0c8d2cedd2f0db60a991f2e82e11ae3ed57aca1c
+EBUILD tblib-1.7.0.ebuild 556 BLAKE2B 09003f4b734347c8233b915a2ba8c376ad39499d49d8d781ce896215eaca1701ecb3937c5de965263bb38904dfb68bfca108590c9ba1ef63c5052590d540c9b5 SHA512 99c91505c6e42af638441b13bedadcf81434f215335c6a49a30f7e299656208d165719d7005e1fbc070ea12a8068b0f7f840de5ccaee29925424db1debae9378
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
new file mode 100644
index 000000000000..437f2c2d4915
--- /dev/null
+++ b/dev-python/tblib/tblib-1.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..9} )
+
+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 ~arm ~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/tempora/Manifest b/dev-python/tempora/Manifest
index 48cf2c5bc305..491622612f83 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
-DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a724722bfc83c129f18032e731d69b2d12635a519226ef4ce99e77a3418e7e1a05a116a80c222b4e8138f9966f9e SHA512 4ecd5430d4d90959b0985908a1e4f239a56ce0026cd315ef6b8c204b645caccb135db76bb2ca9cb95bc65bdf337b61e7c31514eb9c85036771469b6a058edfbb
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
-EBUILD tempora-1.14.1-r1.ebuild 1449 BLAKE2B e9fac10aad944f8398c0acaa739d2de2b9d57d0589507a3d8df4fb9092edefde4d42f4d938ed5bc773752376c4e17d84fe288606943fd2bfcd5064019d2c3242 SHA512 653192a76817d729dc297fc52d9bf2382e5316c7f8b6d2d53675e5ab57e1e739e2440dd56312efdd856ce6c60902ed28d763dc6cb46d6b25a46064daa34a0644
-EBUILD tempora-3.0.0.ebuild 1517 BLAKE2B 0cc50c6194a608111cfe9a465b1e29bca560808063f44f049de534eb6025f5bd3e8cb5894c0864ef17073af65b051a30db37bca3f5d04890920329c31f46cfd2 SHA512 1e9eebb33b678c8af3b3defb6631f23587afe16fb9efe84571b0ea7df84f893ef06e6d3dc6012408718026793a17ee408c92082adb8e6c0b3052fe88ad13471b
+DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
+EBUILD tempora-3.0.0.ebuild 1512 BLAKE2B bd20ee242a1fa86de4b266670289110e6fe0d11aa7e274fc0650fdc0d323376ccb362fbd070aa972aaf959dd257d3704547874a75be991415045cda19d51a87c SHA512 b36730adbf19e408d2a834f0ae5004850e4422f7a8a2f19aa8db493401d9b664d1e039cbb25273ed14916070f84937ebc673521e54c5c8b4cc0961460c610475
+EBUILD tempora-4.0.0.ebuild 1054 BLAKE2B 0635ce1e265914b6c76d8aaafc8e785a1ce0f3863f37c669f4af10797080507990e3704ad6d3fe4185ca91a260045eb526d619711960b0656675fe717b5e9b9f SHA512 3ed905b4dc5b5698949f9ad0e42f1bb1839806ae4e66468f135351beeb8c7985abbb9cdf3aca453470f3fa9d3c1a4f2ca33ed600d3ae9c988e680b16fbb215fe
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild
deleted file mode 100644
index 34ec22695b19..000000000000
--- a/dev-python/tempora/tempora-1.14.1-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=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="~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}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	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
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| 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
index bc13434facee..ef04ec574011 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
new file mode 100644
index 000000000000..a45fe1f5b5dc
--- /dev/null
+++ b/dev-python/tempora/tempora-4.0.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=( pypy3 python3_{6,7,8,9} )
+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="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+src_prepare() {
+	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index f5da3b19c4c2..ecb5c430a700 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,3 @@
-DIST tenacity-4.8.0.tar.gz 28057 BLAKE2B 31451b061c594a47fdf4e6ae97e09c601d95ef76afc805d6f746624e3cf18a0f7c288567a5fd5ff8c264d00ce55a635afa2920799c256168dd89ac800f0d3ca3 SHA512 4662a92325de6b2dd7f6dd8823cecfdf0cc2f1390d054c8ba14f84fedb917cf5896d5c26aaaba9816303dea06ad7f922877c8a09e248319317155e2d6f509873
 DIST tenacity-6.1.0.tar.gz 33438 BLAKE2B e3f7c0ef19f98c0ac5b2a9a1be53241292d895547e5c10810ff94c27f34e8bbca7ef3aea79ce6e4042c84109e209b4be2913e6231233a3b050c18ed52f8af087 SHA512 a8f52f77e066a35c4a35cdd80fe01922613d9f4ca07975aece4a35bc743475f7540bf419e5095eacf94cb248ce33bdd89b46c5e3c5bd5a93bd99a601cf580732
-EBUILD tenacity-4.8.0.ebuild 563 BLAKE2B 88ff228c34ba8927c221084c65a2f67f2700ab998ad09cf48a0c673f357a2800f5183b5813913ee06e9c4152e55c3f781cd63904253efee424d0cbf1fe441392 SHA512 c7c5e68ee700976c028e3af2c769b38d43d66bea53d7a7898523256e666ceb8aa2de026104c474810f1d6beac8cf1d24de7d7d7409b37b83679cc8842506dfb2
-EBUILD tenacity-6.1.0.ebuild 692 BLAKE2B ee28707560df4915d4b7ff53d8071ece067c640c36c20a32acd3ac61539a6fcb62bd6b783401dc5b890418b6e6d861fddfb83d3f623b42dafd2633123da48fc8 SHA512 a7ec969ebb4d44f679841a6e39de773d0317419d2dcf2e605ebc24d98751d3b9115f5d6eaf0dfac15b3b51d08fc4992160616b0aaa0540344970afe17cbedc87
+EBUILD tenacity-6.1.0-r1.ebuild 608 BLAKE2B 7a3c9672d856039254946a764852fc70cb17e2a44fd499d801cbd3ac948bcc1c39f1f8bf96ff9978a0a956e1e7ea3af5fc104d4fb662aa6e29f30924251e3c13 SHA512 47c15546d862e77b94082364219e9e32dfb391351be9965e7c7b6f4bda719c6e79da006bfa43177da0fdb0d88f714d890733cc39f262caba5daa94be93d74b81
 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
deleted file mode 100644
index dbe75ac53ec9..000000000000
--- a/dev-python/tenacity/tenacity-4.8.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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/jd/tenacity"
-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[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/tenacity/tenacity-6.1.0-r1.ebuild b/dev-python/tenacity/tenacity-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..bbe88755047f
--- /dev/null
+++ b/dev-python/tenacity/tenacity-6.1.0-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=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+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[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/tenacity/tenacity-6.1.0.ebuild b/dev-python/tenacity/tenacity-6.1.0.ebuild
deleted file mode 100644
index 05b617276645..000000000000
--- a/dev-python/tenacity/tenacity-6.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/jd/tenacity"
-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[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-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 f035f84782e4..01d83c3104df 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,4 +1,3 @@
 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 516 BLAKE2B 429bd57f73dc7ae32cff77d8b587cda2f2277447c467643884f17ac5148c9a1f70f1b1d7ef108c67728402957562e08d0cec19841b3e563432ecada4c6779311 SHA512 738085ca4b3e458e21b03fcafd897d87a16e2ace2e9970d93c099183bdd3baa5b87b393404db4eb477e6c4d4301af754361983822b75256101e5050b29a16613
+EBUILD termcolor-1.1.0-r2.ebuild 509 BLAKE2B 3db78941eca246283dd46b0f29d15689ac81292a678a56c1a9cbdd3eef9ed9c8630e46134bfd53ba63674fa65a534c1bcbeee98342a40a5b8e7d28952adb7742 SHA512 3bf02798961849b74edb57ffe44f09979f51c8823c26b08ce77436685615e32aae0c44a62c66938583f855bc9432f2baafb4e802e5ae636f7909e3c9ac5fee03
 MISC metadata.xml 443 BLAKE2B d66fa2b33b0f2a854f6293896d9f94905112f9b10cb7bf5f7c5e5d5b2e5523a86523ce83078f1f386f5781ce6cd5ab183e6f8241d72c88dd389760a1b126cde5 SHA512 029e70f455d0ccd6aabe54c2b96cb3c0857fac49d23ea28e0885ca30fff829d2de2f93345de7e1fd14b46eb065b278d8b3f7047156b52feedd7a07df2d162864
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
deleted file mode 100644
index 8eec81812694..000000000000
--- a/dev-python/termcolor/termcolor-1.1.0-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=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSII Color formatting for output in terminal"
-HOMEPAGE="https://pypi.org/project/termcolor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 99d4ad02aef2..4c24fabb7620 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm 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 012fa5e6361e..79e1a537fb8c 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,3 @@
-DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
 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 742 BLAKE2B 170266014647db99e70152f0c88191e6bbee77b6d01f7943b18f670816138a6e1620bd6e8ef4d531a83f0ba48c8ba0c6e45d6ec761a9f95fbb706da4a0aa48d1 SHA512 c2bbfa447ff1b2be0e598aee7a2334c40822e969b2b34c7da869d3866c5e39b49ba0b69f85bacc9ca820d9cf48f1aa8a35cc5970ffb10ac2f3c46be3ba0c5aa3
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
deleted file mode 100644
index ab145799d081..000000000000
--- a/dev-python/terminado/terminado-0.8.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,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 ~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/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index cffc9720b4cb..4594dc0f4886 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,4 +1,5 @@
+AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 759 BLAKE2B 224752d1cfc6a641d85abc7e9d65ebf89ff53976457fc696afa6c5af5f03778c88e87e6979ab1c80c6415a844ef4a47a53dd8743f29e99e114e0c1e58b65384b SHA512 ff0898cd7fe1e23633710a2096b8f856b7ab64c6b57706908cda429a13644fec39a708a5e94914893a8f642ff753c31040e71e45860568663c5484fbbd5efc57
-EBUILD terminaltables-9999.ebuild 739 BLAKE2B 552ed33e08ce9215f2df043d2e7cf906479a7b1f76544ad1bc02730b44b214a39d1b3c5a9e4a5f6f492e265d08c6dfeabdf3d8397d6b59082950afaae539fce5 SHA512 cf5565a99841f661b1b0abe622e26c4c4817c9997f570f6d10613908f103e98bf3f04840315610f313e917c7e5620eb24a70e7b9a12f49afe40471f9d1b86d2f
+EBUILD terminaltables-3.1.0.ebuild 682 BLAKE2B 18d202e683e4f17730d4c9ac742475c06dac8371cb9c478fb9a5819ad55a11438d03ac4f51cb0178f9f0271e75b78fa50c27454a20445e8f23918a2d9fe59c45 SHA512 8baa778f73775f2d9fbd4cb068d3df76032611934e11966e27e3587e4f7c553fd21f0cbdbba6d0a60311482a3818664e568e8f97ce1480853f1690a5dbde21d5
+EBUILD terminaltables-9999.ebuild 625 BLAKE2B e3c70b88f7209b54be4654fea6ccc21ac574128956a53d42e196bd0c022fb4f668413ffa118fa76c2fd2b0bd3bb1f8c7d142a219395ecef05b90e49b0002b7e3 SHA512 1cb532c3800e6ac07f592509f2c33f0fd7f14b53798c3b4692b4d1753d679dd8f1f840b647c98a24c96fe990fe17723f38daa5e2b9e1b7fdc1814653551ec10a
 MISC metadata.xml 413 BLAKE2B 7aef163d29b857e19732c69ff0a5745d511ba8619a9f44f6ab0ecaf5b046a439b109789855cc1ee13ac99b1b3dbff6ba5432ad4bb8d9644cb4aba43aa9a8abe8 SHA512 44b71c2921a4db4517cd9c2d64021f39988a0767dab2020b2c4b6354da7eeb79d783bcbe197109cffd0fed3bc01ca6a1a1d5a4d8793176792e4ef749e59fe975
diff --git a/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch b/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch
new file mode 100644
index 000000000000..e463ff66f93b
--- /dev/null
+++ b/dev-python/terminaltables/files/terminaltables-3.1.0-stdout.patch
@@ -0,0 +1,23 @@
+From 9cb9d0ef11fac861e46776fb18cef309df28c234 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 30 Jul 2020 07:59:05 +0200
+Subject: [PATCH] Fix writing binary data to sys.stdout
+
+---
+ terminaltables/terminal_io.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/terminaltables/terminal_io.py b/terminaltables/terminal_io.py
+index 8b8c10d..310263c 100644
+--- a/terminaltables/terminal_io.py
++++ b/terminaltables/terminal_io.py
+@@ -94,5 +94,5 @@ def set_terminal_title(title, kernel32=None):
+             return kernel32.SetConsoleTitleW(title) != 0
+ 
+     # Linux/OSX.
+-    sys.stdout.write(b'\033]0;' + title_bytes + b'\007')
++    sys.stdout.buffer.write(b'\033]0;' + title_bytes + b'\007')
+     return True
+-- 
+2.28.0
+
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 384bf33858ef..86d74c67298e 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -3,27 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
 HOMEPAGE="https://robpol86.github.io/terminaltables"
-SRC_URI="https://github.com/Robpol86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/Robpol86/terminaltables/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}]
+BDEPEND="
 	test? (
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/terminaltables-3.1.0-stdout.patch
+)
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index a855b1d99da0..7bacaa3fb7cd 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
@@ -14,10 +14,8 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/colorclass[${PYTHON_USEDEP}]
@@ -25,6 +23,4 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 3be267d9c87c..68e1042a4ea0 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,7 +1,3 @@
-DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a05af88df86dd01926bdf0eab107744fc89d75bdedaced7300c24a52a9d1c0685f5dd3f5f732121ff97af6d0859055a SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59
 DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
-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.14.1.ebuild 1507 BLAKE2B 0f5d741510c4c176411d6bd12a3816fe01fddffc0736ef009a11422e66a46c20b75740e650a6224e5b78e9ae31d9a052b3fbe7f145dc789aa88530c8ca726452 SHA512 a3fbcc28dfcab72fb7c3138ed88f1bfd31a1b4f5f5151b1c9c0ca548b5d01cab536efff233a9b61dac2b7433608705c754404c8c723926ca7ceee7da4c5349d3
-EBUILD testfixtures-6.8.2.ebuild 1458 BLAKE2B 66b804ec92096bec292354e43ae38a80ef399446f3703e6db9079f2ef819147b50fafe9c3df90a3094c1b67de623f55d51a59aa2eebeb217ab84b86f5db68d81 SHA512 43e91b8248b0fced7f5205a09038c6a56b06624ad258258d2dbefdde49104911fc9271c805b85248c6a491a59843c63430b11003dc35b247721da1c7efaa1023
+EBUILD testfixtures-6.14.1.ebuild 1497 BLAKE2B c70168019185c9e49824e4e3cffb3f45fe28ab3a8782bb35f7b7aa4089b824b62fb05c5041bd0bddc3507adc2b4863a5d15901599ee4e0a21386907a8406568d SHA512 4b0f50aecf8a3da34701e52f7b3009df706f5beb69624748d32309868a77e767b31c119db501a37b550f2459708aa4167b19719b2815d3c910b94f9d7ca2411b
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
deleted file mode 100644
index 60bd10d75f5f..000000000000
--- a/dev-python/testfixtures/testfixtures-4.9.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=( python3_6 )
-
-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/manuel[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		dev-python/nose_fixes[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Makefile comes set pointing at a wrong location
-	sed \
-		-e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' \
-		-i docs/Makefile || die
-	# 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 || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testfixtures/testfixtures-6.14.1.ebuild b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
index 3367b0ca55c2..1c445c878270 100644
--- a/dev-python/testfixtures/testfixtures-6.14.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.14.1.ebuild
@@ -13,16 +13,16 @@ 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 )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
+		$(python_gen_impl_dep sqlite)
 		dev-python/django[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-django[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/testfixtures-6.8.2.ebuild b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
deleted file mode 100644
index 1acbddb94ceb..000000000000
--- a/dev-python/testfixtures/testfixtures-6.8.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
-
-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}]
-	)"
-
-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/testpath/Manifest b/dev-python/testpath/Manifest
index 0386e41a5706..06196e0effd2 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,7 +1,3 @@
-AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
-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 711 BLAKE2B 7f2a9b92b81f48cf54b7f726fa46b1ad79cefa3072216d5039b7e9eef0baef9a308cd323203a96bc520e61a4c779cb7bf5255a95f240332fcae72c089ad412af SHA512 e3bfda4606161759224486ce93479293df9f80523be392447def9116504ac864d02aa9887d76e7860c8f4af8e30b0e49899d44b0ee103cef6ee40da7b130738f
-EBUILD testpath-0.4.4.ebuild 896 BLAKE2B ad48594448f494d44922e12414d24a5930f8592d7f3df4ea90d4b00ac9a9aeef9db3b05dcda811a08c59b3b9e0f3eaf84cda85dc7b4dee03f3e57ae6e0e184a2 SHA512 734740462be1834f515151d6558c203e1f0f63be2e2545ef11937f845b29ce312e6df239f679dd859973f80ae746c45d161295db04084ed1e72df033530c9475
+EBUILD testpath-0.4.4-r1.ebuild 713 BLAKE2B 2c081d018ce1ea566b99d0f174b1f71370c8175c4b3e2641504e55d41d15256cdeee3f491eb0fce067334be42d7c15f561c755dadd2ccfc0b5a3229f6c344d9b SHA512 006c51a27608acbb7a386b8b77d25b9bcf37e178470b1f24c41d14cceff60cf0721821ddd4f5f85f5a1abe5b3430aeed2adf8476126b8708961500204e9fd8d7
 MISC metadata.xml 720 BLAKE2B 93bbf7d182fd5b9bacaf1da0044d0e145c14708a33dfc25aea2dd4c711e89848e0f2165acb98afb4ee383c01f8ff8d04233815169331047c0b8d7eedf25a244a SHA512 f4efcf08f277225e352339bb48104fdb33326bbd43c8dfea6f77f57d51f48e4e2b0657099fde91ae5f12e0ad661d10a6ac480b6e7dfce38c8d161dc88c163916
diff --git a/dev-python/testpath/files/testpath-0.2-setup.py.patch b/dev-python/testpath/files/testpath-0.2-setup.py.patch
deleted file mode 100644
index a1bf41acd352..000000000000
--- a/dev-python/testpath/files/testpath-0.2-setup.py.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch to bring back setup.py from
-https://github.com/jupyter/testpath/blob/086bd1bd1ec7da1b3dacfed1705c0c99fae231b3/setup.py
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,22 @@
-+from distutils.core import setup
-+
-+with open("README.rst", "r") as f:
-+    readme = f.read()
-+
-+setup(name='testpath',
-+      version='0.1',
-+      description='Test utilities for code working with files and commands',
-+      long_description = readme,
-+      author='Thomas Kluyver',
-+      author_email='thomas@kluyver.me.uk',
-+      url='https://github.com/takluyver/testpath',
-+      packages=['testpath'],
-+      classifiers=[
-+          'Intended Audience :: Developers',
-+          'License :: OSI Approved :: MIT License',
-+          'Programming Language :: Python',
-+          'Programming Language :: Python :: 2',
-+          'Programming Language :: Python :: 3',
-+          'Topic :: Software Development :: Testing',
-+      ]
-+)
-\ No newline at end of file
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
deleted file mode 100644
index d7c94e75a1f1..000000000000
--- a/dev-python/testpath/testpath-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=6
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2-setup.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/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index 55d67c8608fe..58fd14108670 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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/testpath/testpath-0.4.4.ebuild b/dev-python/testpath/testpath-0.4.4.ebuild
deleted file mode 100644
index 694fa324bacb..000000000000
--- a/dev-python/testpath/testpath-0.4.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=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2-setup.py.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 570c291b4a72..aa6cc51d3500 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,7 +1,4 @@
-AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
-DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.3.0.ebuild 1525 BLAKE2B 3019cb2605fa41e8031a9214b39014114f10fabc7ef52299f3ab0a2a3d07279bed44d345a7ad0d90bc084775b6fb259b6d01292eae989adfd1d7b279355510c7 SHA512 dceeb6352bb3a62a2c14dabfbbc9521e56914bb4e41115a05f7dc2717b86c49dc33eb2001c6e6b5ddc0a1b3da90da571081629e821ca857874bc5db1de32b53a
-EBUILD testtools-2.4.0.ebuild 1257 BLAKE2B 5f8afb462a79c58e6cb6fefba2833f8147f2b2035118c57250df0ab3f7bc3a0f61538718ea63544335c61fe6454542f5b7492ee7abc2c23f3c94186fec37f516 SHA512 18e04ca6c6333410c103c80d5ef9e780cfe35d3cb2df02ef771d1e4ec5163ed2bfd2cadd9a5dddd862de83464ede20e67a04521b4e9dae065f65b8d19e0dc9f2
-MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
+EBUILD testtools-2.4.0.ebuild 1248 BLAKE2B bd76577fa747b5428a287b9ce035c525ae8c84cba17c8ab056c9fed4909c30f9c37b3689072d0c05f19974c443a50f33da9c7850e0b2235e73e3f0cd7d59bb95 SHA512 342c929c5913d60ec64dd30cbf00012ea8ab9b5a443d81ec4b55686ee0c2203cc69c6980beaa63d9b0b327b7858099a71ce49164715c11a9b57d053690cb3e6f
+MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/files/testtools-2.3.0-py37.patch b/dev-python/testtools/files/testtools-2.3.0-py37.patch
deleted file mode 100644
index 0f2da043ffe9..000000000000
--- a/dev-python/testtools/files/testtools-2.3.0-py37.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/testing-cabal/testtools/commit/29004731f9c480b7c44a9c2605513d50d372898f.patch
-
-From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 17 May 2018 17:52:26 +0200
-Subject: [PATCH] Fix the tests on Python 3.7
-
-Exception's repr got changed not to include trailing comma
-
-Fixes https://github.com/testing-cabal/testtools/issues/270
----
- .travis.yml                                |  1 +
- testtools/tests/matchers/test_exception.py | 11 +++++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
-index 6cd80af1..acd39252 100644
---- a/testtools/tests/matchers/test_exception.py
-+++ b/testtools/tests/matchers/test_exception.py
-@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
-     matches_matches = [error_foo]
-     matches_mismatches = [error_bar, error_base_foo]
- 
-+    if sys.version_info >= (3, 7):
-+        # exception's repr has changed
-+        _e = ''
-+    else:
-+        _e = ','
-+
-     str_examples = [
--        ("MatchesException(Exception('foo',))",
-+        ("MatchesException(Exception('foo'%s))" % _e,
-          MatchesException(Exception('foo')))
-         ]
-     describe_examples = [
-         ("%r is not a %r" % (Exception, ValueError),
-          error_base_foo,
-          MatchesException(ValueError("foo"))),
--        ("ValueError('bar',) has different arguments to ValueError('foo',).",
-+        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
-+         % (_e, _e),
-          error_bar,
-          MatchesException(ValueError("foo"))),
-         ]
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index d2fbb03bb6cd..4355534c7b6d 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">testtools</remote-id>
     <remote-id type="github">testing-cabal/testtools</remote-id>
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
deleted file mode 100644
index d7d7f476c5bc..000000000000
--- a/dev-python/testtools/testtools-2.3.0.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 python3_7 python3_8 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/testtools-2.3.0-py37.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-2.4.0.ebuild b/dev-python/testtools/testtools-2.4.0.ebuild
index 41097304bed4..0046a6e88530 100644
--- a/dev-python/testtools/testtools-2.4.0.ebuild
+++ b/dev-python/testtools/testtools-2.4.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 ~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/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index 112c520c3fbc..8f9872f237d8 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.3.ebuild 478 BLAKE2B 47533e1e4c0ee4737a0c843da3e887aad16cc22286e661e89aed0c25ba41d69f56a200748a1f7db769fe3718121af5c4e23f03183a8d4eb64e333a52817e9a88 SHA512 96030a13dddeafcb08b52021b0afe09beb7c215d0ba1ab48851b3b3d2a093bbc4fb3a4c80c1c31355bfc4a71198d37cebb34c83ce73e161476d4ee3a713a9d5a
+EBUILD text-unidecode-1.3.ebuild 476 BLAKE2B 380c06db4be67c72b78dc001a9a1e253b26c27d94a38ff8643fbcc4da1ac84cd7dd1eaa77d837a879c966a6b226ea309690da5a58f014dfd0d55f60d5565021d SHA512 e35b33cca6aa77a7aaf723a5b3499fb9c4aac5d880f987f610ae745de4376af0abe6f493ce15b4b71354f1270a4994dd37299db0851be50e6b171ebf6438f2d8
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
index 3008ce518a91..e749b9a01f31 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 6a53f73ffe1c..ec14d184c3a3 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 768 BLAKE2B 6a41d54d815c83dc6ae0e66b33656be12c8b137a4e50b4a1f928e9853e0205148ff098f8be50e115cd5d72534586442039838ca3b28b163c6d312ff57029358e SHA512 618f87ed127bdabf1fa6583ab231836ec8dd0be1120ee6b8fa0265a9e812f7dc7fe6a891a9a99d03c7bcbf6c9d7d5c41a6ae23614edf680ce8f1be53a5a9e675
+EBUILD texttable-1.6.2-r1.ebuild 676 BLAKE2B a0751b9b176128f312fb480d111da09d8f8b7560c88614c1df2da6de9c08027e67ef53a70932b9af06162a54654f5810969b277217193e062327b213b37429b2 SHA512 2663504b7283fc6ca08b0f291819a080b3cf97c3105a7755b4c8d71ca1b21b58b8f0b3242ce26cdebc131e9b86e61f18cb62991cdf8d59b01b36d20eb239e6da
 MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/texttable-1.6.2-r1.ebuild b/dev-python/texttable/texttable-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..9a89499c0207
--- /dev/null
+++ b/dev-python/texttable/texttable-1.6.2-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..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests.py || die
+}
+
+pkg_postinst() {
+	elog "Optional features: "
+	optfeature "better wrapping of CJK text" dev-python/cjkwrap
+}
diff --git a/dev-python/texttable/texttable-1.6.2.ebuild b/dev-python/texttable/texttable-1.6.2.ebuild
deleted file mode 100644
index ffc2c5255f69..000000000000
--- a/dev-python/texttable/texttable-1.6.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..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
-SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cjk test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wcwidth[${PYTHON_USEDEP}]
-		cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
-	)
-"
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]
-	cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv tests.py || die
-}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 9370605fba9f..7fe67bdeddc6 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,3 +1,5 @@
 DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
+DIST Theano-1.0.5.tar.gz 2842778 BLAKE2B ee82e9487a5265a1040750ace70465c450134e70eba4e58752cbaa7d487be5fb3cce31b838429cb52f7bc31d32a20379e158ee289dd5732dd8b86a9ee36b6d89 SHA512 6bb27753957d32392ea793e39ea56eff94baafbb55e27488f9c0bbdb387172a6829e64f461f83dae192486d9764b72d815e3b8dc059b2af116b024fc7228a118
 EBUILD theano-1.0.4.ebuild 1257 BLAKE2B c7fef716786c92810df145f74debd9cfef52b81028a532f4b111e4ec5317e3d57c4e5d1ab885d6dec8ecd323e43fd6227c6399bdec46345e098a656961a83a44 SHA512 fab62809f565ca9ee4781b9d605e5f176962b76c02ae07c5fdc299fd7cddfbff26bde88fb8c4afc00f26cfd6c4eaa930becd12c8483b8e69421c08f4af1d0b7f
+EBUILD theano-1.0.5.ebuild 1070 BLAKE2B dd446d06b3db9a27950063c572da4eb4f1e8d9ddd85d7396bfda5d7f26446e9d34ec6eaf14c4b33e867cce6ce4a0190ac3c4f8d3c3102ff57a9923d97e103a65 SHA512 38a07dcfe32b33ec801f7302c325982d438d2a07a4067160aafb9913f2c834ff21bfdca6b4c20c22726c1fb8c599c22610872b53e3f71159a11c811c86e74377
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
new file mode 100644
index 000000000000..6bee991692fd
--- /dev/null
+++ b/dev-python/theano/theano-1.0.5.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+MY_P=${P^}
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e "s/, 'flake8'//" setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	nosetests --verbosity=3 -e test_format_flake8 || die
+}
+
+pkg_postinst() {
+	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
+	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
+}
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index fb91c4e001ed..4b5f65ea382f 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,5 +1,3 @@
-DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
 DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
-EBUILD threadpoolctl-2.0.0.ebuild 619 BLAKE2B 5c9faff51172774d8296258829ae879122a85f01bff37e96bba20657cba754e270ccad837a5d40e7414c1cf31227ec517a8594659b23e8cb66fb6985c4bce388 SHA512 6ac3fc6c4cc6ab9a80380e1cb79a71cfa5618b6bbdfcf0dbd544b0a3b3e4657865d78f42a5f4d18517dd16d470ef49f93b79d8906ad04eaa97eee1b677e710bf
-EBUILD threadpoolctl-2.1.0.ebuild 621 BLAKE2B 399fbf27e2ced60041ef2a949f5d226b7e7355a2ea6b4b5b8aff39278d9e6a4046e31a9a7691e2792bcbb81fdc85aa376c414a195970a4d997242e7c590b4e57 SHA512 a15b51d0b04957348e5c833e23579cb1191a6355ee9689f068d7616208481fa27505d298b7496963de972b25bdf0bcd1f696d1e89675c5dfe2545e1cc17aaa1b
-MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
+EBUILD threadpoolctl-2.1.0.ebuild 624 BLAKE2B b20bd5be36f4699bcd4064182981ebdd9e50481dfcfd894424b0ccb85dc5d9814b04b0c1b969ecaa0073573cd3446c54b459d5ecda7876673ccb0d4bcb2e8698 SHA512 07f918ec9401b26b6edd769891c995728762c8bf21bf6dca704b7d6b5bda6a4b37628a0dbdc7d84880775499656ede6423ddb3d4711e9314e3f657d88eb9dd00
+MISC metadata.xml 363 BLAKE2B 62e2ff44db5d8b0c5a4fe21c5243ab6fe271bb0d21b40b50e40b58b07de8a6b2a38d7eb728a4e9fad95faea15d7ebd0def9418a5e993f1557e7030f2f8d6b194 SHA512 b90ec23472954157ca06a1142d3b1648b2bc2b46791a2a9a422213508f65fd0ae38225be07606d52097a024564d01963a2ec224781a666b0b8af2ca310b4d5ea
diff --git a/dev-python/threadpoolctl/metadata.xml b/dev-python/threadpoolctl/metadata.xml
index 2541628cf9a8..ff70d6e6ba19 100644
--- a/dev-python/threadpoolctl/metadata.xml
+++ b/dev-python/threadpoolctl/metadata.xml
@@ -8,4 +8,5 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
deleted file mode 100644
index 832455b87380..000000000000
--- a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-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 ~arm64 ~ppc64 x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-# tests require openmp python bindings...
-RESTRICT=test
-
-distutils_enable_tests pytest
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 1d26d7c49723..240c240bb9d2 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 0519af92cc32..5ea6930f703d 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,4 @@
+AUX thunarx-python-0.5.1-py38.patch 951 BLAKE2B c83f78b4ddbd08b7325d87b16133ee455b43a8e7c666661b15a582ec96eaa6a81c0a0b1ee19b4428b06e60ac1ce04414c3ed5f754c037cf17223081aa2ddf49b SHA512 44cc2aeb13e8d98ce2e9cdd0a28906da3d9826080b12b33ee7cf78e80f57371a0af801df8ba9967b5d831bb442c5836f02427b7ee58045c2f326dbcf3808508b
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.5.1-r1.ebuild 755 BLAKE2B a4da43181cc6ce167d3550c7c1b0e07142b4c909921e7c01eb5d9b8086781bd83d41f81ec5314761d9b5631e59bbe87f92de804130212e29a5240f2799f34845 SHA512 55082f1ee32d29181bbf870036d762e057e76b8eea93c804ba0ff82dea13e3bf563039efe273aa33cef9d3136dcd8c24e4dd4b6ceff2107aced30fb512f499d5
+EBUILD thunarx-python-0.5.1-r1.ebuild 804 BLAKE2B 5445bf968f9bb1f152f464cfa835ea882418e41151c9338343bf976e813127290f384fa3b1f0558b09e587b522395fc4ba3ccc8ea55d52ae59e78d8d7210c408 SHA512 8c0381b21508045a2665d962ba875fa9c4a133afd0d3ed26ff84861951081c272d0181f1884c6268677f0d11881fc2c6d54f0713f7e62b8d3c12e7fbf0263bc3
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch
new file mode 100644
index 000000000000..19ad0886ad52
--- /dev/null
+++ b/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch
@@ -0,0 +1,27 @@
+From 78b24f3bf34c1faafcdc5816856bc9bf1bfaed6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Jul 2020 17:19:34 +0200
+Subject: [PATCH] Fix compilation with python3.8
+
+Based on upstream commit 5f4edd0b657f52619b60e9931340502fa87f49ff,
+stripped off irrelevant changes, made directly in configure.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 9fabaa0..ff2ceae 100755
+--- a/configure
++++ b/configure
+@@ -13557,7 +13557,7 @@ py_lib_name=`basename $py_include_path`
+ if test "x$PYTHON_LIBS" = x; then
+   PYTHON_CONFIG=`which $PYTHON`-config
+   if test -x "$PYTHON_CONFIG"; then
+-    PYTHON_LIBS=`$PYTHON_CONFIG --ldflags 2>/dev/null`
++    PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed 2>/dev/null` || PYTHON_LIBS=`$PYTHON_CONFIG --libs  2>/dev/null`
+   else
+     PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+   fi
+-- 
+2.27.0
+
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
index 0a243f4cf713..d2bb115a4a8c 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.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..9} )
 
 inherit python-single-r1
 
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+)
+
 src_install() {
 	default
 
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 8d326e987086..96af7e9c8b04 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,3 +1,3 @@
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.4.ebuild 799 BLAKE2B 4e758854409c2b7788672e182e4da8251974f1c24005fbefe1c3d65806ca63ec5137a94f06b3f94d59940fec5311e40ee02269c6828b7035440e7f46678ba102 SHA512 22f7f6764fa537b5f49726d5a851ecc7c59631f09b09c60ea04bc551502d46d2035509f2b8bc39dc91fce92a06fe1eeb6a01dc0724368645997aee4d0771db74
+EBUILD tinycss-0.4.ebuild 793 BLAKE2B 797d34171ea408d492755b672d2c99905ccf2d5e88cdc616d6105f9a8facc070d602ca32eed86486a1e749f64c50ec192b91c1e83f29fdfc1a5ef75b0633dd83 SHA512 4f7c290d040c7e5c05d6ab2a808b61677469f19cc52012ee985daa85c4b23c85dec8bdb41816ba51f63aa878fd5a28526fc7f9f0cf2905e953649e6443baa7ae
 MISC metadata.xml 380 BLAKE2B f32bbbd80838a147ab80701c03462b8949aa987f47fc7bb8cb2127720937888f484b7f1ceb9cb490901d07782c2c0c261e42277b55e39d78c44a05173391282a SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index f69dee9435d3..2ff8a8f05347 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 4d285f03e13b..f14ad6d2c7d6 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,5 +1,3 @@
-DIST tld-0.12.1.tar.gz 1346595 BLAKE2B 393c052872218212ef13ee60d011ed5fc0ee8eea37530081b43004c3e4d9e64a6198df1191a4e28032a1ee8ab884d52297995e138f830d81a4bd8484e9aa72f2 SHA512 eeaab86528fdd516f8e8ff42bd04432d6c1bea995c673563630a2b849705ec08450e592c39f9f5e649ced93548443a766507474222cce31b86ef0fc400d766f2
 DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
-EBUILD tld-0.12.1.ebuild 492 BLAKE2B 9009d45cad616dbf0366bd6167110427247f21ec33c2bf761ff2c718c2ddc6162063ddea6b287270445cc7aeda8190933a8b1ef4a78f702052e549368850a69e SHA512 c101a9cce181a51628a533fa98dbd9307aee29ef6ed66e23dc37cd3b8d54dabf3820c62a850acdae67af03500348d2f3b452e28f17fccd7b4eb7bc14e6969c0b
 EBUILD tld-0.12.2.ebuild 492 BLAKE2B 9009d45cad616dbf0366bd6167110427247f21ec33c2bf761ff2c718c2ddc6162063ddea6b287270445cc7aeda8190933a8b1ef4a78f702052e549368850a69e SHA512 c101a9cce181a51628a533fa98dbd9307aee29ef6ed66e23dc37cd3b8d54dabf3820c62a850acdae67af03500348d2f3b452e28f17fccd7b4eb7bc14e6969c0b
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.12.1.ebuild b/dev-python/tld/tld-0.12.1.ebuild
deleted file mode 100644
index 73e336742d2e..000000000000
--- a/dev-python/tld/tld-0.12.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,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/toml/Manifest b/dev-python/toml/Manifest
index 7d3140fa2211..ead046da15de 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,9 +1,5 @@
-AUX toml-0.10.0-depricationwarning.patch 586 BLAKE2B 6da04c9641095a4d0cd2b45ac09c4ed09b9f93990267867738ae8a288acb4be1d49cd1bcd5ee1365636df6b25b458dda8ece175cbefbe56ebbe9e1085e093ccb SHA512 64507e993b7b853aa06ab2fd31838aeaf5600125c2c11cfe6ca82e07f140f8aa40d0de61a6800ce8bc50dcfebd0888fac703035fea4a5ccc5f3e725121cad3e6
 AUX toml-0.10.1-skip-numpy.patch 1105 BLAKE2B a3cb255be800f833a5bf32b3860b7d6737b1c02b8f42079b99393ed49daac05659cbd9b9961de86160dfc7e995e5eb783c855fe2e4a3f1e75597e672dc8b3a4f SHA512 b51112969c531d465e83616690dc8c0098c3a3bee6ac56771beedbd92a0a0e7d79a4ee96e2961881a56b166283c2cdd4ecd75bb26bd0173c405e3fbe738b7f9d
-DIST toml-0.10.0-1.tar.gz 20396 BLAKE2B 3ddcb4cadfc68239cfcb34938a785b27326991ea89966aa6ba3ff2c8a430099664dce1474adf453f2d372b0d149c43584bce9c7abee4c8cbec3126adb3d2ab95 SHA512 ebad9d87606cf66f3db5abb2b0abd333d5536037446df131bda3f8138c33a6495a8923fc583328c27632d39448790e0e6788745d8acd7d600ea3ce57cb7dbd45
 DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f965eb1896a0eaca9a6d8ce1dda3a5dc825a8b6cd2a2096a582bd35952e6f0a3372021c739c69186d5a2c5642be SHA512 0a2348bffc889e63f4c6f8ae4faf022cceff069b178d086a37ff03e97e0f24b4b5a72810a345692f21810f3f41908b6981da902862adb06286bdb2941e9e0d60
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
-EBUILD toml-0.10.0-r1.ebuild 1176 BLAKE2B 8eedfef64d2c2c48fe2de53aa38bb7cf6261de812f869fe7cdc91639d03a7df2ed5e01c22915a3105c2427bbe854aa487fbf264456a2c55fe7072ae5bc3fee65 SHA512 b724315fee3649260755161708cd18d90a3cc213f36d50b63db036f57fd3c178da6d4ac1bc87e3a03b1c09aa10d917d2579007aa08fec0e1d91bd41da99e3038
-EBUILD toml-0.10.1.ebuild 1064 BLAKE2B c3850076c8b7f793df711188e90b6846473ef736078235ead81e93ecd4cc9da1f8400929c6c1498032ea6208d1aeb383dedfbd499494ee2cb1da3189ceb085bf SHA512 77376a7154a051f19a038f9d900c6fee1e78b30f749b40efcad5e274965117c250d6494e588b2d64938086c7d43464f301cb7667a177e57802ce33e00b58ee38
-MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
+EBUILD toml-0.10.1.ebuild 1055 BLAKE2B 8deab8451c61121c04811124f1dcfba838322230fd29ccf2e4e87bc7cfd758d7bfb92971dfc8a0fb3efe223a7230c4fe57d9fcb79cf8e75073692a16d70dc07f SHA512 56f6c554bbf46cbdd383708a63fa2a831940a86a5f57b4ea7a8ad2939fcc379da733ddac5e08fba4ce083a1ab2914eb84c646457b4e56f645ac7c22de763daf2
+MISC metadata.xml 349 BLAKE2B 2616a9e0b3c28e61eed2c14cb21f10bedfa7440b2e82a132cb2b26356c2f79f0a4a73d42b59dd6a8e1eb03af8700e637e851664eff281d84bace343a4b0f9ca9 SHA512 2840c365fe21c27f1bfe512a2a85312116477427f4cb1325fbbe4db2c0f653fa8af7c8ca5c6160e5c248a5e055146d6e1d1bfbe563de6724810c319de2138f30
diff --git a/dev-python/toml/files/toml-0.10.0-depricationwarning.patch b/dev-python/toml/files/toml-0.10.0-depricationwarning.patch
deleted file mode 100644
index 6afcea90a5b1..000000000000
--- a/dev-python/toml/files/toml-0.10.0-depricationwarning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 660dd2d57278e6f608bbaedcaaa4529ace557e41
-Author: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
-Date:   Mon Oct 8 23:32:53 2018 +0900
-
-    Change to avoid "DeprecationWarning: invalid escape sequence"
-
-diff --git a/toml/decoder.py b/toml/decoder.py
-index bed551b..aa468f2 100644
---- a/toml/decoder.py
-+++ b/toml/decoder.py
-@@ -44,7 +44,7 @@ except NameError:
-     FNFError = IOError
- 
- 
--TIME_RE = re.compile("([0-9]{2}):([0-9]{2}):([0-9]{2})(\.([0-9]{3,6}))?")
-+TIME_RE = re.compile(r"([0-9]{2}):([0-9]{2}):([0-9]{2})(\.([0-9]{3,6}))?")
- 
- 
- class TomlDecodeError(ValueError):
diff --git a/dev-python/toml/metadata.xml b/dev-python/toml/metadata.xml
index c071751e0471..85b206a00020 100644
--- a/dev-python/toml/metadata.xml
+++ b/dev-python/toml/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">uiri/toml</remote-id>
   </upstream>
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild
deleted file mode 100644
index eb4bbaace7d1..000000000000
--- a/dev-python/toml/toml-0.10.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=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="39bb76d631ba103a94b377aaf52c979456677fb1"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-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.
-#RESTRICT="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*') )"
-
-PATCHES=(
-	"${FILESDIR}/toml-0.10.0-depricationwarning.patch"
-)
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/toml/toml-0.10.1.ebuild b/dev-python/toml/toml-0.10.1.ebuild
index 02c4445df242..e17ce0ef4b9c 100644
--- a/dev-python/toml/toml-0.10.1.ebuild
+++ b/dev-python/toml/toml-0.10.1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 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"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index f224a5339618..17027400abfa 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,5 +1,3 @@
 DIST toolz-0.10.0.tar.gz 49579 BLAKE2B c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c22221ba05de2a2c7437eed1eeff31dface1c823f6e SHA512 4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
-DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
-EBUILD toolz-0.10.0.ebuild 426 BLAKE2B b6d68602f9608fa75768a95a59709964df0bc6a5b554dfdda838fa44f27a4aebb72bb221de4ee5985d37431481614822a4f3275318e3158eb27982daa6cbd8af SHA512 9d043f8a176507bdeff29963778f717fb8b7e2e99d1da3fac11a78711117df9a48198ffaf23ce211acf2913738815f88071a5bb6e12de4f11f7decddeecc53ac
-EBUILD toolz-0.9.0.ebuild 424 BLAKE2B d02fe615d0b64ed90fabb2c1b7ff269528492cfd4cb580f0adc2a5301d6f0df6365fcc75585a809a30e2875c54b61a0861715afd4b6cad1cc0f3d69730a7a65d SHA512 3b204f5a470c3ec28ce8f9a382ef56571faec4c55b011df9897016ddf5ecd346955d22f14f888b4ee2d87d075307e474712a169f7a57ea869af18a95dcc7a9be
-MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
+EBUILD toolz-0.10.0.ebuild 436 BLAKE2B aa344df77d7e820dcc80e13b084ba150c6ff3c274a681af59e83404db8527846a8801f507442ef40046ba2e3f97f80f5b6d06ff155e388532a860c93a6d5dab0 SHA512 d53cd5b4c4d2ebb70c48f5f03a51173ed65c8b66ca58128a3bf495c1247bb369fbecd695b552e7b4799b779ddc3a1c77711411dc724fb43cdcdd7b6e0af3dc5a
+MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/metadata.xml b/dev-python/toolz/metadata.xml
index 5d207d14c2ee..d23cb206dbf8 100644
--- a/dev-python/toolz/metadata.xml
+++ b/dev-python/toolz/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">toolz</remote-id>
 	</upstream>
diff --git a/dev-python/toolz/toolz-0.10.0.ebuild b/dev-python/toolz/toolz-0.10.0.ebuild
index 79762e7e4cec..cc4399f2b620 100644
--- a/dev-python/toolz/toolz-0.10.0.ebuild
+++ b/dev-python/toolz/toolz-0.10.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.9.0.ebuild b/dev-python/toolz/toolz-0.9.0.ebuild
deleted file mode 100644
index 0c486b0291bb..000000000000
--- a/dev-python/toolz/toolz-0.9.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..9} )
-
-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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 2a907366069b..44d9e16be031 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 919 BLAKE2B 4af531d401b899de32789737ec8a6d7c39bf7ab2ad26d1bbbae8a4f40ae6fc7a38d78227ad5911492c8f8ead784d3467e508d23385813467b8e13fea09e7e620 SHA512 d845941aff1fc2d2b844018950ae790e2e7a0ae67a9125465dedf0a1e5e9b5949f71de07ca1a808b9442a1187c130e10765968e19df0e3d773e9a4973d24053d
+EBUILD towncrier-19.2.0.ebuild 915 BLAKE2B 65e95cd364e4aa85132d560eb6521c4e4ede943cd9fd39293f44bc182b4e10b0ba0ea51223f9d89ec1b8c4611c496c56c9fc07850e003345bbf2ea9b8c3a014c SHA512 8d38fbfe2b0a204022e820c5c01afc14d9ff6cfd5c182345b0699dfe95123b4d111cbe75d6a68c574e2850190f7a3aa6324d7bd3408609682281fc7ac26e9bd9
 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 c907a6f75042..dd62c54b8eb8 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="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index cf7f7dc66472..a43d1917700d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,23 +1,6 @@
-AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7646584b382eb62d17bd0a72e6d10011f25818de0886df79eaa4bada5fb9b43797505b1c8df4fc7d97398741d2f719143c4e8 SHA512 cc14794264ce0d9ca4c36de868e823a46e84bea8867e6bb7b37f5e13723d3ec84af41bc0cc7586789cc14b4f6844a68d2c5057cf77d36950c2fa2e8152e1be61
 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.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe7785ce288b54d8a4940db0b8fed5f075c3f2cdea1d2242e35fa50765de1cd5ea544d1f433faa9a31894d61 SHA512 94e71d06ea62c275651e574359ffa224702eb4062398b44dff9504ce9e55df94d9227fc7cdbf02bc3d44244c29f29b8d3bdef3a66d94ad2dba6971860444ae7d
-DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
-DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
-DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
-DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
-DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
-DIST tox-3.16.1.tar.gz 294080 BLAKE2B 692ef3f498f78f239ecbb3f9ac5745462430a96bb67df7a732e5c5756d1b579c4ee8582d528d5eafddc7b19905057c01514cccaa42d7c1a442ac24cd531a656f SHA512 83fefc4b82fb33adbf2ece9a6fd6ffaf27771ac6076af5d2939dcbf68f1dd88b8edd0a105b0ec86dc7ee37b127d27ed46748af61423811c7435d0093d2e8e1eb
-DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-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 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
-EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b9b26106edfaac9bde6b0fc6025989a56dfa3e55660d0373f5cbaf65811474ad39957711fcea028881e29b0 SHA512 c9d973a77a9ad1f8b7c37af20184971bd41ce0233352dced8625f01b911c84c46d1e388cacdfdc19a7775b2ad27273e966e32515e9d671f2a7ec258eb025948d
-EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.15.2.ebuild 2237 BLAKE2B c012b59b73176ca6cf9371b12a0354217fd17917bb1cddd814c97bc5dd0ea1335450cd10ba68370da2fc46a41e2b319d4db770205cd50431dd8933b84953f325 SHA512 beb0a1ecfb5cbeb4c267c9e7bfb3d61255df1034090d696f757ef8cf04d8875226c4d84002884c0c9065f68b3d2570ffa649950510f8cb70f8bfd0c90ed9d8de
-EBUILD tox-3.16.0.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.16.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
-MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
+DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b6df2aaf716a2e8bbcc1cbc797c70fb51665411cf1bb69243aa8415f7fb7c82d78afb2ffb7117e4ae75edad SHA512 b084d4552609c90d006573dc95d46d0b27cf53c40a54465040e3c625b5d33eb19f95f3fa488439f11029e30ca414ce4e9ed6793a44072023826bc1f4398aaeeb
+DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
+EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
+EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
deleted file mode 100644
index 382bf2b158eb..000000000000
--- a/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
-index 6a8ac18..56dbe95 100644
---- a/tests/integration/test_provision_int.py
-+++ b/tests/integration/test_provision_int.py
-@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
- @pytest.mark.skipif(
-     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
- )
--def test_provision_interrupt_child(initproj, monkeypatch, capfd):
-+def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
-     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
-     monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
-     initproj(
-diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index b814b7a..fe7ebe3 100644
---- a/tests/unit/config/test_config.py
-+++ b/tests/unit/config/test_config.py
-@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
-         for name, config in configs.items():
-             assert config.basepython == "python{}.{}".format(name[2], name[3])
- 
--    def test_default_factors_conflict(self, newconfig, capsys):
-+    def xtest_default_factors_conflict(self, newconfig, capsys):
-         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
-             config = newconfig(
-                 """
-diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
-index ea6f65d..e4f0e92 100644
---- a/tests/unit/interpreters/test_interpreters.py
-+++ b/tests/unit/interpreters/test_interpreters.py
-@@ -28,7 +28,7 @@ def create_interpreters_instance():
-     return Interpreters(hook=pm.hook)
- 
- 
--def test_tox_get_python_executable():
-+def xtest_tox_get_python_executable():
-     class envconfig:
-         basepython = sys.executable
-         envname = "pyxx"
-@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
- 
- 
- @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
--def test_find_alias_on_path(monkeypatch, tmp_path):
-+def xtest_find_alias_on_path(monkeypatch, tmp_path):
-     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
-     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
-     os.symlink(sys.executable, str(magic))
-diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
-index 0523112..3db5416 100644
---- a/tests/unit/test_venv.py
-+++ b/tests/unit/test_venv.py
-@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
-     mocksession.report.expect("warning", "*test command found but not*")
- 
- 
--def test_install_python3(newmocksession):
-+def xtest_install_python3(newmocksession):
-     if not py.path.local.sysfind("python3"):
-         pytest.skip("needs python3")
-     mocksession = newmocksession(
diff --git a/dev-python/tox/metadata.xml b/dev-python/tox/metadata.xml
index 9a563f6807cb..c562ca1f3995 100644
--- a/dev-python/tox/metadata.xml
+++ b/dev-python/tox/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">tox</remote-id>
 		<remote-id type="github">tox-dev/tox</remote-id>
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
deleted file mode 100644
index 52fea638670c..000000000000
--- a/dev-python/tox/tox-2.9.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=( python3_6 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="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"
-
-# tests need internet
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# remove intersphinx stuff
-	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${S}"/doc/build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
deleted file mode 100644
index 0b093a1f9d91..000000000000
--- a/dev-python/tox/tox-3.12.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=( python3_{6,7} 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 ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=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-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-# for some reason, --deselect doesn't work in tox's tests
-PATCHES=(
-	"${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch"
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -v --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
deleted file mode 100644
index 188f784f7e8c..000000000000
--- a/dev-python/tox/tox-3.14.4.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-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/tox/tox-3.14.5.ebuild b/dev-python/tox/tox-3.14.5.ebuild
deleted file mode 100644
index 3246135988a2..000000000000
--- a/dev-python/tox/tox-3.14.5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/tox/tox-3.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
deleted file mode 100644
index dd501faa9ef5..000000000000
--- a/dev-python/tox/tox-3.15.0.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="~alpha ~amd64 arm arm64 ~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/tox/tox-3.15.1.ebuild b/dev-python/tox/tox-3.15.1.ebuild
deleted file mode 100644
index 0365e6a79004..000000000000
--- a/dev-python/tox/tox-3.15.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=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 ~arm64 ~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-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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=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[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild
deleted file mode 100644
index bc779e0a1099..000000000000
--- a/dev-python/tox/tox-3.15.2.ebuild
+++ /dev/null
@@ -1,71 +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="~alpha ~amd64 ~arm ~arm64 ~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-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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=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[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.16.0.ebuild b/dev-python/tox/tox-3.16.0.ebuild
deleted file mode 100644
index 0365e6a79004..000000000000
--- a/dev-python/tox/tox-3.16.0.ebuild
+++ /dev/null
@@ -1,71 +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="~alpha ~amd64 ~arm ~arm64 ~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-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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=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[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.16.1.ebuild b/dev-python/tox/tox-3.16.1.ebuild
deleted file mode 100644
index 0365e6a79004..000000000000
--- a/dev-python/tox/tox-3.16.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=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 ~arm64 ~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-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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=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[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.17.1.ebuild b/dev-python/tox/tox-3.17.1.ebuild
new file mode 100644
index 000000000000..8fcf947120f9
--- /dev/null
+++ b/dev-python/tox/tox-3.17.1.ebuild
@@ -0,0 +1,70 @@
+# 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..9} 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 arm64 ~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-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="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=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[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.19.0.ebuild b/dev-python/tox/tox-3.19.0.ebuild
new file mode 100644
index 000000000000..499658c518d4
--- /dev/null
+++ b/dev-python/tox/tox-3.19.0.ebuild
@@ -0,0 +1,70 @@
+# 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..9} 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 ~arm64 ~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-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="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=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[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
deleted file mode 100644
index b8798335d338..000000000000
--- a/dev-python/tox/tox-3.2.1.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=( python3_{6,7} 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="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 )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-4.0
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# remove intersphinx stuff
-	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${S}"/doc/build/html/. )
-	fi
-}
-
-python_test() {
-	# TODO: find why these 8 tests excluded below fail.
-	pytest -v --no-network \
-		--deselect tests/test_config.py::test_plugin_require \
-		--deselect tests/test_docs.py::test_all_rst_ini_blocks_parse \
-		--deselect tests/test_interpreters.py::test_tox_get_python_executable \
-		--deselect tests/test_session.py::test_tox_parallel_build_safe \
-		--deselect tests/test_venv.py::test_install_python3 \
-		--deselect tests/test_z_cmdline.py::test_alwayscopy \
-		--deselect tests/test_z_cmdline.py::test_tox_quickstart_script \
-		--deselect tests/test_z_cmdline.py::test_tox_console_script \
-		|| die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 4f60f8701729..734f729b8c9f 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,17 +1,6 @@
-AUX tqdm-4.46.0-py39.patch 1637 BLAKE2B de3dbafba500055cd292b2e24d16e089febf518881fc46369526fd641290489941199260c3018e266fb2fa91e4909947d11a23d1a0e29633fc5d2bd67fcb24c9 SHA512 0278d09ca22d97e5d2ceebc97ed4bf3500e8474910990cc9aebb46c9f1ab158d157a73847a041951863cae3fb36d1a32800e49ccd671a874486c3ee74da3cf62
-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
-DIST tqdm-4.46.0.tar.gz 144312 BLAKE2B 93b902d9a362e658f244f3c1b15a3496425cb3e401adf291dc0a9c7c0bd551baa1171a753be8d1c3b877d2cd3ab25e81dddbd8492668d0b0f6ca3cb47d13be1c SHA512 ccdfce4d273e78ced172fc3edb24ac038465169f7b765e7bf779831ef3d0dc72c648c5fb165aba02e0c6dc86c5d0ea3d93d5530b642ddd84e3d284c7354739cf
-DIST tqdm-4.46.1.tar.gz 144383 BLAKE2B 4d72bfbf0c225c779ae2c9bf405f9effdb69cfe7862325b12e8408c17a03b7a87f9cf0d055de598a67132861114c89b237d0ad2509302e452cc67ce9aa34fa48 SHA512 de8710ceb44b6caa073aaa3c9dca281880d752d1b542a3dd87a54884478a185c35ab1969c6cb7242e30ee0511f967cde7bd4fa83a8d4f8c58d3e95ad2bf3bfc6
 DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
-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 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
-EBUILD tqdm-4.45.0.ebuild 1355 BLAKE2B 309811522c518dc0a6cbcd598409bd0c3d69efc9f8ed6a47ade2a9ddc6df4a99b116dd5c02de0b8a1609f07b605ac8180d34ad81fa9156a998c12864ad03c5f0 SHA512 63e1762eb5508d99acab3d6ea25a45b5f9fba1d8b04d8aa9f0e16af7a2deafeca3db3fc8dadc527466a34ced5900b931a1360dd428c19e1fd9c594ff12fe1ec4
-EBUILD tqdm-4.46.0.ebuild 1382 BLAKE2B 4c22605d67ffa9f686148c836e55d696adf92a9c8ef16e5c6aeee371b5f232996673a33f179638b429e1ebb2d6870cdc6b4332ac5ae2eb4e3b5b522c062d9d7c SHA512 312a694be69f171f8b07be4c718bdd1955c95366b3adbdc16de2694353b1d2e92b68e948add38bba57092a8bada6d25bebb90b7ad289974d86278da1d727fba0
-EBUILD tqdm-4.46.1.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
-EBUILD tqdm-4.47.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
-EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
-MISC metadata.xml 803 BLAKE2B 459df7dc960e21c114e5e688d60ade18cf4e2280fe7a55794d7097e8371c6daf3cc0bfad74ddf418684e2941ca97bdfde695e1398fddedbea10c65d962a1fec2 SHA512 673f0bc8c48f3d0c24d79304e6ac32e8da06d3004fdb7bb57f0b2db93ec555f9237812a894290b0999152e7fd5e1baadb43f45e0835bb6da7b2ca98f2e3aa85e
+DIST tqdm-4.48.2.tar.gz 148978 BLAKE2B 2423a3d23b86ec6b535a2157d0fbaea6921f95873fb2507a08ff57de0fdcf8fcbfb030210393f5410437ee9977da3ad2011f07a866b3f91a057e338082325976 SHA512 849e4dad4bd0819b328e906af8a8f7acf2ebfd559c9ae3ebf822bc64c1b1a5c96e44b9b69d3dedf6387c44cf9eed559f1377ea29f71fadfc8f056c52685425e9
+EBUILD tqdm-4.47.0.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
+EBUILD tqdm-4.48.2.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
+EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
+MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/files/tqdm-4.46.0-py39.patch b/dev-python/tqdm/files/tqdm-4.46.0-py39.patch
deleted file mode 100644
index 0734aa83b96f..000000000000
--- a/dev-python/tqdm/files/tqdm-4.46.0-py39.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From aeb52044ca29f37f1f98ee5a4f9ad774d557771e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 21:43:05 +0200
-Subject: [PATCH] Fix error due to missing sys.setcheckinterval in py3.9
-
-Python 3.9 finally removed sys.setcheckinterval().  While the package
-apparently tried to account for that, the logic is flawed and the second
-getattr() raises an AttributeError even if its result is never used.
-This caused tests to fail:
-
-      File "/tmp/tqdm/tqdm/tests/tests_tqdm.py", line 126, in pretest
-        getattr(sys, 'setswitchinterval', getattr(sys, 'setcheckinterval'))(100)
-    AttributeError: module 'sys' has no attribute 'setcheckinterval'
-
-Refactor the code into a try/except construct that does not execute
-the setcheckinterval() branch unless setswitchinterval() is actually
-missing.  While at it, scale the arguments a bit -- the current version
-used either 100 instructions or 100 seconds that were rather of very
-different magnitudes.
----
- tqdm/tests/tests_tqdm.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tqdm/tests/tests_tqdm.py b/tqdm/tests/tests_tqdm.py
-index a2dac52..5f322e6 100644
---- a/tqdm/tests/tests_tqdm.py
-+++ b/tqdm/tests/tests_tqdm.py
-@@ -123,7 +123,10 @@ def cpu_timify(t, timer=None):
- 
- def pretest():
-     # setcheckinterval is deprecated
--    getattr(sys, 'setswitchinterval', getattr(sys, 'setcheckinterval'))(100)
-+    try:
-+        sys.setswitchinterval(1)
-+    except AttributeError:
-+        sys.setcheckinterval(100)
- 
-     if getattr(tqdm, "_instances", False):
-         n = len(tqdm._instances)
--- 
-2.26.2
-
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index d109a0ebe957..62d174ed4d27 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/metadata.xml
@@ -17,6 +17,7 @@
 		Instantly make your loops show a progress meter - just wrap 
 		any iterator with "tqdm(iterator)", and you're done!
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">tqdm</remote-id>
 		<remote-id type="github">tqdm/tqdm</remote-id>
diff --git a/dev-python/tqdm/tqdm-4.23.3.ebuild b/dev-python/tqdm/tqdm-4.23.3.ebuild
deleted file mode 100644
index 292ecf6c3149..000000000000
--- a/dev-python/tqdm/tqdm-4.23.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
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s#man/man1#share/man/man1#" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.33.0.ebuild b/dev-python/tqdm/tqdm-4.33.0.ebuild
deleted file mode 100644
index 92d9aba08cee..000000000000
--- a/dev-python/tqdm/tqdm-4.33.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=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-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="~amd64 ~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 test"
-RESTRICT="!test? ( test )"
-
-# Uses pkg_resources
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	# tests_main.py requires the package to be installed
-	distutils_install_for_testing
-	# Skip unpredictable performance tests
-	nosetests tqdm -v -I '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/tqdm/tqdm-4.40.0.ebuild b/dev-python/tqdm/tqdm-4.40.0.ebuild
deleted file mode 100644
index f3355f39eb43..000000000000
--- a/dev-python/tqdm/tqdm-4.40.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=( 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/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
deleted file mode 100644
index 2c4a44d12e74..000000000000
--- a/dev-python/tqdm/tqdm-4.45.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=( 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 arm ~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/tqdm/tqdm-4.46.0.ebuild b/dev-python/tqdm/tqdm-4.46.0.ebuild
deleted file mode 100644
index 0c1a502ea5fe..000000000000
--- a/dev-python/tqdm/tqdm-4.46.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
-
-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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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"
-
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-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/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
deleted file mode 100644
index 563276f5d141..000000000000
--- a/dev-python/tqdm/tqdm-4.46.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
-
-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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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"
-
-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/tqdm/tqdm-4.47.0.ebuild b/dev-python/tqdm/tqdm-4.47.0.ebuild
index 563276f5d141..a51d15b84f05 100644
--- a/dev-python/tqdm/tqdm-4.47.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.47.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.48.2.ebuild b/dev-python/tqdm/tqdm-4.48.2.ebuild
new file mode 100644
index 000000000000..27373f57ea4f
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.48.2.ebuild
@@ -0,0 +1,58 @@
+# 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,9} )
+
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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"
+
+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/tqdm/tqdm-9999.ebuild b/dev-python/tqdm/tqdm-9999.ebuild
index c55f5112880f..f8988f331138 100644
--- a/dev-python/tqdm/tqdm-9999.ebuild
+++ b/dev-python/tqdm/tqdm-9999.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
 
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index b4b5fced2c2f..6932b605e3c5 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,3 @@
-DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
 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 627 BLAKE2B f83ef7bf7906b2301fce2ae921c39aafa68206c9de727c127b93d6e0f88ffa375869649becec3d3601d62e8e1b3aa6c05adf87a7e2f3a38540d5dd9918bb9393 SHA512 dc314336e489de5aa0d629248c38ca72c09268f673b706879be634788e43dfe8f4413bd2bd8f0e52d56deab105ed07b9bb4173a4a393a3741dbc4bb8093fd7ca
+EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B 7f9eaa77a6248c64d1c48fe7e2c04eff431311f0a75e9ea6740d872a79c6c2369f4b7463201e71fc92bb6cfabfc14b28a1137d68b947eb76cb90073a6f8cc968 SHA512 c35a1dd350106f6fe3bd56455123d7045e1bbde777e7509f2069ecf6f3a1276511c78db6e46a41a3dd4831b4798095b14b1d132da62b100f8cc02e43823c3981
 MISC metadata.xml 711 BLAKE2B e8a10398927e2f5dd1d51df84ea8d156f175c2d7f5a14599d154cb413263cd8a396cf037fd50e9adbafa96fcf4dc060d3073ec1c775443538ecc963112728951 SHA512 5b6aa6c0c602beb2cbf3c2b6fb5eb35af48bb1fcb1801f0cb7cc9cbc7645757cac4ab9e06c492705acc3e51ae6565e5124d97dba6be6b204fa58483c7ee42204
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
deleted file mode 100644
index c99abaa62359..000000000000
--- a/dev-python/traitlets/traitlets-4.3.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=( python3_{6,7} )
-
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	doc? (
-		dev-python/ipython_genutils[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${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() {
-	pytest -vv traitlets || die
-}
diff --git a/dev-python/traitlets/traitlets-4.3.3.ebuild b/dev-python/traitlets/traitlets-4.3.3.ebuild
index aa50d4904df4..f6a0e4b730bd 100644
--- a/dev-python/traitlets/traitlets-4.3.3.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.3.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"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index c1b22567f6f9..a7045fe780f8 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,5 +1,3 @@
-DIST transitions-0.7.1.tar.gz 1283833 BLAKE2B 5f2f2813ba158cf5ccac4e2d55700149b986bdd24f9e864cec8d03390724cf79d9d379afa06b1a7b56c6a91376410252fdda169024f6ebbba2ed976fe7a18e7b SHA512 3fe5989faf9dbfdc15d50beaf2656240317f00278727271e5bd64ad465be1640b67e760fb73f4b06a61920343215815a8be03d41dc4d32086222446463ef71d7
-DIST transitions-0.8.1.tar.gz 1094152 BLAKE2B 38e687fd30ae5a49c4c5f4339fe31728c4f44539a8d977337b54015d939aa48e39616e2044b1f5a7f6d7f82b34f2a0e807c36b9d416e10fcb0cd04db4bb9f840 SHA512 627f4f26cc24b1ac2e43cd6570341620b32e1f75662d3bde069ba5f3547e2670380d6e58876f8208f0411c91d8d2c21e500e8c91565b3a8748e07d2f4d94b0f6
-EBUILD transitions-0.7.1.ebuild 978 BLAKE2B 21528bd19c7666cd7c45ff50098bafd3ca9762ac31df01e48509c5a5499a6d9fbbd8128cd3c9d8c8235ee036d321955f17a0b2c0b99ade30afd2aea44339dab0 SHA512 7271a48488b9f43b57d47304e667b451ce9bd53bd01ebaeb06d8f5197042b21d448a7cc8924fb11aeae72c3e21d0e7a5ae685e80c6639b186d6b6afd49bac347
-EBUILD transitions-0.8.1.ebuild 980 BLAKE2B 2b229525563eb04ebcc06248bdc4f8072bbcdfbeb1b1b26ea2f81740eda89df7f442fe11427b8fda1900e34e44a709e09ee849a25114031401bceea2b3b011ab SHA512 8a85d3f077ad52a72a0a2bedafbda15e0ad1351724f936795dcf5b35556516c7b9a2bfeee6ebd48851b0ea312075d71a3fe4b41e2129bfe7ae97d818609f675c
-MISC metadata.xml 688 BLAKE2B aa20597be6470d32cc9a933d01f04f2b145d9d0dae23cd7bd3f4a3794e919c08cdee49f0c9a861b00e8971721091a315474d19f482afb6d009eceebb6a49ce15 SHA512 4b09b37102dbad8597aa58b1a0bbaae9c37360e58967c468226ae18122fa29e7c50902dd44a71e28a6822089ca9e787781d28d1e09e56a73ae34d8a7b9a6d941
+DIST transitions-0.8.2.tar.gz 1084797 BLAKE2B 9ff6284e7c42365c5a169388057acffd53dd31c3ca6d9dee240b253ca34118a67d3f070fd8b6a86cb6a01a2e15023e0bad02ccc07813ee0855a54008ac3d7597 SHA512 d10e513806801d0c874be3eb59e92ad61584b5f7992ba26db8828848df1225fb806621abc118a8d43f2efaa353d988b5becbe4296bc054754e551c86495a540f
+EBUILD transitions-0.8.2-r1.ebuild 913 BLAKE2B 97c2df5a1661bf0ff2571fd539f87903d9bc542a7fee8f108d5f5eb90ade23a4f9172a3dc6bbfd5ab30832ca5e9c4b959ef54a16479369af09c2044540453b02 SHA512 7ee29369baa5a7d1c12162e62ce505e3192089d3f4f6f6812b167c08fca23c4becd76261470af8b2ac501def0a09d79a5c563bb1e0778c521a41d435b5fbc0de
+MISC metadata.xml 712 BLAKE2B b4c911e4b006f4ef5b486b62d2b8aa3542df841dae6c120cf2099ef1e843b0142f45b62e5621bf13f555398b0483f30730e86258412971f6bdde289720146cf2 SHA512 49894aa07b32aa7ba5c1181af8059c6bbebce9912b4f311169e51b57c85f4fc2fae294994a9375194a0732365afb2fef79b703842a5f438970e4602ff6e274ee
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index 1cfa63698d55..cb357577f372 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -11,6 +11,7 @@
 		It is an abstract machine that can be in exactly one of a
 		finite number of states at any given time.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/pytransitions/transitions/issues</bugs-to>
 		<remote-id type="github">pytransitions/transitions</remote-id>
diff --git a/dev-python/transitions/transitions-0.7.1.ebuild b/dev-python/transitions/transitions-0.7.1.ebuild
deleted file mode 100644
index d07f7758006c..000000000000
--- a/dev-python/transitions/transitions-0.7.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pygraphviz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.8.1.ebuild b/dev-python/transitions/transitions-0.8.1.ebuild
deleted file mode 100644
index 60c72178daaa..000000000000
--- a/dev-python/transitions/transitions-0.8.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pygraphviz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.8.2-r1.ebuild b/dev-python/transitions/transitions-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..f97d135b41fb
--- /dev/null
+++ b/dev-python/transitions/transitions-0.8.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/graphviz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 2e9f6e0aca29..6a633f7f0d17 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST translate-toolkit-2.4.0.tar.gz 7646438 BLAKE2B 5d956ce05b57aa3ec2c7896a36f199cab5a590d4d6a4ad84263d7b757e35d5e42a40cac38ea3da1c8a11c64b1cacff5a5742b79ad5a87436842a35547d89e611 SHA512 715d9e974c451a5c3d92471287f4da8e8ba663efda849398f77a3c3d6f16e0c9a8e685261ec07c02ce9bd13f3766f0b2b1ad441b92116bb3913036ffbd415658
 DIST translate-toolkit-2.5.0.tar.gz 7679224 BLAKE2B 927b0dcfc0836ed2f2589d70f5789fc6d8b23a3e80bf4ef0054704ca12e4b5287a7e3b2a90992197bae6fc0acee1ea9d93a8eff05f6e5182f9269ca2aa9e5a66 SHA512 c4ff8fe9e7cc5b44a5448391ecbcfc454bf32d3794267e67824b020ca78cfbeba1283287a42f07859cd197a413fe8171ad5e31375f60fec77f334642ed2ad13e
-EBUILD translate-toolkit-2.4.0.ebuild 1909 BLAKE2B ae816dbf3748c3a794b5593773480b2886dc4637121f4d27776bc88e48a55013ea712ca88eb66716173a8ff16a340f679ee5dc70c88bc62ca76a40952dbb2869 SHA512 db6aacf34558c4bbbdabde084e53a4d5e67726b1ea54bed21fb513932e0f70c1716556ed9495fea47638b0bb8c6b445f97b1fd075fa983a808f9be4b38546f55
-EBUILD translate-toolkit-2.5.0.ebuild 1932 BLAKE2B 8a10478aa9c51e009850027d924ce9ecc69a5b651cb2f8dd07ffd987337b8cfea2b0d960507e582a89eb297e6316f29a7a7b4bcb52460312df27bd01f2a4d03b SHA512 bd040475f5593a110104cc70c4afd53e5fd7a292b7c8e8a17ff9613100df33425f1b3c5d3591d0731c319edc3dda4f09c717564d4f6e81cd82a166cfb13daa4f
+EBUILD translate-toolkit-2.5.0.ebuild 1930 BLAKE2B d14340824d56742941d5ec3be728f79308e59a8ac8e6a5c646609f5075036467831d493b00f56f96563d5889d61cb28b287ff45583578511d85357ccf3b39946 SHA512 e95b1509e9575c3aeca90087aba030296fb60d4b32c52b8c6c5e6d46de2567f843bd220bb3533f365673033a63b118237fc8ff15a33ab52abbf877b990245e06
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
deleted file mode 100644
index 95b94c3da370..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.4.0.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,7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.5[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-18.5.26[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( dev-python/iniparse[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Prevent unwanted d'loading in doc build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" \
-		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( "${S}"/docs/_build/html/. )
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -Rf docs || die
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
index 8cb0310220df..84b66865615f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 92f04c449460..9d24abefa76f 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,5 +1,3 @@
-DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0d41035b558326ff947a9e17903ce33dee3157d2cb2f79ab3aa884ddebcd52e743cd6e1ad08a0de324cd6bc SHA512 62933a512fcc8b0e77333eb9268846ad17f4b44cf6ea317ada2565054100be3caf03bda0a1becd775ec85528fc2f5ddec33d23d3579cf484a3c6ba7c71c50a7f
 DIST treq-20.4.1.tar.gz 59116 BLAKE2B 1370748d8bde407a8802d54786b45fbbc65525efba14cd5a33d741573b9fca7b36629deea65672669c4da45347bb40d975a063430ffd18f50d5ef896ce6dae66 SHA512 ca24ca7ad6bcf3fe6cba490d05eea4d71727a84bb2caf0a019edc01f91f7c25d87dc8208fc7cc816d18ef42db4dc66884475f0baa6b2cf39714e4422d0d67d3b
-EBUILD treq-17.8.0.ebuild 1589 BLAKE2B bc2c3e2d713dd9d6b1e0d7067af164b10e4c1e0c13492003b1cce5d2106dbe0ee9a2292a2ac6144cd6e384d5fa08d328cb49dd0e1e2f44e7f199a67cdb7bf5e0 SHA512 6ee0ba3e5a6f1415710c2302b2341adf72e7d9360d396c1ead699e1a7986fc11c1587231f6215899ac9eef201966d58f30dbba5970bb9a041b9d784a4443cc13
 EBUILD treq-20.4.1.ebuild 1553 BLAKE2B 17c437ce8dcb71c013e710abafb805b36151b1d729369871ae94716b0cc1c3e187a9d991e0be90e6db087899e45e02bb1ea9f0c0811da0d6c4d459d6324a0ca5 SHA512 dc515b505296adfa0ae4bd0064eda47fbd0cf2310866ddc9ea5b6ab72aef30bbd666b367b28a6e385fc90d552459920d5bf6b29e49bbfca0a89b7b8b19c777ed
 MISC metadata.xml 679 BLAKE2B 1218e13a10ef3e4b63b892d3ba444116d8ae3bdc625c9b95ef73f9c4d59dc7bad527e919568306e7744b79a9bb00dea90ee0b83146bc4314d224e2dc7657cb7d SHA512 b3d2aadc2c43d03d80d50fd67830e62ba7543dc7ea7e0f834b32a7738031a49a8ab57069b8d5c7a9b0f88405bae8d59333e50ecab87286f8be5504141081914e
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
deleted file mode 100644
index 990b9483c2de..000000000000
--- a/dev-python/treq/treq-17.8.0.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
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-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 )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.4.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && dohtml -r "${S}/docs/_build/html/"*
-	distutils-r1_python_install_all
-}
-
-test_instructions(){
-	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
-	ewarn "dependenciess are installed for this package."
-	ewarn "Please run eg:"
-	ewarn "$ python3.4 /usr/bin/trial treq"
-	ewarn "as a user for each of the python versions it is installed to"
-	ewarn "to correctly test this package."
-}
-
-python_test() {
-	# Tests fail when run via emerge
-	# they need proper network access
-	test_instructions
-}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 88c2d2c13395..82480c9aa49d 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.6.0.ebuild 897 BLAKE2B 6be297c4ced1f5b0da8a8c2272cbb3ab07f6af6931d4ea8a4374538dd4cef99f31307b4501ba51b97579d12e203d3f95515da60b6522485d3f1ea8db0860c26f SHA512 7d7e150711216d0d2aa3b5f0bbe112acc9adcbb99eeb6d07a1a8cc126ec949e544d9f9ec7bfbc6fe523cc2da49a32e045ba13bc2473ec8e3cdfafd09dfaa9700
+EBUILD trustme-0.6.0.ebuild 899 BLAKE2B d0d07dedecb338ad4d08b293057ef494b4d981703ff78a54fe440bdaf5387d854a9da6c0966d18ea80ce8120d6032516b4d914286271ce7ab7dd4b2eb89432ba SHA512 c9814b4d8196a6911ae1deb2a762465c49a7b974c8c4287c8f62a26907bc74a167376633c7128bec8a4aec90587b2d7e1eac244aff2b1d2eebc6bebd74664434
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild
index 1fe0382cafda..99f5e639226f 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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/tubes/Manifest b/dev-python/tubes/Manifest
index 9e0784ef3fc3..345488b5baff 100644
--- a/dev-python/tubes/Manifest
+++ b/dev-python/tubes/Manifest
@@ -1,3 +1,4 @@
+AUX remove-unnecessary-dep.patch 555 BLAKE2B 9e5df1bd6bf31d7081361ca67fcc3a439d2544a6d8bd8371c3f8b040d97579c192624d6599a6ddd4e4fd73e577dd3d29ebb5c6506d02e4b33d9b95ae74c98030 SHA512 d71688663468110b1e7eef0b536e7c4545894992f46963186c98c50ad5a4e305a536eff743ff9b6d17b8aad748ed3154aca200eeed82b53eb29063a37893c073
 DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
-EBUILD tubes-0.2.0.ebuild 715 BLAKE2B b631cf5a2bcc4e73bdfa04ae3f61c01c3ea17e2ea1a3b9943137b7e8c62457940558725f4519278868482691b7b1f2ac047bab766bad33d0e43e8d84b6af331f SHA512 5664bda610efce9bb61adeff8a67e531230804773d09767c1156f92ff58e06526edee13d97401552493674b1bee9a3bbe6c7e2e5d248260aef51a965eb981a2b
-MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
+EBUILD tubes-0.2.0-r1.ebuild 666 BLAKE2B 5257f6f4e7f147ba10f27575a059d76337d112f7ed1de15f949bcdbf4bf769e7c6afba46460b14a04bde1fcf9d262feaf95dbe20fd6d94872378a50674aeb923 SHA512 be6199b51794352eba6e0b2f1b1f2cfc46aaabc677c1123a63174b68344ab70a0863eb53a79d24c3dd6b95f1d5bebf7437116af982828475f6bda3578794bef3
+MISC metadata.xml 659 BLAKE2B bca50c3e192ef6b48aec039a7cf8b54875818c6f64e74ca99a8fa64d2a2114a7703d890fcbdc83c5ce96e626e07e7db5382fb770f0cc19b9beb81723f8b29248 SHA512 6ab0a92134cc1b9ca24c253c16f642b00bf5db618005760b83dd4b0d033f7e247efad35f00d87adeedede2064fc1425b93c622411a213b531334adf910e96f9c
diff --git a/dev-python/tubes/files/remove-unnecessary-dep.patch b/dev-python/tubes/files/remove-unnecessary-dep.patch
new file mode 100644
index 000000000000..678f3c27abd8
--- /dev/null
+++ b/dev-python/tubes/files/remove-unnecessary-dep.patch
@@ -0,0 +1,24 @@
+From 2c05dd8f27c97ebbfea18706ff54d2406448b09a Mon Sep 17 00:00:00 2001
+From: Glyph <glyph@twistedmatrix.com>
+Date: Tue, 3 Mar 2020 01:24:13 -0800
+Subject: [PATCH] remove unnecessary dependency
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c647927..e9e3134 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,6 @@ setup(
+     packages=find_packages(exclude=[]),
+     package_dir={'tubes': 'tubes'},
+     install_requires=[
+-        "characteristic",
+         "six",
+         "Twisted",
+     ],
+--
+libgit2 1.0.1
+
diff --git a/dev-python/tubes/metadata.xml b/dev-python/tubes/metadata.xml
index 77d7b556b447..a67569e9a9d4 100644
--- a/dev-python/tubes/metadata.xml
+++ b/dev-python/tubes/metadata.xml
@@ -7,17 +7,14 @@
 	</maintainer>
 	<upstream>
 		<maintainer>
-			<email>bolson@bolson.org</email>
-			<name>Brian Olson</name>
+			<email>glyph@twistedmatrix.com</email>
+			<name>glyph</name>
 		</maintainer>
-		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+		<remote-id type="pypi">Tubes</remote-id>
+		<remote-id type="github">twisted/tubes</remote-id>
 	</upstream>
-	<longdescription>This library provides encoding and decoding for the
-Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
-It is implemented in pure python with an optional C backend and is compatible
-with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
-module for performance similar to how pickle wraps the _pickle C module in the
-Python Standard Library.
+	<longdescription>Presently based primarily on Twisted, its core data
+	structures are fairly framework-agnostic and could be repurposed to work
+	with any event-driven container.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/tubes/tubes-0.2.0-r1.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..e9e16492a5cb
--- /dev/null
+++ b/dev-python/tubes/tubes-0.2.0-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=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="Flow control and backpressure for event-driven applications"
+HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
+SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 "
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "$FILESDIR/remove-unnecessary-dep.patch")
+
+distutils_enable_tests pytest
diff --git a/dev-python/tubes/tubes-0.2.0.ebuild b/dev-python/tubes/tubes-0.2.0.ebuild
deleted file mode 100644
index 6e7b2f17ad58..000000000000
--- a/dev-python/tubes/tubes-0.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit distutils-r1
-
-DESCRIPTION="Flow control and backpressure for event-driven applications"
-HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
-SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 "
-
-DEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index f77b4b0408b8..e4283b95e933 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,6 +1,3 @@
-DIST tvdb_api-1.10_pre20150406.tar.gz 33758 BLAKE2B 929b9e1326b5665eab29b9361fb25a107c91cb34b8226f071f5ed07490f1f2a305644a00ba5fcfda68e1357f50b7ed52cd842c806d8da3fb00e5094db55a09f8 SHA512 a62680a8e18fa5cb246c0916232aecd06dd5f7381e589690f8fedf5b85a9eac01331a858880f888c14ece53c888ab8d18e7dd65a6665639f5f6f6d335138469d
 DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
-EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 516 BLAKE2B d8270738bcc75344e22a9257cd507ea0bd09e4cbf8eec75fba161ee49f0db6d8fc02e214749dcd53a9391ecbbeb15a81933f3d0d287459b8f25b05c30c6c424c SHA512 2914c792fb06c2ea0d495637fc8e6bf9b8e61af673c45bd02250045f5596c999e314cce05c94dc252ad244bfcffc266e33107fa7d5b0cd771355cdca50a69a3a
 EBUILD tvdb_api-2.0-r1.ebuild 475 BLAKE2B 3434303db768f18a03a9d412451f4ed432e1b11b6262583d331b5017ee14d3f39c31e377b6353b2b8e39e38da53ef791c7f42cf5f459e287d2dd27411ed22274 SHA512 b4b31e076e6d236cf84d8201536d20c87e12aea8f0fe2a20980a9ba3c3332cf059ab642691a9240939d5dfb68f778b085e7f52a2b7f0dce802034ea29230be41
-EBUILD tvdb_api-2.0.ebuild 471 BLAKE2B 2210c9a78f7039700d0a75d1d38f4f7019dd8a03c1a928660864219b91feb07f25108efbf51fb95df87047b1adbde95ef5234404505ce46d67a3d075cc0f7e94 SHA512 bcd878e50586aada650ec18cddc5c7564459b0c66c391956c908730c6d11eca6c708a94fb0ba7892154539ff56fa6fec5746f0b1a9f52a87a08da7784d282ccc
 MISC metadata.xml 333 BLAKE2B 37ef6dce06fb7536eb18133f5dbe87b03a4cfcc54669dc7795dbfa9009920c020dc0fbca7d3ff82460e2e05bf3896fcaef8784078a4ab56899e9b7caff9dcb7d SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4
diff --git a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
deleted file mode 100644
index c2a50cff92e1..000000000000
--- a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-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=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to thetvdb.com API"
-HOMEPAGE="https://github.com/dbr/tvdb_api"
-SRC_URI="https://dev.gentoo.org/~thev00d00/distfiles/dev-python/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/requests-cache[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"
diff --git a/dev-python/tvdb_api/tvdb_api-2.0.ebuild b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
deleted file mode 100644
index c8cfd75e065d..000000000000
--- a/dev-python/tvdb_api/tvdb_api-2.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=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to thetvdb.com API"
-HOMEPAGE="https://github.com/dbr/tvdb_api"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index b64af84c7488..0a8ac76db4dc 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,9 +1,7 @@
 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.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
-DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
-EBUILD twine-1.15.0.ebuild 1315 BLAKE2B 855ab7cbe5071f1f12978c4a834a21eee84b7cb5404614f4caaae63120cfb46aadf485e363a049e3864997cfc344f607cc3a772742d05a1b12ca1ec181073d47 SHA512 fbd347002493be89cd4a5c8622ba66c95bd9f2baa09294582935434502b3935888da1de539f4c7d6b78ddd27feb652dcc8603b73574cde9c0399c68a560e2fd5
-EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
-EBUILD twine-3.2.0.ebuild 2000 BLAKE2B fdb7b5d3d8e7f454658ebdba4b7047c496931936e97f71b13e9f4e0d9d7af21ab3b925a61ab38e0271dbb798835fda14218b80dbe76958cc19ff5a3020832b05 SHA512 81c68f707a4a9e5a3d36d25a05bea66ba85d2adbb2200569779e4deba6fa052b3ef68f558aec33e5b42563080f94f5b56e546c547fa99400f095e1a35ccdb5b4
-MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
+EBUILD twine-1.15.0.ebuild 1224 BLAKE2B 26ed3c59f0e1a4215ba1b8a9c63d22c227a18d9a5ddba92a109bfe3461cd13f4391017bfa56ea86cbf94f1bd90c2d95c22ef0be59774ff862c612075c9b24a0b SHA512 73cc966d65ca3fa0265235cdc8ab4e2177712541f77fb788f69f72f10e3d06be92a1590a6e7aeeb877cd3a599c883420aca6a21614bbd63430baa040e9b19092
+EBUILD twine-3.2.0.ebuild 1994 BLAKE2B c5b41281d0cc519a3520a9ca9e2122bc1671e4a19264d33732bc63de39cd23b286b64c9fcd0366be062d9afbe204143170ab2d8c0c96420800c7c2391b92680f SHA512 73db48d2caee8da04d9caa713ffd687f5d82ba1c032118c2377c5cf397396e7b4aefc76e3b328e4bf991c8d2f86f35e75a3875cc1464f7f1ee06015570a8ffd3
+MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/metadata.xml b/dev-python/twine/metadata.xml
index 3b7872fa6a97..ba7a8823ede7 100644
--- a/dev-python/twine/metadata.xml
+++ b/dev-python/twine/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">twine</remote-id>
 		<remote-id type="github">pypa/twine</remote-id>
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index 48fb322e6a9f..e281b95ed916 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="test"
 RESTRICT="!test? ( test )"
 
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/readme_renderer-21.0[${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=(
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
deleted file mode 100644
index adef323d40d7..000000000000
--- a/dev-python/twine/twine-3.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/twine-3.0.0-tests.patch"
-)
-
-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
-
-	# requires internet
-	rm -f tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
index c41930434c29..49f51f7098f5 100644
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 165f15fda5cb..0fa382da07e9 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -10,6 +10,6 @@ AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e2
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-19.10.0.ebuild 5789 BLAKE2B 33995700df1fa184e1612aed28c2a42b413c8b5454c13a5e28ede8aa1398394b1e78159b8cea5210f18cccc10a03943a001e46d440240d2d588bd8a5c77cf097 SHA512 1c5428786d6aab20ef667578dd66d05bc22c820105fd700e1e0b15a2620985f10ad71dae14f88ccb9ddee1f155934cba4d3d01e9b87990ce521eedf3d751b45c
+EBUILD twisted-19.10.0.ebuild 5779 BLAKE2B ff2e99dab9506621df1f30a47435a3bba2e689e26722fb1b6fd110e063422f5e5cb9250de71e7acb528caf22eb3ec9022cd790e096acf93fbebe37b27fa22fe4 SHA512 cf4a6b161e4958e0de605d271cfa3b84defe1cd2703e692b79cefc5c98b19fea2d1463837d7554655165795e161d59aab26751997df3efb08cf4e975b847fd89
 EBUILD twisted-20.3.0.ebuild 5595 BLAKE2B 954a85bfcd63d4a861d3eede43a2e3f47f49d75aff3d3c11a78be5995d5db0b11e962a55d52e42b0bd0d819bb1b336cbeeaf095d406c3591e7ac6b21ccd8a2f4 SHA512 d0dc5e956273dc94d7b7f97d18dfbb14b7e42e9fdc9bc801720121f80ce3fb46de8acdab79690b1756e963ab598cec308aa1997539a81860ebe9d6689f76b369
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index ed3222af413e..04a0f3af2fd0 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 417ae9d1ee69..e5e5025245b1 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,5 +1,3 @@
-DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
-EBUILD txaio-2.9.0.ebuild 1277 BLAKE2B 6d2ba58eed43d55a7ee40cbc3b1e4e604b45712796ad8f156e17c155edca9ca4a17961132770a8f44bdbfe3b26738f86af1e646c00297c6c839d672910b1609d SHA512 85b98df51df9b0766c2f07a62ee5b90c240c8d8c8d0ebe700890701db5e05bc06bd6a84ede19c811bf47e1218dd78c72003df52c7025b8720d6c4406e2137dcb
-EBUILD txaio-20.4.1.ebuild 1249 BLAKE2B b839b8060abf717aee74800148e92e52a3fee9510afd7883589708d7caf6e1350fbd8ba3ee599a0825f27ce625a4233198870f28015d240865edfdd19df1e87d SHA512 1820065ebb532b221c7bcdad6c97b94b353332f346d11d7bbf6b0956d43a7f9a8e7e9a92a998fc570be7bfc78ca59613f12aff36ca68172aa1224609061e3797
+EBUILD txaio-20.4.1.ebuild 1248 BLAKE2B 97bd4fb4d67b25f5c7354ad2db0cf455e45dbcc09a5a60b78de6607069597a237f9a1c4af5254c0871dacb11d84036f803655befef85e2de26bb331b521099d8 SHA512 79466def4ee99c900e3e89ef7fc1462c5f5db19f92802efdb3961fb89930604d54362a3decc835cf01712edf9a38c67c044a5389dba5c2f074dcd625f87d4c53
 MISC metadata.xml 492 BLAKE2B 5a30e6aeef4fe8e51cc945db2433d0154cad032923fb596c7723ea85c0e26097a55367c7f7aad898f8e92d7e0bc25cc8e15f846e2e620c956df7918a821c35ba SHA512 789bd30cb7a9467c4fa2b4495294b2c17fc8ac5e62cfe94b44d942e73a4cf76674b65866607c7a6767ceb6ea92f8dbde7dcd2c02b83829d2e82219c6aa5e4c38
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
deleted file mode 100644
index 2ecf87e168a7..000000000000
--- a/dev-python/txaio/txaio-2.9.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=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 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	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}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-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_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -v || 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-20.4.1.ebuild b/dev-python/txaio/txaio-20.4.1.ebuild
index df0478fbc6ea..ecef57ee9400 100644
--- a/dev-python/txaio/txaio-20.4.1.ebuild
+++ b/dev-python/txaio/txaio-20.4.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 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/txrequests/Manifest b/dev-python/txrequests/Manifest
index 4afedaf01c6d..aa1aeffc1293 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,5 +1,3 @@
-DIST txrequests-0.9.5.tar.gz 5265 BLAKE2B e5e3cf66abc394ae5c457b0d5144fdd1d09af5fce651f888bd44f0e48d6d1386fdfd2ca1d350ba1abc856102d051270867a2da96b781fbacf53de01f80158f3d SHA512 e9f527eb2fed0038d7e68b5bd74d0a0e58a1d7cc3e181068423dce871ff10b2d5f1ae92e44248e75b4ad8d44b32366ee9eb6cf8fdd114a562baa6b35fab6eb7b
 DIST txrequests-0.9.6.tar.gz 5306 BLAKE2B c1b55835c360f27c519371834de6cce0760e201a746d960425d7bef98e10cdb421d4db90b93bccdfa05b1fa2d5d6258fea4cce93fe62c7e9ad75780f1a5a89e6 SHA512 3892e121417b8346a2a2db02f8f4143b8f87c060cb4d48dbd07fa77559cfb0caf5742b257377ec0a746f2b995eba36f419a1a5b19d83a0c343cd39057dd34fb1
-EBUILD txrequests-0.9.5-r1.ebuild 533 BLAKE2B a7fb8a29be268440a373ee41decf110f025cf6f9de1a5f3df372e982008d295b47e105e401eea4e628de1a71aa269034391e3b8ff22e62fefab67b3f9a5f2cc8 SHA512 a0b43267e48b7215b250dab423d9e6f16752fb79437effc1c90bf6d0694b1d09896f3aa4d65f2c66e22fbd90804278875b87ad27db4e6f5f8de8a7ecc15aca17
 EBUILD txrequests-0.9.6.ebuild 525 BLAKE2B 63b0232a9c23d1f6fb1dfddbe71bc467cb6a11696b62b4fddc7d883865585ca95e2d50cf137bf1df12aafa858de28485a5143e2cc93935c3df2c10e35a3c5d70 SHA512 6d801f355f87110dc73e762c68b368c69330cc2d1d470d8ab3525b7bb9fdd99f425abf4ab422c9aeee424fa74b03410008f385bfe249785208deabf7bffe29f6
 MISC metadata.xml 716 BLAKE2B 6c7c888fc46e965870217d426859d9ccfc86acbe765b54b1451764bd959d5882b9d7293abd391043e29cb3c55b6774ee2ea745a19bda5390be6a4bdddff79797 SHA512 c4712c102c4fff806db37387de7e272a7feb1b70f99e3080361e5aea38b463184d992fde20a9c46de203255c4e78520323f5a34ce682c559c06188cbb89ab0f3
diff --git a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
deleted file mode 100644
index 123a0eddff0e..000000000000
--- a/dev-python/txrequests/txrequests-0.9.5-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=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous Python HTTP for Humans"
-HOMEPAGE="https://github.com/tardyp/txrequests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 9019a021ca0a..a414d848f47a 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,3 +1,3 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
-EBUILD typed-ast-1.4.1.ebuild 562 BLAKE2B 24e63e1ecdec2e2bbb398f4c343500bee8e50dbcf73d82010c9288d6beaf6250db54561c7854d74371b5763f15cefceedbd8eda35eb8db366981ce59c2fe745e SHA512 f7b44b48c046d4cc8d6a4317b66756fb72134e2675d92c15bce1a56b314b4f4609f414381a77b02936b3e4339d9ba1ad368aced29f6f7c3accf1a9e23e234a04
+EBUILD typed-ast-1.4.1.ebuild 568 BLAKE2B d854196548ac86e7282da240da35b453887f43d231f237cfc265e08086499053c26b42a23f25d5dfbf9cd47c2fcc077a96360a49ece690642fe2d199d2a557bd SHA512 f3e7be91a676d71fb402bda7f772a03c5c9fa56b842853f4f75a0388a870f89000b28fcb96186449c91409f2cb30102088e20d91f46cc645f7c2db4aa201b94f
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
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 d667c9b90a4e..ed2ae5db3482 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 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips 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 4bee68f18575..a61cd80f4fda 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST typing_extensions-3.7.4.1.tar.gz 36357 BLAKE2B 69a1dc0d86c73beb54c5b727ae0fa71a8891e729895a928be48bad49d71858d2e1fd52e029fc7f129a6990e52587eddccff985ea902cfb392534f3a299e52d84 SHA512 ef66388d035bf69f2f3f0ce5708bfb8c2284392cc9ce1804f8ad47dc1adf021637e779325d2cbb30ee76b4408defb1aa51fd2ea8cab88de2d515ab4f543c9a6f
+DIST typing_extensions-3.7.4.2.tar.gz 38427 BLAKE2B 9d7514cb27b5a8dbf246b15c8643a0e6e80d74004a39dc5585c1cb662cd77b9d8bacc25a03f9da7cde51aba4bd932ee8ffbde75d95ef29ae03c9f7e25897c816 SHA512 7a74c4a97d8cda3e56830c92b409235ffbe7cf0c1685b7fefa7a275a0abf21937622d12c25b4163b4927f6269ed689cbd30f95990ad0b7d2d4341ed648516819
 EBUILD typing-extensions-3.7.4.1.ebuild 798 BLAKE2B c4ce0d6c159da89ad63a4cb8f858d44e1aa25180f1536b96258e3a860b175bcf1bf1a1e8a6ce9737f735b10767314dc0664ea094bef847e7470627b3bcdebfa0 SHA512 c97bf9daefe20b239adf5979868c550e8ef1ed2cf662764f62fe176b51396d8a8dae3c066214ae52529dcb7b8b789945dc3d9ed7f9d78f5e0c14f2f6478a4fa3
+EBUILD typing-extensions-3.7.4.2.ebuild 719 BLAKE2B db1f7b94debbfa2b792869a3ee51b2ee3a6f71b3e0de815780c4835bf70b606b7652b65a6fd457f1a4c3efd6656ce1f8ef04c441e9d9178d0877278925b5bbc2 SHA512 5a0d4f63549b8ae636092d76e46afaea51be4b016f4697a597f82f74bfbb90141d92f7d6f91547cb4a9d7757a842a1dedb4c32b6863f3dae98392f05c2409328
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.2.ebuild
new file mode 100644
index 000000000000..781bc0f632e9
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.2.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..8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Type Hint extensions from Python 3.8 backported"
+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"
+
+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 b29bb6451b90..53ff9ec9dcdd 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,3 +1,3 @@
-DIST typing-3.7.4.1.tar.gz 77982 BLAKE2B e770b1c028142a70799732159b295d3bd5c4911619fd5f200567f8b27813d86de643e9b79aa45fba8590c1e2a6c96c1411dabd0707190a237a79f6f11851e1e0 SHA512 5f5080bf66b1de094b7984ed3d1de22651de8ca018ffde927dfa67fe65b13f91602a877faa24e73d44558638b609be276b924b894d63999bb93b0657a2d5ec6e
-EBUILD typing-3.7.4.1.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
+DIST typing-3.7.4.3.tar.gz 78592 BLAKE2B a47991466db75729620e180d230917cb32158475804b294d2ca956544c575323765bb9d2fd87e723fb8a6c79db4c0c83387fc45fe31f8c55a802bcebe793b997 SHA512 01d3d33bf3264a8929242d58ffa3b6a897a9ce23cb84858871146ed516a6ef2fc222d3001bb5197276da1a374ae243f0ceab0325ae8675ef0ffb76df5065ae1e
+EBUILD typing-3.7.4.3.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
 MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing/typing-3.7.4.1.ebuild b/dev-python/typing/typing-3.7.4.3.ebuild
index bd25896de668..bd25896de668 100644
--- a/dev-python/typing/typing-3.7.4.1.ebuild
+++ b/dev-python/typing/typing-3.7.4.3.ebuild
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 0b2a8d4118ff..de4655edb5fc 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,3 @@
-DIST tzlocal-2.0.0.gh.tar.gz 18223 BLAKE2B 46c3132c60140ebe93a7bc0848f97d7ee7481f29544ba93d11bd6de3a6ff2d17c9e6643a844c2dc6236ef26baebec070bc60e829a95283b7c037624bdb1bda7f SHA512 b758f6ed9677e9aca3909a65f64c45ed21e8301d20ddd620be58312661c9e2a2305bed90e8b86afeae92e6be9e38a35385c8b76ccd7cb12b027c341585d7a6a6
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
-EBUILD tzlocal-2.0.0.ebuild 547 BLAKE2B 033a8b495d5263e88265fba1afe791d6091a2403b3f43ffb4a7aae1bbb06a7113e7d1162e0ba857973569b317e6fcc1da3941fb2099bba3f2479551ce5c91540 SHA512 7ef867d3c0e0b8c7436367c5493cada1ef3addaf25a2ce4fce85dd66da244e21bc9fb48f755aa5305dc4934f28de7408f50ed3223919587247c72574177a7551
-EBUILD tzlocal-2.1.ebuild 549 BLAKE2B 41e6ddccd827051411da1929ffdb6f3f1f1c321db98f29fe8a80696b216c459bbe6d31d62aac8a111a657a10a90c8b8ccf94dc958be5389bef783951ea315fe6 SHA512 25a9cf4aa4681bb25623ea7a9a81c1ddbd4802207ea9438db304c728b38054b1c6fff3cc00dda1587c82b25ac7098e1a350b616b60f8cc7daaee2598bae8981d
-MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
+EBUILD tzlocal-2.1.ebuild 547 BLAKE2B 033a8b495d5263e88265fba1afe791d6091a2403b3f43ffb4a7aae1bbb06a7113e7d1162e0ba857973569b317e6fcc1da3941fb2099bba3f2479551ce5c91540 SHA512 7ef867d3c0e0b8c7436367c5493cada1ef3addaf25a2ce4fce85dd66da244e21bc9fb48f755aa5305dc4934f28de7408f50ed3223919587247c72574177a7551
+MISC metadata.xml 402 BLAKE2B ffb6b7524232f23d77799fb244ee455c98bf36b2284d2493e79b9fe6e41327fd9e2134e9e036678466226f895c481d81dd351db3294da3ccd7a7a0a0360daf62 SHA512 c29fedcb3c915065ee5fabb28b9bbf8cf9ec4653f9d3ac076706f3cfb9519f376756d752ce51ec15e4421842228693c4c24b3a15241ec8feee283172a3c00963
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
index ba2007a1fb81..feab42d1974b 100644
--- a/dev-python/tzlocal/metadata.xml
+++ b/dev-python/tzlocal/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">tzlocal</remote-id>
     <remote-id type="github">regebro/tzlocal</remote-id>
diff --git a/dev-python/tzlocal/tzlocal-2.0.0.ebuild b/dev-python/tzlocal/tzlocal-2.0.0.ebuild
deleted file mode 100644
index 6bda305afd91..000000000000
--- a/dev-python/tzlocal/tzlocal-2.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index fcd01ca65340..6bda305afd91 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.1.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 b4d7b984466d..0c6dd9b0ab4e 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,5 +1,5 @@
-DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
 DIST u-msgpack-2.6.0.tar.gz 19911 BLAKE2B a6599a85fcb386f91dce4d11fd8d10c6be75c1fe4e80756c58058bcb7c2934c2174afe65bc0b88e11c5c9e3f66b46c956c9209bb6faf74ab5c382bd665c412fc SHA512 b0f2fa677001705a8a1e96e590fd334d0561065e0617a56a31abd506907dc2446c93f8c4429e65e86c87f6d2cf3e19a921fa0aaccad5cdaf1acd1ae0a1235688
-EBUILD u-msgpack-2.5.2.ebuild 658 BLAKE2B 2050f42c8a8b9c011da96dc51277281c69fee78c671ab7bcd26e85515c04a37f2251d28c7b9a87ab600411d624a611783eff0f8ca78b899690cb5d455c9f28dd SHA512 06ae2f885861b707eb94d18ebf0c2cd13ae853462430ec3df541dc820c17a09d101fb0b74dd99f77bc0e2759a9dfc01c0e66560f8fc96bfbdce819c3c98ea5e2
-EBUILD u-msgpack-2.6.0.ebuild 667 BLAKE2B 2227705246a9a38d87a77db93736e8b787a2541f16d696df87ee279c0c9fab981a7a7deec84156b9da9f0d5c613df5045ff3b2bc1038073a8222e473c51f09a8 SHA512 8e4ac4c5a920578a7e5b03a2857aa61da91daf49b2c7401c661a4e0bc3934639526e9c4180f67722c5f043112997bbc39414fe4c50829f89d7c8898b422af0e1
+DIST u-msgpack-2.7.0.tar.gz 20427 BLAKE2B f4e4447635fc20ef5246bbc90ee9cc0b93eaa9d13a0384423145531bb8bbb21dc9d1ddadc075a4a5e456dd8cc758fed3add4b2b43f83c0115c78a0095030ff70 SHA512 b5a6676aa3eea878e3f1cc6ca1351f59ae0fdffdfe4d68c43303a1c5d257449bdcd08bef0fc75117b238544366e42b43c6444bb93ba63d1633aadd0c32061c8b
+EBUILD u-msgpack-2.6.0.ebuild 652 BLAKE2B 582c36afb53b81c72a67d948f66724f298a9c4d788fbd5c15d2afbcc9dee9d508322648892d983dbece9215fc243e40705e23aedeead0682472b7541ecb6087a SHA512 9400b141650b85d7484abe6d54d2143ea5ac0c48a6d915d85227df61ee4f033364c4e5666d2371c537d51be20b43dc225d56d0004a79b6c23ac519a9004f3046
+EBUILD u-msgpack-2.7.0.ebuild 661 BLAKE2B fb05633914823142a0d518b18acaac085e144eb150da4ee01084d647f2272398ac5658318795f8cec18aedf2a1d888cd93bc3aba76feb66f5cb1eeed9bd4792b SHA512 7d0c6e623abc1f0346980de4634b69248b865db28278411dcb056ccd05047263adcb272901dc3f559e36860a677085bd5191897ae0960f464c2b98e840dee268
 MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
deleted file mode 100644
index 74629fa79f8d..000000000000
--- a/dev-python/u-msgpack/u-msgpack-2.5.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=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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 sparc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
index 3bd4d2b913b0..f0ad14a9d10c 100644
--- a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.6.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,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~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/u-msgpack/u-msgpack-2.7.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
new file mode 100644
index 000000000000..30dea55f9b99
--- /dev/null
+++ b/dev-python/u-msgpack/u-msgpack-2.7.0.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,9} 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index b214319d538f..8f947cb681b2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,3 @@
 DIST ubelt-0.8.8.tar.gz 172347 BLAKE2B 94435bf8b5a5f67011540c43dd767393cda6bccf95b963ca74cf3ee72444de43828b87bd2e6aa93001fc2c7cd49e245c459b0bc8f2617f12da906ae4e3f194aa SHA512 f63b3a9de51176d00a12999d540080e381266bb43b15942580f7f60b230b2e52021937b0cb4b31e084e0b77c141ae5cb3b8ae000d7af196e0c2f293a960e7438
-EBUILD ubelt-0.8.8.ebuild 797 BLAKE2B ed0aefd68e06ad1b6845ec3b9c85c26bc5a5b6a4126b6f9bd8997152d702dfae92a2cb05edaadb48067398af48940b0dc27163da7ffa9726344122c3f6e8d2fe SHA512 a6d46bbcd6c8d532749fa91300a0415a17895b20d9e88ae97109164db334659ebcde1a6801c1a07c2761dae1589d87f54a3e068bba96055d4edaa5558e38ce4f
+EBUILD ubelt-0.8.8.ebuild 687 BLAKE2B 71c2edc511e51cc84c620d35b3f9c0818bb5c2195c06062d75f9d80d0e5925c3dbfc1454913857dfaa0e6694094964678c90fe76910c683b7ef4f18281f210b1 SHA512 159ba8de814849f59aa20fd6062f8e6e93ce93662fce4196e66d182c8a4da671d8d884bea50dbe4a6eccca581c70de601bf9d002ad2f0c005c7d6e9332708c95
 MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ubelt/ubelt-0.8.8.ebuild b/dev-python/ubelt/ubelt-0.8.8.ebuild
index b38c32e6365a..51131ab81982 100644
--- a/dev-python/ubelt/ubelt-0.8.8.ebuild
+++ b/dev-python/ubelt/ubelt-0.8.8.ebuild
@@ -11,8 +11,6 @@ DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing,
 HOMEPAGE="https://github.com/Erotemic/ubelt"
 SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE="doc"
-
 SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
@@ -23,7 +21,6 @@ RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-napoleon
 
 python_test() {
 	pytest -vv tests || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index c9aaabc68d1b..5a6042b1a5c1 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -6,9 +6,9 @@ AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664e
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
 AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e6093043d2f847ee68287b2f3fc497ee0bd98fb3974cae86e8bf9b0af69d088250b90871b5597bf046cb803ceeb5a64d6f60a SHA512 d59021415229142e673059bd18d313ac3886b70f39dc9e53bf592d4b796ceedd096468adb5c5aeaadf99c2cad2d2d6188ebdbe5b32aeeb83ba9cd1890327226b
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-DIST ujson-2.0.3.tar.gz 7127432 BLAKE2B 09fc3bdd127e5b54cfb26ffe56eced194d7c4aaab5717a396e06317de26f34815d04cce2b67ccb0157474165bdbdc62f0171b9485d7083dc1c01aa7252afeb5a SHA512 2c1879c372745966a00e064559dbf615f282ef192cbdbb29243c48169fc5f6e9344eba29988a1de3b5b0d1fe7699fcd88373d6dbb2e3fb59b1e8ef12b8a0375d
 DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
-EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
-EBUILD ujson-2.0.3.ebuild 583 BLAKE2B 24b7c4e57672c9700976bfe3dab1c3a99c6a5eaa81dbcdacc0ddaf46cf780b59b1ceb86097e453d35c54d9b1d605d07126a2af476c10475b95da45590a9d5cb9 SHA512 0d646f96fe82f4fd3e28ce4b0afe969a6035438f033290aad0a08905b4f800e20344df1d523a2bd86cc9fed5241d0a3b876389c8a1b09d16f8caa9ad4357a400
-EBUILD ujson-3.0.0.ebuild 635 BLAKE2B 7e8b8520525861b7518e3c5a1a53bf1f5bedfd83b2610bac87f9179f51aaea0c3f0b4196ef87a1b4933b557c386b12ce2d09defa886ec15e74fd4fb5870e412a SHA512 81cc447cf26dcda9a350c7ec09bb2cc88f6bdff8a26aee6c7442224fa16afb7cbe2008b349edace853b95595ebd6b114cd9517058ff496f4df169a2ced5e6862
+DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61799dff257f139510e4e97e9bba5c4742e1ed1f0b0e78dfcde0589f0b255c92fc5f3059b6cdd86279aabfe141 SHA512 c40953a4b5b55e894e42fccded618a9f2ed771904e1d1e90a28f4691a53fbd8b2fab3dc98a36b6e0637d2ef40ac87ebf9f2d8fce33cd3bc4e68bf7c18c7a33c3
+EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
+EBUILD ujson-3.0.0.ebuild 631 BLAKE2B 88b9cbbced507463e6aee7342f0d76b5468edabf2f009d7852cf153025b6749679cc339812f32465a34879df11428f7f3aeb3ab6baf2aa78a57798e015055ed5 SHA512 390ec9c2d42d22f229463fcf3659e96bc025cd0eb6dde344e4e45c85a9fd9828adb07903a98d6b20fdf9c4a834b13cbbc4c9b991da7958e30eb9eb8defa89450
+EBUILD ujson-3.1.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 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 4a266318bd20..e2968cdabfaa 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ujson/ujson-2.0.3.ebuild b/dev-python/ujson/ujson-2.0.3.ebuild
deleted file mode 100644
index 372e2a70e70e..000000000000
--- a/dev-python/ujson/ujson-2.0.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=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 ~arm64 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/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
index 60a87e3a0884..f865939a1276 100644
--- a/dev-python/ujson/ujson-3.0.0.ebuild
+++ b/dev-python/ujson/ujson-3.0.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.1.0.ebuild b/dev-python/ujson/ujson-3.1.0.ebuild
new file mode 100644
index 000000000000..18e434f25cf1
--- /dev/null
+++ b/dev-python/ujson/ujson-3.1.0.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..9} 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 ~arm64 ~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/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index df9bec1cd59c..a31a6d8a5ae8 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,5 +1,3 @@
-DIST uncertainties-3.0.1.tar.gz 225752 BLAKE2B 6dc872d5617b8c4e9deda5a5a60492ae1eb0facd7f053f0799b3762831f9bad7da39726811feffa3630091e00dbedf89c296ed4e1b2b1f78399ed45663ea5339 SHA512 d4b2a905665c46224586f5f9702ad9e69580fc5afe8c6c045b04141fdc54e0c402cdee033ee0ee7055823b922bd33c732b3066453876509d45add15abf9d85f5
 DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
-EBUILD uncertainties-3.0.1.ebuild 981 BLAKE2B 310adc24cb8f21eb5d8c913894c965aa6ee264e5b5ee4d299f424c015e7f8f2c72fdc7a47e0adc6d4cd8345a9651660e873b1a7aea1a1258ac3eed6bf85a7b2f SHA512 b6999cbdb6e9403fb2c4737a1dd5e3dbb0e2bff9bd26f0b29ba8679c3986f1ba919eea9d643f1866dc38c7523048cac9621a17d9a83d717a68a03d1a48d21619
 EBUILD uncertainties-3.1.4.ebuild 888 BLAKE2B d596855768d480ec5cfde978c737ed5d945603fdf011ad766c246f6acff8118f133c0775c808d479bfdc456871d1eab87a13a17048e05d87fbac49580d901a07 SHA512 023e083079fd873c91282baeba2abbb65a4ebf23cde330285d9e730630a68a1b34425838217fb161e77afd46febce0c8276ae6ed91480e50ae7f3ef8718a4c63
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.0.1.ebuild b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
deleted file mode 100644
index f27c1d6e6cd8..000000000000
--- a/dev-python/uncertainties/uncertainties-3.0.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 module for calculations with uncertainties"
-HOMEPAGE="https://pythonhosted.org/uncertainties/"
-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/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-ppython_compile_all() {
-	if use doc; then
-		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx
-	fi
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	esetup.py nosetests -sv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index c118f9468b88..a6010febdd3b 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 649 BLAKE2B a328cd996028dcf8a5fbc3706e5c31645994f45a8c5ad4280e52c4f14a6908c99adecc817e80b27b86bc51b1b2951e67d2cca5143d3c372305a944cc068dec38 SHA512 bc2df62fbf420cd5a9ddbee9a942667c3a427872fe721fe9b8c241bb8226fc4a0ce2d624aea1c362a8c564d0d074d31920e0e0f5c2f09476ad711f87c1c99f4a
+EBUILD unicodecsv-0.14.1-r1.ebuild 643 BLAKE2B 15ae8014583c85c16e8be8f9cfff7841dfe47834de6daed133ea27d0e75c2046460b4e0e38bde81cb7a4435e0cf8b111694d71fdcc96e5fe7a8baf8b63561f0e SHA512 6ce5480859006a7980930fa4ca521a82827103e5cf6e32c1311f203677cafe29fe8f29d2c0360e889959813f15fbc3dab1ea80c9d064c3b4f4473a549f919994
 MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index 1b726c42c610..50fd55ae79ed 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 19b8311cb79c..71dc1a5a5f1a 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6.ebuild 643 BLAKE2B f8be96e34e6d50cd91823bd5db5e59ea5f6d012b7ce31eeeabafe4f79c3ba3990d261dbf4ed271eeada5b32ed6ebe57ceff8a3ee4b0c59366884f74d1b1e4dc3 SHA512 edf7528a0c244865db51f82b6e8b53cfc0affc2ab01e85cd2cb2818774e68c99e014ea35fcc3b34e3086dbce31ac5fe1af8633df93f7c55794fece2c5bbac2e5
+EBUILD unittest-mixins-1.6.ebuild 649 BLAKE2B f663948738041d8f0dfe1eeff5c28f09a9d4874a2853796172dd959edac9acff9922aeb8c5400755d22752886010dffb35d7889376c7b738c572346327365fd3 SHA512 b0fede169a1966dc001ea5789047392a3240e37c0410c6887c0018de4044d8dcfec87c3b3c8b92ffdf98b3e87d27dec89bbfb7813b937486adcf1dde6dd4c347
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 0ed9e7b35211..81ad947a25e4 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 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 0510ba7718cb..915ba9964bb1 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,7 +1,4 @@
-AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
 AUX uranium-4.6.1-fix-install-paths.patch 1584 BLAKE2B 45a4461a2dddf00772098c0ab374fc511dcea1fc2eed94c563e1088be61c8ca6658fb6dbbf6bf2b628bd021d937fdef98a9b9b07bc861a9c3f84954fd38ecb5a SHA512 fba41223d1e14a25232b0efa0b83ccdae9e86bc18f49c5a495c2e3058bacc4a3647a567c346bd0184b22f25319c8e63e1f92fa13b4cf50385dea57d03013494f
-DIST uranium-4.3.0.tar.gz 899153 BLAKE2B 314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b SHA512 eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
 DIST uranium-4.6.1.tar.gz 1013314 BLAKE2B 2a89eb1c4ffab35879eea9a681ea20e9cc5f78736d9c8bda5bf33baf5ef6d3f6418fd1f4b779738d644afd2d553d500c4892559ae402eeab0c38a4d95b295cf5 SHA512 ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a
-EBUILD uranium-4.3.0-r1.ebuild 1742 BLAKE2B 3165ae0a2295a570aea9bdd1985e935cf7a7dc2579e90e4ca7f9f65062949ffdefe1f15d52f3682cc76ae5087aefe0c5cfae0a41a44acb21661eade504f795a9 SHA512 fc01a7524769d5f70b21790a67e8b3beb61bbb9a34a4dc79f370c03f7d380b19ec9b23631fcddb37c5e34d8d3984aa5c2e0711b3a75612bf4ee811607c2004fe
 EBUILD uranium-4.6.1.ebuild 1767 BLAKE2B 1431554d0fc021d74e951bbac246880b3f74c5dd1c388a46481eb8a038b3342362b8cc13dddb1dfcf6fd58b8b6718a1e40775ec7f67d939fc67e32184bd045a1 SHA512 96d1d8a702c4d26b36328ee4873772f3c2ef907706e90916f1e60ffabf7cb9d08b57072e2e52c952e84184755f475cdf42bfdd2a6744aba39caf5c9e0633ec8c
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch b/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
deleted file mode 100644
index 598b93346a4f..000000000000
--- a/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Uranium-3.1.0-orig/CMakeLists.txt   2017-12-04 18:02:00.000000000 +0200
-+++ Uranium-3.1.0/CMakeLists.txt    2017-12-29 18:57:22.493045527 +0200
-@@ -12,6 +12,16 @@
- 
- find_package(PythonInterp 3.5.0 REQUIRED)
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+           STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check failure
- # In addition, the specified pylint configuration uses the spellchecker plugin. This required python-enchant to be installed.
-@@ -48,11 +58,11 @@
- if(EXISTS /etc/debian_version)
-     install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
--    install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+    install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
--        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
--install(DIRECTORY plugins DESTINATION lib${LIB_SUFFIX}/uranium)
-+install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_LIBDIR}/uranium)
- 
- include(CPackConfig.cmake)
diff --git a/dev-python/uranium/uranium-4.3.0-r1.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild
deleted file mode 100644
index b5516dcefb70..000000000000
--- a/dev-python/uranium/uranium-4.3.0-r1.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 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}]
-			dev-python/mypy[${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/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index c7b084e0f87f..b894a10da1c9 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,5 +1,3 @@
-DIST urdf_parser_py-0.4.1.tar.gz 20017 BLAKE2B 805ad1f86b7d79963cc03070efccae3a44602bb309949bd5f3ac613e48e9f6cbae01ba8973e128d654e88c51f59647828a2360966664b5bb0b045116dcb61092 SHA512 08466a76e64cd46b1e9188aec039b8a0c20499c43be7c859d98c55f2d8d36305a76f780789a019dbd2e6badad90e9bd421dcd1bc82d3b8529fd08a9f9d5885f3
 DIST urdf_parser_py-0.4.3.tar.gz 21317 BLAKE2B 8ac3806ae2342dcef10adf952c0027c11d1241e4448b64a915acdcbb5145486c3d83bda344f2d2bd82fecae27f95ce223896e6762139f6ee7c5f687338ad631e SHA512 235f9648bbdcc57ae28e4029844dfbb4d7875b82849b24a76ee9f75391f5b93e7ead73b3f1f0216c17087017055364277e51bc03a09fa7901edee2fc7acd65aa
-EBUILD urdf_parser_py-0.4.1.ebuild 720 BLAKE2B 3b39a9648fbcc96ca3c121980eb5a58e01086e142553e45f57446498cd29503569fff060f61a5c182683334235d0dc4215828194a447a9d2a8925ff96f09feae SHA512 c6b6fe0e44ef656900bdd74bd33d11ea566c5ab5966ff4ea4ba017192b86af2f365283c3d334a93af3cf7e5569d39e90c9f1ca90e8a840f7b87734c76b7db6c9
-EBUILD urdf_parser_py-0.4.3.ebuild 777 BLAKE2B 11df2935a48dafa9d15a7fcb27f7e03cffb107299bb3465816016f74b9e351ef7a9c771d5befaaa6bb5edda260caf46e146d71c0c0874ef7ac267b52d680d6c9 SHA512 fae43e3b40f81acd70711940046feb800c0f1009d34dba15dd6c028ac66963be8ea78944a101b23afd095e04817cf842cb199ecf46a6a67cc78e29225d2dbdc5
+EBUILD urdf_parser_py-0.4.3.ebuild 778 BLAKE2B feca51969303ea9e05274e8bd4699d2b85c848b6cbc91001b626ee5c0315bc1d74c7f53388dfd8295c68308531cdbdcc0ea2826f3041399a781594b99193d076 SHA512 ce17f6559c2690cab0932365a6dbe11615514fe5b840bc906d6e6a9bd5345b9a666144b1b1362a175ca6235df8f3bb661514acbd8886cbcf9b683149a7df8224
 MISC metadata.xml 332 BLAKE2B e32fdf158e352a3e43c6465c4ad378e44b9e01112f06e245d717d9ab6404be91a7529dbfd7b85d68fcf0168b296d7a6e55465f9a7a291112195968e3d3863361 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild
deleted file mode 100644
index e69ddbca8fe9..000000000000
--- a/dev-python/urdf_parser_py/urdf_parser_py-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
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="URDF parser for Python"
-HOMEPAGE="http://wiki.ros.org/urdfdom_py"
-SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.3.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.3.ebuild
index 445b2d168612..24d46b9d99a2 100644
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.4.3.ebuild
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.4.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="URDF parser for Python"
-HOMEPAGE="http://wiki.ros.org/urdfdom_py"
+HOMEPAGE="https://wiki.ros.org/urdfdom_py"
 SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 80f10dea1868..44ce1c6ab330 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,4 +1,3 @@
 DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
-EBUILD uritemplate-3.0.1-r1.ebuild 667 BLAKE2B 176a989cbf0c051b9f4a411d9c302338de66479fa411abe6da8bffc318b1a9b07984003b6e9d66fd3ee3785622ae9e688fbf1fac9faf154dc6beeb63738d6c27 SHA512 c87224ccf2e815bbe1d2c76093ef2800dbff804b8850ebccb00a2970b35eeeff62d7f4163c136731dd1b3cac8e2a35a56267a976378b91f3123d941ee39eec25
-EBUILD uritemplate-3.0.1.ebuild 548 BLAKE2B 70c9b5bd863dcd1427231cb798715a06d3d00014661d01ae3b39aeb1602722385862b59576606e1622d1a17e1bcbc1defc566288664f0addb37157801f1cd3cc SHA512 5d92b7d79ec2b0bacf65d6cbac85e44d604094f684185e350b81b325e272980ad7ee56867f7548fdfad67655625f22620c4a0c35735a51d96f60bdeacd9228ca
+EBUILD uritemplate-3.0.1-r1.ebuild 663 BLAKE2B 0aa1ecd5d1ac9f4a7c1fdc9ed5be33beeaf78bd4557257500da7d62097b936347e17b1b8c48ef6857cfc07e6bd96621d32bee3f419a96c2001c4ae76ef9675c5 SHA512 1f6d156d8eaffc85dcacbe8d5c7c560d23b32682167121bdb6a9a45a8bcd6e736bbe8242a123914f25c3fccbebfadfa2cf2d17c2ee153b5f812ae4d3748137ae
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index 250a5e8d801c..7c7dd36daee9 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uritemplate/uritemplate-3.0.1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1.ebuild
deleted file mode 100644
index a4ea032e684f..000000000000
--- a/dev-python/uritemplate/uritemplate-3.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,7} 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 ~arm64 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/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index a7917d1fcb66..bc1590aa3879 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,3 +1,3 @@
-DIST urlgrabber-3.10.1.tar.gz 83735 BLAKE2B ea0b3c071f968b2632e89cf225906740685b0f1134d41cf8aaf7e6361110780f6c998b06e4d79527be7e7953c5c4a617d039477135135cc7fc13a0426f0d9ee0 SHA512 c44d32b17c5f8984d09ed46ae36b3e05dc69d041820cf979029bc325d8407bbd7e324f264be5886286cd99e123f51affec26638cab6e525f85e2a1c4247462d7
-EBUILD urlgrabber-3.10.1-r1.ebuild 690 BLAKE2B 616a06222ba081083fd7b7091155de81a3dabe61c8d18368c86b6227717d3e797722fb4c0334b62414e44ddc8775b5dd00d20a18dfad3541efb6e3b992cb5810 SHA512 98fc0b1a057a877e34cf1984a50dd2e65a5abd013d0a930641ed4bcab80c4f4e7774fb3c37d1fa764b9fdcfebf8740eb957788830cc1707b749c06eae59e2f13
-MISC metadata.xml 1485 BLAKE2B a3ae1b3e600f302d2b5c32faae061fc44eb5924dbcacf1c9ea33b546bfb938b65f4541ab4a1427888f1233e3a19292275cdb2030b04f57f6aac1a36b2afe2444 SHA512 cb471d25797f7e39e9b27a6ad12131b2942e4f62128cdf02d53693b478c80a0cf3b48d0e562930149a98dcb2f71068e11475fe8c2bcddcbe010564beaa34df2b
+DIST urlgrabber-4.0.0.tar.gz 86308 BLAKE2B 15195336d8e19331134b3bc1de29a669b80ab62c14e613fbcbbc1b8be8cb4ee1da3df317591989c6a3e3a403f8ad9071ca866006f23fbadc6283e88d5f050290 SHA512 01579281b1548c71737166daa6dfb7eaafceaf4afd9703f8e5e3193c33613750cb4291e3c7939065e995a173925965a16e656c43324f3b599f9c83d9e479e8c1
+EBUILD urlgrabber-4.0.0.ebuild 535 BLAKE2B 633a59ef8fee2c4c829978758c7d03ec5b5c559566a43aa1cb8fff68b675d8211df2b923dd42e3822ddd24b6ca9126ebb6d5a737ccfbc329010ca7a153c78375 SHA512 cad88565c543d06f3437006f50bfbd0067cdc3b2bd17c55da218fdd0a5d9eb7fa4100eecdfbefd01a9bcb5ea757b43a0c637dc55379e5284b9c12062f7daa190
+MISC metadata.xml 1510 BLAKE2B ea1a51d8b138d90a3349f373ac2430b7d943c80b7797527b07dcff99aca17887a4898fe08aed1bf1ee1f070716debb6bd0e4d25225cb46fbb0a8964bd1e6db10 SHA512 200f3e524f8762fc45876d9b2d1e1975e64bc17384a0f3a53b1459f7e4ac2d59f3dc7f80e6441e467af861fede9e6c1ae1d1b385fce3f586d99ee57291534f3d
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index a1f005301924..61b9e764b90f 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -33,4 +33,5 @@
     * mirror groups - treat a list of mirrors as a single source, automatically
       switching mirrors if there is a failure.
   </longdescription>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
deleted file mode 100644
index d66088a5f87d..000000000000
--- a/dev-python/urlgrabber/urlgrabber-3.10.1-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=( 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
-
-src_install() {
-	distutils-r1_src_install
-
-	# Fix "#! /usr/bin/python" to not end up with Python 3
-	python_setup
-	python_fix_shebang "${ED}"/usr/libexec/urlgrabber-ext-down
-}
diff --git a/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild
new file mode 100644
index 000000000000..aece0892c4ca
--- /dev/null
+++ b/dev-python/urlgrabber/urlgrabber-4.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_{7,8,9} )
+
+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"
+
+RDEPEND="
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+
+# Entire testsuite relies on connecting to the i'net
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 16134f42e692..ccd4c3c230c0 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,7 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
-DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2
+DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055afa443c53ec82fd9227348859566e20ca33b803972134be24eeed070c63b98e6ae75efde4006e2a4bb7b4cf3f054 SHA512 5718dab472a476bfd555753758ceef46c81dc358131205b6db05d186a66f397dc07252eda1622d12586390ccf14e8e17acdb9486c17cb7d34e323287a67373af
 DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
 EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
-EBUILD urllib3-1.25.8.ebuild 2536 BLAKE2B 1a5167611d39195efd2367a47f709e4e0350f879a27f90ef4ede33fc5c167aabd1b3cfca4e24177649e2a1b12cbb1924860d2ee930bc683d581dd3d857d7be3f SHA512 c257bc9443f3f5464c5d33a79cace27e9305bfbc2b1c2e374a46613cd5d926acf24b298bb79b4fe55a30ea816f6b41f8f9fd3b16fbe129b96e48e45e8ec2af4e
-EBUILD urllib3-1.25.9.ebuild 2108 BLAKE2B baf4fc80008da78cbecfdbd23bf43eda778c04df3aa4b833c8da23505a1e01ce2844e719c917715ac5c2ec5f9fdee8120cc25fd4c32e81da745489fd05a431c1 SHA512 56e0175d192771e81513167872a0df697ed6fab1ffad6447e6ec11659656b3d2052e117290c829a2202d7839c439cfa1a0792c2cfb27bea0dd410e859cc2165b
-MISC metadata.xml 523 BLAKE2B b5104cb8130aa670af99f36a2853f4ccbe78f367d5e80a3626a5323237af5f7da1ba6fa5d83586afa1072753f63d918197aa97a578f7e2f1faa82f457c7947a9 SHA512 3c384cd1d75e038ba7b7d3aee93f2f9cc05b61710cd6f45f2f250392994caa253b6c783ce5f321dc72a94e1e94e12527a229d652920492637dfca4eb7b13c457
+EBUILD urllib3-1.25.10.ebuild 2114 BLAKE2B 94beae886893b2e331b28b0cbe14b98dc1346a0a60aaa2e845252438599b1c39f4cc70f965531bc2b8a49ebeb397390226dda0eff10af1a88f664d287da96940 SHA512 a16b329a40683179c291f13f9c97b5be28dd10767a04f927cbb10a2f93f624bc7720fd4e784826ed68db1021a20de70451833d23f5d0ed6c1afb47c542866841
+EBUILD urllib3-1.25.9.ebuild 2106 BLAKE2B 365be3ed3d45043b7f2bb1f8c414570d412273c879984c1d9ab41f486f0e8a39867414f0d11afb0758f7620086da92ff134739852de82cd3bc5af2b7e094e164 SHA512 3c9b415e8aaf9ea37d7ba4643ce5efef645d4e00b4c687295eb3057acb9e95e4dd23043107a269bb64b21e78dfe991e55129bf7f707a5d0684793fa441868a79
+MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index b3b12e9ba782..c5e3b54263ca 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="brotli">Enable support for brotli compression</flag>
   </use>
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10.ebuild
new file mode 100644
index 000000000000..e724f3938f78
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.25.10.ebuild
@@ -0,0 +1,76 @@
+# 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,9} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~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}]
+	$(python_gen_cond_dep '
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
+	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(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_{6,7,8,9})
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/alabaster \
+	dev-python/mock
+
+python_prepare_all() {
+	# 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_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	case ${EPYTHON} in
+		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.8.ebuild b/dev-python/urllib3/urllib3-1.25.8.ebuild
deleted file mode 100644
index 06d98f955dbd..000000000000
--- a/dev-python/urllib3/urllib3-1.25.8.ebuild
+++ /dev/null
@@ -1,85 +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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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}]
-	$(python_gen_cond_dep '
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(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*')
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# 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_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_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() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		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.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild
index a3c2ed92451e..7281a44b4413 100644
--- a/dev-python/urllib3/urllib3-1.25.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.9.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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index b41363f331fe..a8c2bd4052cc 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,6 @@
+AUX urwid-2.1.1-ignore-resetting-to-invalid-locale.patch 998 BLAKE2B c76965b4bb61df264d01ec898d327f99e761909f49b7fcb5fcf222eaf74fa50fd89d16477d48d1fe939ed98d1c3c55969cf0b6e50204e26f6b0adf395edfe042 SHA512 d2aa4e8edc96583b7a1c68788e9301d200004100a00fa03157e0c6cf0f295b1320c1f1d249c9b67d30766cad65ee36ea1b5796fa9312f8cda52b509e4730af67
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
-EBUILD urwid-2.1.0.ebuild 995 BLAKE2B 7bff9a6384aa4b023435fe2b4f990e7cd5550fad6ee70b904f59352aaca405db45217c4c76def3c0f2d806bade01761e9bda77f1662abdaacb3fe0232e46c50b SHA512 164cb4a14f51d2a2de09f88071a95e6ee5203e04559ac882b16c72f3555b3e9be1d77bab9c2aed6c2956728cafd35887b922ed10e9e123e97c49061254dd8aea
+DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db
+EBUILD urwid-2.1.0.ebuild 985 BLAKE2B 33914c61c857f995ffa096a08e27bce1ba5137130b8d1aabf6c4cce08b3eeb1d2a7795bf1fe1593adb23774d394b9022e62ebf8a8500ae6f42f7597885638a6f SHA512 23acfc9e34aaacbb8ca3f929934989dfd992405ea460adab19173d570704bf99291a2352eb78bb5d731b93ffe82703a095410df79180821059b3c6a21318954a
+EBUILD urwid-2.1.1.ebuild 1102 BLAKE2B 4aa5b866c1a91224051f3be17cfa61fe49de279607a458f7534900f58e3ed1e97eb058680a886e74f183ff40ae606f37a26ca3655d8e1581debc4f38b6398160 SHA512 d5c752a2e7c8bb1a686ddebcd420370ea93c779c4fdfba5be95ca0f735a3989f011c525809e94412ff12b51881244baf4b2bfec0fd28a0812cbf70bf441f1958
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
new file mode 100644
index 000000000000..61549a50d087
--- /dev/null
+++ b/dev-python/urwid/files/urwid-2.1.1-ignore-resetting-to-invalid-locale.patch
@@ -0,0 +1,32 @@
+From fd010f8336407ad1a42522b424d2ea7b7800ebc4 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jun 2020 22:26:23 +0200
+Subject: [PATCH] Ignore resetting to invalid locale (Closes: #377)
+
+Resetting the locale was introduced in 5dcf236, before that an invalid
+locale was ignored. Restore the old behavior insofar that only valid
+locales are restored.
+This fixes the unit tests of scottkosty/vit with unset LANG.
+---
+ urwid/util.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/urwid/util.py b/urwid/util.py
+index 17c049d..acd62f6 100644
+--- a/urwid/util.py
++++ b/urwid/util.py
+@@ -55,7 +55,10 @@ def detect_encoding():
+         else:
+             raise
+     finally:
+-        locale.setlocale(locale.LC_ALL, initial)
++        try:
++            locale.setlocale(locale.LC_ALL, initial)
++        except locale.Error:
++            pass
+ 
+ if 'detected_encoding' not in locals():
+     detected_encoding = detect_encoding()
+-- 
+2.26.2
+
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
index abcbe910f5ec..497c42bd4a56 100644
--- a/dev-python/urwid/urwid-2.1.0.ebuild
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
new file mode 100644
index 000000000000..1492f14e7d41
--- /dev/null
+++ b/dev-python/urwid/urwid-2.1.1.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..9} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/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="examples"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.1-ignore-resetting-to-invalid-locale.patch"
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# optional tests broken by modern tornado versions
+	sed -e 's:import tornado:&_broken:' \
+		-i urwid/tests/test_event_loops.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index 2b1391982e83..5615101a0f3c 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,3 +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
-MISC metadata.xml 463 BLAKE2B 9539bdd0e8c0a4651230d24a8aca67f0022cb42bddbc5e7b288544ab86977ac382326fe53e2ed48425518a6b7a1c84c3afae47fe1bf164f684197a34788b75be SHA512 ccda77efadb8707e1c16cb1bc944f6380e5b0888445614fb40b06fe041e68698b59fd3ca67059f0913cd452ee7aa869b839e0654626dbf1e088fec7cc49f5402
+DIST urwidtrees-1.0.3.tar.gz 292930 BLAKE2B 91487debf4878fb58cf2505366a4762a4c755b53eaac86e3ac912d2972c66442828e152749f34e73ade10fd1b912054e4047900e0b54b960629909c1b03e2270 SHA512 f7d69d359ba24345a694659fd9432335679f4b505a5c0e33baf9fc0c068935148c393aff8e11cd5f2c12aa26884aa37ba86e9b3a763472e382d73dd57fd32cd6
+EBUILD urwidtrees-1.0.3.ebuild 668 BLAKE2B 7ee94ddb554d4ad1cd8c0cfa6ae62617e3ff2fc3e29dd5d5eceb4a49b91fb5bbaf0f51831fb4e91d1325897e8ba56752cc370c8ff9a9762282770de6d82b7285 SHA512 a0f37453a70174eb503902b4a57cae5fbbef3796ae185d05d98d888ed918445131de63f23d88a12233672a861148745a0c1cc57ad61e48afcc85bc770f2df8be
+MISC metadata.xml 668 BLAKE2B ca8e96fbb2a3ccc7514e4800780a1e0e153edc50a72e7834bc22b3ec539272ea5b9e39060f55698985c8785e92cb148294888976de60628e2094578db92853e1 SHA512 0e2b5276ab8bd5d16f94c28a39cebaacacc297da93fbd25f0d9afeb150af820930e0ca63e6adff20ec53fef4274062e8c607b5aaf1ef07df6d34cfce0b6c9f35
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
index e312933c461e..f8156c81608d 100644
--- a/dev-python/urwidtrees/metadata.xml
+++ b/dev-python/urwidtrees/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>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		This is a Widget Container API for the urwid toolkit. It uses a MVC
 		approach and allows to build trees of widgets.
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
deleted file mode 100644
index 68baa31a9881..000000000000
--- a/dev-python/urwidtrees/urwidtrees-1.0.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=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tree widgets for urwid"
-HOMEPAGE="https://github.com/pazz/urwidtrees"
-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 -name '*.py' -exec \
-		sed -i -e '1i# -*- coding: utf-8 -*-' {} + || die
-
-	distutils-r1_src_prepare
-
-	local md
-	for md in *.md; do
-		mv "${md}" "${md%.md}" || die
-	done
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	use doc && emake -C docs html
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc; then
-		dodoc -r docs/build/html/.
-	fi
-}
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
new file mode 100644
index 000000000000..c435a32a3b0e
--- /dev/null
+++ b/dev-python/urwidtrees/urwidtrees-1.0.3.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="Tree widgets for urwid"
+HOMEPAGE="https://github.com/pazz/urwidtrees"
+SRC_URI="https://github.com/pazz/urwidtrees/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+
+src_prepare() {
+	find -name '*.py' -exec \
+		sed -i -e '1i# -*- coding: utf-8 -*-' {} + || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}" || die
+	done
+}
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 5c65601af96a..8008c8becf74 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,3 +1,4 @@
+AUX uvloop-0.14.0-asyncio-test-hang.patch 1175 BLAKE2B e97cef3438a603249e8b1977b2a7f3d3b636d3f38c59c4075c01fc0660b6afd01a64528655bd9bc9c0845fbd88c86f8b0ad5571052a02e511587fe73d87547fe SHA512 e8219cc1c644c220d7626790be5fc701ac27486689b7bc57b70dae818c51be8b3d1e524684cbaf6aaa2de199159b1af9534a913e7d8f1c209b87e3a2208dfb43
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
-EBUILD uvloop-0.14.0.ebuild 1183 BLAKE2B 6d2a39e03c3de958e7fc803630b4fad15a92921ee6962f137905ff47038d24e4bbe4c0d406d972bee34ee22b98bdd13509c44266b715c98aaf1ad4baf5bb5ced SHA512 fd7c0a943a8f2aaf4c09700be1f2abbac04808f783df2ff1af29182c1950eec93912390995e7b6567958e6f8c7bc772ce392ce1dbb1fb7fa905b5dc225bfb6b8
+EBUILD uvloop-0.14.0.ebuild 1278 BLAKE2B 2ea3cfe8707c8b47eb05cd5567d31168d82f26ffabe7094c7a99369cce63eed2f249973ee480e7b95fedc01d4fd615ddce6b6983e75ca4c64e4771a61101c930 SHA512 e0bae7cf397a3e9730d54b0f8d266f9eab4bb7b0ddcf8c581291e33c7a80a4009c530c204f4bc49d05af3224a9e404b93308c687b5789953283b13a005d68f92
 MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
diff --git a/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch b/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch
new file mode 100644
index 000000000000..d139d6f66b0b
--- /dev/null
+++ b/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch
@@ -0,0 +1,33 @@
+From 1549514de9c344ac978472097e750b1caf6a36b9 Mon Sep 17 00:00:00 2001
+From: Fantix King <fantix.king@gmail.com>
+Date: Mon, 25 May 2020 14:10:07 -0500
+Subject: [PATCH] Skip for bpo-30064 until 3.8.2
+
+[mgorny: extended to all py3.8 versions]
+---
+ tests/test_sockets.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_sockets.py b/tests/test_sockets.py
+index 6a8a63f..d9f258e 100644
+--- a/tests/test_sockets.py
++++ b/tests/test_sockets.py
+@@ -194,10 +194,11 @@ class _TestSockets:
+             self.loop.run_until_complete(asyncio.sleep(0.01))
+ 
+     def test_sock_cancel_add_reader_race(self):
+-        if self.is_asyncio_loop() and sys.version_info[:3] == (3, 8, 0):
+-            # asyncio 3.8.0 seems to have a regression;
+-            # tracked in https://bugs.python.org/issue30064
+-            raise unittest.SkipTest()
++        if self.is_asyncio_loop():
++            if (3, 9) > sys.version_info[:3] >= (3, 8, 0):
++                # asyncio 3.8.0 seems to have a regression;
++                # tracked in https://bugs.python.org/issue30064
++                raise unittest.SkipTest()
+ 
+         srv_sock_conn = None
+ 
+-- 
+2.27.0
+
diff --git a/dev-python/uvloop/uvloop-0.14.0.ebuild b/dev-python/uvloop/uvloop-0.14.0.ebuild
index 0c4b130beda0..2cafc6be0842 100644
--- a/dev-python/uvloop/uvloop-0.14.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
@@ -19,7 +19,6 @@ 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}]
@@ -30,6 +29,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-asyncio-test-hang.patch
+)
+
 python_prepare_all() {
 	cat <<EOF >> setup.cfg || die
 [build_ext]
@@ -39,6 +42,9 @@ EOF
 	# flake8 only
 	rm tests/test_sourcecode.py || die
 
+	sed -i -e 's:test_write_to_closed_transport:_&:' \
+		tests/test_tcp.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index f2b2f8af4597..ce7bd592bf49 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,5 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
-EBUILD vcrpy-4.0.2.ebuild 1391 BLAKE2B 8fcf248c6fa4327cdd77626cffebbfb384d202ab8ffd1d54346261d3554e4f7656972b25f8ea9fd3ab8f262193f368568ebf2977018788202aa552a5db2066c8 SHA512 0d10b4142f02427511ec76c3441a4027094bd375d96aaf1024e1865b6d34e47484d7ac05af09c427120ab8c78494ac7202def995257fa4a3e81c34833f563eae
+DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
+EBUILD vcrpy-4.0.2.ebuild 1389 BLAKE2B 84a6c873cb48a40c6f7b7e133863d58bef6ae00edca2faa3a9739bccdbf141f5f45aa413170508abb27fd70a039685eeab9dd0abe6b51e622fca5bc8ed1eb78d SHA512 2f56198bb62bc2844b37e99dcbdf2ec909188ec16db101ffde5f03fe799aca29f7b73262d347f38521fb3859a1bc618f1da813e344e9d2909fe93a495053481d
+EBUILD vcrpy-4.1.0.ebuild 1393 BLAKE2B a6470456c465894972edffdce4e89823153dee2cbb7d8bc033cc4536ae95ff169c24f140290f3a0c1b8d82565809c5208af61675b0340a844fffdaf926c0fd3f SHA512 09704e8002f65ad1bee470f333fd3a2e995dd0d90b97b62d24f2b51ac3fa9818565ae47e28f6c335b5fc4f3ae250b3367a1394110f5c5b79fcd95b3426167fb1
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
index b538d90a9181..d2d8fd9f9217 100644
--- a/dev-python/vcrpy/vcrpy-4.0.2.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${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"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-4.1.0.ebuild b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
new file mode 100644
index 000000000000..75f411685298
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.1.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..9} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/vcstools/Manifest b/dev-python/vcstools/Manifest
index c5ce71308988..587d0cd07f12 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1465 BLAKE2B 75562e8b1a609685bf1a6ba20f50b5516a7513b35bfeddf902e6ea5fc4372566eb02d6cddf663f5f4992be588a1f48e855f9759d129fd3a2d20b6e2d14977a31 SHA512 4e7006c77dbe03235e0d0e13a22220cfa7c24e6b799a7166d1ce308f3205c9d0ae49cf20f396b87dbf973b81444aba29e4887c329bed058a4506e17537e92d12
+EBUILD vcstools-0.1.42.ebuild 1470 BLAKE2B 1958a16eb9228ca690d54142aaf2c34e28eb223e8b722909d1d15aeb4d34ce0f4c5b727b0f6cc84d14f8586a4f646756831784d904ee4a7e15a766044230a09e SHA512 dd1d4a08cdacf579248ea877e83b3acdd175b094bcd18807022467e0f22975b89390de6e87625ddb94425ea7965e0ccaa2df1831acbf10ad4be1b6f942582933
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 733f8a2e48e5..ef01b1ba5e71 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
+HOMEPAGE="https://wiki.ros.org/vcstools"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index df235240b3ec..738cb1485e2c 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 668 BLAKE2B a4b87d4a0301ce4bd360f6d82917fc6b47958b742f4c5e772cec448062cd0ac13335e8aee8bf68d6f0724d3e1129925c7342660ec8d63b2d97e46719c1bd85b0 SHA512 07e7dadf96d68d3057da74978e9e1a71105b199f19efa10e4c6d82b742dcecb1c3913fe75d299e6ecdfcb31b9b52dd7e42f353f40a54152d44ee0266d9821e9e
+EBUILD vcversioner-2.16.0.0.ebuild 658 BLAKE2B 1624e042b47f88f69d62107cfc239f02b24eed15d70c9871a901b5463970881b0e565c29ba279258ff08b6c046d1ef25c1a974b5bd78fbcc34839c60532ac3a5 SHA512 04261c39600d6c390ecef76b0da838be97be069d4ab7119b573c1a5e1f18517a5ecf1c1239566c859db105b33393c2b620b3f104ff6b0cdf9c77d308b37bf75e
 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 a1f3f67769f0..48d8f6a7409c 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 766b5b561e5d..f78305136bd4 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,7 +1,4 @@
 AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
-DIST vdf-3.2.tar.gz 15050 BLAKE2B 62118879607462d9c205ae454f9187bb20267d5eefb3f0cf7efc5b93585b5400d565063dcacceb4dddf489371129bd4710ea2bc09db35a9739add1c4dafa992c SHA512 c9b60f6999c08b2610ea6ad1e6fd9d143ffabd6a93af65fc5ee39d775a6f9a2dccb002f19ce72a1d7de6e53188fb98bd4a0dc4074047b74ca53991294310175f
 DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
-EBUILD vdf-3.2-r1.ebuild 533 BLAKE2B bb03c3b237200d7cfac66aed5517eb37c94325720c3785f8471135abb69565232a9abeebe52b35eac8fb77135c8e5d9df6a05315aaea34e33e9068e7e39d283a SHA512 70c6a034e78f07f7b21ca2d264dbc248decc84dacc222737180fb7a53dbe117b896e12b35e8e646482cb4a8f002ca634ba6abcda068013647761d753cc3242c6
-EBUILD vdf-3.2.ebuild 518 BLAKE2B 7bcc3f44c6de2eba10ab1530cb57a803a630e7876fd2072d6a86da346afe75e729c5cf3199a1b98200a2f3ccd77897edf88289cc1f60eef4b67ba0233cd93c98 SHA512 8541f1031cf1c1bb322505b2ef64c823cd24754eacfd061aff9e1cb67578a3beee929aee3dad0feefca8d3c218a693ba19636f93c2a0f287c0e650a9157d2b90
-EBUILD vdf-3.3.ebuild 532 BLAKE2B 4cdd3cb6c10a9f89364e30ac762d726748d96343fa54680f920b083bed074fb458ae531577991e239515dc4ff598a475018fd9c72fb0ddcc166887a4ee12f929 SHA512 219c51244fccb694694058c8fed219bdcea7dfc15c56f4228d29163fb07cda64b99e6e4a2276192b806af06bb2fa557da3c8ae82ecfbafa1f9586753268f79c6
-MISC metadata.xml 366 BLAKE2B df19925265c9cbb45a9e51a18c52bd72e6b544cb42fe5ce192a94a351faa38242c0d85ba0d9ba1f83371990c011ea30233960c5a0ca3349bee27d1bd94ba1b61 SHA512 2cb7d9ef5bdfc2b9ba4d991c03fe882f41cd96be13e8e5d2ef49217c7ab5962c1f02ad21aa9bb8a3d4dccecacf0a9c5ea3c7022ee2cc0c88fb42662a3f8a751c
+EBUILD vdf-3.3.ebuild 531 BLAKE2B 86b04cc789449dfaaf829b47e106c5d1f37d732aca9f267c4330623f310cb29a18c91b97451ec47067ba58ade7c5480514e8a0b5b9054d7ce07fb87e2cd11ae9 SHA512 6cdfd50ac638eb08dc9822b999f7f2190c8e5118274cc483dd0e9c242f94e8f16c7c0354d7f37675ccafb9043097c618941ccd98cda67dbc935052021c74c8a3
+MISC metadata.xml 390 BLAKE2B 1bec2f25b9826fb0d9236302938ef8ddaa4e29c815f63a900fdc6a25a8749f9d96aa5ec682b006e6b25ef0f8684491f08539b76ebc9ebdda43b9ca9a1f8126eb SHA512 6470d901496b951b03663055ebac69e588d8d40f0aaa7bef670f6a07654644d55781274e41ea82af094caa86313c60cfa0827d89da76aacd42bcc52d6b675098
diff --git a/dev-python/vdf/metadata.xml b/dev-python/vdf/metadata.xml
index 4807350e1a8a..138435803a9f 100644
--- a/dev-python/vdf/metadata.xml
+++ b/dev-python/vdf/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ValvePython/vdf</remote-id>
 		<remote-id type="pypi">vdf</remote-id>
diff --git a/dev-python/vdf/vdf-3.2-r1.ebuild b/dev-python/vdf/vdf-3.2-r1.ebuild
deleted file mode 100644
index 2c3eaf316de0..000000000000
--- a/dev-python/vdf/vdf-3.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.2.ebuild b/dev-python/vdf/vdf-3.2.ebuild
deleted file mode 100644
index 7a92d59b66ce..000000000000
--- a/dev-python/vdf/vdf-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( dev-python/mock )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
index 573902811712..188470c2fcea 100644
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ b/dev-python/vdf/vdf-3.3.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"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8d6622c64dc5..beff94d3969b 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,18 +1,8 @@
-AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55a58db8f352f793fb873a2d82b00b13a41fea9b556d90613a8df1b4a86939b22573542d2187366a9e551ed3090c62d6bc4566779c7 SHA512 9517f2efccb3cd177370cf66ea12244a39e762aae64e9bd412fc05af087648066deaf62d381b52a0eee1487c82109df4bd463599eaa641890c32eec48b694f25
 AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b230c2502691f36f49502427c234c8b2da1a2d187791aced234fd70f7be98b98ff158f570747e670cc0ededdab1d5ed499d7b8588be SHA512 17f2a38d32f17c7f8bfe138939b6953dcbf13404371b8377a47759118ad37aaf73f45f670d46d5956fd5948754fb9c60248d9222920c6fd7e7c2e7c7661c9a18
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
-AUX virtualenv-20.0.21-py39.patch 1161 BLAKE2B a8f8f9f45add1e48b0904b5de85479b44cf5bae9153d8362bdd47892ec5ef57a85e55d6d7e797b5d7a79efcb2bf579f39b6c5fe4fc31dff4f9e6fa8bd442aea6 SHA512 17886796c0dbc388c4d115f81f7b129ff18a649a68e474142ebf06d708864a7ca19a32e19c7b3b9d7d526b52be38dc76c8b26f761088b60ec8c9d3252ac6b0c2
-DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
-DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
-DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
-EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1762 BLAKE2B f00d03022a30babf6278c6735ca5b9a860ea8481410539e1538ea870ff1b34f4841376bb229daaa0258b2fbe5059e976e3193b98419a604749dd7bc81fd0188b SHA512 932f0bb7e39b68a4f82485f578f63c3c2f9dd8d9ea48cf628d536b761261ea540e845221e62474aa5a428634fdd08c5adb9cef14f224a273e7dceb2b2265ba3d
-EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
-EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
-EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
-EBUILD virtualenv-20.0.23.ebuild 2582 BLAKE2B 5c6421e1682a7878d89e40754b1a9445de3f5da7503ddbaa2b728499c0c1bbead6e3f6c1239950778a4c0c181326193e7d7dfc79aef5f0142ce24a7e4bf4828e SHA512 52bcf6f1ed5bc14634d31c250948efa486bfa9c25bf69f958fe3286ed43ad1f9e5ace94288907465e2b4d8d9da8f82669cdec7f2ef57056a3997f7bcb41c389d
+DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
+EBUILD virtualenv-16.7.10.ebuild 1901 BLAKE2B e9464ea36c8772c6cbc19df04458ebc53bceafa9cf39a8e13ec2805d9a8c3a38a2e7b1bbae6a589dc5d912256c770e55f54a84b476b81d2c41c2907e495dfbe6 SHA512 586cc1b761b9a46e03a45835a010877aa9e7e29b00e35d722f5bc244a051aa3aad2458ac2f36311749291bf9a3e81671fd77d14fbcd9fe5aace0652d843d0686
+EBUILD virtualenv-20.0.31.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
deleted file mode 100644
index 5c14c3e22850..000000000000
--- a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- virtualenv-12.1.1/tests/test_virtualenv.py
-+++ virtualenv-12.1.1/tests/test_virtualenv.py
-@@ -6,6 +6,7 @@
- import tempfile
- import pytest
- import platform  # noqa
-+import unittest
- 
- from mock import patch, Mock
- 
-@@ -126,7 +127,7 @@
-         shutil.rmtree(tmp_virtualenv)
- 
- 
--@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
-+@unittest.skip("Running create environment while testing is broken")
- def test_always_copy_option():
-     """Should be no symlinks in directory tree"""
-     tmp_virtualenv = tempfile.mkdtemp()
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
deleted file mode 100644
index 221cc734d268..000000000000
--- a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8717bf6ac3375d7f26738189c32e3bae04d280a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
-Date: Fri, 22 May 2020 12:41:32 +0100
-Subject: [PATCH] Add 3.9 on Linux to the test suite (#1839)
-
----
- azure-pipelines.yml                  | 10 ++++++----
- setup.cfg                            |  3 ++-
- tests/integration/test_zipapp.py     |  2 ++
- tests/unit/activation/test_xonsh.py  |  3 +++
- tests/unit/discovery/test_py_spec.py |  2 ++
- tox.ini                              |  2 +-
- 6 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/tests/unit/discovery/test_py_spec.py b/tests/unit/discovery/test_py_spec.py
-index 445412773..52154f14c 100644
---- a/tests/unit/discovery/test_py_spec.py
-+++ b/tests/unit/discovery/test_py_spec.py
-@@ -95,6 +95,8 @@ def _version_not_satisfies_pairs():
-                 for o in [1, -1]:
-                     temp = copy(sat_ver)
-                     temp[patch] += o
-+                    if temp[patch] < 0:
-+                        continue
-                     sat = ".".join(str(i) for i in temp)
-                     target.add((req, sat))
-     return sorted(target)
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
deleted file mode 100644
index 87a7b5e5be62..000000000000
--- a/dev-python/virtualenv/virtualenv-16.0.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index a50edc6e731b..b8f4327d4e7d 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.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="~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"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -26,14 +26,16 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pypiserver[${PYTHON_USEDEP}]
+			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 DOCS=( docs/index.rst docs/changes.rst )
@@ -53,6 +55,11 @@ distutils_enable_sphinx docs \
 	dev-python/towncrier
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Tests are skipped on py2, please test externally"
+		return
+	fi
+
 	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
 		die "Could not copy LICENSE.txt with ${EPYTHON}"
 
diff --git a/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
deleted file mode 100644
index d6c847fb9ef5..000000000000
--- a/dev-python/virtualenv/virtualenv-16.7.9-r1.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
-
-# pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
-	# disable tests that need internet access
-	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
-	# test fixes for pypy
-	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-python_test() {
-	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
-		die "Could not copy LICENSE.txt with ${EPYTHON}"
-
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.18.ebuild b/dev-python/virtualenv/virtualenv-20.0.18.ebuild
deleted file mode 100644
index 85130547d143..000000000000
--- a/dev-python/virtualenv/virtualenv-20.0.18.ebuild
+++ /dev/null
@@ -1,85 +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 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
deleted file mode 100644
index 2f37b45989c3..000000000000
--- a/dev-python/virtualenv/virtualenv-20.0.21.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=( python{2_7,3_{6,7,8,9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# require internet
-	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-	sed -e 's:test_py_info_to_system_raises:_&:' \
-		-i tests/unit/discovery/py_info/test_py_info.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
deleted file mode 100644
index 6c1825d6e7d5..000000000000
--- a/dev-python/virtualenv/virtualenv-20.0.23.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=( python{2_7,3_{6,7,8,9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/coverage[${PYTHON_USEDEP}]
-			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-			>=dev-python/pytest-5[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# require internet
-	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-	sed -e 's:test_py_info_to_system_raises:_&:' \
-		-i tests/unit/discovery/py_info/test_py_info.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.31.ebuild b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
new file mode 100644
index 000000000000..651770201985
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
@@ -0,0 +1,94 @@
+# 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..9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' -2 python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_prepare() {
+	# we don't have xonsh
+	rm tests/unit/activation/test_xonsh.py || die
+	# require internet
+	sed -e 's:test_seed_link_via_app_data:_&:' \
+		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
+	# TODO: investigate
+	sed -e 's:test_cross_major:_&:' \
+		-i tests/unit/create/test_creator.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	if ! python_is_python3; then
+		ewarn "Tests are skipped on py2, please test externally"
+		return
+	elif [[ ${EPYTHON} == pypy3 ]]; then
+		# TODO: skip with better granularity
+		ewarn "Skipping broken tests on pypy3"
+		return
+	fi
+
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index a228da2e1c5c..05acd9aa8347 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,3 +1,6 @@
+AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.11.5.tar.gz 44216 BLAKE2B 921e0f35bd5348f412f0bf20939b3364b0014d3b1d1a7248cd73f2514eef0fb4e5b4b742876dc4606b5619529f1aa96e3577508ed0bf8d1e98b4d8bb88e2b8a2 SHA512 8893434e8e73ebf3682da1970d1d720444de452937ac9123fab53413c88a21d04ad3eb490902d829aa60be6804ff68b8bcf57a1c45807751c3d50be63e9b2551
-EBUILD voluptuous-0.11.5.ebuild 526 BLAKE2B 0524f99dd3c90f446064b27a2a0d8abd6aa73bd3b2713a827cce059701e06797283dd701879b11cdfc3658cfc036465533666551e5a8bb9dd6f067623da4926e SHA512 1a059795c8e77e1d7f19fcc9cabd0bb84d265fcaa00d81b39b29387e88cf8e80139220b929a13541ec5182ba8a48bcfe0b1fbbe83340e2ab355ac41f5d0cf92d
+DIST voluptuous-0.11.7.tar.gz 45262 BLAKE2B 2c4c171ed281bdf799491b0e14f64ff2f4ff73143b1b5498eed0d2d4a148ff0e40392393923f25bbb066a872a81ac753d861640abc8b3d340c4c01ff5e139140 SHA512 bf0ad4684a4da59b3eccb54f6edfa643eb894076fc50d1bfd4c953de15cfd711a70e8aee685497197eaef24897ae55fb5fb2aec5e2fc9dcf344a6f7c6f569b88
+EBUILD voluptuous-0.11.5.ebuild 535 BLAKE2B 7a44f9d16a2b5ea9e8210e6819b642d40fb736fa1a5049d6afa8a13d58faee85fcd4db70bfa5b3640aa2c973f069ca7a1ad9ae9db6f8458d4b9a6fe14fab4b51 SHA512 464e35ec91ad0d87ea802153c291c07d6a61bc8a64af059bbb512c1adbcbc36efa96a82dbb88d1e0afccf55ebde3209b5344616e53417478715acdf8d8e1d1ef
+EBUILD voluptuous-0.11.7.ebuild 541 BLAKE2B 3991e82383c6aaa9df0e8f49a1a5aa8cf1022a1201d99e8bd33039955d3f292a37e971d13391efd85c023f5ad6ed20529078707494b3816fcb519442a34bcb9f SHA512 a926c4c872edc46771b37f74b0bd793299f8f7bbb311b7262fc11419bf33c9224408673e77825c4428dde61a40524b6446e0d8a673da1c18feeb3252ffc3179c
 MISC metadata.xml 691 BLAKE2B 833a0f6176b6e2b3db23053e8be9054b28434061afa2e09aae9ceec1a3c1b841b3f0e0b9939341b66614cb12d8a002111aa554ee4c094123439de935e7e60b73 SHA512 0162ad8edf206d260e648a6a2441fdf054bc591b9368e3c78525bde5ab7e6a23f65c3f0ed1c04827847759182a8b81c0fa55ebc833a753f90a9e7df14aa04f06
diff --git a/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch b/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
new file mode 100644
index 000000000000..bdc8228ff40e
--- /dev/null
+++ b/dev-python/voluptuous/files/voluptuous-0.11.5-fix-doctest.patch
@@ -0,0 +1,11 @@
+--- a/voluptuous/util.py
++++ b/voluptuous/util.py
+@@ -87,7 +87,7 @@
+     >>> s = Schema(validators.Any(int, SetTo(42)))
+     >>> s(2)
+     2
+-    >>> s("foo")
++    >>> s(42)
+     42
+     """
+ 
diff --git a/dev-python/voluptuous/voluptuous-0.11.5.ebuild b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
index 40ef58995c16..bef18fbef06f 100644
--- a/dev-python/voluptuous/voluptuous-0.11.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,7 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/voluptuous/voluptuous-0.11.7.ebuild b/dev-python/voluptuous/voluptuous-0.11.7.ebuild
new file mode 100644
index 000000000000..d0c398fb00b3
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.11.7.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..9} )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index ab6591aacca9..5e5ad62a80af 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,3 @@
-DIST vpython-7.4.6.tar.gz 3542460 BLAKE2B 358bd33f386b27ade92088af07fd5a73c1fccd5dbe729fe989f802b1db0eff38014bc38baf383324bb6299f53c68df8cfe9070a6d805303e0b50d4088af133ee SHA512 68591fc3bf71ae1b87e86a61574c46bb64a041ab29309ced64ef69c6d110e0fcd4f3d3adaab2ae76b21df9f66314095c4b3d79e6ebf1d60fa7725f85ae7a7b06
-EBUILD vpython-7.4.6.ebuild 624 BLAKE2B a8976f0cbd36719088e1416ea517740f5f06e01f876a9ed17d63975ded31b464ef49212d8014dbcac359e62b24601fc11796cb7c3d13d9e1337372152c23fd44 SHA512 bdc819ed4ed69a69c5d239fac747d6388acb8544c6fb467d86f2189a7a1d239662f752ae71aa771cfab6078f3073f61c08feae60b76064f0743f9dc7e6887d54
+DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
+EBUILD vpython-7.6.1-r1.ebuild 667 BLAKE2B 019540e4cd1c93d58306322199a7a53d7b3af7e9e90ed1b9ca38225782d77e23471b959a8aeaad9485149980a2d99eaf2800714ae0c19228999b14f54b051b33 SHA512 eed3058ba86df4370958b0952d2fff396b392b190ecbecdb759a97aa42dcdc5e6fc6978c30040cc2c790e73b6a0d4d6b346e3544bae2a524bf7ddcfddb29c9ba
 MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
diff --git a/dev-python/vpython/vpython-7.4.6.ebuild b/dev-python/vpython/vpython-7.4.6.ebuild
deleted file mode 100644
index f04d979bc1b4..000000000000
--- a/dev-python/vpython/vpython-7.4.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=( 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/vpython/vpython-7.6.1-r1.ebuild b/dev-python/vpython/vpython-7.6.1-r1.ebuild
new file mode 100644
index 000000000000..1d0df6203ec8
--- /dev/null
+++ b/dev-python/vpython/vpython-7.6.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=( python3_{6..8} )
+
+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"
+
+RDEPEND="
+	dev-python/autobahn[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	${BDEPEND}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 7303b024a510..32ed37e5d1c2 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,3 @@
-DIST waitress-1.4.3.tar.gz 173767 BLAKE2B 4d64279c69403347c7048024b0c70f8192af5fd5ad32f873d66ddae53b011d1445fa2d8f6db0f98ab86bb92855c8882bca4903dbb3657bbe86e7cdbf6a9b67e6 SHA512 b4fd6d174fe63d83686708ffb83f61421e94cc6c6e9ebc7deeae93ea50a0c11ee523d4448e602ba03ade942912accb33d482c13a367d7dcba61ba6b4871bc3b4
 DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
-EBUILD waitress-1.4.3.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
-EBUILD waitress-1.4.4.ebuild 675 BLAKE2B bd805b7c524f6adfd12f42a0e0aa23a2dc81525aae8eb4db634651f45e967d25cc262234ed4c260b053e95b751fd7e654596e87c95bef0b815c4a7afac48a8c5 SHA512 3a1d942eef953301cd6f089ebc5642562f271c76bae6599bbd313f61593ce024a35faaac03d1e2d236ae9226c748f8bb32d216ec88203e949d8f06abd618aea7
+EBUILD waitress-1.4.4.ebuild 656 BLAKE2B c8737d6bb06fc87df369c5f3d26dd3673e0a93ad58d7748fdcc3a662f9389aa6062e8a91cc419643196ab722b49a40d4027385b3d0dbb5f20b189f031e38771f SHA512 5ec766157ce7e51bed550cb36ee43682ae96d0876323e290402345ace33dc6317595c6a13ba931f73e19f6934fa30102e1c0587409f931c8a4dcef6c195e05c2
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.3.ebuild b/dev-python/waitress/waitress-1.4.3.ebuild
deleted file mode 100644
index a9f728fecfbe..000000000000
--- a/dev-python/waitress/waitress-1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-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="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
index 6ec338584415..098f4c862094 100644
--- a/dev-python/waitress/waitress-1.4.4.ebuild
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ 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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index d75f1f366ae7..f15ba770741d 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,3 +1,3 @@
-DIST Wand-0.6.1.tar.gz 10501178 BLAKE2B 76eb22363a20bc93fafae334a65917310cae82b0613b4b8b1eb749ef453268eb4413734ece7a39448d25782ce2ee8c63e71f9571707ec764851d82dbe5a6a6e4 SHA512 3edc4030130c1d03547d933f05eca4e9c9d10bdd527b1e41657a6b3f81d433da63fbbaddf63c726417f90335ac475508f1a467ee5e368eecb5cf9e94e79da9bf
-EBUILD wand-0.6.1.ebuild 786 BLAKE2B cf8f2fb581dbd926c301b36028b72543629f169834d5743fe3eff6db52641a9bde67ffd476dce5beed8f1d227e98e9285ffdef6daef92701c962bd9774dbcae8 SHA512 01bf6309e1a1eed927b3ac4ce1fbfd34324d5ea1115d815f465cedddf587b379e90a9fd3d1a497200f38ebdaa0aa217c47375301b58c3934d74fabd2fa9f3f04
+DIST Wand-0.6.2.tar.gz 10503865 BLAKE2B ad488a2d3d6b5801b20ca3caab884069cd5fb6913e04fb719885abdd49578f77cfc4b47a33235f4833463d75c01ad80e06c0687badb9c981a16c9c358c815032 SHA512 906490a0a75a4fc315b592fec12dea21cd40102c461381a79d5215c70ab6fb9c8a1e888fc478ea2ad006db6549dfdd2b7b1e01879cc2aba34dcc0cdd6ae2d128
+EBUILD wand-0.6.2.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
 MISC metadata.xml 432 BLAKE2B b4cf502cb70ef3ca2d5077a491e37fa6d610504ca76e1381a2220e734c6dc435f42a9a260805114e4803dcb8f69871fcb57b92ec9085734c7d2a06f0d7f3a040 SHA512 d5253cbcab45e68901d7678652329552082f0d95a0d38d797ac351f4419a77116ae18cdfbbd8561bbde14c9d99c6ba0b5ce0a435d34c10b99eb14288275709b6
diff --git a/dev-python/wand/wand-0.6.1.ebuild b/dev-python/wand/wand-0.6.1.ebuild
deleted file mode 100644
index d4d05f193964..000000000000
--- a/dev-python/wand/wand-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=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-MY_P="${PN^}-${PV}"
-DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
-HOMEPAGE="http://wand-py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-gfx/imagemagick"
-BDEPEND="
-	test? (
-		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# PDF support is blocked by the default ImageMagick security policy
-	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/wand/wand-0.6.2.ebuild b/dev-python/wand/wand-0.6.2.ebuild
new file mode 100644
index 000000000000..094165125f7a
--- /dev/null
+++ b/dev-python/wand/wand-0.6.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=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_P="${PN^}-${PV}"
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="http://wand-py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-gfx/imagemagick"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 65ddf56e76b5..7834c6e3d204 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,5 +1,3 @@
-DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
 DIST warlock-1.3.3.tar.gz 11602 BLAKE2B 8d3bd3cd19f27e9c4ceac97f242742c58c6687659d8ab0ea42da74ce948e43415e513e7d7269767b76b21c995229702da66c64688119bbfcc0d30e872af1b65e SHA512 b6f96aa8e084872397744641e3fdc0e7c8d0a9285b048e894b66ccb42af65301c550813221895f0f99ac49cc26d293798b731cdf30524c13a79389ce07dd7e44
-EBUILD warlock-1.3.0.ebuild 1031 BLAKE2B 1616b314bf019cca4ac62db5a3790ba26d2d88f472935b487c48dcbfcf0202128f3689cab69dcbba0e7d8dafef978dd728cb91ed0c93b1cedcd4daa835ff2543 SHA512 a09ffc3cf51e6e8a451936891435ac74518932152f567efc104d7533715545837feff85fffed9b03b90e8e46ff18d6073fc08c181aad9d903d6d42c805e8831a
 EBUILD warlock-1.3.3.ebuild 1031 BLAKE2B c71c3f5b5b19808ec8e54e1e591d2bf2d3fead5a42ba62e72d784896ae3623e1348395d45aa8cd1f3c90ac63474490d25a9150fa46074456f8afcb3964a04370 SHA512 0807b3a183e49c4f65d155b3a990670203d0df5462d887979e14332c08911673741e5c5160cfd85924701dfd828d5626f8cf55c7afcac2ab749d635d8569f07b
 MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/warlock-1.3.0.ebuild b/dev-python/warlock/warlock-1.3.0.ebuild
deleted file mode 100644
index 2a6cdc6082b8..000000000000
--- a/dev-python/warlock/warlock-1.3.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=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 1ec0dd88031b..ffd2c1143f14 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,9 +1,5 @@
-DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65 SHA512 3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 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.10.2.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
-EBUILD watchdog-0.10.3.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
+EBUILD watchdog-0.10.3.ebuild 885 BLAKE2B e5ab730671b85478750191853042b6acbff0455c2e00fa4f259e8cc7a2dcc599ce20f2332655d71f6e7ffa78f3f84b91ab1830eafb6071da670e98b05b108981 SHA512 d84f509a72d427b7e2d480f025641e8c21cc08fbf6b56c23346f1b6d80981f4f4efe42c300508d540f4edffb463d275126eb61f0e5dcdff76d6550e4126abca5
 EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
-EBUILD watchdog-0.9.0-r1.ebuild 845 BLAKE2B 99fc184e8f2282d5e7b4291f7215bb6fc50accd843aa3b1b48150598bbf628ec9d37ab74521247de0d49f3fbb321f5cd518ecb6a04a0b5bfb5b6fb47c3f8bf9c SHA512 a2efaa1b2f6d6a8d21230a64deb919a52eb5289d56f94681bf3a10ca863451e9988f530bb64b20780d12fcc0b7c56c3e031b70001a6707b523ecea7c751f5562
-MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
+MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/metadata.xml b/dev-python/watchdog/metadata.xml
index c2abbade6b63..aa34af61373b 100644
--- a/dev-python/watchdog/metadata.xml
+++ b/dev-python/watchdog/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">watchdog</remote-id>
     <remote-id type="github">gorakhargosh/watchdog</remote-id>
diff --git a/dev-python/watchdog/watchdog-0.10.2.ebuild b/dev-python/watchdog/watchdog-0.10.2.ebuild
deleted file mode 100644
index 6420d472f83a..000000000000
--- a/dev-python/watchdog/watchdog-0.10.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-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"
-
-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() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
index 6420d472f83a..9af812bf99fe 100644
--- a/dev-python/watchdog/watchdog-0.10.3.ebuild
+++ b/dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -14,7 +14,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"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/watchdog/watchdog-0.9.0-r1.ebuild b/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
deleted file mode 100644
index e9a1476eb9d1..000000000000
--- a/dev-python/watchdog/watchdog-0.9.0-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=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/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index d9bb26e7862b..7b3f7ffccff9 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,11 +1,3 @@
-DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ceedb3d05eeaf85f90c1157e21d00ee8cd0f715098bf65e5d699a40287ce08e235f2f1d22a73f6606f490a921d SHA512 b828450feb56b5c0e686f6922e777ab48d1336816a41ef4ef95f71c25a37ef492861634c16c788e1e4570d21bd4d45c990a18787860ba6043157c2781c78b65e
-DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
-DIST wcwidth-0.2.2.gh.tar.gz 46929 BLAKE2B 8dac0a793417b04aaccd2235bdd3dee30e18b068a41e515934d2e7b6efb354039adba767db011a2782c9e1f5b8d2568f4ef73ae09361bf8f608491d252bccc21 SHA512 e644a8f83ac5974174e7dae35784c4f9310e39fcfd49d98d6da0f59efd19a0734d5c65e252689843346eb6adad62edfef76658648b34779191fbcf0655188d52
-DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a9bc165ef82ec80a6e0793eda5fa89829542dc14959eedf9cc7676edb0212b29bac95c8f041b9f007d03d2a05852 SHA512 69123170421f7f37a9d09e44860cace29b303701b7be8941d7af403b0f4044b273c136da5726689f13c061587fda24f944ef1da918712bed0eda8c00c7a208c0
 DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
-EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
-EBUILD wcwidth-0.1.9.ebuild 553 BLAKE2B 82ebb496ee479b35aaf0eee2c4fd155e3fa1c18f9d78de3f92cb05fb423a546558af0b91d5a94a67cb53455feee8cd52ca4c1edb8243a89926f8bf50eca1f9a0 SHA512 7f4d8348570e79a419c4a5c00e0aac3ac192589c7df7f8f5249f05fe4c8f8efa8b65894bac31faebef2945e48e8e7db2a39a0a95a1f11bde234343a4cbe6e116
-EBUILD wcwidth-0.2.2-r1.ebuild 920 BLAKE2B db6d3bf6acc5fb9c02b01816656ce095a10d0e77f15cbd6dba46d1c6265c5a6ba19d878439499d3ebb66a6451ddc4206694ea4d2ec5223a5f1b419eaa4c18a2f SHA512 f13a5e8a7e1b4f2da68bbb7eb5d55f58b1ebb73eca618b7926e324c712048df27414209c69673387b18e7fae58f90e847213305b20f71bb5d182257f2f394aa9
-EBUILD wcwidth-0.2.4.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
-EBUILD wcwidth-0.2.5.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
+EBUILD wcwidth-0.2.5.ebuild 917 BLAKE2B 3154a409a41f784db0a45ccf69bfe652ea5ef932a05524243f650f4da91dccaf27ee1f2f72fa0e704c5e8cda638475991a9c223c314914a7b74389964ae5996b SHA512 bea932fc0b193f53c41b8e149827850d26dfc7f3e0a3600c728a25d9661c1479128029ae058e107003b2d53f4007949c6a774507294218151cb8cd85bd48c0bd
 MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.1.8.ebuild b/dev-python/wcwidth/wcwidth-0.1.8.ebuild
deleted file mode 100644
index 7236577a5d53..000000000000
--- a/dev-python/wcwidth/wcwidth-0.1.8.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=( 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/wcwidth/wcwidth-0.1.9.ebuild b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
deleted file mode 100644
index 3b6f48a14745..000000000000
--- a/dev-python/wcwidth/wcwidth-0.1.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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/wcwidth/wcwidth-0.2.2-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
deleted file mode 100644
index 42a66c084106..000000000000
--- a/dev-python/wcwidth/wcwidth-0.2.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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="
-	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-	' -2)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov-append::' \
-		-e 's:--cov-report=html::' \
-		-e 's:--cov=wcwidth::' \
-		-i tox.ini || die
-	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wcwidth/wcwidth-0.2.4.ebuild b/dev-python/wcwidth/wcwidth-0.2.4.ebuild
deleted file mode 100644
index 00627f52df55..000000000000
--- a/dev-python/wcwidth/wcwidth-0.2.4.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..9} 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="
-	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-	' -2)"
-
-distutils_enable_tests pytest
-
-DOCS=()
-
-src_prepare() {
-	sed -e 's:--cov-append::' \
-		-e 's:--cov-report=html::' \
-		-e 's:--cov=wcwidth::' \
-		-i tox.ini || die
-	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wcwidth/wcwidth-0.2.5.ebuild b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
index 00627f52df55..f4b955e9c11d 100644
--- a/dev-python/wcwidth/wcwidth-0.2.5.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 526ed1692dae..eb4a3781279e 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,5 +1,3 @@
-DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.10.ebuild 611 BLAKE2B 6296e642f4cc47678435958d583ddd7189774e4003da333345b550468c68464224c6b9e5aed67a1ba8cfe528b52e7fcf73d360e548f2bb9b23d31327a18ada30 SHA512 ffecf7a0020b221944c31f515f5e91936fab9d3dbbc1db6a497fe3e9038acf2804c3d95dd1bd06a10a1cd606c65de115d929e78ad11ffd0fd29c1e7b3df1783a
 EBUILD webcolors-1.11.1.ebuild 605 BLAKE2B 92eec5251d209b91b48c9c23465f0bcf06aa34ea60ff341630bb59c9f020c14b5e20bbe4813990abcffdc410432174992742bd2fc899a07b552d95c7859bb763 SHA512 b4b3c1cf081986e27cb797c9d5ec2765667502c276425c81b79878657a57add681cf50927b3a78cb868fe999e4ef11762e9b542d78127445ae2bcf15b5271f69
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
deleted file mode 100644
index d16c23c3814e..000000000000
--- a/dev-python/webcolors/webcolors-1.10.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..9}} 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/webencodings/Manifest b/dev-python/webencodings/Manifest
index c8edab16e199..779fb9d25159 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 693 BLAKE2B 11e863383bc3f6d86cefbc0771511fd66246b9f1c4d6aa5e0dc1ea1d158ddc5a19d9e0af040c1a0905495b973cd62f914cddf4534423c56403d8f3659c3660e6 SHA512 b6245595c64e404d075d371320b998a9c58b7898f871a93eb7bd3bb001b70f95e1b5096b8043ba69704fb1b7098b1ca56c5868c3b8d6e4aa4aed793f436e4f6e
+EBUILD webencodings-0.5.1-r1.ebuild 687 BLAKE2B 9d990b9e1c8ca9d3f56cdc7f4ada704fe1506ff72be7e3959f566412082e413bd5a4f528bed69e8a0ad3b4b82743b56f1d548cf715ae92c62cd12be6a0b0ff36 SHA512 ded5153d953860838458f1bcc79226be5d0ddb3e6245fc4022f19c1f109ddea0c92faa40cffa3217d201b5c716cba86b7fd1c129fcfd29feec8c4f7325f5c59d
 MISC metadata.xml 601 BLAKE2B 1611511f6d29c01cec657104f06188182e5bdffdfd95e0d1df407e9ce6697f3b89294221028b5f1d20cc09566ea505a33e8f7be068c7bd17cae761a0e2b96858 SHA512 aed1b164cc066e122462888591003a5a6cd8ffc4a151a8c986f763a262f35674bb7d741268f1efe413857335e455d9ed24c1e9d10e0bf37142158e20fd460dec
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 007f25600ab4..41c058d08075 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 5126a053bf2c..2229881f50ad 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,3 @@
-DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
 DIST WebOb-1.8.6.tar.gz 274606 BLAKE2B 0419e60faaefd4bb822387bf5624f77765c6ad528da791d54204b528b7c827d0cc506cbe260ccbfc7d23ffef73132254dcf133ffb1e0377d75ee5ae83d4deb84 SHA512 b9a3faac114c55f3e9a6eb71a78dd921d928da99a427dea05bc798bc1fe249f0f1cf8c9b9fcb1b73be2737b9132bbfe2250a8652e3a8a1199ac74fa62a59d44c
-EBUILD webob-1.8.5-r3.ebuild 779 BLAKE2B 0e68feb8b835e93a8460a6dc34d5cb213dfec4d79d533f213f08277a5588b8a63646c9a7f35e924f17f43bbee9f997b121336645cf7279b5466596c4e3255991 SHA512 c0dcc0f8fa35144c7a76be4d48e3fa8601d237bbb14ccd9fe156aac0305343cc7e3edc062a4a898c4bbad4961dc0e15ea9fac70526d55509794b58b934e4bd87
-EBUILD webob-1.8.6.ebuild 733 BLAKE2B 4bd67b469fe046eba9390ca4f52e3704ad7e9c9aaf8b63ea9bd59c2c9ff510b91b5a64caa079e56fc41f9c538c83add08ffc8af5c7799a97f1e35e12a863b134 SHA512 a7f9242a92edf25cfb7cf2452427152818fddb6fca21e3aa123ebbc50ebed9259441459c22031158b7b9822c71a7a4688d9e7b287d8c418f0a4abc35e14306c4
+EBUILD webob-1.8.6.ebuild 718 BLAKE2B 355f01a4c50ce409a032e40f37912aea5fb9eeb58da12f8172debcaa24e15a2218f92eba9dec24b9a6165623a9931308c099c59d56347a97ade796aa0c92d377 SHA512 ff87e83b78ab0d04bfedcfa1a1673f72fb725f75eb74df2dff79c83b6aba90bf3ab0b5192e4b11c65ca44c99fad5557ae21293ed671fd9ed3857e6a7c9be215c
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.5-r3.ebuild b/dev-python/webob/webob-1.8.5-r3.ebuild
deleted file mode 100644
index da8bf93e9091..000000000000
--- a/dev-python/webob/webob-1.8.5-r3.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 python{2_7,3_{6,7,8}} )
-
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_sphinx docs 'dev-python/alabaster'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/webob/webob-1.8.6.ebuild b/dev-python/webob/webob-1.8.6.ebuild
index 0be6b5b7041f..ebc1bf8e2d1b 100644
--- a/dev-python/webob/webob-1.8.6.ebuild
+++ b/dev-python/webob/webob-1.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 75bc14f5926c..e61396bc27a4 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,6 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
-DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
-EBUILD webtest-2.0.33.ebuild 1411 BLAKE2B 10c8762873ce7fb712480e3e9ce6cbcf848ed9a3db274e2306a09bb496dd223d29b40eac61604283f9fbba222579bfc8f6ba55b5a3bfc2355d561d45ded511e1 SHA512 da877093e91a7d899ca6dec376eacb2a65a9d26017b20a1c18d249ff33c498baf893d3433ca6e3c5561adbddb32d30584f9d1b99b67217c55d05ce82bcb87c89
-EBUILD webtest-2.0.35.ebuild 1166 BLAKE2B d89cd6d952f46789bde9be8f534ad6b9dad5552e0e9464327872b1d1e023cdfbddbecfe5270064a263374fdaaeae75e48f440a7022a631c2d5dc04284c15b9e8 SHA512 3f705e0e280b1da215d478e4b2010ad2bb6c812228cfc543767002478507d5207c989d4f564f47c4dcd0c5587eef8889abcedbd2dd0cc89b11d3e73361f70ecd
+EBUILD webtest-2.0.35.ebuild 1153 BLAKE2B 05b406706c3eeb61820e7ddc57fe04edb38346e973a215a859430b800c517c820dbff3c78249c08c88fdc16ee1b1d2058151dc94281bb4475bb82afd81f63d60 SHA512 2ec4c8f6cac8cc64aa5152971fc637bc321080d618c7c055b0694d231d02594b07eca488da0f15dc28c8d59cb19d24403355b6b290a733eaa4d913226887b9a8
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
deleted file mode 100644
index f6c90bb7be19..000000000000
--- a/dev-python/webtest/webtest-2.0.33.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-#python_test() {
-#	distutils_install_for_testing
-#	# Tests raise ImportErrors with our default PYTHONPATH.
-#	local -x PYTHONPATH=
-#	nosetests -v || die "Tests fail with ${EPYTHON}"
-#}
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2a82d27844c9..8cf0c7fd6070 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index ba9a9b21fc78..31f91d98776c 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,3 @@
-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.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
-EBUILD werkzeug-0.16.0.ebuild 1173 BLAKE2B e3bccc385cf6fbf35d2ec9dd5a162816756af220f6b272ce8184877deea82bbfdef159c7dc4da20f9201d193ba3b66e338dd68e978c66876d836a32b21605147 SHA512 14365bd1768d04ed2968043e74945a36ea3ca879b83125f9d21dec62420dc6479f09f8a70196491df4d6d81bd45e01ff664be7bb353fc50f541840df643fe612
-EBUILD werkzeug-0.16.1.ebuild 1001 BLAKE2B 90c598018f5e117d58af89ebb846e4fe4bd30299a3898a0f27fd085a891ab9f782fee565169bf03a40f8d385e7fc4bcf41ed220deef3de50c5f290c5679d3d29 SHA512 409bfbf53b3d73e6364a9277f2eab5761da10b9af3a82e0f74620cc520f8e32d7e7fd64d30b0b816e6bf5792e5c84cf52e6e522a5f20f2e3ef70972f3c2d4250
-EBUILD werkzeug-1.0.1.ebuild 1361 BLAKE2B 100b836e5e9d67881c84cbd9530a0a7bb7e5cfaf67f29e26c8da45242351bb6b1140b85301a43176f5f89a262c078fed04c02e333fcb4e20b18aac08d7c47ecd SHA512 3f29354a35257df34a2c34b94ee3ac4397c60852c2aa3735f6c7f00816ff895868e3879a5c5a1584bf98515278b62bb8fba991500d90c61e4393e81c1c84b76e
+EBUILD werkzeug-1.0.1.ebuild 1368 BLAKE2B 2d9135a10d9b482548dde1ef34b284f7d0dbb6b3056314ff68cc2e5e3db469e6daf7b56d8bb6afed87afc1ad13592d25a7847c99b71dc79bac1c377cbd8df811 SHA512 12867c9fa8499b7999bc9d9582bbf51b7f4b86869d29f1452f7c2b5923c99c3da803fa5fb43b9b4836e835a09732c2e39342a7374e9eac395a4bc3d5accf94c2
 MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
deleted file mode 100644
index 4a26883cb765..000000000000
--- a/dev-python/werkzeug/werkzeug-0.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,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 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# dev_server seems to be broken with PyPy
-	# https://github.com/pallets/werkzeug/issues/1668
-	# TODO: exclude only failing tests
-	[[ ${EPYTHON} == pypy ]] && continue
-
-	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-0.16.1.ebuild b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
deleted file mode 100644
index 7bc514bedc16..000000000000
--- a/dev-python/werkzeug/werkzeug-0.16.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=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="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="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
index c9eebbcef2e2..aa43e65dc429 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
@@ -11,13 +11,16 @@ 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"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index faf398ae7376..67ec6ec4956a 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,5 @@
 DIST wheel-0.34.2.gh.tar.gz 57175 BLAKE2B 4d06c411561f80e51c15422f2d3318efa565f9119e869a2f9284adb9bd3aff7bc104013a63fefae36742d7d87c8468b42292723ed031c2b109323a9141fd1cea SHA512 fcd02cf770382c26b5250aa48f60481ac868ff7e1b08245ed4616aaa7d6dc5e3280d9ab787c4d1690b11550de9f6160c0d31dd65b79554711ab5d02de479e1ab
+DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
 EBUILD wheel-0.34.2.ebuild 787 BLAKE2B be23b828e156e96519b635eaa585f60fdd3f2fc6a80d1150d2d997e20930b31bcfcf838c93b6aa98bbd3cf26349300164f56656db815865b78afe270163bc1f3 SHA512 255a55734745a37a6203c85ca279aa5ffbc31cd0efb2f190db430fbd2f3ef7fbc2cf8d96f8a880054b825033e36d6db5636fc881ebf140765d3131869ffcd5b3
+EBUILD wheel-0.35.1.ebuild 945 BLAKE2B 62355aae4169edd0c26ef259c36f06b9bf08222eb51e7badbeb49d359fcba72e64aaebd2a305c7173e72cd95d9dfd8a059c0e191000efb1eb53777c36f5908b6 SHA512 bf4142de9d626c84caa75ce6ba6148428c77384e6fe831b3cdeae7fad6bd9e5b62298c6a7d443a62868ffef4632f68d7360d429038feb1d199130a3e1acda74d
 MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/wheel-0.35.1.ebuild b/dev-python/wheel/wheel-0.35.1.ebuild
new file mode 100644
index 000000000000..60f3b6e68015
--- /dev/null
+++ b/dev-python/wheel/wheel-0.35.1.ebuild
@@ -0,0 +1,38 @@
+# 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,9} 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 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 9ecce7676eed..3145ecc2ddb4 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4.ebuild 987 BLAKE2B e80e50396192266843f1114d004b12018c09fb5ed14e7d326c54fcba4af4ab63f77b6b940b85f64e88d0fe5d8c69be551ac079624014266611f11b03e873c15a SHA512 5e86ccdc0e0817437e2be64d7ad2105095a8e4d7917b743d775e03ced11692873e43dc98eaec28f7cd045e2ef672513155be1a731757035526bb4d227338f109
-MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
+EBUILD whoosh-2.7.4.ebuild 939 BLAKE2B f7323f768cf02ab8bccdb35dcebf35916569301f9b48d36bd3e14d67fce2951d6ceb33c8ab396de11b11810c36235489138415fa7b257e837defa19786f3e6f1 SHA512 70dd1339f4a4dffb9ec5d1ddd44294e1b633aa33093b12b2cd3f5b5d482ee3c3aec2e9e985609ba7a51fb092b45fc24eb13674bbf90f93ab6412ad91e267de2e
+MISC metadata.xml 760 BLAKE2B 6c2bb15db2b263c2583af425655eab29bcbe6e1903a88baae4a5922d31dfe4de19dad5409a927da3504db5c10757c48de1d2d2e7811a33da539c74a87a911d50 SHA512 df5ac5858ced41e412bf97b321d05e1a9dadfbf23e185d5713be11a669f97e73a731ed53b08c3a2997e2b4341fb8d15a7013b483b9e00dbbdb056a56c859882f
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index 8582f22d6e39..8536aa34b834 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -18,6 +18,5 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">Whoosh</remote-id>
-		<remote-id type="bitbucket">mchaput/whoosh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index a445686a4f4e..4e4fada977cd 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 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/"
+HOMEPAGE="https://pypi.org/project/Whoosh/"
 SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 S="${WORKDIR}/${P^}"
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index c6bb92365084..5c1f5eea6dce 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,7 +1,3 @@
-DIST widgetsnbextension-3.0.0.tar.gz 1253392 BLAKE2B 88d435b06fcbf759f7ea919ee69d3523f86f2a150bb7d411d9f2a41f9e4a6176a7900595ae5bd30232c203b81f3462a1178c001fbbf456f847597b0acbd20f12 SHA512 079a2ce837e37a8d1707b6686e5c23989bb79af298847ae6bd01dd0f6e570f91e86ff53ff4aa3a8cb4f56f895e3839ef96c722bd156599eb01893870aa1fb4dd
-DIST widgetsnbextension-3.4.2.tar.gz 1103610 BLAKE2B 1cbd08dc1b9e4a8350b2d3a6e21ad106cacae8da308b82af5c55a7d520fa0ddb6c82cd7aeff7d7521430bbbbed2aaa276d869a8eaa1122cd5a3b8f69e1376352 SHA512 e50daec0a6fc7df2317a1c90ed7713057b35e4c0aba626cc70a9d886aaf0c6ec3f820344d1e1e79b7895de41b6721dc209278395cdce61291bd03ada51c14613
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
-EBUILD widgetsnbextension-3.0.0.ebuild 479 BLAKE2B 779446ca8c8a632a29d251dd2b396cd962f779bc018e22cd524238ab2f9f30d78517f0bef710a497417fb5bf755f23520057e080b3a1a3a566cdb85f0c27bc0c SHA512 96587904be55684d894ec1536cedc388b1d3962bc0e9ee7d5de87c56b56d431f4e807d973c890db596052d30ddf71b16af1ced128f5f29e5baba52712ab9dca9
-EBUILD widgetsnbextension-3.4.2.ebuild 473 BLAKE2B c8027dc2693c744a82bf15dccb866c2d5b2ac331ee4b6551413061dd851e53befd5eca5a1b4354781f658bfc46fab7d256b1a2207263599c4f6eb3b6e3d1f81c SHA512 9d378e8dd0f2aaf1f256789c858dfae15312b3404d20676857fe762c5b3c29f330a0902b03b00abe10d634e8d41d8b1b12f907a9858c1dab41365755775a8042
-EBUILD widgetsnbextension-3.5.1.ebuild 482 BLAKE2B b6a9c8cf3b7a2dd8b044b3734cbefad035445fcc2b4488321fc463dc94482ab76a3d737124dfb01d75818b9373b86ee0ebd606f1dba83f160f394a38edb28aec SHA512 c96566b4d15c612d1161e6c51a87316d664eb32db497bfd617d988fe9c2c8a27b40d1b01ccd93b0b0e544c88b49a55935013fb2eb91af4ac6e15a70fcf81b240
+EBUILD widgetsnbextension-3.5.1.ebuild 480 BLAKE2B bb4e624240b86ed5b0d988eef02e04095feb06b43e40bb9a6666322774f561b95bbaf1a8c7248aeb1ee1b1c528212af252c9f0989b2d4e4700d2dec2cf59dc5a SHA512 4a40d26e24f80ec5ef3e5eadaf2307d8bc91f8f44619f4ce3ffc2d09a420e8b690a92af565f60ba52b6ac5fb6e64d1b389a3b5838b44ab1a32dca5a293cf9f89
 MISC metadata.xml 519 BLAKE2B 592ea12fcf1d68154b5e993b0aaf5370e3675c6fb0151800b777e36d35e93f59d4126167b6a00c7ea0c4fd08469d0a5d14c9fc9c5ab7759ea839057d021e9824 SHA512 abe9fb9ee0902e30755d996d2886ce34419bc6291feb9c51a91d374675279fc7e03850c0a6f319a034c5fa5288797747a67a5b248855622e15ae9444264fac76
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
deleted file mode 100644
index f58c7ee7a973..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.0.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,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="http://ipython.org"
-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/notebook-4.4.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild
deleted file mode 100644
index f7030c3323d1..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.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=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="http://ipython.org"
-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/notebook[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
index 28147f8a5302..2d8c5bfa734f 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.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=""
 
 RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index fd1d0b6afeb3..dc5eb8bed099 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,6 +1,4 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
-DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
 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 773 BLAKE2B debb489dc37260573be7c5ddec7c03276ba9b5ff8f69e3ad4b816489e34b63753fb6ffc3e26b586ab88d38b33277262e150e08b0eb6fb1aba5f1f7622efdca7d SHA512 c29d7592cb02f39a0d38a1681f4c96e3cce41f74b51a5047c9272178073d987ec0aeb205f44c29e70aaf1dfb71f79b161a84d4223694661de0ff352695e0abad
+EBUILD wrapt-1.12.1.ebuild 766 BLAKE2B 0cdb1af4ae7f151f801b1bf2359f2bb30c771152e5d37aa589ec1d833535bc1006d2b1855fc38757270fd174107bddc2b01f3d2d0bcae7534bb683e96fed5ea4 SHA512 7c4a45038f6da2f69b3256ecf5d8f2cfb3f1ed41c820967799b8ef95da807935305db6abc67e0385573b0ed07b4640c55f29b49417ca1fdc0c91df18c1ffc8e8
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.11.2-r1.ebuild b/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
deleted file mode 100644
index 1c93fca3441d..000000000000
--- a/dev-python/wrapt/wrapt-1.11.2-r1.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=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 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/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index 477f6b207dc3..c7e2f23bdedf 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -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 ~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"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 20e45e0b1e83..5c664c125f66 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,9 +1,5 @@
-AUX ws4py-0.3.4-tests.patch 2439 BLAKE2B 0d0a185104b073ceed3c745f46b67df5916b001f5e67be50000ef1c68f923f2375be248f4961739180d4992db6fdf11d2ba3558a4725cd4f3d330303fc9c01a1 SHA512 fb8cf920ac48aface7e50576c1038db47133c6a44e7d4ef1b965d6efc4374d22392e44bfdca64bd61696a5c6ed884ef6b1e410e515ed6e1856c7f3c4862d19ff
 AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d2a845daa0e9e932452ba34416b088531734013f1617901617d82804b32ec22026d50c27152b68fb548b0871a11ac20ffa21fc5b435b0 SHA512 3012d74e348f7965fee811c9b0e290dcefcc4f365159ecc0fc5bc9dc77ff0e5e6d1448b62b0ced1f9e87dc2bf29f9a831d110301257d260dcb3f2d1ee7ed4f80
-DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.3.4-r1.ebuild 1726 BLAKE2B beffbc7b4a6cbd1487769c4b4d55ae70f748fbd6eaf9d621abc8dbf2b92e927e9173fa3c7d982dde6cbdef4b24044fd883fadb496229dc43e28106b401fed7ae SHA512 00774d6709968c5896de6fff395fc3547d34f0cbf81a2db82201853e73609269ddf1d6fdc6ec08ab568828934521cf990aa8db21bf8490dc6e0f6c7278be9c87
 EBUILD ws4py-0.5.1-r1.ebuild 1782 BLAKE2B 2974e13ccea65faa858dc30d31033f1e6f9c4fbd949445084cd8eef9996e932e11d388690572e74568da38a9304feed0718d5795161e1a1fa79325eba6c742e2 SHA512 2e401ba6367ab0fd14abf6caafeb61f8e5e9be1af59ab34d23e9b741d09186463e9a423558835b01bce7febc21920f06e0727b8ab0573c07a271500bb5bcf16d
-EBUILD ws4py-0.5.1.ebuild 1690 BLAKE2B 44cbb9758f359bc8b5a549d312f9b77f95011852447778d7dd507b981965e476da6b852550524cee7d0cc640b268a51792fe5f2f1aafa9f3c4c8d467378f68d5 SHA512 98f64075746263eecbbcb0a1bd1690166f927a521cd6aa82128a928de3b6f597516b8878808793c2896ce7c65c2e9558b8ef854e5d18d9adf2ce2eef2809c118
 EBUILD ws4py-9999.ebuild 1784 BLAKE2B 43cf659f0e4c4c14e344dbf2f8b1f637f168233b14085ad10fcd5c96650306f5162d4bd5ba6487d366898c3f055632ea32fb2e807be4dfab1d33de62ad81ce1a SHA512 827f1ad7a9ed752a2dc2e0c0a55a83eb5f7109744134e4fb76e555e7baf97cbd059890cfa0d0d73b8b8624f420ab0a1f56c6d8778d571a8558c1285df5f85355
 MISC metadata.xml 480 BLAKE2B 464f4b1e941659251ece44c65b341bac398a73a13624f58a36113359866557789b255a4e45a23ff9305be2e7bcbd3ae9e30b11d0ab72a1496544b1e559e07a17 SHA512 f3785b920223b276874e389c7db00b20117aaa3e003ed03593490fda2bfcc4df20034a91a3e98c58ec30f52ad50bc81d91e2ea388e87e56bb91863edbdb6d231
diff --git a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch b/dev-python/ws4py/files/ws4py-0.3.4-tests.patch
deleted file mode 100644
index dde60f2ed04d..000000000000
--- a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 185c88cb6779b3b15a5c14047bb62b8fcb8d2e57 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 10 Mar 2018 00:33:37 +0100
-Subject: [PATCH] Fix AttributeErrors from mistaken Mock.assert_call_once_with
-
-This commit is a backport/subset of:
-https://github.com/Lawouach/WebSocket-for-Python/commit/b5d47f7b3497f1b713a20fe6306b7d9afdd8c408
----
- test/test_manager.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/test_manager.py b/test/test_manager.py
-index 8c229b0..aacc162 100644
---- a/test/test_manager.py
-+++ b/test/test_manager.py
-@@ -16,10 +16,10 @@ class WSManagerTest(unittest.TestCase):
-         ws.sock.fileno.return_value = 1
-         
-         m.add(ws)
--        m.poller.register.assert_call_once_with(ws)
-+        m.poller.register.assert_called_once_with(1)
- 
-         m.remove(ws)
--        m.poller.unregister.assert_call_once_with(ws)
-+        m.poller.unregister.assert_called_once_with(1)
-         
-     @patch('ws4py.manager.SelectPoller')
-     def test_cannot_add_websocket_more_than_once(self, MockSelectPoller):
-@@ -49,7 +49,7 @@ class WSManagerTest(unittest.TestCase):
-         self.assertEqual(len(m), 1)
-         m.remove(ws)
-         self.assertEqual(len(m), 0)
--        m.poller.unregister.assert_call_once_with(ws)
-+        m.poller.unregister.assert_called_once_with(1)
-         m.poller.reset_mock()
-         
-         m.remove(ws)
-@@ -98,7 +98,7 @@ class WSManagerTest(unittest.TestCase):
-         m.add(ws)
-         m.start()
-         
--        ws.terminate.assert_call_once_with()
-+        ws.terminate.assert_called_once_with()
-         
-         m.stop()
-     
-@@ -109,7 +109,7 @@ class WSManagerTest(unittest.TestCase):
-         ws = MagicMock()
-         m.add(ws)
-         m.close_all()
--        ws.terminate.assert_call_once_with(1001, 'Server is shutting down')
-+        ws.close.assert_called_once_with(code=1001, reason='Server is shutting down')
-         
-     @patch('ws4py.manager.SelectPoller')
-     def test_broadcast(self, MockSelectPoller):
-@@ -120,7 +120,7 @@ class WSManagerTest(unittest.TestCase):
-         m.add(ws)
- 
-         m.broadcast(b'hello there')
--        ws.send.assert_call_once_with(b'hello there')
-+        ws.send.assert_called_once_with(b'hello there', False)
-         
-     @patch('ws4py.manager.SelectPoller')
-     def test_broadcast_failure_must_not_break_caller(self, MockSelectPoller):
--- 
-2.16.2
-
diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
deleted file mode 100644
index d6697eff1d24..000000000000
--- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# We could depend on dev-python/cherrypy when USE=server, but
-# that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
-# pypy is viable but better with a cutdown set of deps
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
-HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+client +server test +threads"
-RESTRICT="!test? ( test )"
-# doc build requires sphinxcontrib ext packages absent from portage
-
-RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
-		server? ( <dev-python/cherrypy-9[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-		<dev-python/cherrypy-9[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.4-tests.patch
-)
-
-python_test() {
-	# testsuite displays an issue with mock under py3 but is non fatal
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
-}
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
deleted file mode 100644
index 38507310ab2a..000000000000
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# We could depend on dev-python/cherrypy when USE=server, but
-# that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
-# pypy is viable but better with a cutdown set of deps
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
-HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+client +server test +threads"
-RESTRICT="!test? ( test )"
-# doc build requires sphinxcontrib ext packages absent from portage
-
-RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
-		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# testsuite displays an issue with mock under py3 but is non fatal
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
-}
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 44c7ac5723f0..d384d2138697 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
-EBUILD wsaccel-0.6.2_p20170108.ebuild 635 BLAKE2B 64436d593e082b08618cf8487fe8fdd744392ec8f2d10113ffd969e6cc82d325c0f3840c0b0ae0f4a9d88148b06d06a1c500cc74ace9da2f3d208d818ead4b4d SHA512 1e3be94364d0a33ead1d3fa99650c572183e302caafcdf2eae0efc2a6daa675a0eb09aa8cc0d98dd91a185044807c0890248c19b630220dfcdbdfe4d9d18aa15
+EBUILD wsaccel-0.6.2_p20170108.ebuild 634 BLAKE2B 69326564fb8da839f58dc73285f559ff07425800de0eebcb0dd851b3c94cce021b7ca1a25a2cb61557de416048afe606ce492ead9646f95a7718e5ec7910edd8 SHA512 56d108d7fa54ad878aa4e04b042418c7883e14d4bb17a2a2cc0ca1d89210ec458366c37325d45b38f86057cd7a0ef699f060fb121e74b9c0d6b8d0a7cf2453c2
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index d9e9393a9a2f..cc21c2ec83c3 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 6d96eaefabc3..1e6648189b08 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,4 +1,4 @@
 AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.6-r1.ebuild 1098 BLAKE2B f3f6f464d95e0b134e0925ea986207ace8e5dd1f75d15c098ee07e32418b997e433967c7c3da7cab6d687118fd811e173f357b9e7d2297547b1a8a6503d3b3e9 SHA512 2e530ca9e45106090a7671fc811aa8852cec35e83a9dc6e9a571b7f796639660ca4f8dccd1d04efd9749325d01ef4d75bf2666e8773ae0e730cbc3308c49868a
+EBUILD wsgiproxy2-0.4.6-r1.ebuild 1086 BLAKE2B beec6d81c66c06013b5125730f0ea63b2a81ec1635b4067605c075246ea4c16ecb213f5fc7dd77c68c6d993ce95c84f7fe3cf9ae0d2472d3e8b5851cfce05ec6 SHA512 7e80561f1d8cc1fc7ddacb1f6ed8e60915075cf4a5cc30260db98032ccd90e32200069eefdc83be71b7a0cdcab621e6f97fdc1eef74b23e71be1b3c7dec980c3
 MISC metadata.xml 337 BLAKE2B b34d470df573b61875a4d4bbff338d30a9bb21fc1905a73e47639fd9f3a9c3222b8d5dd54daeb37228dea119cdd354d618cd544de3ab7b46b826f70faaa9add0 SHA512 85c5219804c984dd8f028fcafd94476d0e44a09154d852fcc86194f6c1fb4dbe47228346be487aad7de0588079499c8e47cca0166721f519a8a99cb359fd4f03
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index 0f5f947be439..d524ceab7eb1 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index e0fd9021705f..d5f870fc1c6d 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,3 +1,3 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
-EBUILD wsproto-0.15.0.ebuild 592 BLAKE2B a178738f2ca9abc07077b0952ac13474867d29806379a302be2188e3611a4f8615b326dd5e052e10094a492c9bac61640024e2736024d787e1a01e21a10a5223 SHA512 8f1ebc1ff26e78a599310e4a6e48b23a255882be838d32de9c9a4a0876f5bc690bb6a5c86ebbd5088fad6de967bb611c4e99a4c0c94ed598c1ee5f00f7db20d3
+EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
 MISC metadata.xml 449 BLAKE2B 20905c7dcbfa8e649ec28d7825903e62987d2c5a77c2e66b21ee8493a9a7bd1294fe4cf89db71497a6580ec1f60aefff7406c0179b258f98db9a6e807d4f0883 SHA512 5652a88da35965492588df16a4b4d17318174284941e61dffa4a618820243ce6795fe566beb7c27a2d39ba56de776e71b49782e7294c7d43b4d48ce67466cc7c
diff --git a/dev-python/wsproto/wsproto-0.15.0.ebuild b/dev-python/wsproto/wsproto-0.15.0.ebuild
index b4e0f094aaf7..e7dbbeb8b3a3 100644
--- a/dev-python/wsproto/wsproto-0.15.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -15,11 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/dataclasses[${PYTHON_USEDEP}]
-	' python3_6)
-"
+RDEPEND=">=dev-python/h11-0.8[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 6c464532a4ec..d7c8ab6551a6 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,7 +1,4 @@
-AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
-DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 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
+EBUILD wstools-0.4.8.ebuild 767 BLAKE2B 81b0fce596e1ee93c4f0ff636221a9e223a74d0311169439ed12cfc84bb4a5601f1805e7017b8080836c64c997fe31b18be54dcc0347c8a78f7b5a0422733f75 SHA512 d22b93b19b37b59ca9e6dcb5ebcd4863c8b7b6037bdce625670c1e4e8f2c055e87a823f2c6f80808ac45fa14f37a0e71a20f21f759b4a36d94c99dbd88b6649a
 MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
deleted file mode 100644
index 9de7c159c972..000000000000
--- a/dev-python/wstools/files/wstools-0.4.5-setup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Avoid pulling in a lot of unnecessary test and setup deps.
-
---- wstools-0.4.5/setup.py
-+++ wstools-0.4.5/setup.py
-@@ -9,7 +9,7 @@
- 
- from setuptools import setup, find_packages, Command
- from setuptools.command.test import test as TestCommand
--from pip.req import parse_requirements
-+#from pip.req import parse_requirements
- 
- NAME = "wstools"
- url = "https://github.com/pycontribs/wstools.git"
-@@ -55,13 +55,13 @@
- 
-     def run_tests(self):
-         # before running tests we need to run autopep8
--        try:
--            subprocess.check_call(
--                "python -m autopep8 -r --in-place wstools/ tests/",
--                shell=True)
--        except subprocess.CalledProcessError:
--            logging.getLogger().warn('autopep8 is not installed so '
--                                     'it will not be run')
-+        # try:
-+        #     subprocess.check_call(
-+        #         "python -m autopep8 -r --in-place wstools/ tests/",
-+        #         shell=True)
-+        # except subprocess.CalledProcessError:
-+        #     logging.getLogger().warn('autopep8 is not installed so '
-+        #                              'it will not be run')
-         # import here, cause outside the eggs aren't loaded
-         import pytest  # noqa
-         errno = pytest.main(self.pytest_args)
-@@ -136,9 +136,9 @@
-     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
-     packages=find_packages(exclude=['tests']),
-     include_package_data=True,
--    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-+    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-     setup_requires=['setuptools'],
--    install_requires=get_requirements(base_path, 'requirements.txt'),
-+    install_requires=['six'],
- 
-     license='BSD',
-     description="WSDL parsing services package for Web Services for Python. see" + url,
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
deleted file mode 100644
index 8774c5f79d31..000000000000
--- a/dev-python/wstools/wstools-0.4.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=( python{2_7,3_6,3_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 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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index 857203dfd07d..97a2acd7dd53 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 5c3c32db2de8..d34526e4300d 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,5 +1,5 @@
-DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
 DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B b51b5cb26c550a2502c8c70c1de91c7e6e320f60e2df3ab2b9a5cd755dbbb753d8d2fa05837657aa639929b380e8c65fd25182192538ccef837cae0869b19c80 SHA512 40b810d2d0ce6d2e7880615fb5c3b3e55cfade8e352be5d626d0de16f00a9ef4626ffa106b67d0cbef15e42513073db52ba1ceb04cb18146bba0ba9c26236fdd
-EBUILD wtforms-2.2.1.ebuild 1110 BLAKE2B 369f0b87e96599604b9c1d475f23388c352cde0ab926e6e54b5d541d2623f8b4d2f04a5ff1aa170e9949c20b6ff3deecb19c504ef8f21a9a17a5256b4637a9ac SHA512 d5853383f9b46dca6165d2c777122f429bb3160001f49a614aafab7c5f9371cf8ef8c4d662c05ad32ad7f19ee4cdc9ad7b2c2b41d536c7229acfbf6123e44601
-EBUILD wtforms-2.3.1.ebuild 1168 BLAKE2B 2390e15d8542eada503e79be88129728ec89b338bf90ef5fa5448cdfa7d354d47c5641731db6c92e68b919acc4008cd71534daa01a71e8b3c1c0e30ea1505372 SHA512 bf727d8066bf7f04e723063f61e675cde87def3d23c6aae76800cc9d21dc4ba5c29f8cfd9859c24bee652d8aadfb0c1e4cd478e3fa83233be7d9107cb741b6b3
+DIST WTForms-2.3.3.tar.gz 162945 BLAKE2B 5f9f2c920ffc784c34d69f42cd259c1cb6007edbc99028bede98b7c3e24b8ba616b89eceac241cc9b20b241e758ee0c88a9c6736597ddc83c90542135a004fec SHA512 934cf1483beec37d698d13a81e44a733d082baad1f418d3087306fd908df809d37fffe000ed1ecabf65d2c31b57034bf6f25c3b77cfc5598ae1f65bf4a115fe5
+EBUILD wtforms-2.3.1.ebuild 1166 BLAKE2B eeb46e175c9ae3d5e1ce169a02c269438131e896bedf1cfaae35798bd48019e8f379eab0fc9a386590921e7a7cdb9367994e99b9af65432cddf8fbe7b1364a32 SHA512 590fa611c411def976e2e0d2ec2c11e3ebd2ac6fd1cd6a5044a31551ec00f7b98b1e82f5d328968b426e97116d494fed01fa80615e2be3ce24b702e2306ce447
+EBUILD wtforms-2.3.3.ebuild 1168 BLAKE2B 2390e15d8542eada503e79be88129728ec89b338bf90ef5fa5448cdfa7d354d47c5641731db6c92e68b919acc4008cd71534daa01a71e8b3c1c0e30ea1505372 SHA512 bf727d8066bf7f04e723063f61e675cde87def3d23c6aae76800cc9d21dc4ba5c29f8cfd9859c24bee652d8aadfb0c1e4cd478e3fa83233be7d9107cb741b6b3
 MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
deleted file mode 100644
index e52ad989976d..000000000000
--- a/dev-python/wtforms/wtforms-2.2.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=( pypy3 python2_7 python3_{6..9} )
-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}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# Extension-tests are written for an older version of Django
-	# Disable pep8 even when it is installed
-	sed \
-		-e "s|'ext_django.tests', ||" \
-		-e "/import pep8/d" \
-		-e "s|has_pep8 = True|has_pep8 = False|" \
-		-i tests/runtests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py -v || die
-}
diff --git a/dev-python/wtforms/wtforms-2.3.1.ebuild b/dev-python/wtforms/wtforms-2.3.1.ebuild
index 6651bb04febe..85518d2bdd5a 100644
--- a/dev-python/wtforms/wtforms-2.3.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]"
diff --git a/dev-python/wtforms/wtforms-2.3.3.ebuild b/dev-python/wtforms/wtforms-2.3.3.ebuild
new file mode 100644
index 000000000000..6651bb04febe
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.3.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=( pypy3 python3_{6..9} )
+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}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	# Disable pep8 even when it is installed
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-e "/import pep8/d" \
+		-e "s|has_pep8 = True|has_pep8 = False|" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die
+}
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index c7824ee8c2a5..83680e16813e 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
-DIST wurlitzer-2.0.0.tar.gz 10203 BLAKE2B 526f1fa1cf2f257c126a4f2c67b27b373b23e113552e72372029ab69a6b629d9453c39feac083c1376e3996a44af8ad823d1ca119515b420d9fefbbf326da38e SHA512 5cafdf84e47e6d18074f6ed3af6bab2eaa1f5cfd3d658ea02a49d387127e9a9101de05c864480af42f5a7650cc47e0a218e822912a4ba3ef826e71206dd2f3e9
-EBUILD wurlitzer-2.0.0.ebuild 563 BLAKE2B 75fa4e8a559e826c23d1578d54144e7502c8645e455dcbe9a2c8aaed99b1b6c0a883802ee79272f73102f78dbb8963900f5a4b65929e7dbb337cd96cee8b0774 SHA512 fe2b9a2be875d49e8f9b08474140853646c05f4a24163530fea1b79f09d9859dd73f1e17733bc454ada2057ad0f404693d6240d71308fc97aa47342c32e5d2a1
+DIST wurlitzer-2.0.1.tar.gz 10638 BLAKE2B e5350a3920ae072f93a0043ec368766d8e190558b3e897e68b272b06d0d6ff7907f2aeecfd41a99b54804a596ad9f7d7062995a5c465724a2b87419ee801daa3 SHA512 06f67b666c2a364b5ee497fa2f0ab8640aeb2953b678e35b13e1558ab29bc5554f479731f9942d8f033275f5151bb9f86408e0f04b1120bae0f29b27649d783c
+EBUILD wurlitzer-2.0.1.ebuild 566 BLAKE2B df1775c1c9a9030736814eda42fb5bf92974abcc9995b4f48fa99cd05dc38b87ad512bea34a885b90222b40cecab4883dc6068df3e69b8ee72d4cda3f94a4d46 SHA512 f18d7e74e7d61537a5eb07c799cead8918871f6169fc3aa5f3392cba786d8338b3658f70e30f1bf7a1952b410ae6675b4e06033b3c4765ca26ee8e8a84af14ef
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.0.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.0.ebuild
deleted file mode 100644
index 7ae94bdbdace..000000000000
--- a/dev-python/wurlitzer/wurlitzer-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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture C-level stdout/stderr in Python"
-HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
new file mode 100644
index 000000000000..f920b819d1d0
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-2.0.1.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,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture C-level stdout/stderr in Python"
+HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index fbca63a2cb9f..9254737bcf08 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,4 +1,6 @@
 AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
 DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
+DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
 EBUILD xarray-0.12.1.ebuild 817 BLAKE2B 2ce5b748c35102f6e46503c99fca8af49f3d7f6ce3a0b2498e7bb896ded6cf086414d7c506953773b495f35cd56ba509825fe73797b8742760dbd3486ac3b1f8 SHA512 689536ab57a3b18f772ab7c406ad37688742bdc5cd0217b013452b63c26626f1fe7350d3390c0528e7e9c7005993dcaea62c4dcd78edc2645aafe88591b69e98
+EBUILD xarray-0.16.0.ebuild 981 BLAKE2B 5dd5b10ccb4034ac19e99860410845fdc47590368e9998aab557c895905c73d50ba8b7799df68c60e616c9df37f670075a0c0d58d69fcdebaae6a2a58e2e7323 SHA512 eb1e285c2d75e2e4417a908b1acd394887532206a29225d48a98d32f8fe4536c17b759acc1264a5342f208ee2900b20dd12ad24d54b4526dd4f725b8b668a8e4
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild
new file mode 100644
index 000000000000..67c0b3aaa1ae
--- /dev/null
+++ b/dev-python/xarray/xarray-0.16.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources use in code
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6..9} )
+
+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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41.2[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+#	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
+)
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 6e595000ef3f..c2b72fc0bcca 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,4 +1,7 @@
+AUX xcffib-0.10.0-testing.patch 712 BLAKE2B 755afd987d0a6240f4d140717c62c62bf0ee89a1e4f14000b9059269a5674d58fef7aeefd45025f2c7dbfabb9ac7024f1abe8d7fb5f77b3a6a0a4a04bc337fd3 SHA512 98da04ef2a26ac89824ea9b4986840f30f398dffa1ffd22cfcc95242aff65e94ca2c3bcea7890c0081c8c8e721fbe617734af32b756dbd86d6982bae69b05889
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
+DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
+EBUILD xcffib-0.10.1.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
 EBUILD xcffib-0.9.0.ebuild 762 BLAKE2B 0292d0cd3101a0b6d7fa2b7b7dbdea76f99500a0b31c451babe58a4a9df2f62abd7623c0934e337f9887d53b3b310f07d24de7a9c301d4f2545fc4d2afa97eda SHA512 3b9f580fc0a743166b9a6bb84d6c53530a930c7707f2d73e61589a4990136b04dd1efd997f6d7d42d61e559a13d55aaa561c7cca4a84b7c660bca7c21b777c67
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
new file mode 100644
index 000000000000..7c075ae9811c
--- /dev/null
+++ b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
@@ -0,0 +1,23 @@
+diff --git a/xcffib/testing.py b/xcffib/testing.py
+index ef0268a..0662fcf 100644
+--- a/xcffib/testing.py
++++ b/xcffib/testing.py
+@@ -31,11 +31,14 @@ def lock_path(display):
+ def find_display():
+     display = 10
+     while True:
+-        f = open(lock_path(display), "w+")
+         try:
+-            fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+-        except OSError:
+-            f.close()
++            f = open(lock_path(display), "w+")
++            try:
++                fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
++            except:
++                f.close()
++                raise
++        except OSError:
+             display += 1
+             continue
+         return display, f
diff --git a/dev-python/xcffib/xcffib-0.10.1.ebuild b/dev-python/xcffib/xcffib-0.10.1.ebuild
new file mode 100644
index 000000000000..790a52834b15
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.10.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=( python3_{6..9} )
+
+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"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests nose
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index ccdbfcff18e3..640b54974c8d 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-1.2.0.ebuild 645 BLAKE2B e117b31d6b534175470ade71c870f5343c8facc186397b06daec7d89315eac3c8b9b9af9560b4ff933e4a0245d6c260c5e7bf18fe1f822998db0f40b27351aee SHA512 f86c8e58fa003af4127476fefe79783a2b590cbe6263e21202933ece387edbb8fbed525c77122dff6f752b52c74543a6009d5e587c7626e5a2522936dc73fe55
+EBUILD xlrd-1.2.0.ebuild 658 BLAKE2B b34b4dae617c34f64572c6cd8d102c0bace5fa7086d111cf32aeef80761a8e64d28a304cdc6f819af837c167ed6248cd832842b01ec797b7dddc6ec1aa5781a1 SHA512 16807742ff8cb604088f21b9e5858a85ca8cb6487c136f1f6776fb1d4da515884a6ced8bc3f8b00a97af78599fe594e72effc09f997641708690b0ee7ec6a08a
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index d2dac8fad320..8b8925aed733 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
-HOMEPAGE="http://www.python-excel.org/"
+HOMEPAGE="https://www.python-excel.org/"
 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"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 42cbdcd27308..0c9987f96a1e 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,8 +1,5 @@
-DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
-DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
-DIST xlsxwriter-1.2.8-tests.tar.gz 29222574 BLAKE2B 11a13c5fc4089c8c15dcaa069a6f044555426e71dd040a6abf1038fb2a33788744c80487abaf1da6b3c0fae2db55a389c0cedbac251c793dc828920ea55ee5b3 SHA512 2269235ad3bb243dd8be5cf33efb6503e08e3d7ac42bce042c97737ebb8a9db880db93c05bbb2708b0bb6c621cb11c91f3e7d5b4fa09fce88092b365910b1afb
 DIST xlsxwriter-1.2.9-tests.tar.gz 29395878 BLAKE2B 010e3baf191dafe04b4c73986c7997048aeb1002515d24e104a241e7bc80c5e3e4e46b2454e01de72e23418a24ad981b758355dc77dfa1980265d5b119e7c247 SHA512 4680f2eaa96ec8063432f3f0642d27895cd462d3d9b664a452f8e2956bcd16268f41a5780d172cf61cd3951f1f5fbc2dc904ebef1e08e7f45269821a3157c7eb
-EBUILD xlsxwriter-0.9.8.ebuild 952 BLAKE2B c31d7bc21c3364389e8e4241d68e180915c3a86db13eff01c33284262c9008e09513f49f0eb5d6b12b4f5a6fe98ff06ca2afe54cbbad3e1d917d37f740b0085f SHA512 cd1b9969918b525e4256e5a665021089af8aa9df7df21a95e4f20d73d9e54d05606665cc831fe3645c4b867db78d5a858a31dfa60b7d047fc340c23c025d4ee7
-EBUILD xlsxwriter-1.2.8.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
-EBUILD xlsxwriter-1.2.9.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
-MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
+DIST xlsxwriter-1.3.3-tests.tar.gz 32108929 BLAKE2B faabdf2d2662c61217925679b1b22b294db5279da11b959b12d181711a4c9033e34a52d4888e3dfe1d804889eaa2ee8ff03cf1f298b4930268594e2856ddfb85 SHA512 d5bfcb624b66bb2098fcab1623f8e221c1254fd7b094bb71622969618061b434d9a17d9199e32110ef56336e2a96a93c94f1ed1ceca5877ef41fb52c3b2a37b6
+EBUILD xlsxwriter-1.2.9.ebuild 571 BLAKE2B 7371ee874a18952deab026b05f9d4e6ae5776af3f1f9f046aaa228213a46645625304c29661b5714b827da40339fee365af313c7158ae7127972fdcd411d43c6 SHA512 5dd260a2126ffb6434e24d6f3c83dc80ff6cdad686fdbb518ad14d2bb23f8447ec1bbb42766c28981aab1bd70945ab2feefca073f125f86722a2a7308866a4fe
+EBUILD xlsxwriter-1.3.3.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
+MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/metadata.xml b/dev-python/xlsxwriter/metadata.xml
index b6f904c2dec1..39ed85ef6aa7 100644
--- a/dev-python/xlsxwriter/metadata.xml
+++ b/dev-python/xlsxwriter/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">XlsxWriter</remote-id>
     <remote-id type="github">jmcnamara/XlsxWriter</remote-id>
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
deleted file mode 100644
index 8b195492bc4e..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.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,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.zip -> ${P}-tests.zip )
-
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/unzip
-			dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	if use test; then
-		cp -r "${WORKDIR}"/${MY_PN}-RELEASE_${PV}/${PN}/test ${PN}/ || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
deleted file mode 100644
index 11100a0ce79a..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-1.2.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=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
-S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
index 11100a0ce79a..12bfbaf692ba 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.3.ebuild
new file mode 100644
index 000000000000..0976f9f9d2f1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.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..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 34a5a140551f..51f976b38ed9 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,9 +1,5 @@
-DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf2c63c1908e008401eafe210b759894ba508011ee58e2c242ca5b3d424c86cdf7a65312e9df1cda426802af8e861 SHA512 df277cd75058e10b8e0505db51fc167c688fe4c3d319de289ac77faa37913f60d2697f4456e00d637c4a3c3f83d164619e0ce1b849e8c8ea3b5e1932b56044dc
-DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
-DIST xmlschema-1.2.1.tar.gz 318674 BLAKE2B 686b94846b9cc8bc3dabfea9c9171a186561a0ad568a2806f5575a0c5808d3542f4e2cb7c01096036f5a54fb839cbdd95077fee9febad4cd7a82ead445228e62 SHA512 6d27ea5aea227e35f25a34a651b27084844bca015ae60d096fe1879150efb681141c368cd38cf376a2f0ea28b265cb844f1de82d2d7f704e3c2db67683f2af9b
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
-EBUILD xmlschema-1.1.3.ebuild 706 BLAKE2B afd9564f0490f8a2d88c4468ddb9f8cd785e65a16c2a09601cd1531b6fd00c20e43401ce2a70bc62852c061d7058097f619c493eb54001a9e767119612b3abe7 SHA512 ae6620c74b2d753dd4dd84217f4d6114833f50f60338b6aeb03cacec2921f36ca91343e28ceb9554aef5fc5e4247bb75b7e58c2b97401657bddfa9d79a214bff
-EBUILD xmlschema-1.2.0.ebuild 756 BLAKE2B 37a7a167f92596b068de0240b6920eae9293cccf6a714c19026ed8a46e87a8c727bd6a3cc7aa8749d0113b66d854eea2e9719dcf39911f6851cb3f72349f49b0 SHA512 2d0c6fbd5d0f0ae5618f8505e37b386cf77784b5b992d6cc36cbcc7ac4df9b60db7aeca59cb10c0006ee196e8ee143197f64baba9343418ee751760af4451156
-EBUILD xmlschema-1.2.1.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
-EBUILD xmlschema-1.2.2.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+DIST xmlschema-1.2.3.tar.gz 322076 BLAKE2B 2b6c587772a14b4b804a35614a2e1e77ade9be0ef25cabfc331efc3a443058fd51c178339f1d6df2cbda77d2a8d1c2ac2c33155406e7e7f36c10225ecb70a3e7 SHA512 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
+EBUILD xmlschema-1.2.2.ebuild 936 BLAKE2B de45d9ef22dffbfa20fc2b8808cc9d0c540c6e7dfda939dc70c8f207775960ae703ec395d54013df5b87f97d327c9a993f42c259623432e260ed2a652657d088 SHA512 e5cd335f21f8fa0139dc6195c285ac6c3ab7488a0903dd9d030d0627b620c82be8b98e22ce8a15569aec0600f0728da1736032e69eb6041ee76d6a710929ed60
+EBUILD xmlschema-1.2.3.ebuild 764 BLAKE2B 031faa73dd3be8e463192a489dadd1ae0de416453dad607139286ab9f6dcd9309f6aafc59e42359730769ea9ddbac3c12b6af37d80c8104a013ea108921aa519 SHA512 27395cc3c7e8911b55a1eb6ee69029a0654562f0a73b079257aba8527be3859cb3440b875f3f587f3fa92e4ba753aca99e29845dd5ef58f77c357ca9689a48a3
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/xmlschema/metadata.xml b/dev-python/xmlschema/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/xmlschema/metadata.xml
+++ b/dev-python/xmlschema/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
deleted file mode 100644
index 970be7400279..000000000000
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +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,9} 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 ~ia64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.2.0.ebuild b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
deleted file mode 100644
index 590f138983d8..000000000000
--- a/dev-python/xmlschema/xmlschema-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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,9} 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.2.1.ebuild b/dev-python/xmlschema/xmlschema-1.2.1.ebuild
deleted file mode 100644
index e6e1d1a243d4..000000000000
--- a/dev-python/xmlschema/xmlschema-1.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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,9} 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# https://github.com/sissaschool/xmlschema/issues/197
-	sed -i -e 's:test_schema_resource_access:_&:' \
-		tests/test_resources.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.2.2.ebuild b/dev-python/xmlschema/xmlschema-1.2.2.ebuild
index e6e1d1a243d4..b38e095e917f 100644
--- a/dev-python/xmlschema/xmlschema-1.2.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.2.3.ebuild b/dev-python/xmlschema/xmlschema-1.2.3.ebuild
new file mode 100644
index 000000000000..411381185a2f
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.2.3.ebuild
@@ -0,0 +1,30 @@
+# 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,9} 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-python/elementpath-2.0.0*[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index b01353827ab7..93b456b764dd 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,5 +1,3 @@
-DIST yapf-0.28.0.tar.gz 157976 BLAKE2B 11dbbecd4a9cd77e6ff3f1f279cc4302b13445e3f0522f64a7e6b71155703f4c074a5bbf08cedc903533aeaee7338c63a98fc04870b8470a30377686dc66d2b4 SHA512 be9ed5278d085797aba4a582a37295716c76fd10a4cea4bb5090794dd53eba6d1340d8ba7508e33a146f189a863578c95b0a651bbfd90b0390076028e03ad9bf
 DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
-EBUILD yapf-0.28.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
 EBUILD yapf-0.30.0.ebuild 449 BLAKE2B ed3e5b118dccea79a474b89f6795c6e9265b0b9e529948aa3aef60fa15dca6ab2d7f6269feb24bad40142c8221f8678ab68d5828149de4571bb0938a4e7623c3 SHA512 cc2e4ebb46a974f61451795b15d70bc1d610bca0171ba0616f53bfdff5475d05c049a65599bbe08ef5b535b4359ca4bcd371445f4b4f07f7f4dbd3cd336edc9f
 MISC metadata.xml 658 BLAKE2B bd04267b635e205f88ad59f2005a9699ab10970e3ba7fc8917591259e78eec9f1ce7de08d75345635277ba996fed4f7a393989000b78100695e169636d7db999 SHA512 b8c79baca3d700b265485273bcb51394e15e9688b1bb834fd29f00809188032a711f8bc05af7038589c657e9329478542ed7e6b47e420c9aa91f6605eaca20d7
diff --git a/dev-python/yapf/yapf-0.28.0.ebuild b/dev-python/yapf/yapf-0.28.0.ebuild
deleted file mode 100644
index 11aa475413dc..000000000000
--- a/dev-python/yapf/yapf-0.28.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 e3163d07124e..e2f53e68d4f5 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,6 +1,4 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
-DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
 DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
-EBUILD yappi-1.0.ebuild 547 BLAKE2B 7fa3320e99330cc4ff7066bae77435359576e14a428fedc22915904fcb14c82e72a445223456c8502c46fa140b9f32f51d8869d1128c94886b543f4993913cc0 SHA512 6c12e42115de68d28c74c09901983f59196cdd3b8267dbac446ea186d995630806bb37d38115d84df6325ef6d567858798b119d5dc038e17af965829f90465af
-EBUILD yappi-1.2.5.ebuild 939 BLAKE2B 08cfb28fdb2b666e030a43cea0f72b10006cf2064ab54e71e037abe6abf9e5008fe32d1d45e5dd753bebaaff494257eaedabf2797fa6dad6e2c4550b80f5858f SHA512 78104f197454e42d7587a51d8f18b0d5621a2b520bc6c32a4dbacd98ea0aa5494c1480fc26d75e572abd4c59706ee8171a83bed1707a401e1394f718bfd9d63e
+EBUILD yappi-1.2.5-r1.ebuild 976 BLAKE2B 3f047a3015a88861d59e9a2038a641ad8aced7c66f04001855ce50d37ae830bcae60e16df89ec9a6930c4649aef724311bfec311a72f555dcece057fdae3ae67 SHA512 171960875c3d2c67fabea15def17f077f7b9a0caac90ec2c195ca9d1e6256f77c2cbd3781e643d32c1c484b51c49533c4a50b77b4eedd12c1c85e4374c00739a
 MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.0.ebuild b/dev-python/yappi/yappi-1.0.ebuild
deleted file mode 100644
index 05de5b9581f0..000000000000
--- a/dev-python/yappi/yappi-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=7
-PYTHON_COMPAT=(python3_{6,7})
-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 ~arm64 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/yappi/yappi-1.2.5-r1.ebuild b/dev-python/yappi/yappi-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..3af35387b4fd
--- /dev/null
+++ b/dev-python/yappi/yappi-1.2.5-r1.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=(python3_{6,7,8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+# no tags on github, no tests on pypi
+COMMIT_HASH="b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0"
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
+SRC_URI="https://github.com/sumerc/yappi/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/contextvars[${PYTHON_USEDEP}]' 'python3_6')
+"
+
+PATCHES=(
+	"${FILESDIR}/yappi-1.2.5-warnings.patch"
+)
+
+python_prepare_all() {
+	cp tests/utils.py "${S}" || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	PATH="${TEST_DIR}/scripts:${PATH}" \
+		"${EPYTHON}" run_tests.py || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yappi/yappi-1.2.5.ebuild b/dev-python/yappi/yappi-1.2.5.ebuild
deleted file mode 100644
index 390429d7df2d..000000000000
--- a/dev-python/yappi/yappi-1.2.5.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,8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-# no tags on github, no tests on pypi
-COMMIT_HASH="b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0"
-
-DESCRIPTION="Yet Another Python Profiler"
-HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
-SRC_URI="https://github.com/sumerc/yappi/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/contextvars[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/yappi-1.2.5-warnings.patch"
-)
-
-python_prepare_all() {
-	cp tests/utils.py "${S}" || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	PATH="${TEST_DIR}/scripts:${PATH}" \
-		"${EPYTHON}" run_tests.py || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 3d8dbb83727f..05e39df6c538 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,7 +1,8 @@
 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
+AUX yarl-1.5.0-typing_ext.patch 1762 BLAKE2B e633e9dac216db8c530338b87275fa0b655623adc3a1e651bc5a13d82ff8f064507bb2bd875f23124ca329b6c6d7dc146bb2f058400aa3e71db8c87c6c2e8870 SHA512 ac2b28541876815d9e8e7ad15a30d6cb183315bea56c8c7ab1aefe0eb8e95797a81846045371a03ec2ffa797f6ba0587c15a479b263726b08869287be9821653
 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 727 BLAKE2B b9256d903e30bc0de5f1c0bf193de0298308c7dc90c15dcadbdfe9292b69053e7cea9ab50ddc48fab9cbb3854008a08ac6a0e775b042aba5fb273131b2c77b80 SHA512 4a3e36be601f4deed9780d1afe451229c58cf35060152efeaec24a1ba9968845b8f2fc1fdcb262471c3fd21ddae1518f49341e28a2b47b5832c3f7330c26e00b
+DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
+EBUILD yarl-1.4.2.ebuild 723 BLAKE2B d0ec747247e1342272e63daf606b5637d413a06fbed263a73cb04cd3e89ed15c16c31416a52c966075cc0c9ed0c33280e8e6447f494b3c29bca1937752d3c70e SHA512 39c3dccccac74e8244d466b5c62ba1959b790545680cab67a67ce444453295b0665872905ca4f39ce42e0d001ff758f137b03057ecbb05650cacc8af99aa6387
+EBUILD yarl-1.5.1.ebuild 724 BLAKE2B 22f6d1f3db8859ebd110edf1560395a7fbb3bebdc35c04b60483066b3391c3dbf12e8a12f0d55bb87e6fcfe99feebf21ef6cf2c3f5ad64caa680381ef4526d49 SHA512 7a5ec414096aab918b1086d27dcb8802d56055375d51818de50176f7e8836929d4c8b26331d2382a57a5fc1904e576867ebd0eca0a24754f0e919b799f203f45
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
new file mode 100644
index 000000000000..737135b0ff00
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
@@ -0,0 +1,52 @@
+From 47478e942992aaaa26c2defc3294cac45ede2cfe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 27 Jul 2020 07:13:19 +0200
+Subject: [PATCH] Require typing_extensions for py<3.8 only
+
+All the names imported from typing_extensions are available already
+in Python 3.8, so there is no need to use the additional dependency
+there.  Furthermore, typing_extensions currently do not support
+Python 3.9, effectively blocking yarl from doing so.  To solve this,
+use external typing_extensions only for py<3.8, and just use builtin
+typing in 3.8+.
+---
+ requirements/test.txt | 2 +-
+ setup.py              | 3 ++-
+ yarl/__init__.pyi     | 7 ++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 41d684d..1ed5bfe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,8 @@ with fname.open(encoding="utf8") as fp:
+     except IndexError:
+         raise RuntimeError("Unable to determine version.")
+ 
+-install_requires = ["multidict>=4.0", "idna>=2.0", "typing_extensions>=3.7.4"]
++install_requires = ["multidict>=4.0", "idna>=2.0",
++                    "typing_extensions>=3.7.4;python_version<\"3.8\""]
+ 
+ 
+ def read(name):
+diff --git a/yarl/__init__.pyi b/yarl/__init__.pyi
+index b3b58ec..eb4a12f 100644
+--- a/yarl/__init__.pyi
++++ b/yarl/__init__.pyi
+@@ -1,7 +1,12 @@
+ from typing import overload, Any, Tuple, Optional, Mapping, Union, Sequence, Type
+-from typing_extensions import TypedDict, Final, final
+ import multidict
+ from functools import _CacheInfo
++import sys
++
++if sys.hexversion >= 0x03080000:
++    from typing import TypedDict, Final, final
++else:
++    from typing_extensions import TypedDict, Final, final
+ 
+ _QueryVariable = Union[str, int]
+ _Query = Union[
+-- 
+2.27.0
+
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
deleted file mode 100644
index f541d5c0f1d2..000000000000
--- a/dev-python/yarl/yarl-1.3.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,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 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}] )"
-
-python_prepare_all() {
-	# don't use pytest-runner for tests
-	sed -i 's|"pytest-runner"||' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 33d927f6403b..f58f2871d2bf 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.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 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
new file mode 100644
index 000000000000..87144d1075ec
--- /dev/null
+++ b/dev-python/yarl/yarl-1.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..9} pypy3 )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+)
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 78d71d8f3c2c..8ab7e889d7c4 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-2.0.ebuild 1059 BLAKE2B f0de57fa4bb7da5510551d3c2229964a3fb81261d288402c213dfae6a378d65d84339ce0774fb7d2b23decd63aef22ebf00bf67f01867a79af2741dec07cca35 SHA512 17086394d93e07997c39b6f94a44c885cee0a051b6e8ba1fc23a2f5edad1083f22c9916daa87d4aeaee423e4fd8cb02590e39403600b72429099f7a69590865a
+EBUILD zc-lockfile-2.0.ebuild 1058 BLAKE2B 0886a9b01c7809bb5903f959cff14f0bc5c15dad25998b3e4f20212fbd6ca2df386c6ed2734e86155d8797bc3ac1bd5c1d7b69233fef3a15a219ffb725583295 SHA512 9f210de756daaf664d9ba8aa03024b1e8bcae11d7cdeec3d35dc0e887fce6c1961acd40e489302b9774e65f862fce817f0b46939eedc49df2bafa836a2806e30
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 2fb597296ff4..fc88ee687a70 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="~alpha 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/setuptools-3.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index bfd10681b90f..2bd4b4d0c37a 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,3 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
 EBUILD zeep-3.4.0.ebuild 1104 BLAKE2B 574fec4955e588977abc0e66ca4c71984cea96d02f12e889106647acae0933bdc7ec4179898d69b9b17e4b870712450e1963e86935de04836b04b363099d8f57 SHA512 cc0e4bbfadef38cdeb1007d7fc42d3599c33dbff8f8ba33bbf73f18390f7743a20cf9449f70c052d3f32e6e7c29d33fc6302e185d205560393e1b37a0d4c37d3
-MISC metadata.xml 589 BLAKE2B 7753eafe2db0c0494f397bdb185d121f6cf380a7007241d2a8a5e87b8a9080c026ee07c8d64d1ca1e661137c315492e28a6f6fd33578bcdc54432d9f183586c2 SHA512 b6d919287e23bc7a9aebaa3103678b7ca3927d7348a3470a266eaae25795851840c479307fd19a8fadb13f1e051b60bc617726fcfcd14983085fc33670f826ae
+MISC metadata.xml 501 BLAKE2B e687afec70f3c42b91871c4a5fd797626a9a6970368256d5bc5f69653125ac00f5a46a409e25da431ed5f4a7e3c03f7521ee80ec863178473dafb3ee6114064e SHA512 32553eaa2336be92c78412d2253f4e299c793fa9a42c8c4f3d969880a4b356da1d43d62bf1ea7866b1e462075b10b1033a7a3713086bde6d8eb0bcd829c6a144
diff --git a/dev-python/zeep/metadata.xml b/dev-python/zeep/metadata.xml
index 226f3a378fef..3495af6962fd 100644
--- a/dev-python/zeep/metadata.xml
+++ b/dev-python/zeep/metadata.xml
@@ -8,9 +8,6 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		A fast and modern Python SOAP client
-	</longdescription>
 	<use>
 		<flag name="async">Add async support</flag>
 		<flag name="tornado">Add tornado support</flag>
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index bb6e8ecec07b..b6ef8fbc267b 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,3 +1,3 @@
 DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
-EBUILD zict-0.1.4.ebuild 665 BLAKE2B 6385d935eb958b071f956adcb7df5f43e7a894289aa6f66474b8cc48710f670ce6a32688b67742bae847022573c4b64a01538cb497ddaa3c2850b4cdb5f9dac8 SHA512 337dcab9d414e97d0553e68bc692cbf6c14b9228ccacdd2eedb69a1662116c8cb008530d944fdefc14bc7151a9a12c2b7ff9f40439d8bf54b20895101a2cb1d5
+EBUILD zict-0.1.4.ebuild 677 BLAKE2B deb5cf96dc66bd32fbeb8b17dc1ea7d1adcddff1c0ddba94c963e6eb39575976c7ac065b09c0ded7b31aebf1f30f4336d0c88928773170b1277d95413408a4cd SHA512 1f01f2bb4e5bd6c8b7e20a4ee3fe5b53df7f9ce5938e6c16bdb3ed53cce7fe999b914e5fe0eec6acd2d87434a5953aaa89a24f3032312ffda651fb69c3363b23
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
index 5fb26c305b97..89cfb9b7afa6 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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 5b237e2ffcb1..e7499d066143 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1.ebuild 995 BLAKE2B f14b00363691d457fa48463e479a941f60a70ae540f69d4ea3d1a23fc40849d001cbcca1e900294ee7c8fbd05822459837437350ed807d4c5d371b02522c14a0 SHA512 c575d2b7b59513e1614e886b4058c9b7ddae93b78711acac23c5b652ec1b2572716dbe9fbf8af5504b587fd5a409f8ce1d93945a77da6480bda2da792749927e
+EBUILD zope-component-4.4.1.ebuild 991 BLAKE2B 99c29354f3323789d2797f699de37739c3a786af16d510bc55e15838e12400c60c82f289da0bbebb7ae2ce7244b637dd7162399e6ef78557294f18a44cf81664 SHA512 562dd04faf46b1f1e6e9b4331f190aad6857d0202c3153f871021fdbbf46996870e506f69199d12f5d23a8338bdbc5a36c94676c0897969d4168d248f465e74e
 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 34c27ba55b47..2dd6b633d078 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,3_8})
+PYTHON_COMPAT=(python{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 c4cf5a9a62b8..6fa12c1e205a 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,3 @@
-DIST zope.configuration-4.3.1.tar.gz 83223 BLAKE2B 9c55951932f34484fa6760a6a3cbdf89fbf8723c43b9b4ea2cf909b74716bcdd74d03327fc418f43bcfc8b6b5c17554cf8d062952d8d6880e49e6b270da9c1c8 SHA512 bc8edf84a391cab4f664ea3a4d24b65cb9db351c972b6118e69fe3c726bbe3337121ff59d687dddf463b3672ed6996f21d4437941c81dc456a4e5d837e0945d2
-EBUILD zope-configuration-4.3.1.ebuild 848 BLAKE2B 0bc69b75454af2640f60741988179491845cb78aafa026cbbf467fbaa54720b29810613637cd24a41962afe0808b2434f718cf5347268d3b6577c8069d6e4bc7 SHA512 b5ea2834754882221666fab02aa4f0c1e6b515bc4f1bbae804b2f6621a5491b6986f95f11eecefc246f52c879c0c06e2c48014a1682e04d31596c15c59347e3e
+DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
+EBUILD zope-configuration-4.4.0.ebuild 841 BLAKE2B 93d0ba251eac8c8bc331495ddea2d6ec703bb83b9faa54fc993c1388f3c17d3f005153a9917516d134b976f6bd19c8a1f85d24879ea58c68ee48dc24402d3f31 SHA512 0765f05411ef389e88f94e470581270d7c7e6193e5d9030eb8e9d0abcd3b34af6a77875aff0dfbc13ff50fe39a7ebd8be3cbf9620279c3d1f14d9ac12bf5b287
 MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
diff --git a/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild b/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
deleted file mode 100644
index fe5dcefb34b1..000000000000
--- a/dev-python/zope-configuration/zope-configuration-4.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=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-
-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=""
-
-RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	>=dev-python/zope-schema-4.9[${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-configuration/zope-configuration-4.4.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
new file mode 100644
index 000000000000..e9aa585b0c3f
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-4.4.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,8,9} )
+
+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"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
+
+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-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index f765a04b8688..f74255c66baa 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,3 @@
-DIST zope.exceptions-4.3.tar.gz 30704 BLAKE2B aa5319c8f9b3555038809f8209d121b4a8944a9df1c683302749c12e1e5097139047583b1f033e6530005232fadc326aed7da64fa585b749ec50cd22cb3411a5 SHA512 348c8edb0246bb2035ca5c1bcfaca7d3be2525157e2c9267a59a061c8ba749b364428e3d6a3aa3f967306abd0a319e4d6fa935b7fc35fff3bb53960015505695
-EBUILD zope-exceptions-4.3.ebuild 943 BLAKE2B 86acd0a771a708a1053a587698863d689c3de138380667d1ac79d08c12e05b884c93905d22f6718c9dcc69c63e5ecb3c946046463cbd4f48530e2f6c24711495 SHA512 b72f4ade74ce03d6fb1e731ae646c31938cc0b5e75e0c5616d4fcf73430011f6d23087af3c033f4fcac84331bed1dc271018be77fddb399da0e9c52a1c316fb0
+DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
+EBUILD zope-exceptions-4.4.ebuild 895 BLAKE2B b99ac702e278cbcfe8aa537004900c712cf42ae9be371babf654b0876a002dcd563fa2e01c6df8e8741318a0db8620a2c9b967fc4b34ff3bed40e9f6a61582d6 SHA512 01f17646c5c18768307452c3cb1fef3a63082f85a07e7c084d81ee2446bc387840df33533cc2a3453463297e3e54d91a4caa2c6477aef6f9f01ae41bea57d542
 MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
deleted file mode 100644
index 7a4b0e61b6c4..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-4.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=( python2_7 python3_{6,7,8} 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 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-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-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
new file mode 100644
index 000000000000..5b427b0dd300
--- /dev/null
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.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,9} 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 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
+
+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 cbbed5d174c0..b752278b7b92 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
-DIST zope.i18nmessageid-5.0.0.tar.gz 28220 BLAKE2B 84727f56ce8dd069915b5b31a2f9824ee83b334d82e3b2a958e35e43842cee044ec47879809fe6256b51631a5baf9dfb4432f7e5e494faceca2f7ade479d38ff SHA512 76cf129e266f649ab379d1abea143b34e42f0ce66fdfcbebd1dbbca639a55c11a9d41687a7bb4dd04359fa1465e235035849786d142bafaa68d783c1f7aee2d6
-EBUILD zope-i18nmessageid-5.0.0.ebuild 821 BLAKE2B 43426a9a3de7249c822538b3d93c26c1adeab22d201aae7beb381abd50ce2203f6cf93bdd4c172781100129c48df972e3739d427682efcdcf001f3bb6f1ac837 SHA512 fa90b3b86eaa476155494ee41c60d8cbfe43f7a45b5f04dd6c6b3225912f1391f1d4f26073e090122dbccedfb4a95390110bce515cc425df8f949ea0aa252e73
+DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
+EBUILD zope-i18nmessageid-5.0.1.ebuild 853 BLAKE2B 58feac7963169c6a0603fdc8ff772dbc0d97ff7dc46b96643bfc54cbfb21568d8f996517f4c1aaf7b17c6f760f99b190a1bb052edb52198af64edab9c85db67b SHA512 fe0a7e056fef131d0d066e351da515e8b3c0164b338afb12dc21debc7318c5e70142e7dd3520aed360be56e38ba6f660bb3a2ce64d0a14edfcb3ee7a1d520867
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
deleted file mode 100644
index 792f5b319cc5..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-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=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-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"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-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/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
new file mode 100644
index 000000000000..28c7496bc747
--- /dev/null
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.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,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
+HOMEPAGE="https://github.com/zopefoundation/zope.i18nmessageid"
+HOMEPAGE+=" http://docs.zope.org/zope.i18nmessageid/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+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 3536624a8679..f4160595573f 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,6 +1,4 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
-DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
 DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
-EBUILD zope-interface-4.7.1.ebuild 1218 BLAKE2B c54224db04b685c17fa2e7b0efa9c0f1889dcbd30bdab3f6e161e18c4a9202650e6fe52f347a7bca280777daf56dd8f7f81c218c7bd746f7d03bab60f6ba920b SHA512 0b6754a822cf4f8180c5fd8930807d1eeb08992a9c527b892394fc71166883dbcf012320a60076eb488082697ed97707888b33a15e2473ffd32b92d06770eb21
-EBUILD zope-interface-5.1.0.ebuild 1284 BLAKE2B b280c87cbf9cf912fb8fd514f88b2d376fc92931b1b79455617af0810bf0747ab3096b7e540a898dc00ff7c6178865e0ee7c9f6e53861464b6877bff0d9aa72c SHA512 1295bb221650b51b5a00cff6da9880d0411ff6d24ecd096c0f6b8b46470a6527afbbb9a1b5138909f4d53e90ea216204ea2ab885ea0c92fe477721a5ad5dbc2f
+EBUILD zope-interface-5.1.0.ebuild 1275 BLAKE2B c5983d70c1a8057c41f8bde60527f94dc269a4d3e18ca23333d1e2f0a25317fec0ba4c206420e4dbbbb7fa44d182e22a153a411025504c7f9ad36bfea95a7e6d SHA512 3fdbe02a25e93106ada616f3121eef6f1e36a6b311cb76a8eee95a13bc310e7e1e468599186d14b45a23bc5c647064828558e51b6d10a86239f5d940aa684eb1
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
deleted file mode 100644
index 3e1a770841bb..000000000000
--- a/dev-python/zope-interface/zope-interface-4.7.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=( 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 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-46.0.0[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-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-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0.ebuild
index 2e38b0fd617e..89a3e41851a8 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0.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 ~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="
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 97897930a77f..5e7fbcd0bfbb 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,3 @@
-DIST zope.schema-4.9.3.tar.gz 98217 BLAKE2B 9b3288bf8b07174fbbd919398cc441f5585671e312651f9cbcbbab9f885af67f5f8e954d70bd4787e8f17bd465f8152c685b894188d05a0663344fb8b3c70569 SHA512 63cdf431ba2aa79eb5771f99cf0a60932182edae00a63873f96cc02c70f826d23c72ecabd736d0f6439d63af900b4ee2c05246eabe0b1689b01bc15a09648504
-EBUILD zope-schema-4.9.3.ebuild 1005 BLAKE2B 1585e8f0cec69b5e640503b7f9f79c16bda6e4f101467df0eba3ee2c43b99469e38e66bd88484a19bc3b2d1814965a38b4dfd2c035b3152081060b358081dc01 SHA512 8699bd15afc364501e906aee84ab9844d7bff833430fd2984a0b5fd60de737665fe7816d49420cc0a8ade4506180dc2d4893e48879aad04f3c2f7bda56f84e85
+DIST zope.schema-6.0.0.tar.gz 110343 BLAKE2B 8dad6fcbd5bf3ef5902657bb7cfc4d31509cf8b74be3e44ec2a5977dc998bbe9b2605dd0edd85aec7f5e67e5e4e7ea6e9ddde2e63f5d56226dfead804e10eb61 SHA512 3258e6b2bf97485b9496f19319ef5af9a1e908b6c2661c27f45cfd64057597cfd514acbe79d86ddda1b80e66be45a10680fc3d9e662513b360d5f047917735d8
+EBUILD zope-schema-6.0.0.ebuild 964 BLAKE2B e5f6fb0dfb9b9421fbbf3d4b4a2dc64140b402100f035ed31b827424c651d52791adc07699bf46727cddcc44ec4475bc4f988ac4e1809bd9dd3e8a6264540079 SHA512 6ab8822912596f2d23218e205f5b14486c5255483f2de7bac875e4ce0546229c4d8ee5dde8a0a1e54f72b9a524e3086d157086b80cff9230790f1838d2ed0ff1
 MISC metadata.xml 473 BLAKE2B 9d4475a1da73bc0330a977dc4943fe10a2b51465cc79413b2d8fc780a6b1afd73f77e54025fce33be258546fd991e1fd9ff9c37a2c9654065c67867255382a15 SHA512 6d2c6bc56197b18365bdb11a2986c614234aa1e57f37b93f95f6616a3674890f7f02a901d58dbac0d2d98ceb1cb8535d9c2e84969778108e1e8bcdecb89c4299
diff --git a/dev-python/zope-schema/zope-schema-4.9.3.ebuild b/dev-python/zope-schema/zope-schema-4.9.3.ebuild
deleted file mode 100644
index d1f836d2561b..000000000000
--- a/dev-python/zope-schema/zope-schema-4.9.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=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-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"
-
-RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-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-schema/zope-schema-6.0.0.ebuild b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
new file mode 100644
index 000000000000..c7a777c6d32b
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.0.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,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+		dev-python/zope-testrunner[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+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 f78526cdccca..ceb123248216 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.7-r1.ebuild 993 BLAKE2B ca655c07dd13fc76ff452a431c98f00ba6c6fd9e030b54462ab0ec5a095b423ff79dce9a2adf13eb4d71809aaa3f0f81abd980e15235cf997545268c8401447f SHA512 45330ae19ceb1533548cb6c4125c061f796c5e87bea3abba14a284fffa3164a77877390ff092470d4befae4ce0dcd2f1582c0e62e783e9af9675a453a140dfa1
+EBUILD zope-testing-4.7-r1.ebuild 988 BLAKE2B af7c47bde639071da2b0990e43fc665b9f8ba9e48cb8ab8eb140d8d9a849a4621a70fdc8a2d837a53051b1eb59a6ef525245eb808ec0eae7f95394d8e6532a5f SHA512 81e5fec851adf12cfe60dcdc2fd1d2ffb40c9a9678e96c712f3d10ae81889dbfb51236dccaff60e9bbe9c3ca73b22ba506b9ad2291d37c45879181ec948dbbb5
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
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 43f2959a1318..a8de4c37fa3b 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="~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"
+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/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 0cbe0c4d60d7..a86a6c03c2a7 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,3 +1,3 @@
-DIST zope.testrunner-5.1.tar.gz 140679 BLAKE2B 4044b9c77bbda6610b803fbc91cb7bb4d1aaeeb041c32cb91ecd05e05d75a685cd4b6d4531fdcb74380e6ce3fc40f32d21f71ad346491667458a165a90e3a401 SHA512 685d1e1512bd85a00c34f4f89ca1e0f8d1f0939de7b25db0cb43da44e5e41e735e1e9a5ccf2a89b959d7d5f074da71dfe0fd931bd62082159ec65c0b53cd38c1
-EBUILD zope-testrunner-5.1.ebuild 1037 BLAKE2B 2dca6bb079089098c62067982bacdd7c36dd1a7852c97585c311ecb8d8ebecf312a0ed22f855e5f7d48672d0d26dfaf6e374513ef29e74f18d3fdbda1ba7b5bc SHA512 0767e9747fc29d03a575827ce10cfb15ca8f53a83e8cc8fcd685fc9483f1252dcb625d81cbe023528c1091452bb024b4b075b67d98f120316aed2a3408b791df
+DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
+EBUILD zope-testrunner-5.2.ebuild 949 BLAKE2B 95a6f748621a770832fd8b22cfefaacb74be26333c8cc7b06304ac10e5e81892e81ecaac3edbb4aff25748460fb70df2943257e4ff09172e77c9cba5003f73a4 SHA512 0ccd5dd8d303d5790f8573340776a02b1e42ed6dcb051f416c4ad53611b20eb06fb0109a7eb6ddbce7d6d92d58591c6c4eb4be83050782b9b1e34d472284ae04
 MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
deleted file mode 100644
index f147bb59206b..000000000000
--- a/dev-python/zope-testrunner/zope-testrunner-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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-exceptions[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-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-testrunner/zope-testrunner-5.2.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
new file mode 100644
index 000000000000..a052ac999f6c
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-5.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,9} 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}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+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 59f3580b0c51..a4e5f2387542 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,10 +1,8 @@
 AUX zstandard-0.13.0-compiler.patch 770 BLAKE2B 43ef34c46cf54d5e872c74a12870a3dfba561ea1e91aa0b950dfcdd5f08d68c4a8dceaac3617dd2aa9fd4f05c1c3a556c194c37863bb1dea46e8bd289d35a0f2 SHA512 83eed984669604d84a597c93a86539b6768199947c9e742105fe6fd6eff667e2b738b889ca99165b50cd9b35b804fbaddcc19c15aaeeca0085452f42667631a9
 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.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
-EBUILD zstandard-0.13.0.ebuild 909 BLAKE2B b6c7d84d886f4eb8307fc56cabd8d75ed14ecd46b65d483beccd816f7a8e161654acd56391c5669bc887b3e0a65416f92975285e340884530c45aeab0ff69619 SHA512 e624b56e8a256cd7a8e1c46bd30e8c1d698a99afe018a3b73d24d30016a2ddaf2f59a3e974a4f017ce3d5db618eb153c680ea84a74814dff77f362f0d8ab88f5
-EBUILD zstandard-0.14.0.ebuild 793 BLAKE2B 6a63f401ac51fe0fe6f31708537d0b0f2643ea4ad7a5d4da38f78505f16904d1b84fae02a2e9d1d57e4c5485f891c874567dab128b625551ebfe9294b70ba9a8 SHA512 290d5ff040365afcf0b7069a1e1d565701dacfe6346105a1ab34637798f16e438116e0ecc97670ce856186e12ffac38ec63068b753af6671b98b7dbb4a29362d
+EBUILD zstandard-0.14.0.ebuild 789 BLAKE2B 2ee199ec23794e2524044a895551f0a6fb0e49f2044d74c917452476839ad4f4b3efef97a933e02714f41227da908b5f67806f19c96cbff2cf526f97ce99f3e3 SHA512 4129104bf52449791d0e9649f7caafe504a4eb551665c320343fa159cbd377ab937aab821fe8812e32ca104d590c571ddc1018126ca935b9881fe4c15bbd4cf8
 EBUILD zstandard-0.8.1.ebuild 664 BLAKE2B 1b8903a1d059e9e3f8a903784a03658d733fb55648acd4c9b5fa49e89e49898263a48b77c38ef38d50612102b8d7cf46ff140b28ffa14890be691baeed24e4f5 SHA512 b8da1b96c32dda93794ee527971e607500097b8227f0e9cbb5dfac03ee4ed6a81846b60f88a295f31753bfad5d913adf49831bf61d946362ad4b54040e829c56
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
deleted file mode 100644
index 9a1047476527..000000000000
--- a/dev-python/zstandard/zstandard-0.13.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=( python{2_7,3_{6,7,8}} )
-
-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 arm64 ~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-1.14.0-r2:=[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	# https://github.com/indygreg/python-zstandard/issues/103
-	"${FILESDIR}"/zstandard-0.13.0-compiler.patch
-)
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/zstandard/zstandard-0.14.0.ebuild b/dev-python/zstandard/zstandard-0.14.0.ebuild
index 2f9ab74169ae..5723d9054b2e 100644
--- a/dev-python/zstandard/zstandard-0.14.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.14.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 ~arm64 ~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"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
new file mode 100644
index 000000000000..f2c28cf95120
--- /dev/null
+++ b/dev-python/zxcvbn/Manifest
@@ -0,0 +1,3 @@
+DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
+EBUILD zxcvbn-4.4.28.ebuild 510 BLAKE2B ea067681b051906ee9d22ac180f5c333944cd4bc7aa6f8cd208831de6f980004aee92864fcfb15d327bc17d8809064ce8b738eb36d05b1b54f8bd13a19931440 SHA512 17274989db3263ca1ae0e974f5756ecc09c3a676b7f631ab936e2eb483fc2b84ddcbf832b6a8dd66ac868d0d1df253fed7aad0f5e28773748a27c5653e273fe9
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/zxcvbn/metadata.xml b/dev-python/zxcvbn/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/zxcvbn/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
new file mode 100644
index 000000000000..632384ec4461
--- /dev/null
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A realistic password strength estimator"
+HOMEPAGE="https://github.com/dwolfhub/zxcvbn-python"
+SRC_URI="
+	https://github.com/dwolfhub/zxcvbn-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/zxcvbn-python-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest