gentoo resync : 03.03.2021

1206 files changed, 7229 insertions, 16371 deletions

diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index 4372ec1ee2e1..ba3e4b0e24f6 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.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 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 4b78bbffab59..89adca35bc77 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -3,5 +3,5 @@ AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e
 DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
 DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
 EBUILD Babel-2.8.1.ebuild 966 BLAKE2B a576b7deb55f965a8a83cd281b7d6faabd4d565688506a7e08a4e7b74b9f6cd76e4d4fcae5063e37d5c87351d63b36bafae51963a0141b8d53697370ffc23133 SHA512 a4ed62211ee5b37e42ece5d2eaea31fd2594667abc3b034695cc4baf4c5348d4d25230c6415cb4e2672e8643d98f6527f2f1813a0bee3d0582e293d76da20a5a
-EBUILD Babel-2.9.0.ebuild 927 BLAKE2B 6677a1c1b4a6626c9f7aa8786b4e659acb69bc8408e9727e3e4a57569522906bfe346b31248f20efee3f9f963ff6486038411b6c6a359eaa0bf95b70ec2a693e SHA512 ecec61dcafdb5e9f87a43a46b78d0f94d35c27408eb826f9279f6069d974f08916b67a21ad794fe18a8d6255dd8bd8dfa1391a232a0f8df4f7989c8f57b816db
+EBUILD Babel-2.9.0.ebuild 933 BLAKE2B 414b0aafa068fbc000e829d14cab91cd3fb073b74151f70b2a1ca4bf41b8fb35d502dfc9b315d8bd79cc1c477440e78faaf44f4a82b3809f9ba47958ef6f02d8 SHA512 98fd201ecefe39234c769241a9f567d391ace67ceecee23a64bd484f011286d528c667508def5bdbaf0b54c288ef6dd94e268534cb958ef9990fbba3721f59e2
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Faker/Faker-6.4.1.ebuild b/dev-python/Faker/Faker-6.4.1.ebuild
new file mode 100644
index 000000000000..bbfb4b2b95e7
--- /dev/null
+++ b/dev-python/Faker/Faker-6.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="a Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+DEPEND=""
+BDEPEND="test? (
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a25ad51b6569..b1f9854e9f07 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,4 +1,6 @@
 AUX Faker-5.6.5-ukposttest.patch 1224 BLAKE2B 4d7dcd6637c5e2cdb619b60414cc84b635847a305767d02291d51adb500e6e76bcba834359262a8cc0290e59419192b6dfe3e633a409db5bf61ee09d88fb5a0e SHA512 c3a4505ce7524fcb98567aa1870da3c25917cc2c8514bee6696982ce09ccb9eb207650b2d5129ca6977ac07bc65ee864e59fc6583f1fa3c3d87d0ee22d72e797
 DIST Faker-5.6.5.tar.gz 1058615 BLAKE2B 2a730b79ca11a80b33f5249541e2de68e5c53832fcd06891ce2e074dbca8aa21c657147e55725d37954cb997a2b1854b5c853449e7d58a71358b69fd2a36584f SHA512 1806eded3534602eb5c463ad030564edfe7c663952e62e943b809dd5d7c4e485b26c612e45f481b6125f6462d48215df065f2d3f30df67ab19699b6386a65b7b
+DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e30da92072937308341f22151764c8a72361c93112b5818dc9858e8e565ab2b45bd0fabc9e59613c1015e6ea63 SHA512 8ae2014b27f07b41afc67dc9a3d65e39f1073987c0c4bac6da5d625145e1d43783e4134bafdfe4e94035be9ff4367e5a19ab63635bf8ce7ff353a8745cf96269
 EBUILD Faker-5.6.5.ebuild 797 BLAKE2B 79802fa2f75b54f955f02417689548235864e29e38d53afca8e80f5c9d07327daec7f9a877440420ddf80a3e63a873744cffabc9022715519abf75f4f4660a69 SHA512 4d4cd1bb4f17dfbcd41eec4e5dadc73d66438ae552ff7be1ec3dba2f8a61c13d902f857185df3d3083a53adf144ce4407d2ca95be6cb7d3bf3661326bf478501
+EBUILD Faker-6.4.1.ebuild 682 BLAKE2B 592c09b3f0caa3336c660c348a9a2cb09f6eb2e97a5d5c7594fd4d8d884062cea8f16d5c27867b282f59565dc0ad075832866f386158d6ab553ff68126f5555a SHA512 dcb4a5100c6b5779d283890a98c4bca15a1d77051e82802c0d4ab3eb264b2fa89b3230958b02071e367b65a9bf489a2de7c13aa79bb901ac886b4dc03001cbfb
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/GitPython/GitPython-3.1.12.ebuild b/dev-python/GitPython/GitPython-3.1.12.ebuild
index 16fbe5bbcec6..9e290b1a5529 100644
--- a/dev-python/GitPython/GitPython-3.1.12.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.12.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::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"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/GitPython-3.1.11.ebuild b/dev-python/GitPython/GitPython-3.1.14.ebuild
index ebe82cd545a3..f1e63e903be0 100644
--- a/dev-python/GitPython/GitPython-3.1.11.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5
+GITDB_P=gitdb-4.0.5-r1
 SMMAP_P=smmap-3.0.4
 
 DESCRIPTION="Library used to interact with Git repositories"
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
@@ -36,8 +36,8 @@ BDEPEND="
 distutils_enable_tests unittest
 
 src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
 
 	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
 	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
@@ -46,13 +46,14 @@ src_test() {
 		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
 
 	cd "${T}"/test || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || 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
+	# broken with git 2.30+
+	sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die
 
 	distutils-r1_src_test
 }
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index c82a94550899..3cd7a67745e0 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,13 +1,13 @@
-DIST GitPython-3.1.11.gitbundle 4421698 BLAKE2B 96a4be2b12149c34f0e81580cb8906920a107f9856da585779f8d13590fb14c838a5e73d8831692ea81dd0ed73e17cdab1020b50cb49c7f193d54c1e838d9385 SHA512 64a443e0c517627045d98f7a60b6cdd817f6af3d12f5619cca7c4e24f9ce42018c2aca427365d633e4aaeb5e99d99a944d85b2286c34be1c17e85e441d9693c3
-DIST GitPython-3.1.11.tar.gz 170908 BLAKE2B b327f38bbe9d92caf8b5ba6f3c1e353ad00bad2c3e7b3ae59991eaee5a5dd9f228fd80b86fd7e908fa71563e369d7340070ddc0e093549bfc8378cdf20ba9723 SHA512 fe4baf9c8b3668f29fbc476ec2ba0a8d58a50ffe596b9f3037ddb4cb5c0c7faf0d34c6efac7567074f1b28b866e42dad19c91a5381eef606d3b3ff74b77649de
 DIST GitPython-3.1.12.gitbundle 8721154 BLAKE2B d00ba18e53797ebc2067de8422506db0fafc27860cd3f99a36ad4740956518cfcab98d8211d595e1347c22df3d0ac13557881f471829c429db1527099f53438e SHA512 c84c76668bbc593998cf834d18d0207ae282cf0fd6fd22e5491435884855bb2b6699b61e51b35e6bbcfc4cd2f3c15aa9b435115fe5b0957ab4c63c7aa640ed6b
 DIST GitPython-3.1.12.tar.gz 171126 BLAKE2B e74a613f5269893f29f41add6f39c34497613b728b14c4c65c5fcbd52bee52a2ef53c4db3bc63f843ce4ec1e63f3988029852e9195677db32b704d0429480130 SHA512 4a2915991831fcf0dc0326d9e9be0f06fba1e93560d07c19fad5cbcb9ff04262e7d2225c5174a8c2f55e4c44b1c027bec4ff61d7dc137d8bf110ab96026742cc
 DIST GitPython-3.1.13.gitbundle 4434559 BLAKE2B d8a2478d40f908d7913d08a3a5e98bea3a50366659838a8d3ec335ce7864e7ddbe290de0581b7c4315c83f1cd9ed517af06a7b9232378ee299090accde0b595e SHA512 6d62488a3c9ff66b4f25dd3f1419835591379736ca3faf57055121a8ccb5b8da933e3b37836a6da59de29cb62b03ebef6c38d7387c86dc95da2206024c58f289
 DIST GitPython-3.1.13.tar.gz 171249 BLAKE2B ec653a40654e42d93ba552e1b0a40c5241cd7f86a110f1a0570d6a3ca35cb7522955650a171a8a4113248e508f84a4f5cd021edf941fb41057aec01ef6f30194 SHA512 9618be674e592e3653eb8f59e5878f72b3583d2052184f6321d24130e4cdd16236c9ee4823ee38036c2361685d78ab7ed79660746506a8f98285ab776e1c98b0
+DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e877bf3dedde61665754c1d4b14b98d0ddc863666ff1dceb313174a908f8fbacbda0586e53e874a1397e6eeb562cf1ddf1f SHA512 ecd570bdb85dfa64f42ce447bf381868d584eb56897954d893ba1f1ee193fa4e45f3847fe842a67276da0cf155a2501ed4c25d34d300a9776b0f068b659ba014
+DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675
 DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
 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.11.ebuild 1591 BLAKE2B e6f92dc504aab3c0dd9fbd04b7d47d233dff59cbca6f8189f899d6c3c9ecfbc715e5584a417a82132f9f103c974cccc226a437eae1ecbec49e749007d79babf7 SHA512 dcf70c3db925e29177cdf0f6bf45766fe0a2e4765cf197cf2f875b5f7c557f0eb79677136cd8d067372bec47e0fb7c2364dcaf02edfdecd5f986c97b42158030
-EBUILD GitPython-3.1.12.ebuild 1683 BLAKE2B a7ed728bf5e20b0f02ce2c1e5924b09e85bc5292c90cbc28b95dace511202287a2dc96c1e0c0a79120171ad921161e4795176b0cc03943acda735bcd203c8485 SHA512 57e550000fcb7c22895766e9d0944d1c5396572a9794683691cce2a51f3e3f336f5293141cd88bf78186ae16b4cc8b4b8ba08f74c2bb2832c61d72c96b1387b5
+EBUILD GitPython-3.1.12.ebuild 1680 BLAKE2B efd292f601d6f32ceed82c3c0c05f4c4a20682e2e41ffa1b2acdbe9965c2fe6678981527bedeb75ad82a1d1ba8d30dce9fbec219938d7c127236a559a05b7cab SHA512 e308352b1cac84b55de08c8b9ac5726d5c3c24f04deac6e1c48bdec8452ebb1a7846a19e29480219ac185813dadebfd536844d67b35f4d2d78ab2163bc08e036
 EBUILD GitPython-3.1.13.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
+EBUILD GitPython-3.1.14.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c141274b3dfd..ee9a4065ca88 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index d6ec193e7203..b3efcd3df40c 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0.ebuild 760 BLAKE2B 2579d9ae34cd6f3b959106b36b388124a3befba08de1cf3006e87a6e497ff96c2456968d93ab24bd41fae8a7fe0ae6e54e6435dc6e8d69b3cdf637d683bc1e7e SHA512 0ae023f690370342d4bdfbf2cd36d4e2f1dc53b9a426724ac693499e6fab3a5d33a339aba8d9ed7ac2ea26aca46c2fc9576a635ec3bbc9c4ce7f951d2bbdb6e6
+EBUILD PyPDF2-1.26.0-r1.ebuild 769 BLAKE2B 20cdfb4de25ee14125951aa948199dde1a2a8e385436972503a043a6ef89c3d52ad4ed881014bf8963ac2aa8fce2b3d4ec9a212b89c7a35443e542d659f839b2 SHA512 7ff001c98d092e9a3762342b5a0803b36a892eafc7ab728b06ec2db78c8b6ef1f56145968f85c02097f182d539fa4392369f2659a7332fa8ae53d5fed3533bf9
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
index f47430fd9a42..7c767d86a71f 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="examples"
 
 PATCHES=( "${FILESDIR}/${P}-py3-tests.patch" )
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index a27fdec870c4..d21d15320351 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 EBUILD PyQt5-5.15.1.ebuild 5645 BLAKE2B a06619428dfa12b27c28cfe0b62f194c5f1be48ba2bb3e937eb6225d865b0e111278b76179b22fc4518b327c729b043ee09569acaf61c6cde43595f33f3bf282 SHA512 d517c4203be97bfa91d7607be81f18387a5274ff4b7e7759f422a69c7260cef9e3d76fd05927fc87c7b396f8260bad69768c06378141ea69af7a62caacf8ba2a
-EBUILD PyQt5-5.15.2.ebuild 5646 BLAKE2B 74a757c25d87a4c676f0eb774a4c9792fdf235a7a18ce04a435ba51b05ba1632b3f829c2a6840f613527d83a967b25feab6ab0afb9a413f59ad2c5b04e6a0a80 SHA512 2cd140e377e62010de437b8557b56a735ab32085939628ae9c4084912df806bf28abebdf19d01a589a4f83d718610a0cba26ce57fe17ebd2baeeff550e8dc597
+EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
index c88cf0facfcb..69434bfb6142 100644
--- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 69fb809af836..823344f01842 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 EBUILD PyQtWebEngine-5.15.1.ebuild 1665 BLAKE2B 54109cb1dc1141a6efce562ec846644dc8944f3592b2d1d3a7ef40d149fdd175e9f2427907a7470f74b192eafd259bf32d996398f9734c29b37972f472bce51b SHA512 f7771fb68456bde951a1ed70e93636adde85c81f95cf1942845c5d4cf171ad18e89f72d1bb47c9b3752d6e92904990d44e293fd0c73a518f5e29deb61001c98e
-EBUILD PyQtWebEngine-5.15.2.ebuild 1666 BLAKE2B 8bd015e160b77cc7ba75c02fac580aa24015e8b7d9f69302717c0cee76baf8ca92800150dd2f57e91081b78421c527ef76d20943052e3d107f90991936ad6a7e SHA512 7ed2ca7bc72a096dfa14a72f798237cba2cb1e66286e0d4fd443413d1df4592f26cff7ea29a6ea5cf85eb09f6b6f10abfcab4eec49dd8443a5b22bab48b5436f
+EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
index cc9d7a994c87..3e2edbd11476 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 7511d8075a40..6ed54e5dc30c 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,5 @@
 DIST aiohttp-socks-0.5.5.tar.gz 1349283 BLAKE2B 85cd19fdc8c549a1c8ed66a71a9ccb61093fa6febfc2b2e93e26e47be9fc4d319f0ceecc0d6f70739e861fe5f7cd8c78615dfe67ed0669049d38da1f89da33f2 SHA512 94b9d5fc5a5eb04ce16302ca4a1abdaf8ec2b31811a6156aa3667aeb5bd284fc1757a65dc8dc7b77450017a04aa315a908a52a4d38b0657c41bcd64b9b1605b9
+DIST aiohttp-socks-0.6.0.tar.gz 19789 BLAKE2B 56a9279f78e2a7a391183e6b68f9b33d878dc9b328d3096ca649b136e321ed372a9f9e8f7a02282c32568ac458639bd76b341f87722eeac46741d68064cc035b SHA512 15a5869d24955cba9548d8bd7cf1ec29b27a024603ca1b1d4abf8f93c70702434542c66ced1d8b28ae851034dad1ae8e2eaa4ed9a3729be35ec1e3c853237811
 EBUILD aiohttp-socks-0.5.5.ebuild 763 BLAKE2B f6ecfe0135aae63b9dd43d4ca23ad3c8158ff41a4a6150d3123b30150e8bbcc5e1dfb357f71790f4a613eba63e5e74cd42023a8c71de746891e3419e0fd5e2fc SHA512 b5ee74c5a7841af6e9dba97d6c24a1acf33ead4c13fb9d5bba8a3c4038ca9f6c7213c91015a3e9d465a24c310f6058215e522497f198b04116a9de16fbbfbad5
+EBUILD aiohttp-socks-0.6.0.ebuild 740 BLAKE2B 0292b73a545a0b29b6b6dacc44a146840693e1a9cf4ed4b15f618dfc5c80a5f8637a7e519ea439f77f223365d0adea169e57ec5162a755e5e7dfef33cd76e5ea SHA512 491199e2990bd11bae804ab68e19478238cbfcfcc82f207d257d6f4d1351915eca3bde472f038acb96444b992277b1140b645fea6d962e5ce2813cb9479a865e
 MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
new file mode 100644
index 000000000000..e47d2dc6625e
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-socks-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7920e4c01928..575d0f418126 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,9 +1,3 @@
-DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-DIST aiohttp-3.7.1.tar.gz 1111777 BLAKE2B 03d16e8c9d64ec407cf7b6dbbf5547a88f528ab23e9e256559c11fc2cb6f568101f79dad89b0e5698fd02a3918051e4bc3c349e3ea4358ecb5de1543fea91708 SHA512 accdd588fdd7ba1792cf5e8fb67c6d5dd3e1c5382d9c9ece14e449d6f4f1c116975809d2dad786e0d472b3bb54e3b8c59722be871401a82cef5eff9c12f3c3f8
-DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59b21b284b1120e4edb16f22b760f8cabe56261061e0049a5dfd041456076e294e942a02309e9b3d6b414facb0cb SHA512 2dd4f0264f1fb0801be366c269b73dd80b542e8e5bfe18a01fbdfadd0210022ccd6e3975be1be416551ccce82f42881e18735d5c6fc68a42b7452ab18e157dc5
-DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
-EBUILD aiohttp-3.6.2-r1.ebuild 6982 BLAKE2B 23c854d1ad36ff5c1ca0f35f9a80fea90dc1c16a55e6c36f9951860844deb4b2989648e83c237dd5b6d29772dfcbc6b76271f147af0c125c0ade485e895a2efc SHA512 fa2bb8e901884ea3fe7d3e6e4d55d128249da47684dbf7ec9bc7ce25da7f1e930da11208177ffd8f95880eee7c1e8581cf21cb7dd8f261bcbbb024e55eebd7a9
-EBUILD aiohttp-3.7.1-r1.ebuild 2602 BLAKE2B f89623a32fef92a5a2650a1cb853c244ec4cab7ec731c37cd1b8ba78af51145aaf8a9fae12ab3e8b705cc29cfb73a1ca955630f7d49e880142ef0c2c70a99a2d SHA512 6b16e780de0f64c09f7223500002f14ecc36385b7e9727badc5794fabff5f6ce1230ab6e19166ded3f04dee24e9ea033395bb112bc8757907662bb48a248b248
-EBUILD aiohttp-3.7.2-r1.ebuild 2625 BLAKE2B ef1c4eacf7a6f6cbcd117b4d0c446cfaf7689965e23e8cf631f83db04f4826ec338199afaded653d2c8862949a4b981e87aa60a7a391b75d4d3e82c3e8a6930f SHA512 f494e358d930535d80680998ac92c82a8927878376dc1902bc2da6376079ca2e8023fede7def06c1a885100ae7db2da1c41d175e5e0efcf7b3d0830672286130
-EBUILD aiohttp-3.7.3.ebuild 2645 BLAKE2B 4733d15afde7b3fab6bfafe6cc8116242331315dc81d306d769bdbb6e2a15e6ef90f46600677e18af25a30d55bff2d2c7b6e1e8cb66e98fb09b1aaf6f1cff5c6 SHA512 29f518e164e0be87274216ce380556b64fee5147201c5ee64ebfd1955f5c41f6deed44ebba30a8401f22de526338d7961fbfb5880745f1187c014854f0b776ee
+DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
+EBUILD aiohttp-3.7.4.ebuild 2643 BLAKE2B 412f7cfb6de73eddc715ade9a69cdf892c7c2e9b33bf7eff1d2f6564d9cdb9aea55ca614d5e46b64fcb98ca81f0682eabc6a5fb2a53277a987212a84b77feaf3 SHA512 8aa58268f293fc2750743f777675edece1cd93dc547b23e73338aa1ba347f833612a1b5b6ee8f37ab902af185abb6f47e7fb99e6ecf91bee420c178169709b29
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
deleted file mode 100644
index ff1ec99c9e65..000000000000
--- a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=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}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-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}]
-		www-servers/gunicorn[${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}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-distutils_enable_tests pytest || die "Tests fail with ${EPYTHON}"
-
-python_prepare_all() {
-	sed -e 's|^async def test_aiohttp_request_coroutine(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_handle_keepalive_on_closed_connection(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_server_close_keepalive_connection(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_client_functional.py || die
-
-	sed -e 's|^async def test_request_tracing_exception(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_client_session.py || die
-
-	sed -e 's|^async def test_cleanup2(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_cleanup3(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_abort_closed_transports(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_cancels_cleanup_closed_handle(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_cancels_cleanup_handle(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_during_connect(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_twice(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_close_with_acquired_connection(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_queued_operation_tracing(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_reuseconn_tracing(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit_and_limit_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_limit_concurrent(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_no_limit_and_limit_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_connect_with_no_limits(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get_expired(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_get_expired_ssl(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_per_host_property(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_per_host_property_default(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_property(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_limit_property_default(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_acquired(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_acquired_closed(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_already_closed(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_close_do_not_delete_existing_connections(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_not_started(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_ssl_transport(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_first_available(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_no_available(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_no_limit(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_per_host(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_release_first(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_release_waiter_skip_done_waiter(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_dns_throttle_requests_cancelled_when_close(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_do_not_raise_connector_ssl_error(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_tcp_connector_uses_provided_local_addr(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_connector.py || die
-
-	sed -e 's|^    async def test_read_boundary_with_incomplete_chunk(|    @pytest.mark.xfail\n\0|' \
-		-e 's|^    async def test_read_incomplete_chunk(|    @pytest.mark.xfail\n\0|' \
-		-i tests/test_multipart.py || die
-
-	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|' \
-		-e 's|^async def test_old_style_middleware(|@pytest.mark.xfail\n\0|' \
-		-e 's|^async def test_old_style_middleware_class(|@pytest.mark.xfail\n\0|' \
-		-i tests/test_web_middleware.py || die
-
-	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
-
-	# minor breakages on py3.9
-	sed -e 's:test_iface:_&:' \
-		-i tests/test_frozenlist.py || die
-	sed -e 's:test_proxy_https_bad_response:_&:' \
-		-i tests/test_proxy_functional.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	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/aiohttp/aiohttp-3.7.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
deleted file mode 100644
index 0062a7b8e5e3..000000000000
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing
-
-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 ~ia64 ppc ppc64 sparc ~x86"
-
-RDEPEND="
-	>=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}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-python_prepare_all() {
-	# Fails due to a warning
-	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
-		-i tests/test_multipart.py || die
-	# with py3.7+
-	sed -e 's:test_aiohttp_request_coroutine:_&:' \
-		-i tests/test_client_functional.py || die
-
-	# Fails due to path mismatch
-	sed -e 's:test_static:_&:' \
-		-i tests/test_route_def.py || die
-
-	# Internet
-	sed -e 's:test_mark_formdata_as_processed:_&:' \
-		-i tests/test_formdata.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	# takes a very long time, then fails
-	rm tests/test_pytest_plugin.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
-		-vv tests || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
deleted file mode 100644
index 42a0478fb93e..000000000000
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing
-
-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="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=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}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/pytest-aiohttp
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-python_prepare_all() {
-	# Fails due to a warning
-	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
-		-i tests/test_multipart.py || die
-	# with py3.7+
-	sed -e 's:test_aiohttp_request_coroutine:_&:' \
-		-i tests/test_client_functional.py || die
-
-	# Fails due to path mismatch
-	sed -e 's:test_static:_&:' \
-		-i tests/test_route_def.py || die
-
-	# Internet
-	sed -e 's:test_mark_formdata_as_processed:_&:' \
-		-i tests/test_formdata.py || die
-
-	# newer chardet works too
-	sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
-		-i setup.py aiohttp.egg-info/requires.txt || die
-
-	# takes a very long time, then fails
-	rm tests/test_pytest_plugin.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
-		-vv tests || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache tests || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
index f4b5d82da709..a3a21c4b7e49 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index a97f9dd1513c..dab67e35f13f 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,10 +1,7 @@
-AUX aiorpcX-0.18.4-py38.patch 1913 BLAKE2B f15e8cf86a2447944cca64e5a6e99239918e9e2971faea70bffa13a38c89ae6007bb5504fba13830a4c7dff36fda8e55953907b49421e19204c732e323cf7b34 SHA512 ff7af0ae3f9a538e36d225fef827cb4684d6fa5eccd7f24276888a538dd72f9972d643110fcba87a2f5fcf3c1d54124d85364a51ebb1a1807e608564ed72cbd1
-DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
 DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
 DIST aiorpcX-0.19.gh.tar.gz 65557 BLAKE2B 2bc9d809abbcdcf4dd0358e4bb734068ef76482dc711e1c4568db78e9ae2141e00cffb82c1c7d5976887e0561b6c4f1422063969cec23a886bb192c279fc57d7 SHA512 21d8a75a90233bb4caed804da39274516a7c852c8adf9eabcba928ff7ad9bf922760fdca2c040aad8242193cb23be512803615973256b35347b6c998cccd6632
-EBUILD aiorpcX-0.18.4-r1.ebuild 779 BLAKE2B e6eed88074ebbd0df61bdd6ed1a96874ab30d0dcd6becd75c912790b56c9e584d84ee18df241971e7f95a89f2d755b0cf83c12ba1e9cb49e9dea427dc4e6e886 SHA512 364030435c85f5e6b9869661c64793ff6038dcfaad1abcdc10bfe55d7bb1690a7a8a6155dd1108bad44a06579947fc4b0bd8dd30a73f59617bae747c7bab43d6
-EBUILD aiorpcX-0.18.5.ebuild 645 BLAKE2B d6e92e21169448068ad26ff659149a6a80bd445e3b556b7ee6ce9f3812f844e54b2be18950f7b9a707824a505fb534f0473082ffabdcaa703ddb7400bd79884f SHA512 cfa5801d8b99e7076dc1dede7a5babb66bfc0d01bda9ad6289ed079e9b2996a2b1df1daad929bb95821649c8495b4c75e51450df519358dc3cdab5965ce084ba
-EBUILD aiorpcX-0.19.1.ebuild 640 BLAKE2B 640d8106e3d14386cdea25aadc0b5534321b6c569e9578779c21398a71b7fe424ce089bb60021b0122df363c8f3a7b0324d21d8f1a2f87d2058ee244dfa9b09f SHA512 3010aafc2427f05af99f33d97a84e4f99ddb091feffe171f98a31427504ed8ae143467e7f4bb8417cbc540ac40000241a84296dfd78cec4aacb40b9626f0bfc5
+EBUILD aiorpcX-0.18.5.ebuild 861 BLAKE2B 6f13104a6bff221918e00c198b3fc3596e43dc37102d4ca53eec9774ef0f237d0bfe7ea3ab002584497ca59f448fa64e70dbc0a6fdf4d25c55eb45b0e8af03e6 SHA512 ce74a01085c864f0427da094a6073fce2a002dc32ce93ead0d03b671ec0d25d2600f7be278ba2621ef35d1ee00bc96922f2c0a18d9c97a45d3fae1ae2177ab1b
+EBUILD aiorpcX-0.19.1.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
 EBUILD aiorpcX-0.19.ebuild 640 BLAKE2B 640d8106e3d14386cdea25aadc0b5534321b6c569e9578779c21398a71b7fe424ce089bb60021b0122df363c8f3a7b0324d21d8f1a2f87d2058ee244dfa9b09f SHA512 3010aafc2427f05af99f33d97a84e4f99ddb091feffe171f98a31427504ed8ae143467e7f4bb8417cbc540ac40000241a84296dfd78cec4aacb40b9626f0bfc5
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
deleted file mode 100644
index 7cd487159a20..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.18.4-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_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py38.patch
-)
-
-src_prepare() {
-	# websockets are optional and not packaged in Gentoo
-	rm tests/test_websocket.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
index 5daef298f5af..7547b1dfcba9 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
@@ -26,3 +26,13 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require Internet
+		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
index 1dceb3bd58c3..89eb9710f38e 100644
--- a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -26,3 +26,13 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require Internet
+		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
deleted file mode 100644
index bc189277c4c6..000000000000
--- a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/aiorpcx/socks.py b/aiorpcx/socks.py
-index 92ad396..4a6cefa 100644
---- a/aiorpcx/socks.py
-+++ b/aiorpcx/socks.py
-@@ -45,7 +45,7 @@ SOCKSUserAuth = collections.namedtuple("SOCKSUserAuth", "username password")
- 
- # Random authentication is useful when used with Tor for stream isolation.
- class SOCKSRandomAuth(SOCKSUserAuth):
--    def __getitem__(self, key):
-+    def __getattribute__(self, key):
-         return secrets.token_hex(32)
- 
- 
-diff --git a/tests/test_curio.py b/tests/test_curio.py
-index 9292f52..97b479b 100644
---- a/tests/test_curio.py
-+++ b/tests/test_curio.py
-@@ -1,4 +1,5 @@
- from asyncio import get_event_loop, InvalidStateError
-+import sys
- import time
- 
- import pytest
-@@ -525,6 +526,8 @@ async def test_nested_context_timeout():
-     ]
- 
- 
-+@pytest.mark.xfail(sys.hexversion > 0x03080000,
-+                   reason='broken on py3.8, upstream ignores the problem')
- @pytest.mark.asyncio
- async def test_nested_context_timeout2():
-     async def coro1():
-@@ -562,6 +565,8 @@ async def test_nested_context_timeout2():
-     await parent()
- 
- 
-+@pytest.mark.xfail(sys.hexversion > 0x03080000,
-+                   reason='broken on py3.8, upstream ignores the problem')
- @pytest.mark.asyncio
- async def test_nested_context_timeout3():
-     async def coro1():
-diff --git a/tests/test_jsonrpc.py b/tests/test_jsonrpc.py
-index 315f639..b0cdd60 100644
---- a/tests/test_jsonrpc.py
-+++ b/tests/test_jsonrpc.py
-@@ -1126,7 +1126,6 @@ def test_handler_invocation():
-         (Request('missing_method', []), 'unknown method'),
-         (Request('add_many', []), 'requires 1'),
-         (Request('add_many', {'first': 1, 'values': []}), 'values'),
--        (Request('powb', {"x": 2, "y": 3}), 'cannot be called'),
-         (Request('echo_2', ['ping', 'pong']), 'at most 1'),
-         (Request('echo_2', {'first': 1, 'second': 8, '3rd': 1}), '3rd'),
-         (Request('kwargs', []), 'requires 1'),
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 2c1a7f8e2094..26d64fb637ad 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,7 +1,11 @@
 DIST aiosmtpd-1.2.2.tar.gz 170459 BLAKE2B abf178c28a21c25e8a7c7ed920c154f037aaa21da5d2dfa0ee8cae7d239d00d5a979eedfb3865e3de7e54e7da94ea8a1e6b5194681a2137ac7d8f0f69d82e3a6 SHA512 7ffc279a73685601496dbfffef30a78cc254a76f8c8fccd0c7b7efe41da66672f0d8662f302eb928e90eb8977b859cb7e713415d0aa5e93f369ef23bdff405fc
 DIST aiosmtpd-1.2.4.tar.gz 83329 BLAKE2B accecbc3fe66efc748d0bc3c85504d731005b907435fada5b3c7ae0f7778e89f19d7c15a7edb194a7ba6310a450132728557a441b3fb2958d3658b0a15d3ccf5 SHA512 dc6041e284daceb89f8ca83b5cd715a5811eb4cf76504c23112e24c97d6c88480667c713ce094c2dcbc5b12a80605e551b6aadc4b1ce499089be68c7c4e7df8c
 DIST aiosmtpd-1.2.tar.gz 51457 BLAKE2B c2dba38c5d5a243a65c332cb3b6bf85a124eb6ab9c3526d0ef57788eb7e24e64ec86c56eeaa57e5171631c8a965447f125366741b1d1c54fb48473da5123ed40 SHA512 520b0fae80423d3963d4f17ef393cc0ce9e342fd1237c909159706bfe1e13f27df849fbc14aa1c94ad02e7c9108308984b6f9e21c7dbddb09093ef00884983d8
+DIST aiosmtpd-1.3.2.tar.gz 110769 BLAKE2B 985684d8183c89670c362e39b81cbff187fa820bc3197a0c0c18cd61eb4c00912bf489d935303be0fedfee3dabfafaf81c7d4be3e428374624ed9a1fab6ce2c8 SHA512 b5d183671b8a985dcf774fb1b35ffbdf5c058e24e7cb81d77b2b0ce00b2b4dff27ff8bb167e985d5bf84cb6816c014d7cd601aab59243136ae409975ef3da30d
+DIST aiosmtpd-1.4.0.tar.gz 136307 BLAKE2B 5ae007be6953de8fd804bef25e290153ead6730bf44dbf71448946c1380a972a59b0fcf6f669035dd23acc582d697dc746efe0b03612e6c3ee51b31d58aee309 SHA512 cefbc819a51cbdacc8f24d0f5ff4f2a92ad6e4c5809a9b97635226767f1dd20c63565522ab66fd6c7ede5efdafa89c42e3c3bae4e94ea5c57b49531b02e1bad6
 EBUILD aiosmtpd-1.2.2.ebuild 604 BLAKE2B b5d7a51a15335f12ea7479be582db17be6fd7a929db3db086238bc0ea9b4bf305d7c351d4d943fc09b40983c3cb1aee95a9378f5a507c4cb999ea3512d600885 SHA512 4b09dcff6e06f621db49b94c50bbfb2be17a49b5a5e2c64d28dd725ed37b78f51440081b93aca9b7f6f95e64531810b8e9994a472a014ad9fd77a2fbf67af368
 EBUILD aiosmtpd-1.2.4.ebuild 481 BLAKE2B 7f1e922676bdf7abf8323aa883c282f0705cc2931139dcd9c0a8167e584764550fc40a0004de9e71e76d5bb15bb9d71b62ed08ab7dfd99b36f0cf36f2cdf2beb SHA512 8d6e06c4e21d789f36c4646baddbd239be2dc25d0a078b5c4472410a3c0521bc20696e221b66cd3ee5e801036419bdd1ce0216a6bc4e3e0e08637b278b26cffb
 EBUILD aiosmtpd-1.2.ebuild 569 BLAKE2B c6147ea15f789e3324ae80739619916a80574e2978ee8fc00eaec4c0acc9ec56241f21bc7830ba1330a3f51dcc36597ff20a036a15fb4e3cb7a14210f1d570d3 SHA512 c1669e3177372be4fef402fa1629e33f8f998ef070c5250844fec86c6e1446406649f6754af54b10f19f5b8f4b839977b05a52b34fa0161045a45c08081e87ee
+EBUILD aiosmtpd-1.3.2.ebuild 627 BLAKE2B 25c69f1ea753d119197475f1a4b769d973ad74f8cc64a86f37ccc0204ea988deb1a2874ec79e214c792ba3fefc30a00284e2a273b4960bbacc2f20bee056c4f5 SHA512 668180bcbdbfca58bb1c79b37495a4ea2162cd092c326ef131fbc265081ba6c8631f224e6c60634db74e793ab96bbd17c56b5132ea3bf7b2d3f49bc2cadd82dc
+EBUILD aiosmtpd-1.4.0.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 MISC metadata.xml 461 BLAKE2B 26a357ec03cbd43372f7fe77a2b7ba7330c9c1c18695887c5e297f7d769d3af34ae456f30743880098080f3c6740180bbe0e7e0be5a02a0059096b18177968cd SHA512 67f76d5cf941e2276006c55471a101e0be62e79a2cf3c69d74fac6566da9ef44b14fa29d7fbe57b72d2452318465d4b43aa9337c1cdac798b874a3b3ce2f1734
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.3.2.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.3.2.ebuild
new file mode 100644
index 000000000000..495f26fa447f
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.0.ebuild
new file mode 100644
index 000000000000..3c32f8604a09
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+# TODO: run doctests using sphinx?
+distutils_enable_tests pytest
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 938765899aac..817b64a77487 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,14 +1,7 @@
-AUX alembic-1.4.3-pytest6.patch 2379 BLAKE2B 3c43194ce234703b10e87a8d8746efef96b317b1d23fbd19c1cea4a8809bf68e0a3908314948afb61f5b8081ac021d51d329c4b064f026ce33ed8ffe2919fb3d SHA512 390f3a605649c0c927edb2746906b703cf293879e9cc18be6a87a646ddb8032eeba837f7c4df4a9d82187bd9bb3af5955a815df3428e966ec7b4e7e8fb43de87
-DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B d9c8b6d6aebce7a45194dd6c654f4a2627714a5c1f7cb7a1cf80ed8c3fe861e3bb7857811128787ddd6c093b4370784b40cddb385cfbd30f6134d537fe949d2d SHA512 925d8957fd9008d041737a9e79ec8d7a4c5deba1976e980362d355a75348c1638d783d9d48234a5bc3b2dc3f2f09dcb281d0c80ae0f0c5bc32e176c3dfa05463
-DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138 SHA512 a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5
 DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241 SHA512 2fe490c46c253123333f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601
-DIST alembic-1.5.2.tar.gz 1129660 BLAKE2B ab8800adb9a46e98adfed558a98328cbb06f53c4e1c47a7ac2f9f559e807aa81955295496404569aff53bee449213bc40232d070403e72098a27e789ea2a7b96 SHA512 35a00cee17d626aec55d6fe5b99dec58dfc52167a1ff1559cb69a45b9eccdaf1a0ceb58f8c2bd0d6e590ac2577fea32d82b412b5e706d0b9c183775d44253668
-DIST alembic-1.5.3.tar.gz 1132015 BLAKE2B b3a1e54b365f1b60edbb2c3052d3a0b822e6f3dfe398d58ba3dc9504cf081476abf7af79dab2233629765185a7d1d69af7fabcdbe8328c54b39c81034e55ceab SHA512 0859b21b35854ddcb98f020a03659cdb4c56833a84f868db545aae51b62eddf3c4f76c0d00dd1d5fbd1259766b90f9f5b11e1f5e99db8d8752015aded12ca185
 DIST alembic-1.5.4.tar.gz 1133598 BLAKE2B 88e1f40ef1935b90de789f1adc99edb5fc580c96a3e86a672cc9cfd694e79e940ba696efe560db3bf2878420a168382ed4342cbf1b8c7b9bbbf084532b8da402 SHA512 190f8fe96f18541fd62802e026e93c332f6046618cb89d4f9a6b478505742671d363de1161feeccd8873036a458743165080b5a0e2e55e1d0dd81e617c8cd4ad
-EBUILD alembic-1.4.3.ebuild 1097 BLAKE2B a48797aa3134bf0f4530aa3ce2a35bcaa42f16afe074bceb9028003acb98ce3148f8f72596a6bd08224ac8b762a489b57b7836774e7f58ce543d511086a3991a SHA512 6a3b2b04e1b2ae5856f29a2992637541db939f0e9af1ca65e2275f235fde033505e11ea180c459eea69cb870a2c55ecb591b0aaf54081893eedc8efdef7a1de5
-EBUILD alembic-1.5.0.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.1.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.2.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
-EBUILD alembic-1.5.3.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+DIST alembic-1.5.5.tar.gz 1150308 BLAKE2B 33db8a0ea00802b37d3e24ca43232a993bfc333e232fa08b8dd0560dfec5f18f4fa82bcc3c34a776c88c8fc8d3645c4501a9dde8e4e5411bc255eb654183d01a SHA512 a4078c66bbe1627620224f965b879c46453bc74e6a2a902619df28912f55b27f086cba68f08bc8c0a37bd221ac16e195f7f905379fd5d191854adb7f90f86530
+EBUILD alembic-1.5.1.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
 EBUILD alembic-1.5.4.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+EBUILD alembic-1.5.5.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.4.3.ebuild b/dev-python/alembic/alembic-1.4.3.ebuild
deleted file mode 100644
index f6411be87c89..000000000000
--- a/dev-python/alembic/alembic-1.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# https://github.com/sqlalchemy/alembic/commit/8690940976544f368dad31cfbc46d9e1426b2ce1
-	"${FILESDIR}/${P}-pytest6.patch"
-)
-
-distutils_enable_tests pytest
-
-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_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.1.ebuild b/dev-python/alembic/alembic-1.5.1.ebuild
index 32d428a7bdf3..b0a59134f8e1 100644
--- a/dev-python/alembic/alembic-1.5.1.ebuild
+++ b/dev-python/alembic/alembic-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.5.2.ebuild b/dev-python/alembic/alembic-1.5.2.ebuild
deleted file mode 100644
index 32d428a7bdf3..000000000000
--- a/dev-python/alembic/alembic-1.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.3.ebuild b/dev-python/alembic/alembic-1.5.3.ebuild
deleted file mode 100644
index 32d428a7bdf3..000000000000
--- a/dev-python/alembic/alembic-1.5.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.5.0.ebuild b/dev-python/alembic/alembic-1.5.5.ebuild
index 32d428a7bdf3..32d428a7bdf3 100644
--- a/dev-python/alembic/alembic-1.5.0.ebuild
+++ b/dev-python/alembic/alembic-1.5.5.ebuild
diff --git a/dev-python/alembic/files/alembic-1.4.3-pytest6.patch b/dev-python/alembic/files/alembic-1.4.3-pytest6.patch
deleted file mode 100644
index ecf21a7ca58f..000000000000
--- a/dev-python/alembic/files/alembic-1.4.3-pytest6.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 8690940976544f368dad31cfbc46d9e1426b2ce1 Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Sat, 26 Sep 2020 21:05:53 -0400
-Subject: [PATCH] Support pytest 6.x
-
-pytest has removed support for pytest.Class(..parent)
-and we need to use from_parent.
-
-Also works around new issue for 6.1.0
-
-References: https://github.com/pytest-dev/pytest/issues/7807
-
-Change-Id: Ia5fed9b22e76c99f71489283acee207f996f52a4
----
- alembic/__init__.py                    |  2 +-
- alembic/testing/plugin/pytestplugin.py | 10 ++--------
- tox.ini                                |  4 ++--
- 3 files changed, 5 insertions(+), 11 deletions(-)
-
- sys.modules["alembic.migration"] = migration
- sys.modules["alembic.environment"] = environment
-diff --git a/alembic/testing/plugin/pytestplugin.py b/alembic/testing/plugin/pytestplugin.py
-index 1c8be05..ba3d35b 100644
---- a/alembic/testing/plugin/pytestplugin.py
-+++ b/alembic/testing/plugin/pytestplugin.py
-@@ -33,16 +33,10 @@ def pytest_configure(config):
- def pytest_pycollect_makeitem(collector, name, obj):
- 
-     if inspect.isclass(obj) and plugin_base.want_class(name, obj):
--
--        # in pytest 5.4.0
--        # return [
--        #     pytest.Class.from_parent(collector,
--        # name=parametrize_cls.__name__)
--        #     for parametrize_cls in _parametrize_cls(collector.module, obj)
--        # ]
-+        ctor = getattr(pytest.Class, "from_parent", pytest.Class)
- 
-         return [
--            pytest.Class(parametrize_cls.__name__, parent=collector)
-+            ctor(name=parametrize_cls.__name__, parent=collector)
-             for parametrize_cls in _parametrize_cls(collector.module, obj)
-         ]
-     elif (
-diff --git a/tox.ini b/tox.ini
-index ed233ee..f144754 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -7,7 +7,7 @@ SQLA_REPO = {env:SQLA_REPO:git+https://github.com/sqlalchemy/sqlalchemy.git}
- [testenv]
- cov_args=--cov=alembic --cov-report term --cov-report xml
- 
--deps=pytest!=3.9.1,!=3.9.2
-+deps=pytest>4.6
-      pytest-xdist
-      mock
-      sqla11: {[tox]SQLA_REPO}@rel_1_1
-@@ -30,7 +30,7 @@ usedevelop=
- # only use --dropfirst option if we're *not* using -n;
- # if -n is used, we're working in brand new DBs anyway
- setenv=
--    BASECOMMAND=python -m pytest
-+    BASECOMMAND=python -m pytest --rootdir {toxinidir}
-     WORKERS=-n4
-     sqla079: WORKERS=--dropfirst
-     cov: COVERAGE={[testenv]cov_args}
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index c9ab0f496c76..4b32ba96bed3 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,5 +1,7 @@
-DIST aniso8601-8.0.0.tar.gz 37007 BLAKE2B bb5f42928308fab7746cbea364c03db4813b1b25883495d0488eb755e14f465300662b07c4ccfd03328a0c0f07ed87056ccc13f2652648c4838b0433740fc3ab SHA512 1e6c43f77993e829833d819f7c2b9b1d31f30ca46e258faac0e0b3be864da07436ae34f05710309302477bb3eede5966c95ef3b124c9b353b306c2272dc4cb9d
 DIST aniso8601-8.1.1.tar.gz 39143 BLAKE2B d72161923e164032e1b9e4ed317d688d70b2a16bec6c23966f76abbb4d10f24def18df41fcca4e8f45e6145f4f067ec5483f34305a33eee3445d4706df188a99 SHA512 f9c3412c5e7dec04cca56df5806a747779848adb90137293368b4d50c365692b1d1f792a00f57172925229ccdee34ef5b50cc2d06f4c9b4d697c651e5a2e3674
-EBUILD aniso8601-8.0.0.ebuild 518 BLAKE2B 0e6723ba05fdff5cf73bfba1f2c32a7a180edda059212324ab415b1f0f2b4d5f2c4ad5382bedbadc01ce862f6d2c0a302ba1c8013797b358d31c19b5d899a6c0 SHA512 09981827bf44df392c89b8c12410268f0404f9a08071f6eb46131340040b6d4dc7c03f3cbf47b0f61368ff3f9b5d45068c1203d022d872b67825dfafad0c61c7
-EBUILD aniso8601-8.1.1.ebuild 522 BLAKE2B 46cab7fecb64e924bec095fa03d9351604e7a1a163f11f0d7d9418d2539b86f3f0f86d7fe6e6ccc5c2daeae03fa6e8c24ae632795e7c96dc367e3aea2dd643b2 SHA512 5cad45128bae9d96eccfbb831449b6a046deed8edd22b8215c36b673e51a41ab930aa363c66fd20f82525383fb9c60ad4b452e8dfe9c413f6adcd899fc225cca
+DIST aniso8601-9.0.0.tar.gz 46924 BLAKE2B 2dc0d24b536de48b3c1367203d685b00fcde8b257fc407ad38461422d4b278af1f29bd32dd74136c72204530d874d427d967f711aa69c9224c47ea3883a70102 SHA512 e0fc9ab1de36ddc7a78c0fdd139769312302bb2f8d7ce874aba1e714c7da25ed153a883ef92e62ad9f1a0c4d192c43cc939b8e82405f9f60b7d4b400f104e348
+DIST aniso8601-9.0.1.tar.gz 47345 BLAKE2B d8167bff8fdde88799e165c12aa0ea10a34d2edc91f8eeba93105e669dab52ab73e688467370927ef749395491baa128b55c984feb4f1d972e75242ec1c1efbc SHA512 a17c363a3a67b69a2fde50cc37b080b52615cebc453ef70090498ffce909775b0109c889b63e87381c795c2d8531efd6048542627c88e97297ac22ce81c10c8c
+EBUILD aniso8601-8.1.1.ebuild 519 BLAKE2B 4b744278aba261a5220f2bcbcdd45d687db07b10f87371e894b7c0cd755d8dcac555ea0ac88bf487c7375ec3e83eaf77d3aa4929bbd44b18701031b0249127da SHA512 ef3ec7ecaaab29180180efff0f1f1b64579114a5e59f26cde8a89d58ca1523026a80c3c4fac72435307aa673eb1bbc11cae7d7cd22f95668c098be163bf6fe86
+EBUILD aniso8601-9.0.0.ebuild 522 BLAKE2B 46cab7fecb64e924bec095fa03d9351604e7a1a163f11f0d7d9418d2539b86f3f0f86d7fe6e6ccc5c2daeae03fa6e8c24ae632795e7c96dc367e3aea2dd643b2 SHA512 5cad45128bae9d96eccfbb831449b6a046deed8edd22b8215c36b673e51a41ab930aa363c66fd20f82525383fb9c60ad4b452e8dfe9c413f6adcd899fc225cca
+EBUILD aniso8601-9.0.1.ebuild 522 BLAKE2B 46cab7fecb64e924bec095fa03d9351604e7a1a163f11f0d7d9418d2539b86f3f0f86d7fe6e6ccc5c2daeae03fa6e8c24ae632795e7c96dc367e3aea2dd643b2 SHA512 5cad45128bae9d96eccfbb831449b6a046deed8edd22b8215c36b673e51a41ab930aa363c66fd20f82525383fb9c60ad4b452e8dfe9c413f6adcd899fc225cca
 MISC metadata.xml 410 BLAKE2B a90d3f803fe5f99e83046d3cc1ebf5ec993c18e8aafdbddc2c8928a6b5e4b961e511a027366a59b4133fad65c425393513c1ab9960c32d8119c06da7ec113ee9 SHA512 2ea6cd3e1268d3e14817f2334e3946671161422cba8be852cb7b74ddbe60ceb89fdde07629d2d8be5677cb2820e05db7f67c335a95b74d42a3e23a91a7d8b603
diff --git a/dev-python/aniso8601/aniso8601-8.1.1.ebuild b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
index 298eb44a792c..c3e8d0ec9ebe 100644
--- a/dev-python/aniso8601/aniso8601-8.1.1.ebuild
+++ b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/aniso8601/aniso8601-8.0.0.ebuild b/dev-python/aniso8601/aniso8601-9.0.0.ebuild
index 160d472e0c6d..298eb44a792c 100644
--- a/dev-python/aniso8601/aniso8601-8.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-9.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -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/aniso8601-9.0.1.ebuild b/dev-python/aniso8601/aniso8601-9.0.1.ebuild
new file mode 100644
index 000000000000..298eb44a792c
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-9.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} 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"
+
+RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index 5e64b72a0acb..e94f7871d748 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1,3 @@
-DIST ansi-0.1.5.tar.gz 4606 BLAKE2B 5f88319f05262511e99c8385946b61e2ed7219217ae8e811e8c1762fbd402f2fcaf69bcd6e4caf35d1f982afebcce5a98c721e2598032891382010ff7b928c55 SHA512 03365aca71b4966ca0c78b1563400afe414c86288b4e8ede969fb9c79cd4da4722de8cedae4e86c2f536f82eda42845482e041a396cb33852d3e4ff639dbbb64
-EBUILD ansi-0.1.5.ebuild 458 BLAKE2B 1d5a3c25e3e43c89898c84f5b88887f02c13ad4543b6d041f36b2ab919fc7521540fdccdc3a16eb40c5c9a07dcc773fb147f31d340529330578dd5a53f0b2688 SHA512 e9df7a868ea069a44ed5407901638f9c3627fae7f795717d2ffa32138f9e5adc69a5a6e33cdaeb7802eb06d25987e8e7020f55ff984969cf68a0b45742ffeb3e
-MISC metadata.xml 366 BLAKE2B bb092fb0749c188b5367ff6c352e7614fcd4761d81063f7ed4c07958e6fe2752e88e0dcdb93f48cc58a0e35b8aa2f5ba280ca082767c303118f956d7c5ed5c46 SHA512 4fdd976a6c082c245474c4c5d4809b9b17ad90fc237b2ea08cd3fd3022ae3e3a0a92b8f27b53429ae8f1a1bf964ea1af65523f9f43128a40e296d6714b1b4711
+DIST ansi-0.2.0.tar.gz 5173 BLAKE2B 436caa8e1f36e96f1844e79e3a0ff0c4099e76b25ce9f56c9d8663aeeb650f32fba75a14fe8548f557fb020e2340707272fdda4cdd3c245c903a4f801ae48413 SHA512 22c69b5030f03eca9470e288c16e62042ccd02ef2e232600a4fab629354601d5da0f7c16b60dae7293c69255e5d4125298890d99dba8e5387960a5be60b92d61
+EBUILD ansi-0.2.0.ebuild 464 BLAKE2B 85e50ae40ae38610f5e321a1ee795ebec8169a063b10a258ab56dd059ecc6b15a0a95f37efc09793669f7f2d1371e1b603afa0c3bba437bdda1f73002c46036e SHA512 c45e5fdbcbaaa888e1df0a09ca73ddafeefbb9405e526be05cd7147be00fddf3a685f1982bb1c92b4bb1726c03e61596fabe7eae0a66d6ef2b052b61ab522886
+MISC metadata.xml 390 BLAKE2B 22d724bcfc7292001167a0ea7e69f12916ef601ddf61ee09226a27147d5ca5e66380af85d112a525456ca0634fbbdd17800c0bb451536b832a1640ec25ed07f0 SHA512 f4a04692f970eeedafa4780f027179475746eb1034830ee7ec9c916f24880b0dd87655b0634930e921e7eafd2ed61b1f2d64c3a78ebb246c5f2f179d3773a762
diff --git a/dev-python/ansi/ansi-0.1.5.ebuild b/dev-python/ansi/ansi-0.2.0.ebuild
index d6cec8f9c3d1..afc8d0584e2f 100644
--- a/dev-python/ansi/ansi-0.1.5.ebuild
+++ b/dev-python/ansi/ansi-0.2.0.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 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"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${P}"
+distutils_enable_tests pytest
diff --git a/dev-python/ansi/metadata.xml b/dev-python/ansi/metadata.xml
index 7a7fc220ebbe..c404dbdf8174 100644
--- a/dev-python/ansi/metadata.xml
+++ b/dev-python/ansi/metadata.xml
@@ -5,6 +5,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">tehmaze/ansi</remote-id>
 		<remote-id type="pypi">ansi</remote-id>
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 6cc15ad78346..5265450db93c 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,9 @@
 DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d37a556ace06585b7d354fa75338e5c4e4263ece0d8d043f29f3909e3c200b2c79c744a4bd13319764667998 SHA512 30ab01c66ef1dfb7fb35dc8609ca19039fa3e37638ff0df681d0ffc9dbc832e9d3a577d9a45fc70ff3e74aacb6198b37e61ada22854572c57c27d7ecbef09caa
+DIST arrow-1.0.0.tar.gz 101951 BLAKE2B b8949dc2274f44020bd70e1013b3b3053789319daae0c630e17d2bac66d614e958b2d34ed9b06a1a5502a21684de10e053d4f1e70bfaf9a630548135d72f364f SHA512 4e487a0c1c6f55361b8ec673082d61efec1b27a32b19e2e599a344407737e5eea47ee8e2173b2f089e69a5638f99022870bb3ac57f31c16d5b4efd2858933fa8
+DIST arrow-1.0.1.tar.gz 102243 BLAKE2B bad601878bf692858db56967b456fa0c413faebcaaeee352ffe40933cfd915dca8dbbcc2ce4e4f37e03b393acdbfc94d49b8825664a9d1e246ae91a350e9cfcd SHA512 5500df4af6ac8c2858dc98a427a4b81d51d08a4bb44841ef03bbb3a57c9c9004a306e5d627a5202d5b7498dfb71c3602c1ec265666958a94b95861c901ecd79a
+DIST arrow-1.0.2.tar.gz 102330 BLAKE2B 2f7b737890aceceb265d2790d163c2d2325e78cc9045a95523b4e71d520f7d1fdb10efd18ccfc305bf10b27cf8f503a4e5bfc81897936b7c63600a3569ddd230 SHA512 a1ddfda75c84bd1e7708ba8368bbf672b1906bcd3a10cfb9ff867c72acd4da977089b4059b16de29c6112ce793e459f9eaa173f345bd25727c2dcbacbe235b05
 EBUILD arrow-0.17.0.ebuild 701 BLAKE2B 54462cd2a6133d61697eeeda4df826f83510775759cd5a497f0ceaac9e18b9aa3969d877bae1f59ba5ba3ae2cd4e457a19b56a2bc4eccbcc9239d5cd07c4f711 SHA512 f57b5fb31a08c8a26d6b054da81fbf24516c29eda887b22b944da5955733b624c15f260901a094b8f2f7a5fb22b3183ee4ab91bf1d0b4b9333f3a5d80277db22
-MISC metadata.xml 388 BLAKE2B 68ef136715f60b69973bcfa1957f23ddf81a8d1cb99d2edaf955562b78f6d92a6187b97f208366b320c0bf140d2ce0d9b62aa9a8d6631b9277f58dd60cfdf5bf SHA512 66f3d1a07042e4e935dcac1e5417893b9fd7b9e97b9f7e3670c85960dc2344e101715cfc11fd2776aeddad8b622c4e8fbe509ee5d93c5250183486a7dd53e16b
+EBUILD arrow-1.0.0.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
+EBUILD arrow-1.0.1.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
+EBUILD arrow-1.0.2.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
+MISC metadata.xml 386 BLAKE2B e605d85f1f0360d1a0ea7f78dbfd058597a0c1bf86a7464b3fcbf6951ee5faf5b39b82563d63b2922fe85330ba78e57291242b1260257e3f787f772aba99f91d SHA512 1aa5206e180fd0a879d97ae70ab8b8cbdc4e9196232bb4aca9c09e7fb87bca840a450ee55c046c8579b2bcb13386c8691e6ec970f64b8366e887780a42825851
diff --git a/dev-python/arrow/arrow-1.0.0.ebuild b/dev-python/arrow/arrow-1.0.0.ebuild
new file mode 100644
index 000000000000..81e5cb7ef66e
--- /dev/null
+++ b/dev-python/arrow/arrow-1.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/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}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+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-1.0.1.ebuild b/dev-python/arrow/arrow-1.0.1.ebuild
new file mode 100644
index 000000000000..81e5cb7ef66e
--- /dev/null
+++ b/dev-python/arrow/arrow-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/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}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+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-1.0.2.ebuild b/dev-python/arrow/arrow-1.0.2.ebuild
new file mode 100644
index 000000000000..81e5cb7ef66e
--- /dev/null
+++ b/dev-python/arrow/arrow-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/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}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+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/metadata.xml b/dev-python/arrow/metadata.xml
index 731d99c54338..05383d664514 100644
--- a/dev-python/arrow/metadata.xml
+++ b/dev-python/arrow/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">crsmithdev/arrow</remote-id>
+		<remote-id type="github">arrow-py/arrow</remote-id>
 		<remote-id type="pypi">arrow</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 41a0cd2ae8bf..2e0424c9f79f 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,7 @@
 DIST asteval-0.9.21.tar.gz 54203 BLAKE2B c5232b41cc73184f4a9d21e257d4c517662e7a7e5c6beed0d0a1f46572310263b5370ea455f2d0640410cecd7e3b8a7686a56931fa61c3294a57a2e5ea984336 SHA512 b2930963641486f208c629300f70e41924aa59bd9c64f767ed5a4db0a39e79c02a02fed48eb0e113fb6e3fc594973c9d0afa56d768ac627758a096b1c4fe6030
 DIST asteval-0.9.22.tar.gz 55120 BLAKE2B 5712e72f69e3d48df6a6ac33e3bf87517525efb3907cb954d5a4427b4d41aac5bdfbf71376967633d36574a845c40bbeb391d2ef0a2deef280235c468732e80d SHA512 0c6e0d1273fd9794828e006c56d243e2afbf336314dad9ccc95f40b790851460beb42400defbf4ee09eb7d65532b499a762b4b19c3102bbe6d2553a3a6debb37
+DIST asteval-0.9.23.tar.gz 55239 BLAKE2B 447599078a877784c35b7bdb96f81382139f8a93d72e660658386867b0eb37e04a22ac7ba9d6afbef1a55d35ca38a63fef60e1e1382e9740694b1e94ddcc7e7b SHA512 b2755b4dbefff1e481558f886cc5724d9a6a953b145736afab237e16f7718d48d1f8f98a0b7355c5e871f8ed0862b60bd6a4d99554a5e0fd0875f9cfdfcbce55
 EBUILD asteval-0.9.21.ebuild 445 BLAKE2B 0294274fa252b94bb4f937680a9de156133c19a5ac725b6f669663500f52542988b00f0d3dfd8dcd7d3af45122b152bd3fa08f87accd4e743bc09b424d2aeac4 SHA512 88ff548a117141fd37aae50fe8588e7fd711de11edba3e03f8f0bb80173b160459204b18211c5513f9be7253fa1177428f6fa66d0357b5f5dc046f844d9373e1
 EBUILD asteval-0.9.22.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
+EBUILD asteval-0.9.23.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
 MISC metadata.xml 387 BLAKE2B f4d9e9dd7e5537c9f87e74daf1af859e1a14e93aad3a7a5c702cc3860288a0200ff822f8b25ad1ab9f8302214407493b125caa0b7baa3ac4af668f0ced764835 SHA512 604adbf69eac36bb9e70109021a3c3c6aae60dc67eede274b10874ebac1b21873cd6ce09bb97a2c0618c101c06e63456752f066de0bfd485c16c1307bdddd429
diff --git a/dev-python/cachetools/cachetools-4.2.0.ebuild b/dev-python/asteval/asteval-0.9.23.ebuild
index 4e0424ad1b9d..9b942b300584 100644
--- a/dev-python/cachetools/cachetools-4.2.0.ebuild
+++ b/dev-python/asteval/asteval-0.9.23.ebuild
@@ -2,17 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python3_{7..9} )
-
 inherit distutils-r1
 
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64"
+IUSE=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 23001ac263ed..e5351c19fa3d 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,9 @@
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
 AUX astroid-2.4.2-py39.patch 1723 BLAKE2B e05c71961478c4a9ea76d5edcff3d1f775fb225a98a4b6849068fd387a4061e25078c14d374f5c60260d1678f34cc9ed6db96b20567bb04a4dc089e0a611a328 SHA512 3afefb42e9bda1666820de490c6d4a8ad7c873fce2965f5a8a159bb00617fe71deda231c3f810d238af1b1f386cd4b5c9eba78f6012ff05a7b6f10e50573b5d8
 DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
+DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89edaefdf94209a2fdc7f2686a27abcb1c0710cad658473a0a1516df5ad80f10c6b7c2a4f14dea36af94aa9ae5b SHA512 a0aaa95257961235abbbbc021cdb48da760f8b1856bbc0a7a8b98c53c69045cee4bfe575182a631f994765819e373b33b3a6eca052573128e8b36f2c23c250de
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
 EBUILD astroid-2.4.2-r1.ebuild 1870 BLAKE2B b6fb0fedb655a60c9771384b11adb8132d8ea9ca54e61f070e74fa029eee1888a736287a71e094b90ad304bad7f517e3cb52c4813afb4b2321d36d25eb5cab86 SHA512 3d36a5d9fb124927ba9fadb51c22356d99f190c6ede44fa933286de16c4101e45a484489d79e8617e5642ca3a74ef77b55c8cc5f71d138c3d41dc44d740f67fb
+EBUILD astroid-2.5.1.ebuild 1195 BLAKE2B dfc4ab4e910998b63dbfcf769513edcb98cbd6d16e037f1ce1d8484ecc669d09ed3047f43ad49a43ffd34c1882c632156f90a6d2f48f8d7516980a6e59a2d18e SHA512 5807b77578ead30897ae28bef16e5e696bf7663af12984f17835f22af111868d4d33ddfa2d2ddb1568f4c784afec6fb9c0f90f05c41d8e222c6c277f355d372f
 EBUILD astroid-2.5.ebuild 1837 BLAKE2B fa11dd5895f1c711d8c2a388186304adeddf0f4707270f9dbf51a000f16a567429c52ec7a37ac79ad1531bd2633241635c5817cbf885bb7463817390fae6931f SHA512 1c83ff367c6c5627e491b4bfbaf33fd3b1d111ba6820e851ae3fa6670c05c31e19192549310f71d5624421c91534b13204293117bd9cf3fc2be9f310543eda1d
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.1.ebuild b/dev-python/astroid/astroid-2.5.1.ebuild
new file mode 100644
index 000000000000..b2a9c306e3f1
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.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}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 56914826fca6..ce8ba6d031f8 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -3,9 +3,13 @@ DIST autobahn-20.12.3.tar.gz 1268873 BLAKE2B 44dcaf9d19af89382dfdef9f40a01774862
 DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
 DIST autobahn-21.1.1.tar.gz 1269122 BLAKE2B 6eb8eb22d0f09a4e8d409220ee2dff60a42a4e81acee789e8f9d98649ada24174295b98936f5e0a0a211fddd6d124975aef152679fcfde7b3dca7f18dcba5b62 SHA512 8e56e8a9213e356ea4288c6ed6ba4d6e8a26f5e1f670cfc067d1e11ef4d989b4e3d33a5cac49a635e18f9d45da1d42cb1300de96afdf77898441330e3f489194
 DIST autobahn-21.2.1.tar.gz 343966 BLAKE2B 8ee40610599aad6b0e6832beb867ff7515192e9a896d4f1e1b2c731fb81c899bf530f24d28e52faa91779affb1ed93b9b79b606b1ac7d3ed26a272dfcf6a0afc SHA512 21760aeac80c1e958a338da31d405af2f37c803944032270329dde4b59e6a9f914e9a7e4ae0ae6ae5b699ddc61f0c2f6b89cb0d6d4fdc3b1b58f204d4e94a980
+DIST autobahn-21.2.2.tar.gz 350799 BLAKE2B 06c5f7517083853bcf2e4c982151caadae2c5c0c547f543f310497addda14ff6262adaf876dcd5ce25ab48fd8b9b9c816ff74f518f3aedc65627ee3390db514b SHA512 6dbad05437c92622709c140fd949706c8fbff62477cf9fa5a8bbcb8c5410661b660d548902ebec55b5a8d744cce12c9a229bceeb3d5e7e5dc4e50cb09f7e7ab7
+DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
 EBUILD autobahn-20.12.2.ebuild 3038 BLAKE2B 063b7a3996d586d09fc14f110f50e6d239c8d6cee97928742c29afb5d961f9dec9e4ad283e314a13e208c0c4b335b8716128a2d81bd81613b7c567ab7cca651b SHA512 26848497db0ea8ec1ce565f66645c82f3660209fe74299dde2c07730a53ae77ad36fd54e66c2da1c88462db0613eeffdff665705c1c6d73810de6e48d3c43e6d
 EBUILD autobahn-20.12.3.ebuild 3094 BLAKE2B 0a1435ef4d1e9d0f957377a751af0bc7e4486720b627c797cb290db2ad1570a4297d161e90c0f3aba34701b385c3486bcc2ceab9a6b798b5c3b82329766a2afd SHA512 3aa3276154faaddf3db0b615364a2c65cfd19f112beae9dee0fd83fd1963ab272a01be6bde878ae283c7e5489d55232209773978c4af5b250d379b6ecc2675a1
 EBUILD autobahn-20.7.1.ebuild 2995 BLAKE2B b1a4536d3153fb71bf0c83d89bdab51beff8cafd9a3686791c8697d8d249505843fb9ea7059ebc5e0d299884731b472d9e6255b2c8e800378c0a12336151361c SHA512 b64c89beb8c60179b8fef2dd9fdfb69b32a1bab0adf5e39fa3982bffba9cb55d2cc046216ee29f1a2248b1b15002a6e1f5e1e48f19507385dbde7235427d5157
 EBUILD autobahn-21.1.1.ebuild 3145 BLAKE2B 5f8844a8228ffbfac12b6c36e782f07707f62336fa9c098ece49f4d23d1ac934f9ee91ea26abfa662fddceb6ea5302912ac3f237d62bff674be3788279aa5f3e SHA512 c7515208af81cce17bd51d9f31da17335938777f0386e2c1ed205f809cfec54eb8ffc3407127c4b5d14578ec644abc14e62b93b52b57ff63132f4c094733c345
 EBUILD autobahn-21.2.1.ebuild 3108 BLAKE2B ca119cad37f38de68e006a7e7947ee27e7fc2e7460a1e5f1cc292772ab93b3055e6915f6413f98f52d9d814bcab946f59f48085da833717572b17da17d052a41 SHA512 9a755eecb6e8c856f95f5867cb3144470352515a1641eb473ec9532b945c2bdb8d75fd6278bed8ca71551153518b5753d6cd0cb6cde9c14f07e5a131653db4d1
+EBUILD autobahn-21.2.2.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
+EBUILD autobahn-21.3.1.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
 MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-21.2.2.ebuild b/dev-python/autobahn/autobahn-21.2.2.ebuild
new file mode 100644
index 000000000000..4c94153771d8
--- /dev/null
+++ b/dev-python/autobahn/autobahn-21.2.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="crypt scram test xbr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.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-21.2.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}]
+	)
+	"
+BDEPEND="
+	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}]
+	)"
+
+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
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
+	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
+	unset USE_ASYNCIO
+	rm -r .pytest_cache || die
+	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.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-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
new file mode 100644
index 000000000000..4c94153771d8
--- /dev/null
+++ b/dev-python/autobahn/autobahn-21.3.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="crypt scram test xbr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.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-21.2.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}]
+	)
+	"
+BDEPEND="
+	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}]
+	)"
+
+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
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
+	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
+	unset USE_ASYNCIO
+	rm -r .pytest_cache || die
+	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.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/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index dc43e05989eb..82db175379cd 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,3 @@
-DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
 DIST aws-sam-translator-1.34.0.tar.gz 831469 BLAKE2B fa6820ef8640b649c9866d3e33ca5bb889bb8041ad15ce93b672ba0d84a3396db03ac55c877f303359f20ef1afdcadb257b84616a4376640279ff47dd9d86b43 SHA512 704bb55c99485e37d8fda853ee8b4f36472c8ccc83951bbc48eaaf2a0049765820c9036ad48a0c03b2d267378e5bf3c3155986ceee2e6efae8bb28bff1e68ec7
-EBUILD aws-sam-translator-1.33.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
-EBUILD aws-sam-translator-1.34.0.ebuild 1332 BLAKE2B d4a6f42398e4886fa6f7e102c5b5a6d7cbc10cc0b4f07050d5c0fa85607d767a1dbedb30fe58781465a826008df77d9dbc13dece02087a482481c4ce12c082ad SHA512 9f3e91c9b7ad3d160258b36b72383a4ce605d4a62661918201f80f4392fb59a8368831d64f4bb287cf0be019940125c9eb5be2c4ada1a14e524146bc4b0b8e8e
+EBUILD aws-sam-translator-1.34.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
deleted file mode 100644
index 93aa7dc89a4d..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/aws/serverless-application-model
-	https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/aws/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}]
-	dev-python/pyyaml[${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.34.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
index aa02cfea0947..93aa7dc89a4d 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 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/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-zoneinfo/Manifest b/dev-python/backports-zoneinfo/Manifest
index 257cd083952c..911e484acc3b 100644
--- a/dev-python/backports-zoneinfo/Manifest
+++ b/dev-python/backports-zoneinfo/Manifest
@@ -1,4 +1,4 @@
 AUX backports-zoneinfo-0.2.1-py38.patch 700 BLAKE2B c3bfc78001da6cfcd9e4b2ffae55f010e5237e68cce04bdadca40db95b5b2c2ef4e218cee884cba0e63ee182b817964ed5e9a7ef3b1992b0da041c0847d31b16 SHA512 d4210cf591a5c2a0266a3dc2f8b74b5ba5bde31923097aeb2044eea2c2934fa5946cafb747bb5e022a1af9a771049a4c6027acaf6886fcd0cc16db0c87a0a3ed
 DIST zoneinfo-0.2.1.tar.gz 85385 BLAKE2B a6382560dbe8c4207c5a53971431497126a3bad7374580f4a67ffd1ffe5940701f13a09bc3a5ba4b729ab8d2484516ea2dc71131b7276f5339b1f60fc39c4ab1 SHA512 1f17ce34eef489dcd263665d58780ab54cf8aa83a601d31148bb4316e600f94d0af1d0baa1d6554d069c0801af906e21b9d5535db2bf76de32333820c61e2364
-EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1696 BLAKE2B 601d6a901404566e4df46364aadd67825d623c982a19d62c310e748104c0c463cfbcf4af180d848a3de99a7f2780601cdf5d3475c8300de623ed5f283da65a82 SHA512 c08675c85b23ba60e80bc8a80f878690735579117a2f8731f5ce6cdf66aeab3c91f8203686aae9fc1de7556f5e43de3bb5221b7541185bca8210baec224b1fe3
+EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1702 BLAKE2B 58c41938bba96e8e24ece674d4aeadaae882455e1740d2960331f3d4a7e16bf5c46caebfc34f88fcde56d21dd66287b03dbc8fe35bee712e9d22e44ac4c29761 SHA512 34d83adb4f46a22006c0daa1fadd30485b8f395692a383af951ed1cd808b7434864ac12bf1c9226249dbc90c208d42d885c14d5eb1788c8db7c52223732877f1
 MISC metadata.xml 299 BLAKE2B 1ee3feadaf1ca5ce9f21e6992db3308c45acde5db35f0484cfc9ce8c0c63fe4f6504dd72fcf795562a86a72f6dd566cb31dbccd95d0c162a47050c54c4df8433 SHA512 4429cae96d7f99e5ca93fbf6ae8b5c18a02c515c20f46a7ac7e9d19a9ec63567cfac4ac3122ff23cd04073f76aae3b41c6f1540ea6aab20f488f093bf130db45
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index 786b76bcb95f..84349a1c3ee7 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 7a7880b9c8f0..61967d763932 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,4 +1,4 @@
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
 DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
 EBUILD binaryornot-0.4.4-r2.ebuild 798 BLAKE2B 3eb6c8e097a49cd48f35cd57ed6682e1658e9fe18d548a12421eb9ef3436a9f20f820dfc2ade83f7a38722ea2fb949e84aceeca043e606e5c07110f15e78fdfc SHA512 977df2e0a834613fdb6b4a850dd5c92dfbdc48f2067b798f37e638ecf8b5f04f0349597ca24790b1e74e26d49704cfa522957ee6e93b601578a7a1ed4dfb02c6
-MISC metadata.xml 379 BLAKE2B e0612d88b6c1e586117f4447e88ec38f84d23cfbdd6248a3be5a47ef9016d9748ad9142fcf4793d2f190fffeb78100b65e9d1c58974f6cf3c3c0d9545757f3ed SHA512 46557b676d1d32eb4b69fc16a5ae3e8091b2c602860b7426928681350dbda064ed1565e8cd68fb7ccffb96657699795cc0c9d2d66e66d8155eb582c265da334f
+MISC metadata.xml 403 BLAKE2B cc22b681c189bd3191848e29b7702eb7e2b2c8fdb7b85f33b8df9372170663610d48c10545776c71d2d8374905613f864757f9acd1f7f8fc31b2eba7e0f1d1f3 SHA512 24f9eb00e18e218bd9c59df90ce8dd22faefe53ad6b93714ed3539c4d0cce7e5578028680970a8061020a3982dd7b1f5a294d6c9cd0d3906c85a4a6c42880a64
diff --git a/dev-python/binaryornot/metadata.xml b/dev-python/binaryornot/metadata.xml
index c1195b45b79b..9134558420d2 100644
--- a/dev-python/binaryornot/metadata.xml
+++ b/dev-python/binaryornot/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">audreyfeldroy/binaryornot</remote-id>
 		<remote-id type="pypi">binaryornot</remote-id>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index c11bcb53fdda..709ad06cd986 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,5 @@
-DIST bitarray-1.6.1.tar.gz 55299 BLAKE2B 14bee64a133fdf3d23bd557244fb25c54a223a786108d9f1bdab25d5d0942c1eba01f6997d7d6392b9885ef6be702dc73bb3b00c9c668480b74d7415c77767a2 SHA512 ad0ce244dfeaa571821b704968ddc08bea16dac94428a4571a599153704a4bdda5d7135c42c81ede655d48455378bfff7292a91fe49724bd5a6f48bb436a9fba
 DIST bitarray-1.6.3.tar.gz 57799 BLAKE2B e6c1c1b143d8be4b7aa8e9a02daabaada56dc37715ec2cd36d970767f482cd6239b2ba2f5d28b96e0eabe8e7163077aad6584dadea0d8d10887a385bc96dd68e SHA512 11605959b8d94ad3a2ec947663401a6987058ec6298bef7bb6368711c3aa1f9d47b2245bd820395f0b75399f24065ad38e038e6d1d91f2535af48edbac9de3ba
-EBUILD bitarray-1.6.1.ebuild 554 BLAKE2B 126a7daae76e1c15a341aad4b54ab45419f7f8439bc3eb3ad46cc740c8d189f7d7d2a2e98cd4c8151c4654778dd8f9e01a61cd2cdb7298c295e833eb69afaf87 SHA512 49666dcf563bb0bf37b5c76290a04d90fd0aca48d5086be89f164aca302873118e2e192ba551f0dc28d59dbf197231a2997b513e9056bd4fd3a956df08a24056
-EBUILD bitarray-1.6.3.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
+DIST bitarray-1.7.0.tar.gz 58400 BLAKE2B 04c7abea55e41914b56daf23efcf3e365d9ff1aa7d7e59c0e9b400a882d0080f393f1e07e7e0141fd84223e9b42fb2bce22bbeeb79543dcd49189b2cd302e24a SHA512 211f678977dcbf8adadc93204a6edbf915123daa518616ba6a8587d0b29f3873281bdf796c60ea12988b37b0fba4e6ad5fbfadde03eea7c3ad5179af246fc492
+EBUILD bitarray-1.6.3.ebuild 554 BLAKE2B 51800881a48929c4ed60f5db5a6ab4c4ee05eee904db2833f344f6a22b7a201e695b57d80f6aee9dcad937c58dca4c4277905634be9d62acd661d6138b7236ff SHA512 bda6a3406692187c4cf0882c7d3437f922df41726163cc5306ccb1c445079a0dbfd86382e6c576743ee56cf588833bf5fd4b58c4c56e90879bff83c9cb9e3c7a
+EBUILD bitarray-1.7.0.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-1.6.3.ebuild b/dev-python/bitarray/bitarray-1.6.3.ebuild
index f28d7d9d5c18..dd4b3a7c672b 100644
--- a/dev-python/bitarray/bitarray-1.6.3.ebuild
+++ b/dev-python/bitarray/bitarray-1.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitarray/bitarray-1.6.1.ebuild b/dev-python/bitarray/bitarray-1.7.0.ebuild
index 6e28e8802d7f..f28d7d9d5c18 100644
--- a/dev-python/bitarray/bitarray-1.6.1.ebuild
+++ b/dev-python/bitarray/bitarray-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 47183dfbb9f2..23f3c6a60591 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,5 +1,7 @@
 DIST blessed-1.17.11.tar.gz 6697714 BLAKE2B a181fac1675b0e06bca54346bd6eea4032fde739888d36a7ec51afbe899e5cc71ad924b6bae45777d9b56567da1771f89d451760ec2b62abaf10f6235c69a66f SHA512 51e627f27aea0082fc93a4b1d10043b1152ae8b625dbb6c73f75e993f8eebc41ed1d8e64667de28afbc4606d066a90dd4c69c79fbed7b5b928d126efd3fbac22
 DIST blessed-1.17.12.tar.gz 6697754 BLAKE2B 0ae89a587a34936b31114e4bdf77effc51e0ad01b31f3b7e037fe96a44bbfecf1e2f64495d09e2627343f8021116ba1a2d6bccdaac7998b978aebc54e60a7a13 SHA512 134bba81793e8e0e33afcd9daa7453f11857b3207d0427f061ccfc0dd1caa17cff32f84883860f69e2a98ecbb5cc609f2a1091ab7ca8ff42322f6e8466ae06da
+DIST blessed-1.18.0.tar.gz 6651519 BLAKE2B e512ae49d19e3db09606e07b6a384683aada3de830e3a8f3e938e088607e4bc33f6b53b3d6477a2b0d4bdeb849fa4cea6eb3b0048294b3a567409a993f46b7dd SHA512 25b0c0c17e82ea975ace3415beb680e7ac917cdd4589ff11f0510067139d2f681316c35a59c7ef9bc5225291cebf6395f0dfc78da8845457ed7cc722ac708bbe
 EBUILD blessed-1.17.11.ebuild 1314 BLAKE2B a1b546f406873f279efbdc04351e6521413645c5621344f222fa76ce1f90467e18c8465c0f43b90c7f0cb64b22afe30f2db3fa51b9a8ae9fcf45510de26bab8b SHA512 39e94e0eacef7bf98effc3e26eaa37bbf0400c594a33689b94af8b85c095795a3cd2ef01e6dc641a19d4cee3916b1ae5b63ba909edb4ccb285dd7d1ea17f89df
 EBUILD blessed-1.17.12.ebuild 1314 BLAKE2B a1b546f406873f279efbdc04351e6521413645c5621344f222fa76ce1f90467e18c8465c0f43b90c7f0cb64b22afe30f2db3fa51b9a8ae9fcf45510de26bab8b SHA512 39e94e0eacef7bf98effc3e26eaa37bbf0400c594a33689b94af8b85c095795a3cd2ef01e6dc641a19d4cee3916b1ae5b63ba909edb4ccb285dd7d1ea17f89df
+EBUILD blessed-1.18.0.ebuild 1312 BLAKE2B c93dc3aaea9434ab7cbac859356470e3f1ba8d941690d7f5934f8264888819db7c33885295b38c8ba82b9e8870491348fbceb1e1e2992df968b05f31e73c8acb SHA512 bd2808cdc5671c348b909c65321389b9bc3244b1ae401b2ef773a6fb44bbf77d25ef7b1893b5500c70e958b8475d1cb0e175e21b5577418bae1b8454fd63626f
 MISC metadata.xml 431 BLAKE2B b957fcf973dc786a7358b8554d5969688c86974ad0d304ac752f1f48d246ba955a9acbe4ccedd0a670a3039488c1b9dfc6815b08e08e7085fbef39e62c447f59 SHA512 b962ca5f456fe442dd2d88866d9aec050d0b456b53f22900cda6ec304a055909c0befe2de085775283c9b098fc9d7f53351b9e67d55eeca1744fb09622eebc01
diff --git a/dev-python/blessed/blessed-1.18.0.ebuild b/dev-python/blessed/blessed-1.18.0.ebuild
new file mode 100644
index 000000000000..4db2921df380
--- /dev/null
+++ b/dev-python/blessed/blessed-1.18.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..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 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+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
+	# Requires pytest-xdist and has no value for us
+	sed -i '/^looponfailroots =/d' tox.ini || 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/blosc/Manifest b/dev-python/blosc/Manifest
index 2fbec87e9ece..639ba10a4dc7 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,6 +1,4 @@
 AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
-DIST blosc-1.10.1.tar.gz 858162 BLAKE2B 768ae6d438d9fe05589460dcaeea77dbf2e0212bbc67388c6df1b9fc6bd1921e8cd79da2039cd4300cd91923d7988f8c4741ea1dbd5ebfa13e48f3ade678ac09 SHA512 06e393efa3fc7060205a483787eb4c5befe75dfdd6321b37c43ed7830dccf4d622bd88451e97da663ed9dc9302c30d7486315de9aff6351721862e2eceddd9a3
 DIST blosc-1.10.2.tar.gz 858096 BLAKE2B ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8 SHA512 82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222
-EBUILD blosc-1.10.1.ebuild 951 BLAKE2B 90e35b8ce48278641f70d79342b1b5d4b042e0d4553cd740e5b49783a06bc86e30da5df23b8bb22e27ef393c9c1c3886c8bf8359d449a45424332588ff23f7d8 SHA512 f168c9a55ba41e2c7a846b7e316126345fa43d907ff7ba4530a6148f7ee555d709385a4c12e26863d834f5c31af6dedc6508b1137624dcf7f057a6502a75000d
-EBUILD blosc-1.10.2.ebuild 953 BLAKE2B 5b56fd8359e276027a45c7d80917560494201cfc0ec9f94519a2e2c0cbd35de27ac0ac4118d7534633e710323b1d401901ee28834f2e945c8f020429d1827998 SHA512 de7849f782456069f80642a2c0edd9c51d9b45f8974fc0dbfb133b6861a240e4c14a9bc9cbc975bbc62b3da9c90a27213d675fe000ab6727769db353b9807978
+EBUILD blosc-1.10.2.ebuild 951 BLAKE2B 90e35b8ce48278641f70d79342b1b5d4b042e0d4553cd740e5b49783a06bc86e30da5df23b8bb22e27ef393c9c1c3886c8bf8359d449a45424332588ff23f7d8 SHA512 f168c9a55ba41e2c7a846b7e316126345fa43d907ff7ba4530a6148f7ee555d709385a4c12e26863d834f5c31af6dedc6508b1137624dcf7f057a6502a75000d
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.10.1.ebuild b/dev-python/blosc/blosc-1.10.1.ebuild
deleted file mode 100644
index f4059392ee96..000000000000
--- a/dev-python/blosc/blosc-1.10.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-PATCHES=(
-	"${FILESDIR}"/blosc-1.10.0-unbundle.patch
-)
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/blosc/blosc-1.10.2.ebuild b/dev-python/blosc/blosc-1.10.2.ebuild
index 43923c61a128..f4059392ee96 100644
--- a/dev-python/blosc/blosc-1.10.2.ebuild
+++ b/dev-python/blosc/blosc-1.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index 0d96c66c6e7b..da790d0a4b3c 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
 EBUILD bluelet-0.2.0.ebuild 599 BLAKE2B 900a518c98024158533c39d1a2eac93211cd3dea8b6b45663d0ed93355bc5a9df46a2c41cce45810346618b4fd0503ead84defeabdc641ccf2cf906c35441f32 SHA512 c3942fc0645ffb4e504a888b1d6c37f116ca379a96a06f299170badf25f38da5a9d4ae284d9c6909b7fa702c5ba5af9db5ce32329bfb90e6f745643ae055b442
-MISC metadata.xml 1215 BLAKE2B 90a361ac8838a24b6dff58320a794d585b0769fd7e6859bffd846731eb30cb5e0e7eb79f65ecde23f3e122cd0e1bab9752ea623efbd73a0b69e9533548a5c58c SHA512 b61fa93e8f9a0067ff1ff26d77bd9fcb0b1e2cb388ca928eed643155b03107cfb85a65981f9c1bb4dfbf3366817ee259465ee8db9f0af7d952c2491ff67a7867
+MISC metadata.xml 1239 BLAKE2B a8ea39d7e922bf92f0e53f2514c139621e967d961b065d1cf48eda0b081e6b56780bc6633d45ae1b0afad9e6f163eb1c71d4250a540e072efdc636ba7602195b SHA512 a14464e816d5e89052578f8086e306012d36765714f43ba8ab36320fb0185fc9661060c8cff4d59ea700b19d3948a615dc664c2cb15b10473a69e1540999828a
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index f536dab566d1..1bc472c3baa3 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 Bluelet is a simple, pure-Python solution for writing intelligible asynchronous socket applications. It uses PEP 342 coroutines to make concurrent I/O look and act like sequential programming.
 
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index f5c51f130ae2..4fc18da8845c 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,3 +1,3 @@
 DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
-EBUILD booleanOperations-0.9.0-r1.ebuild 797 BLAKE2B fa7f214a608809b10e2ea85440fd14cad40e07d2045b74baaced1d5429d329dd84c8aa3fefd31e6d045b2af0125b33c044b975286a02aafc3f08a5fb160283dc SHA512 78549cd0c9a374829be130efa8e4b83581c25bc5ccdb9ed4ff60e5c760065efd9b45144413114b96f85bb9f3df079fd16046507219ec650412244e89ef82822e
+EBUILD booleanOperations-0.9.0-r1.ebuild 798 BLAKE2B 6457fe20888f1a68851d44a0ad96b7ae533ffe56803d0d6589bf672a0ca483ff5f986c436c96b3bc8f33102cdf51b7d5a95410a4422d02e8536cee14b0291291 SHA512 709cafef4babb2082f542c17ddfcbc9de13de3ebe99eb758bc4f22753de6f123e2dd04ac672979984115cb59f10c0b2c555ec2d14c4d39d28bccc0050292ec29
 MISC metadata.xml 323 BLAKE2B 083f2b60d847dfae2985c1221edb2b76ad6f8e46b840b96787fea472090068aff6707ea98ebd98bed13d5bdc4525a6b8fe885e563d7dfc9b7d4331b0c2c7c8bb SHA512 b37d8cd8bc3a6aeb57292fc07f1dffa47bacde9f4e25bf1fb324057a5257d8c4db113e21ca2214fe21a7552891645031a4ee59af80ef23c8d1087aec449890a5
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
index bf8eb273b66a..865713960e7d 100644
--- a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Boolean operations on paths"
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 6709e101afc4..17cb17d5ac7d 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -4,8 +4,6 @@ AUX boto-2.49.0-py3-socket-binary.patch 2736 BLAKE2B b37879bf6ddf5e61df79cf482d8
 AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199eddcb5dd08c22a3c8381af743b0aeeb7cd5642bb030e951596ee98477abf1e7507a4bfabc9d36706e7809bf031 SHA512 ba42dee03c39cf238c6cb1864500f5d6c0fabcc395021cba8745c3e4fc4e59828eb7f461d5251367d37c4e0709162117e97aeabc08f941fe07c65f6b179244d8
 AUX boto-2.49.0-try-to-add-SNI-support-v3.patch 4727 BLAKE2B 197d4e6cc632e372faedac8812eb6dc250124555705d5b8d3b5ffe3718315043cf0bab5b9270d0dbd2ce333dbe074583cc7bd1f6057e324d13aea6f39e9b05e5 SHA512 0be17ce24149bfa02f6614fdc37b0e4c4018f78516348a6dc0f3d90f3e22405262a2ab61c36dd1fa6134d7cfdde422a5e06bbe855c6df5e5d7c77e0a9125f348
 AUX boto-2.49.0-unbundle-six.patch 1122 BLAKE2B bfaeaf7fea01e662d19caa6c040aaad9a2ce6544c105865a8b79255057d662c30478b6fb884b9a088f861c99a4d8399c0e503711e36e0581cbeeec3c5b2e1ba0 SHA512 7dd51b6a48f718475e18ac97584a508aee75b69dbfee9e91fa2955feec49cb1786662276a4519438cccc49b4d55a5d8536192bfe47a20a36a6a01f4bc3bfb9cc
-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-r3.ebuild 1299 BLAKE2B 31e98d65bbc0bdeb537d09ecd93c3ea72e8aa1c1f12f6f9f37422f89c76db39134dc86bdba9186e7cdcddd02be560f0bc8eb8e78063d1db4597222f1391f3f85 SHA512 70a197bfb53eacd15cd4c1edc23acb1938b713a14f4f3d197e6c33215b428b4350a996c6a1e1069deec4f3f6deca5da8d4c0902329c7367ba2059365181d2235
-EBUILD boto-2.49.0-r4.ebuild 1572 BLAKE2B 8be980e50231a9498ebc2d1189c910a4bba82840ef91e888ccba1c4cb0d29a6c76b0ff70a85bbe77b2d989c278915f2c5a61cd4de44b6ded64722c8222ad2497 SHA512 7fc767c9c53298cb3dc37eeafd62b2c7005b36138abcefacd299ec023aea666e1489307e14c00f41618b24d39c8f25023748e314c4b82559f8c7b891822062f9
-MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
+EBUILD boto-2.49.0-r4.ebuild 1566 BLAKE2B 76b9ab75df4d54741773fe65fed4ae457e82e40a4a687904bf5f5279d6572f4310b940010b3a4bb84961f37e86f29b9ecef7b75fd214834a87df0ddc1ee64841 SHA512 9ca462f737dfaf2b77a788e591d81fe102ae5d34714c107a899646c16d6f5c7f643121f92f105b9a82b8113e2b2c1e99124e0909807caec105d1297eecdb93f8
+MISC metadata.xml 444 BLAKE2B 2b9d0528976c673a10493dc77e764465ba86ded0ca0ae5d57380fe054a5698f9f3b30655a896006bbdea8837e7dbfc312c1b358f9da3eca74e9b41b17db7c617 SHA512 4344710f1cf2d656bbe031dc8124bbea98606b340c952fcd4e7f4b92e35b3ca911c44db7c557a36d1d9c280568d3799c49807e21efc1372748f39ae483ea049f
diff --git a/dev-python/boto/boto-2.49.0-r3.ebuild b/dev-python/boto/boto-2.49.0-r3.ebuild
deleted file mode 100644
index 3381d03f77b8..000000000000
--- a/dev-python/boto/boto-2.49.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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"
-
-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-r4.ebuild b/dev-python/boto/boto-2.49.0-r4.ebuild
index dd4f5a5b6983..e9c03a7e7cd4 100644
--- a/dev-python/boto/boto-2.49.0-r4.ebuild
+++ b/dev-python/boto/boto-2.49.0-r4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/909545
diff --git a/dev-python/boto/files/boto-try-to-add-SNI-support-v2.patch b/dev-python/boto/files/boto-try-to-add-SNI-support-v2.patch
deleted file mode 100644
index 76ae2cd3964b..000000000000
--- a/dev-python/boto/files/boto-try-to-add-SNI-support-v2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From f5e7f6c98b46ff622f60a4661ffc9ce07216d109 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Sat, 29 Sep 2018 21:47:11 +0200
-Subject: [PATCH] boto: try to add SNI support
-
-Add SNI support. Newer OpenSSL (with TLS1.3) fail to connect if the
-hostname is missing.
-
-Link: https://bugs.debian.org/bug=909545
-Tested-by: Witold Baryluk <witold.baryluk@gmail.com>
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- boto/connection.py       | 19 ++++++++++---------
- boto/https_connection.py | 22 +++++++++++-----------
- 2 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/boto/connection.py b/boto/connection.py
-index 34b428f101df7..b4867a7657465 100644
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -824,23 +824,24 @@ DEFAULT_CA_CERTS_FILE = os.path.join(os.path.dirname(os.path.abspath(boto.cacert
-         h = http_client.HTTPConnection(host)
- 
-         if self.https_validate_certificates and HAVE_HTTPS_CONNECTION:
-+            context = ssl.create_default_context()
-+            context.verify_mode = ssl.CERT_REQUIRED
-+            context.check_hostname = True
-+
-             msg = "wrapping ssl socket for proxied connection; "
-             if self.ca_certificates_file:
-                 msg += "CA certificate file=%s" % self.ca_certificates_file
-+                context.load_verify_locations(cafile=self.ca_certificates_file)
-             else:
-                 msg += "using system provided SSL certs"
-+                context.load_default_certs()
-             boto.log.debug(msg)
-             key_file = self.http_connection_kwargs.get('key_file', None)
-             cert_file = self.http_connection_kwargs.get('cert_file', None)
--            sslSock = ssl.wrap_socket(sock, keyfile=key_file,
--                                      certfile=cert_file,
--                                      cert_reqs=ssl.CERT_REQUIRED,
--                                      ca_certs=self.ca_certificates_file)
--            cert = sslSock.getpeercert()
--            hostname = self.host.split(':', 0)[0]
--            if not https_connection.ValidateCertificateHostname(cert, hostname):
--                raise https_connection.InvalidCertificateException(
--                    hostname, cert, 'hostname mismatch')
-+            if key_file:
-+                context.load_cert_chain(certfile=cert_file, keyfile=key_file)
-+
-+            sslSock = context.wrap_socket(sock, server_hostname=host)
-         else:
-             # Fallback for old Python without ssl.wrap_socket
-             if hasattr(http_client, 'ssl'):
-diff --git a/boto/https_connection.py b/boto/https_connection.py
-index ddc31a152292e..a5076f6f9b261 100644
---- a/boto/https_connection.py
-+++ b/boto/https_connection.py
-@@ -119,20 +119,20 @@ from boto.compat import six, http_client
-             sock = socket.create_connection((self.host, self.port), self.timeout)
-         else:
-             sock = socket.create_connection((self.host, self.port))
-+
-+        context = ssl.create_default_context()
-+        context.verify_mode = ssl.CERT_REQUIRED
-+        context.check_hostname = True
-+        if self.key_file:
-+            context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file)
-+
-         msg = "wrapping ssl socket; "
-         if self.ca_certs:
-             msg += "CA certificate file=%s" % self.ca_certs
-+            context.load_verify_locations(cafile=self.ca_certs)
-         else:
-             msg += "using system provided SSL certs"
-+            context.load_default_certs()
-         boto.log.debug(msg)
--        self.sock = ssl.wrap_socket(sock, keyfile=self.key_file,
--                                    certfile=self.cert_file,
--                                    cert_reqs=ssl.CERT_REQUIRED,
--                                    ca_certs=self.ca_certs)
--        cert = self.sock.getpeercert()
--        hostname = self.host.split(':', 0)[0]
--        if not ValidateCertificateHostname(cert, hostname):
--            raise InvalidCertificateException(hostname,
--                                              cert,
--                                              'remote hostname "%s" does not match '
--                                              'certificate' % hostname)
-+
-+        self.sock = context.wrap_socket(sock, server_hostname=self.host)
--- 
-2.19.0
-
diff --git a/dev-python/boto/metadata.xml b/dev-python/boto/metadata.xml
index e630c4673422..021d4e3296d2 100644
--- a/dev-python/boto/metadata.xml
+++ b/dev-python/boto/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="google-code">boto</remote-id>
     <remote-id type="pypi">boto</remote-id>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 318f87fc6f45..073888846494 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,36 +1,14 @@
-DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9
-DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097
-DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab
-DIST boto3-1.16.60.tar.gz 344983 BLAKE2B c479bc65a04ef01576b046452b125eef931274923dcc3122ca216affd7de55198ace650cf3923fe062ee9a1246d9bd6b2a9e512b88aa91ca5dd8426f3c341958 SHA512 cc7764ace2f94b657de3f6fba977c0b8dcf3e71d159e3ea93fe2d2a6c2e02357655dc08d5ad21e4884173f5a79204c8405d833b4f78063e7f071e7ff8299de7f
-DIST boto3-1.16.61.tar.gz 345049 BLAKE2B 542dc15da302d9eeec31d99d2ee0c1229e4155b1f02ffb295819b0365ad9a9f4b87d2adc67e35b760b5a9be27cfb6c6445c5f22472c1a45d8ffca536f2737b51 SHA512 3e27c6b5c638171941b33a6e22b167a6e2bb5609c9e10cf4b7b2991a81ea5a03d3cb911ff1cf53aaf875327463cfb8437f3922c767d51a8386d665d8ec642096
-DIST boto3-1.16.62.tar.gz 345246 BLAKE2B 26b88075e2d5a14b98a3868c4c8f6c7f13d4188c73f5c6884971fb7e3f61ec7f2f371d95f381150b630c94fb2d0d4abc8ba1cf48ecbbce44a23890e15a72ee45 SHA512 1dfa6f45caf57bffe33308bafc68ffa8180d34349a7d84862c6a105139e7ec5134c932fd0050e2ea4375a066724c002c52b6809f0f9fe2a831f48967f86dcc78
 DIST boto3-1.16.63.tar.gz 345303 BLAKE2B e6877aeb3efd8018188eaf687b96e604f6b6b4910ae1a96d6f0d6db335f836d223f3f3216990a8a1eed3af91830ef8effd52f2c16148bb05dd4a6d69f777ef76 SHA512 25df3e65feb6c89c865021311d3c63bb52b5e48ef2e09813f548b1cc4c28b462969b4c3ec5192ab8b02ab9faef28f9ff042ea78f22d19a8df96f1211a9e1a763
-DIST boto3-1.17.0.tar.gz 345964 BLAKE2B 09dbde33fe41e625e4fe9519d88b6d878024e14c594a845e3394347c5e9b28f2dae6a9e791af277fd2acd73dc8a3e96a7567f3cad3259b7370cfe7e8cb782111 SHA512 eb5b1feb310d44a6201846bead22c2c7e7862b753bcd0b02d91809b5df37842b07e74e507c322243133ffc0e3c64a36bf588e36e5b4066a2aa2a73f2316f768e
-DIST boto3-1.17.1.tar.gz 346057 BLAKE2B 239be1c86bd080b93c134847a2fba77ca85fa44f6106a9b4129a793e1dad279996a2ec3bcaef06b95a7fcaf03095440382402ea77bf48c5711638c0670f25860 SHA512 c74b36a41e647e89bd71993f17414df9af99740fe49855267125141bbd283d1e6df29f52ffd2bfeeb7bd0ec004975d2a596a842afa84656dd9978948227fe9d3
-DIST boto3-1.17.2.tar.gz 346203 BLAKE2B 77da42c2a7f2c2ad08feba51e11e1821a44d5c433ca8fd8339bbdfe41a0caa907c2c566bfb747acf591270e539036988a8cb2488e0b2266b7970fa3fb2d0e9fa SHA512 d215417f68d958bcd4593f19a12d94a00bc7ead5cd6133f7390886fed2a545212f8da75220ddab298737326ec14a347fbba233ca52a4e3214f7911f9a9622fa6
-DIST boto3-1.17.3.tar.gz 346250 BLAKE2B 7edf59a88ec32a08056112c088de9aae903daba909a4dfeb502830d8e9a7767cd34c1c77e06525ffb6b64be3c694e38011815e39b23959caaf11043f50d53948 SHA512 fa31cccb065c0e7cceb8733045a9232b1ee455ec408eaf62f2b2a7b2b29252b5eaa765dcd8b294ae10fef9707940f75194b450ac7f49f9db3b57060ecb74ab2a
-DIST boto3-1.17.4.tar.gz 346342 BLAKE2B 3fba8f8b68edb268f20919bb65c5f8715d6c89c54884395f8080384c2d07ada15894d605a943e2c167ddf7fd3550657367e4b195caf28fd73609763cf23da687 SHA512 45ecf4fe0eb61d09aea5cc5e741544c6b23d6b98de24ab9f646f28d463104ec11116d0afd4b5fbd09f55e1a7ad65a653770efb67d4b023590c218bef4f326af1
-DIST boto3-1.17.5.tar.gz 346437 BLAKE2B 43cec95e82c2f4b78132966aebb3fb1b8e8e01929731e0a9aace2a281a86fb789ec940a62b13c2c8f82e03d7c2a7c89b3b919aa39be85e6d14e1459782b90ef8 SHA512 bd3dde9acd33371eaee9715c4d5dfa095f6571f728213992455864da15a8f49053991babe4cc57bb808bc7733101b50baeab6ed6a6e58fc04f25a4eee00b774a
-DIST boto3-1.17.6.tar.gz 346445 BLAKE2B 778dd820ab134a0c9bc0e67e692e8e1200f84335895a5ed3150eda53ac90dadef09f44c18c2a80858e2c37617c315ff411efec8f1008b8c21179ff519fc4bf9f SHA512 0cca89bd4bfbda7039262ce570c4235bd2ae33e46972026e5f6f66ae42cee9562d23854c3ea23e0fb9b472fc2a28cdabfbb740ae1f0db306c6342cea3c077e82
+DIST boto3-1.17.12.tar.gz 346906 BLAKE2B 47ada52081fca432f23e6c373949bbea74c04396f9fbc15a9ec45654b2e077067c03bf633449e43079000e8be275322048a9f48ae0dd895b30cca2b16a61860a SHA512 76f8462604bded88b959f8a0ebcb4a4bc4bbb31de70c2d527e2d0420fbbd0f4bd014cb255f354648fb57a43600190573b41c6eba8a87c3186c5c93224fe59216
+DIST boto3-1.17.17.tar.gz 347835 BLAKE2B 7861befb9275b0cf36235749369f65b69845ef710404708c2c51c9223d370fd46eede4121be501eb9022f6a62a0158d2cad03ce4095640064def3a9d35be7478 SHA512 5d6bc48f9480963abcbf41c4b95e86ac6339f5386508be7108ec08e91c07c280786d3a4bec2b731c7b5710351e0398c4ab86f4fb95440e83936409b40e1c3015
+DIST boto3-1.17.18.tar.gz 347971 BLAKE2B 1390758e578763d0e8faba73e44e769224f6b3ff54e88798cd2d3a79c7d0fe5c3ef58a08e6a4aec70a7c3a64bbcbac22cd8471679951794fc1c0e48623f31008 SHA512 372baa35ddb770d65cd680544c9dd504a1e19b1052355b729f5b3ae8ef480ad4e250bef305671b1ec9741d953e813209398e8afe1bd396cc1e9c79221e34c629
+DIST boto3-1.17.19.tar.gz 348163 BLAKE2B 47b3f24dd7af7362fb37fb66bb333ac7a607b3d55790e47e3987d88f1ae09fe0a5bcafbbbe6245ecda378a8c56f6cfaa2a86c0b6e0dece58b0b6d2c819646a8c SHA512 ddfccb03335b3389a820a37e2e3ea40414291243291887be6dfd4243e43d918882e7386373578cf6474c5b8c5f592a15e650528b5cf61cb3b989522d4bff7ec1
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
-DIST boto3-1.17.8.tar.gz 346837 BLAKE2B 44a89727a93320ae8feeef584ed8a04fc5e95598252b3943cfba8b6dad7a6fd3872d5f6f6b7c77063cec0081f49d000adaf26f447386193758902e0a45ff63d6 SHA512 ef5fb47f1023f1c6e968bec9eb6be7f2cf06b5517cf5f9e19656be0cdec3dd75f749decd6fada9f789e378cbef7bb9d71c1bc94aebfa8b84b5efe0647e59250a
-DIST boto3-1.17.9.tar.gz 346868 BLAKE2B 58433cb38615da1137e7ad4abcee2a9e20f8621ef540b0d7830bffaa14dedd65aeb16a52a41466eb9bdbcceea05092f747069e7a1b42c6c5483bed7677ac0925 SHA512 a0603783909dbf16d5f46742760521d25c6e90bff7fa1d763c8800fdbbb2ae444b75e1a74833c012c2ae614ec66f9db80a55197388f9af18e900351ab1d28a8f
-EBUILD boto3-1.16.43.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
-EBUILD boto3-1.16.50.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.16.56.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.16.60.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.16.61.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.16.62.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.16.63.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.0.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.1.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.2.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.3.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.4.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.5.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.6.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
+EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.17.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.18.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.19.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.8.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.9.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.16.43.ebuild b/dev-python/boto3/boto3-1.16.43.ebuild
deleted file mode 100644
index 2f9ae1e99fda..000000000000
--- a/dev-python/boto3/boto3-1.16.43.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.16.62.ebuild b/dev-python/boto3/boto3-1.16.62.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.16.62.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.16.63.ebuild b/dev-python/boto3/boto3-1.16.63.ebuild
index 74b9170a9119..2f9ae1e99fda 100644
--- a/dev-python/boto3/boto3-1.16.63.ebuild
+++ b/dev-python/boto3/boto3-1.16.63.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.17.0.ebuild b/dev-python/boto3/boto3-1.17.0.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.1.ebuild b/dev-python/boto3/boto3-1.17.1.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.16.50.ebuild b/dev-python/boto3/boto3-1.17.12.ebuild
index 74b9170a9119..74b9170a9119 100644
--- a/dev-python/boto3/boto3-1.16.50.ebuild
+++ b/dev-python/boto3/boto3-1.17.12.ebuild
diff --git a/dev-python/boto3/boto3-1.16.56.ebuild b/dev-python/boto3/boto3-1.17.17.ebuild
index 74b9170a9119..74b9170a9119 100644
--- a/dev-python/boto3/boto3-1.16.56.ebuild
+++ b/dev-python/boto3/boto3-1.17.17.ebuild
diff --git a/dev-python/boto3/boto3-1.16.60.ebuild b/dev-python/boto3/boto3-1.17.18.ebuild
index 74b9170a9119..74b9170a9119 100644
--- a/dev-python/boto3/boto3-1.16.60.ebuild
+++ b/dev-python/boto3/boto3-1.17.18.ebuild
diff --git a/dev-python/boto3/boto3-1.16.61.ebuild b/dev-python/boto3/boto3-1.17.19.ebuild
index 74b9170a9119..74b9170a9119 100644
--- a/dev-python/boto3/boto3-1.16.61.ebuild
+++ b/dev-python/boto3/boto3-1.17.19.ebuild
diff --git a/dev-python/boto3/boto3-1.17.2.ebuild b/dev-python/boto3/boto3-1.17.2.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.3.ebuild b/dev-python/boto3/boto3-1.17.3.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.4.ebuild b/dev-python/boto3/boto3-1.17.4.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.5.ebuild b/dev-python/boto3/boto3-1.17.5.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.6.ebuild b/dev-python/boto3/boto3-1.17.6.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.8.ebuild b/dev-python/boto3/boto3-1.17.8.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.17.9.ebuild b/dev-python/boto3/boto3-1.17.9.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/botocore/Manifest b/dev-python/botocore/Manifest
index 7524f96e6873..eda91b1fe5f0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,38 +1,16 @@
 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.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5
-DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9
-DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5
-DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 6dd879a5c0c812dd218a71f9712758ec6195b4770afc582bb1e062be360e7909e33ef62896e08be1bc8c57840333cc6fb8f4ce3817b248acff58258654b6a138 SHA512 d38a278dbca897b06d4d7589084b6f3d385051ec346a716b9ce90f1e8980abc2c617f94aa6e3f13960fc86820393dd7c1ed2d391a6bf1fea3edc6f1ba750b24d
-DIST botocore-1.19.61.tar.gz 7432779 BLAKE2B 09fe171532dc5672d5265712b9af1149008cc9a1e3c6d6c6754f332bfc1fb89effe5a5d1f2a7f52ae049ed58db8d07c1187533e6f8d36952b1010a692392dff4 SHA512 9a1095f305c3d2c00cb2ee902cfb46b8e3ab7b2b6757308072c1adeed3632bec7c422be3febbf23de796f0b303a2e9e27877273316e8c9f4a21e32295fb055c1
-DIST botocore-1.19.62.tar.gz 7435742 BLAKE2B 94562f0f42878e5b5aa59e7b36e60c7c8014a356041a9c4e043e3abdf2b029727e05a34a254047374fdbafe830aa982ae6b34682573f8fe2175fa2de3642bf1c SHA512 0c702e207b904593788c7f7a290308730ed2cbe6b67c1566e2c53c45a68d9a5a8a45be67f6a0e2e5e6d1ffce5488508a5680d2f8a83c31f329d1a2878a52e7fb
 DIST botocore-1.19.63.tar.gz 7437996 BLAKE2B b55aa80cf4f17538e5876f61492d15916111c216aff455a1366d12293579bd2c3d4e9c5e2a51e91ee117ac0469743b898cd314abc693a466e99fe332deea95c2 SHA512 11c616f5574df986f576078c18a1f65149ccd01ac21575fd610e2dec0598387cc4d55c05a8ffeed3e7c2fb1809a699d6c6c0c9b57482cbb895146a6a1cddb65b
-DIST botocore-1.20.0.tar.gz 7440754 BLAKE2B 1ff36cd0cc4adefaa9ebdd2150c6469a66867a0491c41e7739c26a91742fe3fac3ca323b9aa2e54ae07cd4145d236a093120a2284af95143af7ccdb39dc82ecc SHA512 0cf8c3d2afadc69fee2a2b0795989b7328c24c038cf66fee693612affc7656d76df492e7ae61604ee4e26f5f355cd4ac27909519cddf7dcefa65168eea13db64
-DIST botocore-1.20.1.tar.gz 7443093 BLAKE2B 62541070fca195777a79619b6270341bed74cf01b41568758136fc8a35b698b42f5739ea37f7a3cbf7677b0b72d715204769c244a3e4f8ab49182d1a5e52eb0e SHA512 b6281b7b3326f548af8830e34f006b9914abc1048ecd2ca8cbbaddf1c222156e12ad9dcd1d6644c3d5d0f8ca4bbb31503a9a362d1bef0af68568c3085be3b420
-DIST botocore-1.20.2.tar.gz 7446650 BLAKE2B 777dbcbfcd824a7d009ffc3a1aec8afbd14a097c61a49116db37c6957e6046b8cd0011cdcb3cc344944e568e9f24d15d625a51d0d2d87761279b449783ce9f68 SHA512 3e225dfa55febb9d7bf77dfcbf4b75c8505ed4a90a5a86cc6eea750b4ab7d8a2ceb16891d4473b1bd7ce1cfd43642ee32e20eea65a25d9d6da1a5f02067fa050
-DIST botocore-1.20.3.tar.gz 7446281 BLAKE2B 536cbe8f6b6c150f3c66468f3e0c51ae0e602f277ff64ee67a2f149c0481fe603b10439e2fa37831b106d7ca4b23d1e7037cfc55c8e7caf06b8f9cf5561d9544 SHA512 ad0982fb9095e4d8e36a5805f5041fa1241526409d6a1fad3628c52d9870e54fd4a828816eb77f39b60f49ade7805e97cd286f7ac4070ebafbb696e513691e0f
-DIST botocore-1.20.4.tar.gz 7447611 BLAKE2B 05cb501cf40748ac1053c4687bd6de7a17d9ac31fe688de8d6aaf8047260f230ea14cc947c4c208a11d26477508b38428fdca116b9fa8212c5ee6ac020a6367f SHA512 b3ec1597b1cf4e9d18e21216f9ba703e4ae0a924653d21cfd93eeffbb13041ad96c3cd099ff1c8631bdcd5c7d6a70e6d36848fdbc44de9f7cebf7ee223918743
-DIST botocore-1.20.5.tar.gz 7447859 BLAKE2B 56b6ecbec1834c414983679e4f3cd01f295c48c87bc972ccec77fe972b88a1785ef82c403576f6aa96ebe9041a29535566280228f8b5a5e35d2e4fdb14cac472 SHA512 488584be3ea9b8a7467384a3947349704d0bf0e6817936a70fda69bc8d682d88601188446d50eeae29b4f0680e8f20d717519011d6beecd3f35cb322fb526853
-DIST botocore-1.20.6.tar.gz 7450975 BLAKE2B 56ad69b958233a94f6bacff28bffb644bde8cc87dcb8d842f542059548d2aaf5762666077f9b429bc0487808282b806725a05dcd3def6c975f4418f209fc2ec8 SHA512 558c3c3b123aeeeb5aff420e7ff3edbba9165e1cf434f8136ead21e9d94dd85d857732902b10e09386ddc80754d7be37970573ce039296e532b593a101a97950
+DIST botocore-1.20.12.tar.gz 7466322 BLAKE2B 07eb28f5b0fef5ffb284a5eac0c78e3430c3539cc18178c8b6bcf10cc397e91c263d89fb08a5f9c6edcaf903602f08ba445836a771b19591ad2acf58cfc4e771 SHA512 c1dee323290e1e1fa31253e23d24671fcf4806872098a8b2e5e851348dcd078ad222f858e3e284a7daa151a3b8caaf6249440d468a3c86d786dc829627bfc4b3
+DIST botocore-1.20.17.tar.gz 7483893 BLAKE2B 5a9ea5c1d3bc5caa91ea939943d86236d58f24b440d7d0de96356836ee6417c62fece8e782f9fd81e14daefac8919a001adb95e67d42110709b7f07f849b71da SHA512 864f938d07b28341128c06186542c0c214a133f1b7a78990e357436463f7cd1a36031101f6588ee706073b78d4ef99571853658f77755eb9f0739882fc706634
+DIST botocore-1.20.18.tar.gz 7485852 BLAKE2B df22d0c74796ddc5c7046803039423e31784a2221556a0cb224f0a006870bb4406cf3e576fac1cc65457da0267dbed92159d98d4198c3beef1b995ef7565f06b SHA512 e1881ca20ffc0b3eaf59635a321f0191775b4c62f4aed4d8ada54dee6066ba85fa1af00bea00949ccb245dce4e1279eb1d120237da097420d95e1c3c95c50d6f
+DIST botocore-1.20.19.tar.gz 7479977 BLAKE2B 4193cb9975dcde134450968ffcf4cc07b7aece4bbd0d8306483f24eaba63c891cb88d0af640f602b03eb400e5815eb977fca0da927dae0eec82f2922e6c185da SHA512 f4d4ffb88edfb95a13b637c928701966d7903bf50c493926674d8c1c0e6004fa6ec2d9b63402fca5829af3d381ad04221c4154a08e2a0cab065110ab65d44fc1
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
-DIST botocore-1.20.8.tar.gz 7460687 BLAKE2B 51a11afa10058fee4cfcd17ce9181bb39910833f2f1e002041ebf713b292ed8fe6b5622c1742a641691e9d662d8d21e66bcabcf1ebf25b1ce1663f251050550f SHA512 6ec14c1c81c3f4d79a6783d5bba934140703a63bd0c852e71a9e1ec78016b531300ac6932f349561a4018487c82e8a4b44315cdf9eae4394920b710fcf4adbbb
-DIST botocore-1.20.9.tar.gz 7461420 BLAKE2B 114c2e491dc7ee38e67cbe257aee01be067172ce999b5ac4ef506faa50878fd902ff5e77cabd482919a11d4962f10acc3ac03b837b8bb97d22985e05c9908111 SHA512 e3ec9eb16afd33ff576fcd023ca161a54768738d79af884724594cfb4a9317bddb24404a01cf3e8f9278cec7305feb0a887ab22d9a2deb1b169e3eec27ffa9a2
-EBUILD botocore-1.19.43.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
-EBUILD botocore-1.19.50.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.19.56.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.19.60.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.19.61.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.19.62.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.19.63.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.0.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.1.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.2.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.3.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.4.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.5.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.6.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
+EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.17.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.18.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.19.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.8.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.9.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.19.43.ebuild b/dev-python/botocore/botocore-1.19.43.ebuild
deleted file mode 100644
index 51bb10d67391..000000000000
--- a/dev-python/botocore/botocore-1.19.43.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.19.62.ebuild b/dev-python/botocore/botocore-1.19.62.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.19.62.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.19.63.ebuild b/dev-python/botocore/botocore-1.19.63.ebuild
index 4e5d698e619b..51bb10d67391 100644
--- a/dev-python/botocore/botocore-1.19.63.ebuild
+++ b/dev-python/botocore/botocore-1.19.63.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.0.ebuild b/dev-python/botocore/botocore-1.20.0.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.1.ebuild b/dev-python/botocore/botocore-1.20.1.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.19.50.ebuild b/dev-python/botocore/botocore-1.20.12.ebuild
index 4e5d698e619b..4e5d698e619b 100644
--- a/dev-python/botocore/botocore-1.19.50.ebuild
+++ b/dev-python/botocore/botocore-1.20.12.ebuild
diff --git a/dev-python/botocore/botocore-1.19.56.ebuild b/dev-python/botocore/botocore-1.20.17.ebuild
index 4e5d698e619b..4e5d698e619b 100644
--- a/dev-python/botocore/botocore-1.19.56.ebuild
+++ b/dev-python/botocore/botocore-1.20.17.ebuild
diff --git a/dev-python/botocore/botocore-1.19.60.ebuild b/dev-python/botocore/botocore-1.20.18.ebuild
index 4e5d698e619b..4e5d698e619b 100644
--- a/dev-python/botocore/botocore-1.19.60.ebuild
+++ b/dev-python/botocore/botocore-1.20.18.ebuild
diff --git a/dev-python/botocore/botocore-1.19.61.ebuild b/dev-python/botocore/botocore-1.20.19.ebuild
index 4e5d698e619b..4e5d698e619b 100644
--- a/dev-python/botocore/botocore-1.19.61.ebuild
+++ b/dev-python/botocore/botocore-1.20.19.ebuild
diff --git a/dev-python/botocore/botocore-1.20.2.ebuild b/dev-python/botocore/botocore-1.20.2.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.3.ebuild b/dev-python/botocore/botocore-1.20.3.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.4.ebuild b/dev-python/botocore/botocore-1.20.4.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.5.ebuild b/dev-python/botocore/botocore-1.20.5.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.6.ebuild b/dev-python/botocore/botocore-1.20.6.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.8.ebuild b/dev-python/botocore/botocore-1.20.8.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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.20.9.ebuild b/dev-python/botocore/botocore-1.20.9.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${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"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || 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/bpython/Manifest b/dev-python/bpython/Manifest
index 4fb3eef4fcee..5cb911431d3d 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,3 @@
-DIST bpython-0.20.1.tar.gz 223953 BLAKE2B b26ee6e4d41609e9a04a013d90f4ae7f598ba28028d9982a77aa7f11887a60c39855e875ae004b416e375b0c906e066a22a18f0251d2e7192d690fe03afe51c7 SHA512 ff69b175afbb1f050f1aa481966bbc32580b3d113a886f49a97fa8f01e3c8c0edf2c0075785fc61ac616168c97d61ee7daeed85d0b08f1317fb774f7ad6bf439
 DIST bpython-0.21.tar.gz 208206 BLAKE2B 22db7abe3786df337af50f6217fa8c6702871b50de41245797270e70622084a22b3d6615cfe634044599a532c5bc14677b01dc77042d228213eaae2cad11b623 SHA512 a0eea1b9c2329ce5665456e99703ef476faab38f880eb8a330a6536970888cfdaada9f0e377d3c1acd8b6c79eb0c562ada43e82bac9df4cce5878594c3399ddf
-EBUILD bpython-0.20.1.ebuild 1292 BLAKE2B 6981b5ba94b365b9a574ecf583fde1725579543435e0e444ef3d1487d463157a8b1f870b08a67f9735048864dcf92893971bff6affb7a3a50e05bff663cca38c SHA512 6774895a8d82402219e4d478831e428c0e1f19d6a04bc1a8664cd385122617e57d4d46b23ad5da0c8406c1e15418304d0814e9b16dee86a5124673e920024007
-EBUILD bpython-0.21.ebuild 1081 BLAKE2B e2e8886d5e479e40d5cd0576af216e41e8d6179104cf6ba1fadde8436f85ff15a3e1592a539e8745469723a7b8caa9f1695f759e5e0bc19ebd9193dc464af8bc SHA512 94a6b25e2a42bcf9a613541a94d53598413f3ee87be42ac30f92b6b3da52c487ebcb16663183835c0faa58a0aae8568a5de6e11a3fe14b0670f61cbfc01da2b1
+EBUILD bpython-0.21.ebuild 1079 BLAKE2B e7cb5b64662249b44f4bee04f2b8d69066598dc71e1569323b7a48410f3bbdfce738d999b4944e1400922c26521feaff3d1673ed631ef278574ec8b164363659 SHA512 b15f1553e48c38cdbae7ec9b1e2cc2c68ad70950df3cc0a521b44925419c7cf7bd5ea13dfbed32c8b23a910eb3805a8ac826c592b42598da4960e4637b355a80
 MISC metadata.xml 496 BLAKE2B 77aef739a6085a972a41cdb41f7c1a9c70d8b80eb3070a1c132f18fba666bd9ede3f1f804064e51384b3173e47915f7172f8086c2d1e3a95177abfb91b8d0ad8 SHA512 95c4ff0de7773693c3c4f1f9c19623318037cc735e54f6669fbf33e2856834e09b15e09df1771a5a28d75de3eaab409da8cba91658eadfd94f848eeab07a623b
diff --git a/dev-python/bpython/bpython-0.20.1.ebuild b/dev-python/bpython/bpython-0.20.1.ebuild
deleted file mode 100644
index 32cd40f8c00e..000000000000
--- a/dev-python/bpython/bpython-0.20.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-# sphinx is used implicitly to build manpages
-BDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-distutils_enable_sphinx doc/sphinx/source --no-autodoc
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's:test_exec_dunder_file:_&:' \
-		-e 's:test_exec_nonascii_file_linenums:_&:' \
-		-i bpython/test/test_args.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bpython/bpython-0.21.ebuild b/dev-python/bpython/bpython-0.21.ebuild
index 6b274ded9485..d82bf1719c22 100644
--- a/dev-python/bpython/bpython-0.21.ebuild
+++ b/dev-python/bpython/bpython-0.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/curtsies-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index df66ffaa56a1..5892736d1778 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -2,5 +2,5 @@ AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4d
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
 EBUILD bsddb3-6.2.7.ebuild 1706 BLAKE2B d1b9f0e5e0fc8ff856bc8453ec95edabb5ef0591dc49cbe8404dd43d17f45e3988f072ff3346eea54452cc418d354fd80618fd847574fb0958f134b4438b684c SHA512 41f9974c61054faf11db07650491e4e30440e3e87185a4544852906170e75f0aa2184a2f8a456b1a89cef7f8e7a3b5698d9c97f6af73689df0360640da6058d7
-EBUILD bsddb3-6.2.9.ebuild 1667 BLAKE2B 768b33c18bb96bbc4bc66b4cfdf2026987e94074af8b3dc37fd8dea490230ddb6088bd757c037d37958be65705112abb186a009b8e979161dce9eba4ba769356 SHA512 68ad8a5650ae1cf0463b198b9a2cf664486192b7d8203ef8032be69ec77a64d8f998c8b8e28ed4bf48a4f469aaf5a25eea0c422432435de7e0b3fe5e5b4bb938
+EBUILD bsddb3-6.2.9.ebuild 1662 BLAKE2B ac77f8ca00747dcd3dc268f6b5862399be05a7e07d102eaee22760b53ac24d28386c16c086ad7a362d13f7833c850e2bf63821810a31cb7b657b3b3883a3f1f7 SHA512 bab21c96fb66db16dd4ea1b2afbf42cc1663f2c1ad16970c75b78978a353ecbd632b359494d20bc2e12d2b389fe5f44acb4b1e90af3f9c3fc25ac42f0ffb687e
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index 3c4794b2e05a..2c50b6decd17 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.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"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 817df1afd6da..c63f0b960c27 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,5 @@
+DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
 DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
+EBUILD cachelib-0.1.1.ebuild 516 BLAKE2B 5ecde8f86ae918a4d5d5c59fe6f495d5ca727cb444982ed9872fda78378bcdf3a91c1d9a098c459e66cda36e7f3c79885dbd883954b8227b9e9cecaaa3bd8d74 SHA512 1d2b8e0dea18dd507d6e9325778d66725a93c40fd69555c5ec2b5c5ecf0517589d7ac94edd0f6744c1b40363d4a05e8261b4ef866d602e5a7ae96bf09c8e14c5
 EBUILD cachelib-0.1.ebuild 514 BLAKE2B f276ca7c170e5b21ec5888d6b924b27d47a9e2fa7c5ccb02fa5b63fbf1a2011c7661eb5751a93fb6d6eaa5678087524bb8f0d8452a21a8272b6afa557eac3c9c SHA512 ef162a3172db5db394ab1e596477081810dfda261deab3f9045324936be9651fddb5810e8c562f97a6f61b204a8916292f369b77e457cdedc85f6bf2070ac4ab
 MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.1.ebuild b/dev-python/cachelib/cachelib-0.1.1.ebuild
new file mode 100644
index 000000000000..1c7f69afd453
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 3b4ec1b7a516..4364a9012e74 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,3 @@
-DIST cachetools-4.1.1.tar.gz 23574 BLAKE2B 5777d243ae87635766811fd2aea8789f9f1674ae3a7ddcc08bb3c8d4345002d65cdbd00cbaf75ba801dccffb1896a75688a6e97f984e1d498a93726854398196 SHA512 254e8821feaaf4fff656aa2beaf0b2c1c6dbe8698148be783bb18a6476f758061471906e4774f47bd8722dbbbc09745088a8f61eb5c455fbe85ef17a3816ce7d
-DIST cachetools-4.2.0.tar.gz 24713 BLAKE2B 06488dbc37f99081ed0dd3784f35d3471a57a7674b9bc9aff5eb366b06e65179bd17ac409abee3e13e4040fb8b4824a1591b0a3db3e8b8621d7d2d3e3aec6561 SHA512 d573d0ad9a6371d25526dc5de8db31f701419ced2206109e101faeb0f867fdaf2ebeaa7f0b92554b9e5b3486253a314863d818a53ba9211824aa8a46618f7052
 DIST cachetools-4.2.1.tar.gz 24753 BLAKE2B 90345deed94ea6d5ce9c4e3d609ae5a5a8e29f506e559c017fe24e5e8c73e056da4bd4d01e80ccc91686e03ff204e1918375b9701abd8ab571241d09c7556cbb SHA512 bf5a05fc513241f05e61547b5d45813308f20a58319d1c057f3269533a55b739203ba74bc2360d38383cd222a148dcf192f6e58614258bcac2855b633145733c
-EBUILD cachetools-4.1.1.ebuild 419 BLAKE2B 7fa4040f07fb0af1d367fac47ef609f86580b7ec5b67f9950aacbd07a5377870c6cb98a68cfc57ee311acb7bc46d09d2d8e6c23d41b04bb3e4f44c04bde5259e SHA512 11084e63225e36fd91997331af5efb3334deb473059472cdaad710b2ee524eb777777596c40300248d33b656fce59b6cc3397c6078e2efff5393062ff0d2d23e
-EBUILD cachetools-4.2.0.ebuild 421 BLAKE2B 673b04da2c53c83814df85bac7b108be9cbf9ae0cd68f7086d5f74704a61358057ff66392f07cb0bb9ece2f1f22f2ccb097cb5e23853069977b7c6c4978cd182 SHA512 90bd5953f9dca74fa3647116af9c1c5b076326c00c5b02741bc7efeee80aec0194e0b2a2f578e6a82113b54586bbe8ab8f4559a6c631a99342df7bebc62ea3ed
-EBUILD cachetools-4.2.1.ebuild 421 BLAKE2B 673b04da2c53c83814df85bac7b108be9cbf9ae0cd68f7086d5f74704a61358057ff66392f07cb0bb9ece2f1f22f2ccb097cb5e23853069977b7c6c4978cd182 SHA512 90bd5953f9dca74fa3647116af9c1c5b076326c00c5b02741bc7efeee80aec0194e0b2a2f578e6a82113b54586bbe8ab8f4559a6c631a99342df7bebc62ea3ed
+EBUILD cachetools-4.2.1.ebuild 419 BLAKE2B 6e4f39e42ad7ac2d499372e585a5a752387e74e330256abba4893866d69c8a115018c71d5209f30d9fe6ed54f9a64135cc7d7a6f0ab5f2f396bd42bc0f764a2d SHA512 8571ea3c64d2a126c1ea7256aaceee63acde2e122f82abcb78b5b18439073ffa92803e9d9026ec5c8ff890f598f5eecb5c1af436630854983fa122c063929380
 MISC metadata.xml 507 BLAKE2B e295e40137fa41a22fbefce74c8eb04bd0bfd920dec5e89bda3c75a524f274aeafd651187e5b86df9a16b63f3ce16e11dfce32aeefb8b7a4ee720283fc773304 SHA512 9d3503941a0c1200e22840f3886a1938c0fe4d9143eb511007e4156118878b39494b4917a68c9798e4a4e24d8f19d18eeef98fa4bbf53e61340c4505ae35bb41
diff --git a/dev-python/cachetools/cachetools-4.1.1.ebuild b/dev-python/cachetools/cachetools-4.1.1.ebuild
deleted file mode 100644
index 40bafcd5dee7..000000000000
--- a/dev-python/cachetools/cachetools-4.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_{7..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/cachetools-4.2.1.ebuild b/dev-python/cachetools/cachetools-4.2.1.ebuild
index 4e0424ad1b9d..d0370c0aebce 100644
--- a/dev-python/cachetools/cachetools-4.2.1.ebuild
+++ b/dev-python/cachetools/cachetools-4.2.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index dea4dd76dd50..7ff71907c194 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,18 +1,8 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
-DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e463045079e5a2e73ad59779fb715f32fca39c1cef189484d62de3bc57a48b7776f5cebcc21c39948b7d73e394b89a4cebba9 SHA512 ca0cba19f930960711676ec285b10e0b60ff36359326098d5040bd2fd8f7ca6cfee985544c4bf94770baefa0e50eecead45c4d769ff3587031c3bf463f26355f
-DIST cfn-python-lint-0.44.3.tar.gz 5591470 BLAKE2B 7d8f6763023a86d528f132b36b9b860b726241576037a1dd92a296f4b5ec5389ffe24e4a41a8f504ae8351b9dafc166d96ae3b17b90ac23062af2159baa36220 SHA512 a3c5fa435ed9afce32336d01cfc6c94d1965dc5c296601aba75064fdaecda9df5bfaf2976837729b56f00bc3e8cea7fe8cd5141c58335091a35dbec31a630b69
-DIST cfn-python-lint-0.44.4.tar.gz 5632477 BLAKE2B 3520cb016f926e180bb1547b4e467d6fb5251ca5e2ef0ceaaed487f40f10b58f5b6700a5f1995d4a764b53e83ba8a4ab7a9e67fe9803557bef54df3036e691ee SHA512 39e244963109953b92cc9e9fd84e33ede157c9e752854f685dd81d2a3e09ea88ec402addc8f2c12f044f0f7ab8e0bbf53486153be9517b76f0a89fed3ff94a14
 DIST cfn-python-lint-0.44.5.tar.gz 5657765 BLAKE2B e35fca9cf8232bc802666333184a52b544bad5858ec8e4c16fe435ea5c421ca25296bb9d8a3bf351276dc1e36ee3101cb0c950ca9d8ce87f5dd2f64cf347ba30 SHA512 e23e415f7d5dd3933e70e7c5b0d9d001bc9aefd0ec67ba9245b4cecbad0c5470376439c12d2cd532eb39e900a325de52c4856351bba2ca27cdc0760ed091ccca
-DIST cfn-python-lint-0.44.6.tar.gz 5689226 BLAKE2B 19f6d4f09a621d8389893234dea2cc5c9e2e04fae7f1519bbd95657f5bf1ff97e34c1ed66a6f2bb0ffc2851e99cae5ea2734aacac58b87088a5430346ce0d102 SHA512 8c4414145e039d8b2b32008871dc0d2dbe946bd10eb9b7a78a070ce16ca13c3c0f4a37212bae07fa798b8b0d0868b342735ef406c6b651f6c85b8ec92bd563b2
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
-DIST cfn-python-lint-0.45.0.tar.gz 6259853 BLAKE2B d6b930ac2dcdb5b629e5bfc1cd37cd694355de16585712a55a2b5f1cf5e2f234668c180dc77c1904d9de1d588e2675523210bad0bdf69d5b9e9032d47e73c2e1 SHA512 d89a6fc6f2a29c3d8294b7daa033f22b5e2f45576d8cd6abc25a30c3039c4c539bab2a8c45cde094e2cf4482227a09b1da34abba0424861307ced91b957ce13c
-EBUILD cfn-python-lint-0.44.1.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
-EBUILD cfn-python-lint-0.44.2.ebuild 1341 BLAKE2B c7814de5062b749b6707a9077a6cc778d62a0d8c5e3c1c6af27f2122e0deb458f4c08c61bf6b092ab81e8cee49b7c2fa872569d099079ff846885162c755626c SHA512 ffb4617f5ea44c9eb4acee59b17cc473c6edf3202a651fe5a2cd61c363672bacf5a9b558d75a950b742384e679ed62c02a68372288ea05e3f75718891bc8a584
-EBUILD cfn-python-lint-0.44.3.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
-EBUILD cfn-python-lint-0.44.4.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
-EBUILD cfn-python-lint-0.44.5.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
-EBUILD cfn-python-lint-0.44.6.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
+DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104
+EBUILD cfn-python-lint-0.44.5.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
 EBUILD cfn-python-lint-0.44.7.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
-EBUILD cfn-python-lint-0.45.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.46.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
deleted file mode 100644
index 864a47207182..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.ebuild
deleted file mode 100644
index 8f92992d074b..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.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=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.3.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.3.ebuild
deleted file mode 100644
index 1b41006fc099..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild
deleted file mode 100644
index 1b41006fc099..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild
index 1b41006fc099..864a47207182 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild
deleted file mode 100644
index 1b41006fc099..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
-SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.45.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.46.0.ebuild
index c3edcec5c4eb..c3edcec5c4eb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.45.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.46.0.ebuild
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 77c8917e2e7a..b29e85d6a6c4 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,5 @@
 DIST chameleon-3.8.1.gh.tar.gz 137012 BLAKE2B 20b0a830ae932ad0e8b28015b233049ee78a74f06f26d2652ee297f366eda6f54fa7650fa20a3c4da3802a2466c0f6a4c4cdfd9608761a20986c86673c61a242 SHA512 d4a4b3ac0b59865a7ea1d9ede7f08d991296c1d08a48c7290b9e2864afa6527237d8dee604114918f3b5035f2cc915bf6218d0758ebcd393f2103bb0751f6ea2
+DIST chameleon-3.9.0.gh.tar.gz 136548 BLAKE2B bdea62d4eb13dc6e830fccf72c7798c97f1f3a72c8f749ce43ce53ea0a3f8521f52f86591796d2850d84d8ee53a22a976e45f9a8b51f6ea2377dce10b8e2c226 SHA512 72cbd21f083d14b056539c515e43daaca01d923e065b6eca511f4e09486eb8e3fa61d6823dc78cca75f71926050aa04e0f961c9ddd728e15f55408e405f3c7aa
 EBUILD chameleon-3.8.1.ebuild 486 BLAKE2B 8e65ffc1885e9801317643f55a1baa0d3c3bd73e61dea0512196633623bc85fc4673c39bcb9b626dad1e074d2e47350603565cd518ebc9ba7848245ad22aa738 SHA512 43f1846a4700cb7f25456dac9502184ec543473d7091f422e05944427a58c7405c59a004d53398c7e62035f3137dfcab86335cd9da5c2a5bce3165c0eaf9945b
+EBUILD chameleon-3.9.0.ebuild 542 BLAKE2B ee98a03a6cdeaa614230a7bd636cc6673edb06f35c8e189e74329b844fe12f074bdfd1cc54c3150414fb0ca313a5efd1ee35ab1a269c42fd8ae3c35fe625f859 SHA512 e72ffa1abb535b523dde5dd1b25261342c2911b0f2293ec177b32f1f1385c0e4154fabf4b58dd4886cb9668954e14978f93a51661730a95b68a57de229ebc556
 MISC metadata.xml 392 BLAKE2B bc9c178a8aa25e5dda53e20ec371ee84bbe8f75e17d426b5c9739a8d438aedbe7329d085c311ce2e5e5ff6d54b4ac676654608baf7ffed39be033382c1c075c2 SHA512 d9bac397232f6ad4c24b72c75dd97f57fad3072f0ba4c898ad75137d6c88e5ad1b71b5b89b251f1cc5d2e18e189f7a41e9cd7a6e369e5992b88594ad8f6a2e33
diff --git a/dev-python/chameleon/chameleon-3.9.0.ebuild b/dev-python/chameleon/chameleon-3.9.0.ebuild
new file mode 100644
index 000000000000..2154eab81d01
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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 unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 8e2d6b969658..14aee3685631 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,5 +1,3 @@
-DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
 DIST cheroot-8.5.2.tar.gz 113183 BLAKE2B a3b60a9df3f34913cfb8c99fbdc8580ea436710c7979e296c18a6981f54bb959d6a300f4cf9d4e608fe2987f58d5fc6d2b8f57bca800e461d31c77ac61fd6b01 SHA512 245c4157f5e11741d94375099878ef5b31945412a2b02961502e762b9770fd968f4f977fe2d74744aa6596c668079d7f07b6f129fa11438783a95d3a5ee088fa
-EBUILD cheroot-8.5.0.ebuild 1527 BLAKE2B dc96d7a1ae4c184671133736b7d6b6d8254a867f457cab9fe1de67105e53aeef8b83571926d6c8145d45e76848f25b16f4d606b920357a57425783214eb3d860 SHA512 e692b08c9eb966e5205040a8533099edc9ac54323c96c4ba733b55a1fcc4f040578fba69c4cdc968001fbc28fb72b8296582b957869ee3e0862aada7a04d8e57
-EBUILD cheroot-8.5.2.ebuild 1627 BLAKE2B 16daee02bb1ce2ce2ec0d1bb6c24d5176f27310d15b3d4e6fe66a1939e3d5b4112b80ef90e1122d597b86928c850fad3c6953f75be8ff8265a2c7090fcb837af SHA512 b7ab367d673a2f1937b7193abdd07f807f283fef8e39df478f7a3939d28951c03099459b03c92aefe15dd309743bf8e81e661e7eb315f92655257f870f9c27e6
+EBUILD cheroot-8.5.2.ebuild 1622 BLAKE2B 1a84b43d6ecc32d815ac3eada365eb56ff0bc5567f093f096bbbd6f05fa23a12fd38a39b97ac1def2d113770856406bcd736c9533ebdb3688701810ac91ef236 SHA512 9453466be06a99467328b52031d330be2e85bb5d84e2a9724abe72ab1cc2de9116d6b8d848c082234ecebaca6a68a8d11dd9d1130199244c22dc2c1ef854aa5a
 MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.5.0.ebuild b/dev-python/cheroot/cheroot-8.5.0.ebuild
deleted file mode 100644
index ff06b1af3fff..000000000000
--- a/dev-python/cheroot/cheroot-8.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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.5.2.ebuild b/dev-python/cheroot/cheroot-8.5.2.ebuild
index a679521746ed..ad187eb5f9bd 100644
--- a/dev-python/cheroot/cheroot-8.5.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.5.2.ebuild
@@ -15,7 +15,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/clang-python/Manifest b/dev-python/clang-python/Manifest
index de327ee13a04..6cd1f8464d52 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,19 +1,17 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
-DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
-DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
-DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
+DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
-EBUILD clang-python-11.0.1.ebuild 926 BLAKE2B e99ef100250facaee5b99b053a1886379e78e16feeedbd16db6a7fc5851a8f49ed56885100d4ae51476b6eceedf5094b174a56b2f61f7310e4c082e03fde469f SHA512 b8da10973bb33b04b3cdff83a1bcecc7ea2c307cdfb93c5c9799683c0361574da77cc735eea0f4c70e5c5571ec93bd9cd23b0b3b407d82606c0758b093c90a57
-EBUILD clang-python-11.1.0_rc1.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
-EBUILD clang-python-11.1.0_rc2.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
-EBUILD clang-python-11.1.0_rc3.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
+EBUILD clang-python-11.0.1.ebuild 924 BLAKE2B 78a1cdf53d24ec466a677857d438f341595bb8f9b9cfcb7d8102bed1131068d5140f3dced794e52de9d6f6d3e273e60482554894ffd9326dad976d6bcc7ac72c SHA512 16ef8f0862afdc31cacf3d3c5e23f3af94d9f4178656b2cf65bcb65c9f3969fa86fab5d43b9ece4cb237842fb650e0756d59078bd8390466289c02d074ec4c16
+EBUILD clang-python-11.1.0.ebuild 926 BLAKE2B e99ef100250facaee5b99b053a1886379e78e16feeedbd16db6a7fc5851a8f49ed56885100d4ae51476b6eceedf5094b174a56b2f61f7310e4c082e03fde469f SHA512 b8da10973bb33b04b3cdff83a1bcecc7ea2c307cdfb93c5c9799683c0361574da77cc735eea0f4c70e5c5571ec93bd9cd23b0b3b407d82606c0758b093c90a57
 EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B eb88d06b0ea6be7b7918f47b0eec30b399ff1cb64819a8b784cd0242d0455e38658bf89703c376846010c2eecb6c051e963bb8c3e47821dfd7efcb7416f1aaf4 SHA512 4eedf397fb83180c54a1f1b6bd9523abbcee38331866d35ba35e2b106f60a6fa5afd510b17c691807f674bbbbc46777c6bb240e2e11d2549f2c2f48532517606
 EBUILD clang-python-12.0.0_rc1.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
+EBUILD clang-python-12.0.0_rc2.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
 EBUILD clang-python-13.0.0.9999.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
 EBUILD clang-python-9.0.1.ebuild 920 BLAKE2B 10f5e147283f34ef462ecf9cbfa788b47ac3b89d493f245307de0cf9ab66d2291903ef654a9c0642daa84b892e175e207216f794863e84730d266e1c90b4a871 SHA512 4d65b05fc80de160c358a330481da9c71a5dc2a4725033ca7161e77483f31336f212ed03e801db30134f31a8dec993a44e0a95856b43fba8f352cf37ce4e422d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-11.0.1.ebuild b/dev-python/clang-python/clang-python-11.0.1.ebuild
index 9b562d893ad1..9bd56b2f3b04 100644
--- a/dev-python/clang-python/clang-python-11.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 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-11.1.0_rc2.ebuild b/dev-python/clang-python/clang-python-11.1.0.ebuild
index 39e999e67709..9b562d893ad1 100644
--- a/dev-python/clang-python/clang-python-11.1.0_rc2.ebuild
+++ b/dev-python/clang-python/clang-python-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-11.1.0_rc3.ebuild b/dev-python/clang-python/clang-python-11.1.0_rc3.ebuild
deleted file mode 100644
index 39e999e67709..000000000000
--- a/dev-python/clang-python/clang-python-11.1.0_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-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-11.1.0_rc1.ebuild b/dev-python/clang-python/clang-python-12.0.0_rc2.ebuild
index 39e999e67709..39e999e67709 100644
--- a/dev-python/clang-python/clang-python-11.1.0_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0_rc2.ebuild
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index 1214ec209fba..3cd76e602891 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,3 +1,3 @@
 DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
-EBUILD cleo-0.8.1.ebuild 623 BLAKE2B a0c0d5d3862334b3900e9e7ef4e30c195a275685aec3df8477c95abeb792b095965b83664bb94b7c42bb8e331d2622b33c24b6427a46e229cd6e901474affc1a SHA512 a6c49c76b46152e51dcc5885cb22ef65652bbf1c5b5f87ff39939fbc005e8a20cfc2dc6d07d6fc28b5232b29e4e7ebbebb102ac57c49829833b0a4fa869f84a7
-MISC metadata.xml 507 BLAKE2B 21dc64d2772ae701ec2297232c11b08c1a3c8bb1a4444d65370c80c655a90642a1eb421c85d87fdd7414ccbe0e707d108ae4e2dff56fcceaeff952053dacdcc7 SHA512 4e9ee663b00c7faa3f160ee78d6fa02ea1947b5134fe173129a357646b0e35049a6b59e630c4eb4f94ea5da514bc44140765955a9f1788760d955b69f0d00fc1
+EBUILD cleo-0.8.1.ebuild 622 BLAKE2B db13d0489a89cec6630dccbf51f6d907b641987da04a32b51f7fd0dc437fa84eff49ef6dedc41c09480c82c42ee117f380b4401dc5c83b6a97ff9104cc4bc033 SHA512 5d76c38bf5f183ae918289b7b05e28749bbece0de7aea0379b90dbade92a1e2da0d2ea608891729b752cdb130818eb64d2ddc996fda82814ed5ee35ce8f880ab
+MISC metadata.xml 532 BLAKE2B b91577228ac15276ecced8723c229787c443d953c5f0c0491fdc6275f84beb2b04946420a64909bb555f20a8503e41878ea304c1f13e58c1b4ac7a8af9703cee SHA512 de3ff2272ce714cccb698faf5277b6b45657b53f590de7f202848d9c0da00723abef00fdc478599265aa0b432e31493ef171d3a8c9f306a1ba46d82beb2106ec
diff --git a/dev-python/cleo/cleo-0.8.1.ebuild b/dev-python/cleo/cleo-0.8.1.ebuild
index cb555e481fc8..0d52eef0f55d 100644
--- a/dev-python/cleo/cleo-0.8.1.ebuild
+++ b/dev-python/cleo/cleo-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/cleo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 9276c356eb74..c57752eb0781 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/cleo</remote-id>
     <remote-id type="pypi">cleo</remote-id>
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index eef44dee4db8..b584bb4b8df8 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 653 BLAKE2B 41106c8a7473c89383f60384e00eed1c34b64e0d7a6a4247294916395981d83ddfd0740371f810e9494eda3fa584862ac715a414b90f22a196edc3c03e7418e5 SHA512 fafd0d535461676e4c8443cd56b40f39c7139ece7197e2dc57340db47ddcdcef782218dbc8194073eb2831caf1c0392e58038bec4615685fe489b153154f7130
+EBUILD click-default-group-1.2.2.ebuild 659 BLAKE2B 55e65f70d174c804954d648768eac699428b4179f08c2ae80c4159902aa5c7425f75263bcd8be1a5a289809922d1304f9ef42b21ffc917f65c42f914139eff60 SHA512 66315c05800b603e434d99ce41a8747d1e6b125382320da6e0b15d620a20780b9ac8f46596db6c59202fc045d20915d43fea2003b052fef2996de03f851ec76d
 MISC metadata.xml 395 BLAKE2B c056e2469b8b6a215ba4340cb91979beec19cbeee393bb3502bff45834075218dbff6552d6cefa24a0fb6d6ec3cf94b0390c36cd84aa2fbae2ca5c1966b70c4c SHA512 cb527c5d7603eed5b507bdfdafb3ccea613bd77f183c1830c9e759650fbaf71a4f851d74028fe4cbb40da4214a0e662f1ff3913295e33503ae859e3f865533f5
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 9d919ef9e7b0..5c294d33d0b0 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 0059fc49bbe1..f7042cfc7c96 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -2,6 +2,6 @@ AUX click-6.7-fix-tests.patch 1971 BLAKE2B 67c0b66f8668851eb48899aab98b4437846f6
 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.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
-EBUILD click-6.7-r2.ebuild 964 BLAKE2B 9318326f72e8614dc550b24fc418d7b8e9bb873f6db359710230c6ebcec529ba4541cec874f7a290d9e3d36cf918a80645141bc30ff6e6896de381f547b4ed66 SHA512 6e62e5cf3c81adc5e3fd4173f4f7a95667802072377a2ea3632ac53d876428624add91f6a76b7d31ec36db33938a4ff160093f25d72d4bbfe5c803947e6076d2
+EBUILD click-6.7-r2.ebuild 838 BLAKE2B 608a2d022c059f918754df5755b29d848e8b30fb12122eecd5396e83775ddd2ea0ebae860ca2e2602d34c705de954a0c196b1770a29e38a6ec6ad37ba3d71265 SHA512 a1def50b7d240f7abfa5b1d42aa3b5126e35b6907ce03fe78b77610df8e1a7027833f82118310c9b5a3d2ca7942c87e3287b29cf1e42df447d4c48cb1deb6df0
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B 095cfcf03856893fbb93140a12ad1f52c6cd30f32367ff466ae798dc9fc6a1cee978eed1826685d698f8f4698fd3751d672083bbc8f067ce77de3304440b0759 SHA512 d606e2c5508c25eebe0cc72faccb248281651fb0d5574a5c5a6ef04af218c047a021f7ce1983fc42c4c89842626dceb6f366a421fdbc64023ada25e4d4d49f2a
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
index e6afce4e9b40..4a02313d5fb2 100644
--- a/dev-python/click/click-6.7-r2.ebuild
+++ b/dev-python/click/click-6.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,24 +14,17 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
 
 PATCHES=(
 	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
+	"${FILESDIR}"/${PN}-6.7-fix-tests.patch
 	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
+	"${FILESDIR}"/${PN}-6.7-support-sphinx-1.7.patch
 )
 
-python_test() {
-	emake test
-}
-
 python_install_all() {
 	use examples && dodoc -r examples
 	distutils-r1_python_install_all
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index f014ec8c39d9..e64da9117411 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,7 +1,5 @@
-DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
 DIST cliff-3.6.0.tar.gz 80464 BLAKE2B 2b7efb07123fd9939c5717d6bdc1685d2e6474f3852e920c8d93f8a3e7ba20e433dbead97040ab035c4081058b621740ff64045c282a0568393fe8453da245d9 SHA512 ed4077e8b9e848dbd8aebb076b9f55086ea861cbf22322f7c9fb03a66b88bd60f5c09c6914481fe5f02bad25c0183e245405d9ac54d37b6bf0f14c9c97bd7684
 DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
-EBUILD cliff-3.5.0.ebuild 1204 BLAKE2B f9d1d9c89bf8b17d42c6d1a15e6102989122ff519c7a311adb2b00e1a5d819bd5316c8b437122dc5c6a3658f1cd5a6e2e8be9b8593b45813529b0f0ccdef0d88 SHA512 f77a41115371641add12f0e1f0b435bc5bb3d34f0c0059b86d27c8d178d9460ebeaaf253e6e7628527892faa9d26fd3727c8f13b9ebb58d86c6aa439bb2052be
-EBUILD cliff-3.6.0.ebuild 1171 BLAKE2B ec6f23e9ec71ea96843a9fa5872d7c1ea3765e9d6582db81ffae5bf1d3a71daf2eb038072fab3a22ac9e2c4eff1967c43f0085b2ee4a70372e0e19a8a17f4f14 SHA512 ccbf1486f07ee53651d60b61cd305e4856d526454c1cda3de134759a26f6e9947f5a1619aa00dcaed427f5e0c99e6217275115892b3bff558a98e113ca6955aa
+EBUILD cliff-3.6.0.ebuild 1166 BLAKE2B dc3b46b9e2ddd54f6cce37ba5c66ca23492f777f015c6719cda6ddd9a4228062d074952a405ca8ebadb1a825477697dbf10c269fe9d6afb43d5d7126bbfa0287 SHA512 2a80ae5c68a3d99e060c1b53ef05db30d8c15e12b01eb6b5285560dd50ef605acc5683e03080d9f949c40f52ba0cf0c2dfb40da6db36647b085addb6727c484b
 EBUILD cliff-3.7.0.ebuild 1166 BLAKE2B e89da7bdd0205270da5e3fc9e42c6465004edf82c46933f4024a5ad039db7ffc29f93351266442031a89c6b3c5484e7220427cd819dec08feea5beefca6c8a83 SHA512 1931493eea1badeca99161b6fcaaddafc7d4106204e3e9cfc8e6de861976d5e6cc5643d020701b5f96c255b88533ea7699c56a5f904f5ddeceefde5058b6014c
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.5.0.ebuild b/dev-python/cliff/cliff-3.5.0.ebuild
deleted file mode 100644
index 184932a74483..000000000000
--- a/dev-python/cliff/cliff-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
-
-PYTHON_COMPAT=( python3_{7..9} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-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/setuptools[${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
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	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/cliff/cliff-3.6.0.ebuild b/dev-python/cliff/cliff-3.6.0.ebuild
index 1cc8d0117cc8..cad6510ed236 100644
--- a/dev-python/cliff/cliff-3.6.0.ebuild
+++ b/dev-python/cliff/cliff-3.6.0.ebuild
@@ -16,7 +16,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 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 98938ef4148e..9f7777fc5312 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
-EBUILD clikit-0.6.2.ebuild 831 BLAKE2B 12b1023060a55aa7b33b62b6a0fde166f843ef2ceb4c78f32fd92524924acd0c2e36e79e6fcd9ef2b0d21057a34a45d5e10b94e00409894934d140d91d393c97 SHA512 774db03d66e86b2c03259ed500edbacdbffa7aba425d85380586f3bc9f78ecec6b28af2111d2d5eeb84607eb301ea7f11b002f36b81da9d2d03b2c85b199594b
-MISC metadata.xml 513 BLAKE2B cb8c163c3be7c18a28edbd53b48d20d30787b2006cc23f68d7b5575232b5fa6fcda37c3b07e5afb6ed5d02779533cd3aed463e4c9aa2c5dcf4ce6de901b014ae SHA512 ea5929f2f091b02c368c6faa4a227b2a2423f05b4aed82abe2122b51630a6be4b9061ec078a5844074cf94ef0a609ab827731eaad6d5c434cc911ce67ae8a3bd
+EBUILD clikit-0.6.2.ebuild 830 BLAKE2B 30f83793e0507e4209cdf0ce32e87ba024c8599f1eb3b87ba56bb200b062247e867fc15300a293b32f0a125a7165fc2deadce0911e5af334e3c7a5d940c5de53 SHA512 8a9e9487c0ba53dd4a4bacb51a7def30f397719a8070ac47ab80748684b69f3e1ad5e5b67c24598edb0c02e92c462cd3a40ab9d7ae1dbfd97c5c8b4e1ce21f0b
+MISC metadata.xml 538 BLAKE2B d7d6dd5979929cc05de8a1f46879d3c393dc827931c38581431f10fa434fd2abbad81c20c47877b05d0717931342bfc9cda4ea76a42157a61991493a2f27d99e SHA512 17fc0e1601ba8604fd49f7217b495ce59166a1ae4fd5bc7f656b7158ff33c8fedd46f6d1aeac8324bf918c2e91ba79d5cadce53c677fdd1479afef8d14cfc4dd
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
index 8ae49bfa3bda..5960ae24c3df 100644
--- a/dev-python/clikit/clikit-0.6.2.ebuild
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/clikit/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/pastel[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index 4a11e6ef158b..7bbe5b12b85a 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/clikit</remote-id>
     <remote-id type="github">clikit</remote-id>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 07a3e634e156..c46508221f20 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,3 +1,3 @@
 DIST cloudpickle-1.6.0.tar.gz 52743 BLAKE2B 9007ebd4464adc0cb203e596cb756176d17ede5cfb90d172e11630df3e0a93dba471d8b20aaf750701cbbf1fdfb4a5faf24a75f8df82aecb4b77bd62c8979027 SHA512 3b663a013d1512b732b13f38bdf2d5d89704a73577c9fee2a6e808882d42ecc1bdb3589b1cc61279ec621b6dac27d8e223b2fd839442e2d5994892f04d015535
-EBUILD cloudpickle-1.6.0.ebuild 802 BLAKE2B 650fcd1d25220fcc09fed5c14235137dcfecc57ff98471f6756caad91eee1986cf59870c1b8a203bf0b3e00f2958735ac7ea18740b05a3f6eb79b6d817d14dd1 SHA512 86f78b1b0e6bfb3edd592fef5621b38667a6205961cfad5fae9c6d8391db0090dbb1d40c16e3291ff080a279bf181baf9a163facc66597b319d273b057bd0046
+EBUILD cloudpickle-1.6.0.ebuild 801 BLAKE2B 4c7c8b4f522b43956f3c441323fe9021359d0637de2154f3192d1c9bdbd372ae6754d6deeb4d53eb59172089a140bcad5cd97260033db0f87cb7bcd438c44543 SHA512 ad14cc0e7b2ad389af281a1cb862b88edb1bd8f8af6ce1ec10b7c551a0b5d1a57b30326344c6ea1da10e1470d8ea90e1591b49fd2ba0cbf3d38213bed77b182e
 MISC metadata.xml 399 BLAKE2B ac63a04dbf00bd09fe35d3824cd6e789b95fb139e4bbedd3a05cd56638a777b834250b46b04fbbbfb656f4507cc1691c5035cfbe01784e94f4bade0a51301e52 SHA512 cbf22fd608de45a444fecbc87cead7be6b2552f18921731c1ede37b8433c345c4bd8162605bfcd83a0e166243da19427669923bc58ae847539aacf80e0e27f1e
diff --git a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
index 645c6a28ba53..9b8ea4979f1c 100644
--- a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 24b00c595f1a..5b027a32de13 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,5 +1,3 @@
-DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
 DIST colorlog-4.7.2.tar.gz 28764 BLAKE2B 35cfba0aa03879786a41eb09601f0b4227c5fbaca91f560810e4a4626d9b3a15b8072df06315f81739d27b410c587a062132d5315bd1e0db059baecf757709d7 SHA512 103640e0a4bff6bd81d26c1019fe954f52870947c0b68b3b2a85f178c8f50040e3eeafe08b2a25aa130433c1c8f144b722e4f3795fcbcc0ed4c2386cee626884
-EBUILD colorlog-3.1.4.ebuild 488 BLAKE2B 3eb743ca70f61c65ee3b9933dadf00fa147fc9dc3533cccd542c89b697282fd737478671984d32eb5e49da2a7b3672c53df8eb421683c3c711f7767856e0d75c SHA512 f32ba03b27d9eb5f1d406de7230601bca8d9bc03b7795ed8f7821f1e3dcd4439c7829a65b1bf6aa3b0128f603c33eea599e1cdad5e09ebfa800f1b20ed7f84ae
-EBUILD colorlog-4.7.2.ebuild 438 BLAKE2B 831298220f1dd8210c6e7db9c36a8076497008f61b73297e0488a9e4c156725fdc866ad4d9afad97c9ab64c108deba8c881fc6e752ed849b41e4c49feb89db91 SHA512 128121fb3b165ab6d063f6a9476210de63fcba3b5e625ad4f337eded40df23c5f27f6a77c332dbb759d1cfef837bc2bfc662a6af5edebc73e142a7243488ee20
-MISC metadata.xml 389 BLAKE2B ded38a2f991252ac74f592870d12edb503ed77e13c60a393545ba0fec689f355ae1ef7bd89190e9d6837bc932f6d61e60e48e567c4ff09ebfb21ab666fed1867 SHA512 04b339e2ca89bfd8862d5491081c7b66f5211dc490b650140499f5a4fc6f66e705a5ab805a6c0bc4d867183e699c3c73a199a750d156862346cb68e3647f8390
+EBUILD colorlog-4.7.2.ebuild 436 BLAKE2B 4383df4cc1117562ea1a192dbbe2f31c8d099c0887633a41269b051341e21908dccf95505c7c5e0b6b761610fb87ab294ca7c3cedaf17d29cd0466a93e02ca5e SHA512 eb00f779a89e0422718fdbc705854b850baa80c97d1bbc8d0a0909dbae358ea82a52544fc61e23b91f2d9fe45dc7e1b60cd11a207c2c0ac7350091482be07bbf
+MISC metadata.xml 414 BLAKE2B 6d745b11747e4fbe68606289b2fccd8433a73d9e26531dc966af716ea2309c023aff26f42f496f7ecc8f280476c7dbb46d0411c863dbf51921c1b7dbbd16ab29 SHA512 eda6c7896513bb601ee87038cb35f32b556007a0312821dd8024588ea766267931998d7276656761a41f6475a1bbefb79aebb5e82b05e010ca26f312c52a30d6
diff --git a/dev-python/colorlog/colorlog-3.1.4.ebuild b/dev-python/colorlog/colorlog-3.1.4.ebuild
deleted file mode 100644
index bc7ccd3e2e3f..000000000000
--- a/dev-python/colorlog/colorlog-3.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -p no:logging || die
-}
diff --git a/dev-python/colorlog/colorlog-4.7.2.ebuild b/dev-python/colorlog/colorlog-4.7.2.ebuild
index 0aff57a0f429..7014081e95e4 100644
--- a/dev-python/colorlog/colorlog-4.7.2.ebuild
+++ b/dev-python/colorlog/colorlog-4.7.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/colorlog/metadata.xml b/dev-python/colorlog/metadata.xml
index 4569d1b46a83..bfe7f66e5ef2 100644
--- a/dev-python/colorlog/metadata.xml
+++ b/dev-python/colorlog/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">colorlog</remote-id>
     <remote-id type="github">borntyping/python-colorlog</remote-id>
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index c5bf305581c6..526dc49eeac1 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,11 +1,9 @@
-DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5
-DIST construct-2.10.57.tar.gz 1184585 BLAKE2B abaeebf5872cc97cc67d47cf79370fecdb1abafb62fa80b6acfa63de9087f70fa67fd69e90ab4e78e7ac179c1bb1011529e34201c3c2270e1a2651c97cc678b2 SHA512 ef2f0bbcf4cbcf4862033b16ccb428f84d63ca5c867157b47e38b441cb439c953b543cf69f352c0542525fd07b37d1b3b68910ae5331c482e75b4af937e116a1
 DIST construct-2.10.58.tar.gz 1184881 BLAKE2B d1dfa005542505b0a154f3c0ae74a1708747b1e7b9f5dc650b924169fa54620719bdf5bb868e616ae58e8890f547eaf3bad5b02ef1f7f7ffeeadffaa87413041 SHA512 8547847e3fa15c020ab7d178b229c5b93744b48497c4cf809a93527be5776eacd52783a0fa38583d694c262c119835c989fcbe0936eb247ca844d252c4bdebb5
 DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621e0fe901e5f8bdf9c0aea61e3ddd2174c71767601be3533092a6a28748597cd1a044e4721436748b9a2dac81b81b41b SHA512 bf5867efdb9e1a27ddede6844f5f3466714e38dd97aae09c6990582989801605eebf90099fb3a0ab78deaed4f3b6be38421b635f6332461efd033d5fb8c2c1af
 DIST construct-2.10.60.tar.gz 1185983 BLAKE2B e263c15db9d8055db854508f767906e51fb260c47e2df17e2786277a3ed66e9a8599f21299b21d0629997c6ce2afd7651e18aee4c7f22d3e38bdc5db5bd53bd4 SHA512 597e4fd9f0264450fe221e100041a897d25794bea4dd5cbf5f58df8a0829a34490daff10764e6329ade165df631ddce661dceae4417d8f55472b2fad2a53e53d
-EBUILD construct-2.10.56.ebuild 954 BLAKE2B 7edbb7e6e3102ce1b903831ce6e1f2274b4a3bba5a78c81daaca7154d418f9e02fc4ca76f0676bdf1e9ef616469cc75905f39bd0374c5c5458e5abab2a54af8b SHA512 2442c5b42ddd82ae4f673e2468af82ae397729eb8684c5ce48b37643e86743b4d79ed61f457d9afda8e007eedceb40546bc4783eae75bfa0dc73b4ec8d9c1763
-EBUILD construct-2.10.57.ebuild 972 BLAKE2B 14fe5688c8136aa27af5780ddf171896a1f02a846934d72e373fff00ffdf2bd9ad96553f3d147eb2c475f19da243ca634646dd76385e85ee6156d1c433a2d13f SHA512 6192b931155be5711a2d838616d91e40d44d4e3c8e6203669bed06b2a95047074890b08f2e89ff15b70acc85bdb07ac94082c0cd9411cc1e2b1fb35140ec4d27
-EBUILD construct-2.10.58.ebuild 972 BLAKE2B 14fe5688c8136aa27af5780ddf171896a1f02a846934d72e373fff00ffdf2bd9ad96553f3d147eb2c475f19da243ca634646dd76385e85ee6156d1c433a2d13f SHA512 6192b931155be5711a2d838616d91e40d44d4e3c8e6203669bed06b2a95047074890b08f2e89ff15b70acc85bdb07ac94082c0cd9411cc1e2b1fb35140ec4d27
+DIST construct-2.10.61.tar.gz 1185872 BLAKE2B 03eb83b707f607f65f13f6430815af3f91f728e133cc1a889f4ff37e34b249cff8f8b13ffb764fbffbba2bec699ce94173e3b80498c42f8fc7628a125b659188 SHA512 dd25f9646d55c4914fbb506b795dced01a5a2d58a9d8378ceaa4d5ba666c9547e96f7a658e8d521ef9a3f53065e89b90e0c8560bc2eb4095b9ff8077b840eec4
+EBUILD construct-2.10.58.ebuild 970 BLAKE2B 2b58bb1c15f9c7d09c1dfecb2acf5d8caa92d3fb3e784c2c6541f8a5c90bf74103cf6847cb69af0c960cbf6793cb4871891d096cc2a0a700240e2086da589124 SHA512 277dba7e98ad829646f21de7ce2254a474bd17bfe89de4d419a6bdbbfe73aecc5a5eaf9721c1b83d8fc61c0e11b8df6119acc1bd3946c9c43492af7126990b4f
 EBUILD construct-2.10.59.ebuild 1015 BLAKE2B 8e32535cf7d7b191659d8a526ffc8d1a95d8560fe2ba5c45bf3030a03e0813ee69f450a8cd641c3cb3a208f326ec90d5c46d4c2373d6c587ef32cd1a4361c918 SHA512 cd9992730f698d77c4ae101337fe77d7845e140ac0f9d53f19db386feaef3f2cc24f1af49bc4c9bb05d013791adbb03e30efb60da76560a4d620f5ace1be7768
 EBUILD construct-2.10.60.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
-MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
+EBUILD construct-2.10.61.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
+MISC metadata.xml 515 BLAKE2B 00b3219cc089dbf190241934b982a6155be3615af84adda69d91e4b7b3bb9c695dfb72561ab192174db13864631add00baa99a514106b989c9c46f60562b09e7 SHA512 bd35a07c3196a166cd5f8839f4877dc44b98a739914b2268ba8855839ec7244ecc4ff3d2201db2e2f309dd870677ca8c55b7a4560727fe0ced815fb63f0cf5dc
diff --git a/dev-python/construct/construct-2.10.56.ebuild b/dev-python/construct/construct-2.10.56.ebuild
deleted file mode 100644
index 31d4ca74df8a..000000000000
--- a/dev-python/construct/construct-2.10.56.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_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
-BDEPEND+="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	default
-	rm tests/test_benchmarks.py || die
-}
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.58.ebuild b/dev-python/construct/construct-2.10.58.ebuild
index e67bd28cd5e1..b5c88e1c3afa 100644
--- a/dev-python/construct/construct-2.10.58.ebuild
+++ b/dev-python/construct/construct-2.10.58.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/construct/construct-2.10.57.ebuild b/dev-python/construct/construct-2.10.61.ebuild
index e67bd28cd5e1..8382a5e82e73 100644
--- a/dev-python/construct/construct-2.10.57.ebuild
+++ b/dev-python/construct/construct-2.10.61.ebuild
@@ -17,6 +17,8 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/construct/metadata.xml b/dev-python/construct/metadata.xml
index d884045ff57e..1fbbfd23ddbd 100644
--- a/dev-python/construct/metadata.xml
+++ b/dev-python/construct/metadata.xml
@@ -9,6 +9,7 @@
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">construct/construct</remote-id>
 		<remote-id type="pypi">construct</remote-id>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 53f840e109da..08ff8e69e07b 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,9 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.4.tar.gz 687727 BLAKE2B 54c9e605eaed551aff0c6764bf2747e2ce64a7c0596cb78cb4ad6998c4b7d79fe31bfe98eb240aee4c838dde6a4536f8e84d00c14846bb671b51b28168a96947 SHA512 c682806bce603fff1ff09234c72e17370093192053961656f06ef4bcc7928f052ef4a350e80687c640d7608a22f4f3434e1836d83674eebca53459745838f519
+DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
 EBUILD coverage-5.3.1.ebuild 1903 BLAKE2B 931042378ecf854a041e560c9491b6212f16b0083c4c3892c10b2a7f2fd1100e869e4954a47a45c8b51b1587d41a855ea3da4160347f4a8d38fe7d4b4a11bfe8 SHA512 137b30acca02935186ef656ae1c2be1227001e030fd838fb6f9ca56482af843af6d83a266d738a169ae51ecfcd8a32f83e2a9404ac53c74f17bcaeef41e2232b
-EBUILD coverage-5.4.ebuild 1911 BLAKE2B 88e1b0a49cadce158d040ecc89ccfb02c7f313607adc70b5b4a4b141f4eb6d778d4591d0533c33a4df1f9466642f48a7c6398bfad1c1587da38e3e58a769c1ce SHA512 fd83a887259b944f8d33fc72a1fa824898dcf75984659d94fc2aa90c8aece27cef55dfa7108a3aa1c226e8f9fe190e8f8b70bd89e1452ffb6544cfd6fb52d8c2
+EBUILD coverage-5.4.ebuild 1905 BLAKE2B d73a1f317295f0005bef5aaa2588d1b0b51c188e1c97287af835ee1466cc7175f26455f86229a00a9c40ea857adbf4be7d40364090487d33e0ebb403089afed6 SHA512 039ca94fc403a4600de41fc9d2363969f85682dfe7f6c2123f079acc2a16bc6c97635cc69985c2c7af32e37689e4006dc648e54231175704f2fa082c662a8762
+EBUILD coverage-5.5.ebuild 1667 BLAKE2B fdcce3b28ba2dc6ad3ad47ad15d69ca7681bcbb150fdc9b17f9625534a76584e3270612e6a9d863267a65a378235ee1e07294afa7f4800307cc92d75b0547dfa SHA512 395c1d8d9b0fb041e7477c3f30200b2ba3b11083acdaf31c19d42e17e609865d89ed92bdd68314cc56844686801d05849ba21c9e7292b3c0184d1c2b4f84993c
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.4.ebuild b/dev-python/coverage/coverage-5.4.ebuild
index 4617e1122f80..f0583abf1026 100644
--- a/dev-python/coverage/coverage-5.4.ebuild
+++ b/dev-python/coverage/coverage-5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 #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.5.ebuild b/dev-python/coverage/coverage-5.5.ebuild
new file mode 100644
index 000000000000..6a99cbf4e39c
--- /dev/null
+++ b/dev-python/coverage/coverage-5.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#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_test() {
+	distutils_install_for_testing
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${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
+		"${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/crashtest/Manifest b/dev-python/crashtest/Manifest
index 9cc8369eb4ca..0e7322c26f4b 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
 DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
-EBUILD crashtest-0.3.1.ebuild 497 BLAKE2B 4ac873a35540852c527dd7b22a75f11f901ca7d0495a480168cbe936e337aae23c76677c3cfadc1cc9cfaa9a62629abf5226c734c207243854871eea8e3be124 SHA512 175687f7039e446ed8a100749dc165c7b2d7c46319c72426688cbaebc86815dec15a03f0aeedef7c5b6c78e93c4d791c16851a610fe796063405b02d88b9c7f4
-MISC metadata.xml 517 BLAKE2B 0975f95441e6bcf402d1214b987e8bab096300387c758dadab39b4d047f43bb1c112190cf6f0d068eacfc39895355edfa3249430a10d4400921c8c6b4ba48d35 SHA512 0bb7b4234db5f0a7bf4faaa048d47a8543fa981a266beae9518eb8f3a14fff421acd3682457095c8d375f5c95ccaa73c0741bb2d247d84b62dda099ffe21a2bf
+EBUILD crashtest-0.3.1.ebuild 496 BLAKE2B 58083b37da7cd656c70b63becbfafebbd4fb4d905d8ef59c46a860257ff3a72e3c6d2e1fb30c67557c735b87817a86ddf4c15d93452af4da0d0b230720695ff7 SHA512 e183b4b3af17d910565883079f1ad1b811500d4d3ac8b2503767abe85413d10ad1813b5b0b220c399b10d4963624c2a4be58c65077c012e5e4e45210b7ea241d
+MISC metadata.xml 542 BLAKE2B e2c84e93c6fc4c14c59968e0579e5c85ee62de87bfbe904ef1f8dfed6ca8e138bdd529ac7372b461f98e74066d6e0d044cafd9f4028f957ab5a935e023c35003 SHA512 e510ae258f7df4c8cf54c755af29f36283bf0e60dd0c9eacf566d8cc0c8be56db46e1bafddf68cc2e9ba02531d3c5df86f4c7df423ff18b944d000cdf5a148b4
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
index bbe908e96438..a87ed8e8bbcd 100644
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index 6af88537ea4d..b3c1cecc09e6 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/crashtest</remote-id>
     <remote-id type="pypi">crashtest</remote-id>
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index b96497dad2c6..7f95c6851086 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,3 +1,3 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r4.ebuild 508 BLAKE2B b9c955e4fe9f3c6055cb49ed563b33466e4eff7bc526d735394d79efce5ad1bb946c8b4f2ac8214c1ee2ef25b9b4c7674a465cdf9252d82d026c576c6eb81ebc SHA512 25f755c1c0012c54377c7112df2a2ef14d2649c5610eb1c583f35552546bb3c476a2a779653d6472df19e62842e4573d3903f96a7f1ef09cb114eccf03e3ff04
+EBUILD crcmod-1.7-r4.ebuild 509 BLAKE2B 799dbb559225259cafadfaae860f15f02e671658485856bfc847ea8dfc0abbb533295d6fae610440c07b590d488e994ab7e18bcdc3432c86a4e9194828db5e9b SHA512 310774f95e9ecf91368814c83bed202edba8571017706e6a5aa5e8f1af8979560a997af84fe844dfc8d5693c224686e66e49cd0eb63d0a6eaf075bf2b520c80a
 MISC metadata.xml 636 BLAKE2B 069e35c666b73c29f748950d85e104a0df9106b579ff56a03fcd83113309781d822504dae0199d132cef3c7310ad4c4ffad5c225143c576232bdd3b7a4909865 SHA512 0791b8f3367307f2a8548557601a990a740cc13da7c3ecc65d7a50a521f264bf18dbfe03746190909e691fe6f800628409751cfa34449732d0396c2d3f7d15a6
diff --git a/dev-python/crcmod/crcmod-1.7-r4.ebuild b/dev-python/crcmod/crcmod-1.7-r4.ebuild
index 3f6a181951e7..cadce1f2c999 100644
--- a/dev-python/crcmod/crcmod-1.7-r4.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index c8e8e7251e92..47d808c69f60 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,13 +1,7 @@
-DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
-DIST croniter-0.3.37.tar.gz 29607 BLAKE2B dfa466f8557e47c282cf7a7399b1364dd272a313d40b4c9a57e60de9e4bd174312cec24126679994ddce3c320b24d89db4b4395736e344e2a3df5fd13188f7b2 SHA512 733412d6263d5261e05139861465602016925716abe04b82218b370e82ca7cdf7418113d911fe693fc7242fdb686580970b60609de28b3b7f4330a91c721a551
-DIST croniter-1.0.1.tar.gz 29720 BLAKE2B 74583e170bc2bcd504ea323a50f0421157dd2e064a8ffa6a3dd0098084f3d4fe86427373cfc851d8d859a08473e9ff1ae4b3c38a46fad5886534a9638cf1a2bb SHA512 2ea3e4f13c8b95c15249ae95c3295e80983cd1713a4d89b931da7f6f712809e4625916c231418d30f419b69caf9f0465cf3f0b5acc3d5468e8a43e1029cdf6cb
 DIST croniter-1.0.2.tar.gz 29809 BLAKE2B d7e5b668f97f98efdf992de4dd92bbddd8197275557364516af5d74b8376260967b249723dfda1d835c60dd185612a45f6ed6447609c593ad108ae1b738cefc7 SHA512 6e4b593dbbb5e3e1ce9a25ad709a1970f22feb1d0a2bf7fa97b8cc3eb43fbe896a842f74b3fc3cd08e3d414767cc661bf5c5307a206c42e1f0de5776b2b24310
-DIST croniter-1.0.5.tar.gz 30254 BLAKE2B cfab37af5c3d750e1f2f902d68324af9276916ddd754d9952ac4af7e8f3388d642f0c878a390ea3916c63c3deb097275eb254e70c1f3d517ca97a64bc410ce87 SHA512 540e9b84df589c84775fb7129c297ac46a8187b51c4b53f22319a8a80fac888645533d27da2755c99651adb1899325f687833dcc0739b506b2e03a8ffa8226ed
 DIST croniter-1.0.6.tar.gz 30489 BLAKE2B a3caf1d0606dbec7a978e5089b08bf6edb13533524f5a3f1639483547b14a83f099276f4c63e9b84031202c088a8237326f70ecaca0bf3503f4a33173ce0d358 SHA512 1ca37c7dbd6a7365db112ccd474d76babc890aad1e2c341677be13c4f4e28a98219266efc065442e2077588a36b60c01d8e2996f0a32def690cf49e2c7c584bc
-EBUILD croniter-0.3.30.ebuild 719 BLAKE2B 87df9ed46ebd71e99a07cfbdcba71a67b99e4ff6ae19a57111bda75fe9f62f6a88fb5d15a3a0755a014ed78cbecb3ad1c0b77df6b08ebf18884e29c4482edc2a SHA512 1640e357233117cb9cb70589310653ed128eb8f71d65e242b3a867a6238014973e3dbbbcaa42371c66788f5d93a1027a8158d15b7b14dd945629e69c06086946
-EBUILD croniter-0.3.37.ebuild 676 BLAKE2B 75e9ae8497c7ebe4dccd5ea0547abf2fe352bc6e1bd98cef8e7dcf104b02a794a640e4ed813a1b14a150133bcc0115a405a458ed8eb8cb10fa567775fa79999a SHA512 000be92aadc4439225c2141412e30c97a2c4bb5b0cdda96463e54fa56c24b216d35a992cd0caca544c6d515233787fdfc80a9e91a1947df0647683be1ddc95d6
-EBUILD croniter-1.0.1.ebuild 676 BLAKE2B 7f75a3968439ba4b74ffba0d4b9740363533875bc1b8557e5114e7c2d20f6f5bd4c7cc6d4e8a0a6d212e891a5e1dfcf2a9a20a61820c8f5827c3d7d852f63b3d SHA512 63d8f0d9e2fd24a262d81f9d82c5514c78e51b83cb1aca556fdb0949cee3c51e083e4f7b234d73cf007c400f86c4965ec91d48ed797135650cd1aa0924de2b1a
-EBUILD croniter-1.0.2.ebuild 650 BLAKE2B 8cefb050b6a3cf461d37e42857df4e3e695c24042b3fbc04a99bbf4d18f903fb413fa9f4d47e9cf4acd7a527b1e027dac8b9e18646b616a3980706e0bbc79230 SHA512 967cbb03c0c53ed7974d836e9313be2e523940306c6ebcfbefe22fec347d07ac04e5e73182c1c71393e8596da27f960453228f1cee0dd4d0cf78e44d673fc65f
-EBUILD croniter-1.0.5.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
+DIST croniter-1.0.7.tar.gz 30735 BLAKE2B 0cd033fd669e8b5ce58136898f8409bc1d3253d7e6b7d8b6d09792fad715656fa51655930aa4fd7b7f771fd8684048dd3d5bcc28510882b7c726ccc5636c87b2 SHA512 db31271889b95333c2bfdb371804bc9ca5197c96b20ad5bd4bf2d81f86b58d43266be8a76c481d28ef4e8f7ae9e4f21947754d6a721ed71ccd0ff0143c80b918
+EBUILD croniter-1.0.2.ebuild 648 BLAKE2B e5fc9aaa8db66bbf820be39afaabe1fd3bfa7423fd8819ab6d40e1831ea1ef1f6ba9d1efe50c2923d7c33a5c339cfae18590ab1b956e8fe76e666dd364dd8223 SHA512 db093df41123a01dbf9d66ac462b05fc633897eb8859c1f0d0a2e8cd255c7582498b9dd14c571dc111c94d218d15dd183317c7ee967243a117b5052ab091f98d
 EBUILD croniter-1.0.6.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
+EBUILD croniter-1.0.7.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
deleted file mode 100644
index 3e938cde0b99..000000000000
--- a/dev-python/croniter/croniter-0.3.30.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-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 )"
-
-BDEPEND="
-	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.37.ebuild b/dev-python/croniter/croniter-0.3.37.ebuild
deleted file mode 100644
index b8a5a340989e..000000000000
--- a/dev-python/croniter/croniter-0.3.37.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-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 ~x86"
-
-RDEPEND="
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.1.ebuild b/dev-python/croniter/croniter-1.0.1.ebuild
deleted file mode 100644
index 938d4005ac69..000000000000
--- a/dev-python/croniter/croniter-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-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 ~x86"
-
-RDEPEND="
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.2.ebuild b/dev-python/croniter/croniter-1.0.2.ebuild
index 705594075b4d..38a4aedab7c5 100644
--- a/dev-python/croniter/croniter-1.0.2.ebuild
+++ b/dev-python/croniter/croniter-1.0.2.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"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/croniter-1.0.5.ebuild b/dev-python/croniter/croniter-1.0.7.ebuild
index 872a3960c97a..872a3960c97a 100644
--- a/dev-python/croniter/croniter-1.0.5.ebuild
+++ b/dev-python/croniter/croniter-1.0.7.ebuild
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index dbf79b61bf8a..e0b63e846d42 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,6 +1,3 @@
-AUX curtsies-0.3.4-typing.patch 365 BLAKE2B ac2f34c7185273fedf546faebe88f3abf7d6d69482f7da875c5979141532d4c49e80c31d1aaed6e32b2e3a8a4d53f526caf0ce83335fa41d325421c04ef01295 SHA512 510474b8cc9b35cbd50e1c993cd9c919bd951b3321a6f2d62e1797968344c506159b1ea2735c21033e39414fcedfa2917f4572019b9c9b2fb263d0e1153d6c93
-DIST curtsies-0.3.4.tar.gz 52733 BLAKE2B 5345005e1a650fbc94db29464f26c9cc615509a64f6287f3d3c9ca69b063e6adaf6af95e292c1bee3a2290abd6b98cd0dcc3a01405b4ab63ee5db4f8570b6e51 SHA512 5f65af34f6dd13491acf65311516ed90e57d99f681032ab6b4753710953f5285b012a09de6c56d28ccd5bc942c9886076f04287cddf955ba424205a5c44785b2
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
-EBUILD curtsies-0.3.4.ebuild 684 BLAKE2B 89079b1e64bef9a10ad40b42c3b0c9e3a0479f7909c58488f2041442b91b1f8c87f7cffb16d4d408dc1e35804c5a584047febb3f58517bf829653e6dc5f08294 SHA512 9aa02b9beeb62ef06e0d060e0bcca5a1a06eb8c621fa30e1c82985c87a2eb35179d790c6c78ef4d142213964451c447641bb5317e6bbda3960ca452c7bef14c5
-EBUILD curtsies-0.3.5.ebuild 600 BLAKE2B e9b645c5bf5d5931a7ceeddfbb8f4887596822c7a4c1e88724a2c73a203f1838d2765bfb16de49f9d023996b3eda136bf213c37ebf42db58b891bd0bbc1fa068 SHA512 f5ad147dd3e96722eabf745ca68c2f79ac16a49df2a7914384631b82ae9bec233e1cc97ed3960914544c163a38cc157323e5f837c7636db7b3989dae6f03f7af
+EBUILD curtsies-0.3.5.ebuild 598 BLAKE2B a9f9244bdd22d5d9ab711f1f16716134072346f1ab987e0ae37e4450cf28ff747a9ac9da9e2da42d5711afca91f0f3788e2d2d67873820cbaa79c4a171795cd1 SHA512 94fc3adfc326fba335625f567181028c225c0663e49579d9cb6aaffa630ef3cf6cec9945aa34871accf0512b83011d34efdb9d1336a1f3feb14600abd6c0a013
 MISC metadata.xml 412 BLAKE2B 1e014dbbbcb73ac1fcc715a2e10b9438531645e642471ba14abefcb190f861ab224b847cf568ab014e8c39a569c67853bdf1d39cd41332902d3228b4690ece8f SHA512 96dc3f518a12d6e7f604e8f4750475831eac1f29c3431daf0983c0fe91e999136e7390c42837b2f53f33b256a4692cd064b16e84b97c942e7795282379b13240
diff --git a/dev-python/curtsies/curtsies-0.3.4.ebuild b/dev-python/curtsies/curtsies-0.3.4.ebuild
deleted file mode 100644
index 972c191f8838..000000000000
--- a/dev-python/curtsies/curtsies-0.3.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-PATCHES=( "${FILESDIR}"/${P}-typing.patch )
diff --git a/dev-python/curtsies/curtsies-0.3.5.ebuild b/dev-python/curtsies/curtsies-0.3.5.ebuild
index 234472088a99..8bdf1bfc514f 100644
--- a/dev-python/curtsies/curtsies-0.3.5.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/curtsies/files/curtsies-0.3.4-typing.patch b/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
deleted file mode 100644
index d7488a9b4b31..000000000000
--- a/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U2 curtsies-0.3.4.orig/setup.py curtsies-0.3.4/setup.py
---- curtsies-0.3.4.orig/setup.py	2020-07-16 03:17:08.000000000 +0700
-+++ curtsies-0.3.4/setup.py	2020-12-01 15:39:28.331241501 +0700
-@@ -27,5 +27,4 @@
-         "blessings>=1.5",
-         "wcwidth>=0.1.4",
--        'typing; python_version<"3.5"',
-     ],
-     tests_require=["mock", "pyte", "nose",],
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 28af265d6520..9cd64dc34da3 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,5 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
+DIST cvxopt-1.2.6.tar.gz 4114036 BLAKE2B d7516c06c00907a42bbcfa99611febd87fa8480ddb812b7abc0a3b6c5a642c87756fa36d6434b4933797a03d4d94bb2838341da6f00143b9f058710e8f625447 SHA512 7b1c092d970e726b262bb5b07d9c8ca6a7081902707a812a6b196e7cb76523bd67b346024b96087622d39d564f4f095485d4f875c88dcc8921ec2185734b0969
 EBUILD cvxopt-1.2.5-r1.ebuild 5521 BLAKE2B d6573a0b3fdbd74f5c1a8626c84cd6ea23f06c0ce06dd39fa3b0d1fbd9bd552f2d4520b492b791e988756313c42f149fe775c6fb975f8413231d11d4647375ba SHA512 1633d4064ce7d33ac2f52a89e690f9ec11376214c0e1e90bc9df22f04b046863ec1da4e4829b5e20f39e6b18432f12e946294699a54fe4a7435b04dedf572ad8
+EBUILD cvxopt-1.2.6.ebuild 5307 BLAKE2B 1cf25e4029b8dda5dc57cba8eaa4761136efb252c4867052acf4567a640e41be3b2e36d6f70f1b5759b5ecf7d6b3ff7a593fb8aa18b353dab0439ee2e6d90280 SHA512 705c4dde6aab2390827af2325fd2fb473f095ac78364954603211f0c24c9d62c281563330106e6c54b82d9ef94ec65c58ab3761dfc4f77a49b68d84fbd462e8d
 MISC metadata.xml 835 BLAKE2B caea2602d76a94cf09c152a0643684e69ba0c60e2770d80332479cbba0080be60dec71791f5473d9da2ed0e7139ccafe413c1a1bb2065fb814e4c5a15c38c082 SHA512 2fda5c0c8aaf8b4bc803375174aefb692d734d735fd883f78ac7a2e78a00f8bbc666641b17d56f7abb79d0a0a0a7643b3c67861f1015773999d5029207c83791
diff --git a/dev-python/cvxopt/cvxopt-1.2.6.ebuild b/dev-python/cvxopt/cvxopt-1.2.6.ebuild
new file mode 100644
index 000000000000..e2442f3b8c2d
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.2.6.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python package for convex optimization"
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dsdp examples fftw +glpk gsl"
+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"
+
+distutils_enable_sphinx doc/source --no-autodoc
+distutils_enable_tests pytest
+
+# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
+# setup.py are passed in as colon-delimited strings. So, for example,
+# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
+# "blas;cblas" for BLAS_LIB.
+#
+# The following function takes a flag type ("l", "L", or "I") as its
+# first argument and a list of packages as its remaining arguments. It
+# outputs a list of libraries, library paths, or include paths,
+# respectively, for the given packages, retrieved using pkg-config and
+# deduplicated, in the appropriate format.
+#
+cvxopt_output() {
+	local FLAGNAME="${1}"
+	shift
+	local PACKAGES="${@}"
+
+	local PKGCONFIG_MODE
+	case "${FLAGNAME}" in
+	l) PKGCONFIG_MODE="--libs-only-l";;
+	L) PKGCONFIG_MODE="--libs-only-L";;
+	I) PKGCONFIG_MODE="--cflags-only-I";;
+	*) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
+	esac
+
+	local CVXOPT_OUTPUT=""
+	local PKGCONFIG_ITEM
+	for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
+	do
+	# First strip off the leading "-l", "-L", or "-I", and replace
+	# it with a semicolon...
+	PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
+
+	# Now check to see if this element is already present in the
+	# list, and skip it if it is. This eliminates multiple entries
+	# from winding up in the list when multiple package arguments are
+	# passed to this function.
+	if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
+	then
+		# It was already the last entry in the list, so skip it.
+		continue
+	elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
+	then
+		# It was an earlier entry in the list. These two cases are
+		# separate to ensure that we can e.g. find ";m" at the end
+		# of the list, but that we don't find ";metis" in the process.
+		continue
+	fi
+
+	# It isn't in the list yet, so append it.
+	CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
+	done
+
+	# Strip the leading ";" from ";foo;bar" before output.
+	echo "${CVXOPT_OUTPUT#;}"
+}
+
+python_prepare_all() {
+	# Mandatory dependencies.
+	export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
+	export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
+	export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
+	export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
+
+	# Most of these CVXOPT_* variables can be blank or have "empty"
+	# entries and the resulting command-line with e.g. "-L -L/some/path"
+	# won't hurt anything. The INC_DIR variables, however, cause
+	# problems, because at least gcc doesn't like a bare "-I". We
+	# pre-populate these variable with something safe so that setup.py
+	# doesn't look in the wrong place if pkg-config doesn't return any
+	# extra -I directories. This is
+	#
+	#  https://github.com/cvxopt/cvxopt/issues/167
+	#
+	CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
+	local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
+	if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
+		CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
+	fi
+	export CVXOPT_SUITESPARSE_INC_DIR
+
+	# optional dependencies
+	if use dsdp; then
+		# no pkg-config file at the moment
+		export CVXOPT_BUILD_DSDP=1
+		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
+	fi
+
+	if use fftw; then
+		export CVXOPT_BUILD_FFTW=1
+		export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
+		CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
+		FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
+		if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
+			CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
+		fi
+		export CVXOPT_FFTW_INC_DIR
+	fi
+
+	if use glpk; then
+		# no pkg-config file at the moment
+		export CVXOPT_BUILD_GLPK=1
+		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
+	fi
+
+	if use gsl; then
+		export CVXOPT_BUILD_GSL=1
+		export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
+		CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
+		GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
+		if [[ -n "${GSL_LOCAL_INCS}" ]]; then
+			CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
+		fi
+		export CVXOPT_GSL_INC_DIR
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+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/cwcwidth/Manifest b/dev-python/cwcwidth/Manifest
index 0fb64cdfdf1e..41ae9887251b 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -3,5 +3,5 @@ DIST cwcwidth-0.1.2.gh.tar.gz 9490 BLAKE2B 3bb2e918361eef7887ec3684ad1414a0db109
 DIST cwcwidth-0.1.4.gh.tar.gz 11488 BLAKE2B 8d71a172f60e7c365917845e4e5b7e4c703868c8b318fbf07bce44e4b34f0512af84b939a91aba8db73ad362c1c514151e74c81461ea856f73f57efbf1676b75 SHA512 e9aaf003b44d30cf8fa2ae015c2b1af4552a84274416e79f1c56d075aa55fb238b8726d9a052ed8db6f3a0e265e5e170431f9815f1b1255e0a9170845f09b7f3
 EBUILD cwcwidth-0.1.1.ebuild 575 BLAKE2B 76ecb01cce5e4e615e06cd1d7f9792e5ab3798d1ef72bf18bc6670fe21be631aacb54a61cfb4c478650dcc1e54eec9b792856073a00c21a8f1147de7bb5ba99b SHA512 4575a64e49bdaa1571d607fb90cf36ae773a0db946c2465b6555ee5c77360ed446a6ee2c89525dbf1ca95cdb8088132bc16ff988afbbcdc1cd06b7304dbc7161
 EBUILD cwcwidth-0.1.2.ebuild 575 BLAKE2B 76ecb01cce5e4e615e06cd1d7f9792e5ab3798d1ef72bf18bc6670fe21be631aacb54a61cfb4c478650dcc1e54eec9b792856073a00c21a8f1147de7bb5ba99b SHA512 4575a64e49bdaa1571d607fb90cf36ae773a0db946c2465b6555ee5c77360ed446a6ee2c89525dbf1ca95cdb8088132bc16ff988afbbcdc1cd06b7304dbc7161
-EBUILD cwcwidth-0.1.4.ebuild 575 BLAKE2B 76ecb01cce5e4e615e06cd1d7f9792e5ab3798d1ef72bf18bc6670fe21be631aacb54a61cfb4c478650dcc1e54eec9b792856073a00c21a8f1147de7bb5ba99b SHA512 4575a64e49bdaa1571d607fb90cf36ae773a0db946c2465b6555ee5c77360ed446a6ee2c89525dbf1ca95cdb8088132bc16ff988afbbcdc1cd06b7304dbc7161
+EBUILD cwcwidth-0.1.4.ebuild 573 BLAKE2B 59c4c6b6a8590a3d131e8dd7fd9bd7a4318cda5bb4dfbf524e9fda9ae635dd3d42db7531a77ad1765daba8e67012195bfd4269ba289e81eb25c3a5e67586d0fd SHA512 2ffbdf245cf565492a51ae579f1be469911879eee4e94389dabe435bbea047464ec3d189489bfaa2634217305da0c86cc9b9091719d018937468516f9ec5f2d3
 MISC metadata.xml 348 BLAKE2B 391d997dbacbacd001676563eb369d85e0e95c97b6f10e00aa51ab6b3f88bf4a7c352105075ee9ca1f2a4e96a7e1831a55cccb2ca01166d6cdbbedf485db287b SHA512 912096776825111301ecfc80febe6297b9146ee57a9861c7a7ae6700aaf9eabb2b494fb3398e1fbb4ef1cae37e9fcbec97de875be1cb1cf3ebb4ecc4b59beae6
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
index fc41a3538ac6..7955abce4a25 100644
--- a/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
+++ b/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index ce400f45cd84..92001774df60 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,7 +1,4 @@
-AUX cx_Freeze-6.4.2-buildsystem.patch 509 BLAKE2B 767f17facca00f0adf50e5be9685dbcd83b689029a39811eee91e71fc06d77081e033e7d7a2f3fb0efa29ce4e0807d0e189aa420a49da769f021e5686a9310aa SHA512 295808b040cdc347eab0b7f3df0c155320953f1c09b69ebcce0ef3132a5a8b28f51149b197e07d3db07103c8ff894fa2b9a3934a7725fac669ecb24a8e4a217d
 AUX cx_Freeze-6.5.3-buildsystem.patch 430 BLAKE2B 23dee2067c28e9e5ef610b6f76e2a25709d021dd2f2bc2da830f589f06e5487b0f4c87230e6bba62441fc17b1133e352a0731934d4e524bc941de14d4acc397c SHA512 8d87172b1ef949c029d619096fd7123ebcb0ebdf14b029e783ffb0c751e068cd215d8996c628b7bc328bdbb82a129e94e3c582930d7f0da1201ac646e8287464
-DIST cx_Freeze-6.4.2.tar.gz 108571 BLAKE2B 742d2491154706f51ebb3e072428afac1ce5c647f2b8cb6325ea166bbedc1852503ad40e56a532345f1e2a045532620cdad24622e19ecb12d9577cf57abd291d SHA512 4c9a92b6f8dc458f82abb144171b18db1349e75b237f707ca37b7b68527508e8fb3adcf5d7b142922709727501fdc46f16a01619b29e98a6af1a0c09f9306b82
 DIST cx_Freeze-6.5.3.tar.gz 112334 BLAKE2B 77558e35ca13bc598a810ea70acfe59901c036daf37b2f9582c4f2761680d54d5be559e9abbf16bd995d7f4a4e7bd5d8793e0b53c24111767d54a69c633c9b46 SHA512 37ba5c920306ff62a21ab46c1b9fd6b1780864095d00223776c308fa28e60a5473c74e7da4e7478725de14b7f5628d8d8445f42c0671bc502e5e2d8ecb5ffae5
-EBUILD cx_Freeze-6.4.2.ebuild 525 BLAKE2B 74b2f074ea5efd961446f4b12be1f5fea0c8f4a87b05ff444faf44dac667964901ead6d74a0bbf67dce66e03601f9b70a2a44dc4c47ad1ec028240f8282cce34 SHA512 756949c6028ed8a7eeb52a27cf783229739b7f7c5058270ed5f414163a955c630de53d5ee62e8a5d5b6088ed85e413b8c232ab45d90048d60beeee950ea3bf47
-EBUILD cx_Freeze-6.5.3.ebuild 521 BLAKE2B 9067877dee151734db71afc3a09679eae657eb0f45dca63b14948323a6032f6965bfa13cc9a88898664d83a15a92ff3174abea832670d15b2f5475d474025716 SHA512 72ec117e3445f4f72d46c7c48032d942ea7c477c39f9f4be752492bd568e8ccf42d96cb65b02fa5b165c897c2d37e71daaf0c4c6a81f14f1b1f6d48f411c9cd8
+EBUILD cx_Freeze-6.5.3.ebuild 519 BLAKE2B 1842fbf6cda4f8105dafa6d63ab181b6b7754554c4f94567220b0b668153c7e568afa1d5213a639bc7c4b3339fc747d054a60b2288c3423bf02e3bcda4926ffe SHA512 0db8a39d2d403049ac3af39f0849c76d1978f5591279dacd32062f447e1a6aeca0f91c604870413cd8a258f093e7d6f1980fa68a77108887c470f84a9ab36cf9
 MISC metadata.xml 383 BLAKE2B 13c4a4f37be666e88f46028991368ed9433f9b8a4ca7a8effc5ce8891097de998172f2b5bb48abc8d70b83924d53ced878c26587a8be6c7e7de5b5bc56b9aa21 SHA512 bcb366bc6b6951f6c79e6fe14b1ee96bf7c803a57c81f48461eeb2779dfb12fe67127fe301c01c7eb2ceb33690f64f8e83a28a9a78168a0c2470754326301637
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
deleted file mode 100644
index 23b32205c538..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="https://cx-freeze.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.4.2-buildsystem.patch"
-)
-
-# Test folder is missing needed content
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild
index 9599093bee6c..69c9cd66a0dd 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=(
 	# bug #491602
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
deleted file mode 100644
index 5d23a8ded944..000000000000
--- a/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index fd24ec9..068119f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -68,8 +68,6 @@ class build_ext(distutils.command.build_ext.build_ext):
-             # PY_LDFLAGS_NODIST = "-flto -Wl,-export_dynamic -g"
-             if get_config_var("PY_LDFLAGS_NODIST"):
-                 extraArgs.extend(get_config_var("PY_LDFLAGS_NODIST").split())
--            else:
--                extraArgs.append("-s")
-         self.compiler.link_executable(
-             objects,
-             fullName,
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
new file mode 100644
index 000000000000..b949d763f04f
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -0,0 +1,3 @@
+DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 571 BLAKE2B 430dc1a722b0b5a498f6029da79f861fe425cdf6ae70f69e3789554d030c966cda92594e9f3e7e6e449198d6797be1a30cb54d9d4cd20bba65a51a306f22614f SHA512 6fc6f714dcbbaccba606c4f0df7774497d5abfda102a5236a6d4f8d13d3506bd63b34798c5964f7fd92ad17ac8ecabc14fb3b9f679ce2ef72a16193d1581fdd8
+MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
new file mode 100644
index 000000000000..f76e3e4f96bb
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A trivial extension that just raises an exception (for testing)"
+HOMEPAGE="
+	https://pypi.org/project/cython-test-exception-raiser/
+	https://github.com/twisted/cython-test-exception-raiser/"
+SRC_URI="
+	https://github.com/twisted/cython-test-exception-raiser/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython-test-exception-raiser/metadata.xml b/dev-python/cython-test-exception-raiser/metadata.xml
new file mode 100644
index 000000000000..ed7d8cab6776
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cython-test-exception-raiser</remote-id>
+		<remote-id type="github">twisted/cython-test-exception-raiser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index dfed1632b5d9..9cc34908b759 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,6 +2,8 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
 AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
+DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
 EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
+EBUILD cython-0.29.22.ebuild 1796 BLAKE2B eb33c0156b5e9a19faab496091632de2e6ffecbfec83e756b493b302b2e850d28aed7bcea7190d69bbaa2d2fc09c61d1b2c0e13d5d6062f3e16fe0299067fdd1 SHA512 b7fad08575a5c2e966416019174fb412355c7bc178433c42bc60a115528004d8e901d2878a2bc494e5d55a6717c161f434081cfe8f294f1a55ffe039bdf5ca84
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.22.ebuild b/dev-python/cython/cython-0.29.22.ebuild
new file mode 100644
index 000000000000..137bf8549e56
--- /dev/null
+++ b/dev-python/cython/cython-0.29.22.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..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 ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	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() {
+	# 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/dask/Manifest b/dev-python/dask/Manifest
index a2678db65693..1917b20dc0bc 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,5 @@
-DIST dask-2.30.0.tar.gz 2858866 BLAKE2B ea5e1e50f9bef2ca81765ee1228ea661ea01355f4c2a495e916388cb757dc089c519eb83372abc2ece16c8ec27e3b7f7fe56a302eddfdc6c0e79247db9c1b65e SHA512 d410fcfc7e30f510bc42e9547bac912609420919489e161408d436fb26c3998eba6bfc9e4845d90b3e8589ecc317ee4bf141e2740108840f2e5a420eb20655ef
-DIST dask-2021.1.0.tar.gz 3634608 BLAKE2B 1fb74ade53ad919496c3a33452eab70492704e73c9a172d5e1451217d5a3931acad3dc48587945807bbf5096bf6674e54d3bb7d1aa3d903ee47c1c203595fa1d SHA512 a65423fa401859bb7ecd569a6a593d2fa7a7be33b4804a95b8c57e90e1be9bf2f7610a3b1b55bf760e0f618c30193cdd5a28aea3710fb69c0947b7f3793051aa
 DIST dask-2021.1.1.tar.gz 3637063 BLAKE2B 6b2ec67f5551c4bba0fde8cecf02de6f24bbcd126a22c56c75e41a645a31f0fd7ba81aa8e5167f495122ca96e2113fa4893851eac382df1ccfaa8bf1be576ed3 SHA512 d1d093af6389b9e02e6040ef66159a4696c2dd91e12190cf9efc25ad5a0f790e3da9ada64a8a5e1cfceab7452957a503c6c303d3e2248e05ebac168a0f7c52f1
 DIST dask-2021.2.0.tar.gz 3643277 BLAKE2B d34f706cefd068e42b32c84b05a46c24c98ba8391358140e2a7d2325d3a18cd855fbe9174ac8b8541e8274b83621fcb5c299d70fa5e2bcfe11214a2a32a82ce5 SHA512 da8baaa7cd211eb3ff123127aa9f599337c3af52f06e9a35331397ab580500dda7135addbfe27815a2b14957f7852d9c22a21b1d220af28c8561edaaabdf2e34
-EBUILD dask-2.30.0.ebuild 1060 BLAKE2B 5bc1492666b6957cb3673c7e151cbd357ae702d77fff2976938a8d62a03b51cde613af4c86bd056988a133c6192b10d472232c38644abf743c4f523f1202518a SHA512 b65d2e051ed1d8748f9bfdd68ede7b8e1da10bd7926781726392fc1fafcd61a46df674c60fec026cf90a4253f1cbdc66139ed72f0b3e45b81c55eceb929f20a8
-EBUILD dask-2021.1.0.ebuild 1062 BLAKE2B aba8e6ce442988efff5665fd11ee384543bf4c8f01d63d45ca0df6b4f49bf40266aa3cffade0c99bfa872a2a8854c03f9d5e685faa49b89f52ab416355e49cef SHA512 81c3edcda8af9979ebc381f1941fef031ce319884787fd52df739e08e80d048c498f887e1c46561c5c57e12c7f830a55e2fcdc2761505076485362d493625b60
-EBUILD dask-2021.1.1.ebuild 1062 BLAKE2B aba8e6ce442988efff5665fd11ee384543bf4c8f01d63d45ca0df6b4f49bf40266aa3cffade0c99bfa872a2a8854c03f9d5e685faa49b89f52ab416355e49cef SHA512 81c3edcda8af9979ebc381f1941fef031ce319884787fd52df739e08e80d048c498f887e1c46561c5c57e12c7f830a55e2fcdc2761505076485362d493625b60
+EBUILD dask-2021.1.1.ebuild 1060 BLAKE2B 03702330a6a43b38330f63b17aac6f994c95754edca3370dcad8362610ffdb5c578003ea1aa375e719c4cf5f1a4123bc97849b31009b54a6761d225894be0be5 SHA512 9664356c87af65db6e5a9b772057466c1ee838ea0712939076eab6af0e5f3b86c9ec9c322e29c88f9b4de9af0a8a53837602b44e5ce3710e1f50e560de045111
 EBUILD dask-2021.2.0.ebuild 1062 BLAKE2B aba8e6ce442988efff5665fd11ee384543bf4c8f01d63d45ca0df6b4f49bf40266aa3cffade0c99bfa872a2a8854c03f9d5e685faa49b89f52ab416355e49cef SHA512 81c3edcda8af9979ebc381f1941fef031ce319884787fd52df739e08e80d048c498f887e1c46561c5c57e12c7f830a55e2fcdc2761505076485362d493625b60
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2.30.0.ebuild b/dev-python/dask/dask-2.30.0.ebuild
deleted file mode 100644
index f3eeffa35b61..000000000000
--- a/dev-python/dask/dask-2.30.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-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}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -m "not network" ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dask/dask-2021.1.0.ebuild b/dev-python/dask/dask-2021.1.0.ebuild
deleted file mode 100644
index 7028d637c3bb..000000000000
--- a/dev-python/dask/dask-2021.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${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}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -m "not network" ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dask/dask-2021.1.1.ebuild b/dev-python/dask/dask-2021.1.1.ebuild
index 7028d637c3bb..bf04a92fdf3f 100644
--- a/dev-python/dask/dask-2021.1.1.ebuild
+++ b/dev-python/dask/dask-2021.1.1.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"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 2b27ab05f004..e847e8af88ee 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,5 +1,3 @@
-DIST dbusmock-0.20.0.tar.gz 72228 BLAKE2B 704287414bf562bcda9c25c6febd6c4a7b0123c1c38dcbe00f5448dc94784eb6002825975f03b8633e253dd63b18126026c9630aa98fcd891d7e40eba207f123 SHA512 26660439801dbd4c2cdc146d67fa465ecfdfbe4dba4fbd163e0f00af415247d0ff502122d0a850b5bd6dde9f296dea601dcb180ba4bdd5d58966ee4ccdef8999
 DIST python-dbusmock-0.22.0.tar.gz 68626 BLAKE2B 51b897ad95bc547afe6cd59abed243dcaecd3c6ce8c47825f3a2eeaf7364c5aba04d23247c876f748b071f30753a86da954493bc63f0ae503085974e7e769658 SHA512 2c3430f4178a16acc376ce582f4a1a9bbe8b917efcd7eee58dab85ee3addf60ba355ae9e7b318ec2cdf7ca771183c37d16520a1e5bcab8414c66e2d2a36d26fe
-EBUILD dbusmock-0.20.0.ebuild 876 BLAKE2B de2002c54993217d4523700c5407d9b2cd6e20cec643ef2df261461f0ac2502aee12a50e087935519ec2f419a084e5d343edcd0f30c5b72095bb08e787817ab5 SHA512 a8b0886565047509df0debfc5372a9a2ffbdb0a26cabc19c815e444a137e808d974b43850926a2d0e23a43ca1603567253dedf52a7f2d611683a71ae28a8a177
-EBUILD dbusmock-0.22.0.ebuild 811 BLAKE2B 8904a8f8f4bfb7e087658409e6e689b0c160ff3bae3302d3a903c286e0d4827c8c9878657ae177a56d728f6bc982059a4e9bfadd7dfa0e94a1a2b42c5724ed15 SHA512 2fa59494782f89d6996d337d93a6f87a272b50f80ce501064ec5fe9114fe77a3f1768e8898054b945f293b457a93095ad13c5fbb4e4ea4be010eea61ee956d3e
+EBUILD dbusmock-0.22.0.ebuild 804 BLAKE2B 2db9472ddf0b454ba63b8048982f021d4ca089420e054fe0c459a4e0c88a22b55c29217950b24c16aeaf445c2f62dd04af72b89601af1ad4994f2d9567af4163 SHA512 c27e8c362edbd8d9375c89dd3c3caca559c750d379a84550a33b5adaf959676f9ba3915ab28980009333afa319198808a5d7ce0cac6d16be05752cacd6c6299b
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.20.0.ebuild b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
deleted file mode 100644
index ed14445b1c87..000000000000
--- a/dev-python/dbusmock/dbusmock-0.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by bluez5?
-	rm tests/test_bluez4.py || die
-	# needed for unittest discovery
-	> tests/__init__.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/dbusmock/dbusmock-0.22.0.ebuild b/dev-python/dbusmock/dbusmock-0.22.0.ebuild
index 8ba3f1810b52..a690869f4e03 100644
--- a/dev-python/dbusmock/dbusmock-0.22.0.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.22.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 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/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 853359dc9b85..3fc5e44a7e92 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
-EBUILD debtcollector-2.2.0.ebuild 664 BLAKE2B 8ddbdbca27b3f7bb58c0a486b35177d569b9c275a56fffcca7e9a957c89a8277d163d2deeb13e7ab8c2053a18ce5f9a6dab31b18cde2621ac62527b3b5c478e0 SHA512 dd5f765f076b01f1753ef0c8abcb688dfc96c4dcea97465f9ffd6c9836758eaa450e573bbe5a53ff7796ee68a8737ee6497ed0eaa2c689ebeeaa57f1f9fa185c
+EBUILD debtcollector-2.2.0.ebuild 607 BLAKE2B d6b7b3887670837660c448bdd903f0161a0a195293867bec7aac403e8b6cf3de6151f7206db08c401d459de792a69030f3a29efb13a1c385e99bbe585049ce25 SHA512 67180d41f3804c85bf342c6632ddbe0fdceee2ae363da8091a59acf82f95a4dc2d920a5246201b64d7aed690e1799bce45d0f4f11e3958699e23f92ba1bf77a8
 MISC metadata.xml 354 BLAKE2B c2e198a4a48d28c75193c8e6eb766b198823632b51a52a15e3a996c75a6aab8f92a68dd4283354fb487cd9b17ec29f6e089df04889e2add49157c69c18156b52 SHA512 8978fb3df25c4060dfe995f7d298fd5b5b79eb513b2ae8d10954264ea6ae5adc2c8a023073337e0f2bfa2ea28e6b45be9b6388d05cde7af19dc4209acf2ce84e
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
index 76b68956472d..f2d8758c6da0 100644
--- a/dev-python/debtcollector/debtcollector-2.2.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
@@ -15,11 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
new file mode 100644
index 000000000000..0f4aaf3ed9a4
--- /dev/null
+++ b/dev-python/deepmerge/Manifest
@@ -0,0 +1,3 @@
+DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18 SHA512 209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0
+EBUILD deepmerge-0.1.1.ebuild 564 BLAKE2B 40ea001d2f6d4e207b3b9c320f90c70b1833a6e43adc392f5358f25a18ebcfbe5ff68c0db81d696a2913899a5e5b3e5bdc090036d903196c8cb558a007e14947 SHA512 4e56bf0942a784e0fff00bea3e05a6d4af1033bbe504a63588450fc36263c5eec4b496ab29658fa3ff1ed32d8f8e854226c08b274302f6d76fdffa16b18b1af0
+MISC metadata.xml 263 BLAKE2B 4e090c272c8539944f061cbfe1b05e3b933029de278ac9d555167db0ba98d05f67b430f48dc740d83a3778d32d5d1f5380856736965e9ee602707f60acdc5dc1 SHA512 d820cb3ccd236931ac0f862314a471ba93e5f3e0cfef0f04e73d0229aaaf164b10513980dc760fce7ee333acf6bf6d15d947bf138bf5e279f38ab9ae225ec3c6
diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1.ebuild
new file mode 100644
index 000000000000..721eb6b566e2
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# pypi doesn't ship tests, and last github release is 0.0.5
+RESTRICT="test"
+
+python_prepare_all() {
+	sed -i -e '/vcver/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/deepmerge/metadata.xml b/dev-python/deepmerge/metadata.xml
new file mode 100644
index 000000000000..4c200a4ba240
--- /dev/null
+++ b/dev-python/deepmerge/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">deepmerge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 37a447a4db04..76e4f9a5bc28 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,5 +1,5 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
 DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
 EBUILD defcon-0.6.0-r1.ebuild 593 BLAKE2B acc65aafbb0131f2f39150d7f37ef57e155b67b3497a5ba0e34a1461fffc4d25fe943fe19a2710899c4bd8a4eeb3251673b61838db1a9207616b2d3cda28e392 SHA512 b8ec2d630d5eac98a90b6c860c1d08e05a0748d69a2eac930c562e5427d6f50df5d1811c135d29d82b95938ee1ab55de2a18ae04c937dbdaa5585c036b2d3311
-EBUILD defcon-0.7.2.ebuild 597 BLAKE2B 8b4475b2e1b2726856ab694f3f4ddc051aa6b94d76956afda2e7ece4a39d25a93bef0023e6ed5bbd2f8fceca4f2b22515a87dc2aedcaf65910a4fe114aa97c40 SHA512 4c444a8c46f56358d8e3a7ac10a786ca97c3e1cda14bd3538df20760ed4367e7f5834487f63b2cd63bd131dd2069edfc752ca6aea992180a98e691cff42a8f72
+EBUILD defcon-0.7.2.ebuild 594 BLAKE2B 765b1df4c1f71a1a76d919a80e3e21abc70566b702a6f1a7c0a0ade312969cdea1c402429611bab53c5c9bd9d107d0d2e50f0b72a28f2cfc3802b787df097f85 SHA512 4816d505d85c62af4eb7a879606bb1fe5f68731ee90be8ce6ced5cc1f7428b562a3e0bc4a4650f2ae0494d8ea232dd5f177850d86fdf3869aa2d510f5212d127
 MISC metadata.xml 392 BLAKE2B a4d2092bcba7205623f44d3f461f3c9f869c9a9e7521b491232f9ade8c3f457c0e60c435b7f0751721279441e493ab0ece6b6da0f6d89a594fc34a18c4d37088 SHA512 70bb099659e2c90b33ecb2ecb2bc3b54bfb0bc148ef872a564df8470ece1ba0b7bf07340a5c6ccfa4f0a9ca574dfb652117dcc88df33ac2bf11a5652c66e0aa6
diff --git a/dev-python/defcon/defcon-0.7.2.ebuild b/dev-python/defcon/defcon-0.7.2.ebuild
index 20c1c070ba6e..4bf2077d2b20 100644
--- a/dev-python/defcon/defcon-0.7.2.ebuild
+++ b/dev-python/defcon/defcon-0.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="A set of UFO based objects for use in font editing applications"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 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/denonavr/Manifest b/dev-python/denonavr/Manifest
index 4d4fc6e2b698..885484fa1180 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,9 +1,7 @@
+DIST denonavr-0.10.1.tar.gz 111775 BLAKE2B c96cd3f4597766fdd1d4d5182ad5eadcc3808f6aa7cd1f4029d29bfe204df561283ebb7cc7ecac836bb1d6614c43d8d56f12bd2b0a7dceb2d0c6fd92e8321d22 SHA512 a13d357f88b10fe9d75f81e3baf26232fe557c4c06d0205a12f40b858dd41a159d9a2b88ccd8b0138414f53195036ef4bb49aea2d9bcddfc03079faecea84fc4
 DIST denonavr-0.9.10.tar.gz 102045 BLAKE2B 2b0cde47d5ea50b218b04b696756d003494ff92f99ba88509312e1a2a8ce19f0bdc0c51671a7097fa1e7d7f63194d6435ddcfb31d902bf855368d69643c4c64a SHA512 8e0bb6a25eb38e798759dbee301371691c1b34e934054897d65d8829b7f7593044522fe4667c005abcf428ed1234016fb8bbf083e05c51502f722e4d8df3b155
-DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
-DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
 DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
+EBUILD denonavr-0.10.1.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
 EBUILD denonavr-0.9.10.ebuild 641 BLAKE2B 97d82fad59ce2c8475d4a846714b5d7232136f6b518909acc2404548d94522bec1df9114b2c24d2f56a722130cf5c3d28eb5f3f036b6e787385932897ef383d0 SHA512 bc09e7386064ca14d35f12a5c0639f7ac727ee29d522243d5f1c520ad8709288d5f382b02fed049a5bf13bfb72c47dacd4437923a74b36a0e2dc23323b67228f
-EBUILD denonavr-0.9.7.ebuild 641 BLAKE2B 5d2b116310078139d8717fabe9e9ef3b11001f9e65ac905ad98dbfc033ecceaf8c839f4a83a413540e289015b68a324f31406d7fbb8a628c07f9a92560730fc4 SHA512 a63d635168f4599f3b01bb920493b27ec6a32f461d6c5ac7f8d9149d19884923ac0d3d2777354412c80a08f2546e53f47517c7cd0dbb426901006f195977f612
-EBUILD denonavr-0.9.8.ebuild 641 BLAKE2B 5d2b116310078139d8717fabe9e9ef3b11001f9e65ac905ad98dbfc033ecceaf8c839f4a83a413540e289015b68a324f31406d7fbb8a628c07f9a92560730fc4 SHA512 a63d635168f4599f3b01bb920493b27ec6a32f461d6c5ac7f8d9149d19884923ac0d3d2777354412c80a08f2546e53f47517c7cd0dbb426901006f195977f612
 EBUILD denonavr-0.9.9.ebuild 641 BLAKE2B 5d2b116310078139d8717fabe9e9ef3b11001f9e65ac905ad98dbfc033ecceaf8c839f4a83a413540e289015b68a324f31406d7fbb8a628c07f9a92560730fc4 SHA512 a63d635168f4599f3b01bb920493b27ec6a32f461d6c5ac7f8d9149d19884923ac0d3d2777354412c80a08f2546e53f47517c7cd0dbb426901006f195977f612
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.9.7.ebuild b/dev-python/denonavr/denonavr-0.10.1.ebuild
index bae988e8003e..31c4eb7e4c8f 100644
--- a/dev-python/denonavr/denonavr-0.9.7.ebuild
+++ b/dev-python/denonavr/denonavr-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -17,13 +17,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
 	dev-python/netifaces[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/denonavr/denonavr-0.9.8.ebuild b/dev-python/denonavr/denonavr-0.9.8.ebuild
deleted file mode 100644
index bae988e8003e..000000000000
--- a/dev-python/denonavr/denonavr-0.9.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-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/deprecated/Manifest b/dev-python/deprecated/Manifest
index e9f617d40a66..8e24095138c7 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,6 +1,3 @@
-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.11.gh.tar.gz 2968469 BLAKE2B 5b1b8872e8786897a51ff96a659ceef0deed81b3cf02edc1f69b6ee504a3c4510621b56678dd28fa795231dfe8481daf3a77bb151ee117fe0541af1983412548 SHA512 343f62a7a658569de885ac923a1de7f7b4cc5bf63d27d1b13474795ca38cc52932e35133b45d05c1b42d498af56f5945fad5c49b3cbdebda70337294da5d84c4
-EBUILD deprecated-1.2.10.ebuild 541 BLAKE2B e6fc86387d3865b69ff2ed9b7d49f1482e9e265367dbdc3a69624e232955a007f451350855e6c8b8dc0d64f56175be3f3f9ba69061a72f53831738c8ea26cc3d SHA512 0dd368dd5b324b464955fc81c1ee56fd36d034b90cf8bcb81d947d00f0b20962c6e8c87deb1eeb34127470949e15a783d77fb69f042d7bbe4dbf2c5db08dad29
-EBUILD deprecated-1.2.11.ebuild 789 BLAKE2B 19a6074b6cdaf5024001e5887aac551d1b5f3e752a9c85f3b8116a13c20dd33fbd77e6cb776aef6b15571dd614d053271af4fae0d72abddbeae2c6d368dd638a SHA512 cd746e095ae9947ecc01e74b7c1132a179a00d37b7665d821723ddeafc27cf7ed413cf87f3623b74027378ed466cadc9d5e298e68173d35ee6fa5384ffe327e9
+EBUILD deprecated-1.2.11.ebuild 787 BLAKE2B 81700df1ca147cd751039da2d5c085a2b77e1bcc359eaa3baec42f562658bcb11eb7e2bcf68e0c687180a5b4015ab313fdc5725ed21b925e6660bb9f811591d0 SHA512 793efa65a94b4d8f9d9216f5374ca35fc0ef8eeef68a5ecf0af3b70e0be08b6779cc45a8c8380b189512ef0991ccb4ba9665fc9ab1921d9c2265cb0c2ade31e6
 MISC metadata.xml 315 BLAKE2B 8016c6be7019b2ef9b31533e8a75480e8f57eb09f0d9f5de5ba53093fbd1e04fc4299f0b18ec4c56b89c2ee06718d3bab8442a28cf457a7fc87c99469738ca05 SHA512 c5c38075210982e49af49da7e3094c4aea053e3cbfce85fa7e8549d842cfefdf3f9d537b85380370093d3e9bc3d108822b1c620eadf369267cbec865c4d5d15e
diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
deleted file mode 100644
index d9befb9fe1a2..000000000000
--- a/dev-python/deprecated/deprecated-1.2.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} 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
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
diff --git a/dev-python/deprecated/deprecated-1.2.11.ebuild b/dev-python/deprecated/deprecated-1.2.11.ebuild
index 1b72f93f7450..aa8bf30defed 100644
--- a/dev-python/deprecated/deprecated-1.2.11.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
deleted file mode 100644
index 42ab81445b7a..000000000000
--- a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 629e7b702ede03262afeb86cd7a6d42d739504d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 30 May 2020 09:30:58 +0200
-Subject: [PATCH] Update expected class method deprecation msgs in tests for
- py3.9
-
-Python 3.9 has fixed @classmethod combining with other decorators,
-making deprecated correctly report 'class method' (instead of function
-or static method).  Update the tests to account for that.
-
-Fixes #29
----
- tests/test_deprecated.py | 6 +++++-
- tests/test_sphinx.py     | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_deprecated.py b/tests/test_deprecated.py
-index 3796640..e4c00ef 100644
---- a/tests/test_deprecated.py
-+++ b/tests/test_deprecated.py
-@@ -1,4 +1,5 @@
- # -*- coding: utf-8 -*-
-+import sys
- import warnings
- 
- import pytest
-@@ -184,7 +185,10 @@ def test_classic_deprecated_class_method__warns(classic_deprecated_class_method)
-     assert len(warns) == 1
-     warn = warns[0]
-     assert issubclass(warn.category, DeprecationWarning)
--    assert "deprecated function (or staticmethod)" in str(warn.message)
-+    if sys.version_info >= (3, 9):
-+        assert "deprecated class method" in str(warn.message)
-+    else:
-+        assert "deprecated function (or staticmethod)" in str(warn.message)
-     assert warn.filename == __file__, 'Incorrect warning stackLevel'
- 
- 
-diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py
-index 42f2460..efc8628 100644
---- a/tests/test_sphinx.py
-+++ b/tests/test_sphinx.py
-@@ -334,7 +334,10 @@ def test_sphinx_deprecated_class_method__warns(sphinx_deprecated_class_method):
-     assert len(warns) == 1
-     warn = warns[0]
-     assert issubclass(warn.category, DeprecationWarning)
--    assert "deprecated function (or staticmethod)" in str(warn.message)
-+    if sys.version_info >= (3, 9):
-+        assert "deprecated class method" in str(warn.message)
-+    else:
-+        assert "deprecated function (or staticmethod)" in str(warn.message)
- 
- 
- def test_should_raise_type_error():
--- 
-2.26.2
-
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 9486f9976c03..9441a6b714ea 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,3 @@
-DIST diskcache-5.1.0.gh.tar.gz 656930 BLAKE2B 19ec1e16e33315248f28e1937a94bb29d641f31c263a3a2fc4d24b58082f7c9c522c74f38d07ece51dce066040538ef47348c50e8d591a749674ab6d6f2ce5f1 SHA512 33437899221051ef3dafd0eeddfec72bef00d5a6b189046cb919495b322b534445a39e5d23a1c85484867d9d07efb7de36fe5f2d3dad79357086a3dcfa3c8b0c
 DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
-EBUILD diskcache-5.1.0.ebuild 804 BLAKE2B d2f64b1e91bb86164a713219177fda2637b56d955b1dcd180eaa037eee5d66ee95237cc406b525b4a89feddfb5350a0ae26beb3668b8e784e7f4f3ee8b2d378e SHA512 7d54720bef2a1e3452ead92b2f951cfebe5692ec12d8618ffaaca08b72387682eb07af0cc7ce4fe5dc8c748b2964a4853e9a0c575e71107d6433d35fe727790b
-EBUILD diskcache-5.2.1.ebuild 836 BLAKE2B 1096e2704c1fed8a474c6e9fa50e7c919a42225d213c09a2d0f3c29d345a4a64f88773441539054296c9f0eed388ba23ebfbe972c6cb90ac55a85cfa814da99c SHA512 3adabd52499db813bbc7647e075384345d133b96dbce349453d05e2f1d4936e7352067bcf5ee6b24129e3b53bbe677b64938cfa38ef764f0225fb39c971db3eb
+EBUILD diskcache-5.2.1.ebuild 833 BLAKE2B 32a4d49c98cd7074c90661572f1a6fff6af85b3bef6515f9d5ae00611491bc246b68c09eead1cc2dcf055b5f3d1ea8e20cebc5a1785dd011654bbce5a21b2a79 SHA512 84fc57af0cf59304851052d90499c6c57c4491c2dc125a04fcabbf634290bc17c0d974b4faa3e7a2963f5c6cd7fbe00a65126842799a556072e2fac6af807d3b
 MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.1.0.ebuild b/dev-python/diskcache/diskcache-5.1.0.ebuild
deleted file mode 100644
index a6849f9bbbe6..000000000000
--- a/dev-python/diskcache/diskcache-5.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 ~arm 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/diskcache/diskcache-5.2.1.ebuild b/dev-python/diskcache/diskcache-5.2.1.ebuild
index 21ddebd65a85..d944ac6dd64e 100644
--- a/dev-python/diskcache/diskcache-5.2.1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 18a00eb15847..4d683b44b63e 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,4 @@
 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-r1.ebuild 1462 BLAKE2B e645e43aa770ac64fcb12f8df9de5b81029813316b3a72c9913ae75db57f719f6270fc847c63306293178cc6a2215beb9a3f0c59d8967b725a07020b747e10b7 SHA512 4c58f133de80dec44e0a2518119a63f3a8e849375cc324fe806dc7bfdf229310b98d364a43013f13667fa9df6680aa3b32a9ad67a679d8dddd3991cf93c277b1
+EBUILD distlib-0.3.1-r1.ebuild 1468 BLAKE2B 4b154a1d890ac4d3b9e4062c08ff2919559d3895c3f447a348be68c9ecece8080f3c3c5ad65902d5c1ec7083387ac546e61de9ab28f11659de064eac8f2beed7 SHA512 61b9b0e5555ab60f61d96607aa354d7cd574069829595caaa04f6cae10cacb34a89660fea0b0d2970c3c1cd324b932d345d951b6df400695fd951f1ce36f5c1d
 MISC metadata.xml 288 BLAKE2B 865be58267f18634250b494dac795da10ca6daa5defa289003da9282f06eebdcc3a3369bb39b2a7ac216ec44134b29ec9052676637564974eafbbf4c270403d4 SHA512 2eb267e476064080a3e34b4f66af276666a30d37967298384f612c2fe9a73bd805b0ba72f6c4e2c1ca6d6bf737d8b3f5484b0c3f37f2ec1616f9017124c54cf1
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index cc4313798982..ab98794d5345 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index abb8475b72ed..bfdcebe21f35 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,3 @@
-DIST django-prometheus-2.0.0.tar.gz 20028 BLAKE2B 272f192cc0ee4492fa6dbbb65ba6696fdf8fbddc0724290d9b55e5aedb740c2c92cb609969240004b4faca4569580ab451284c2f4bbde589ee61bb96ec448ff3 SHA512 8345c23c8032f0dbecd8e801bd6673e7e3804003ebee0a15b0c8ce3b2d4c6b6f47e7c41e33df2b18a0497eb453972d8b231b88fb51184fafc58d306a9430fdec
-EBUILD django-prometheus-2.0.0.ebuild 567 BLAKE2B f991ad45c52354f80430aa081da878c1ea0d70f8bf60bafd580e0a0ce0fbbfb946ff71220f9be1b0353dc533474fbc1d229704b99639bb89125c61e84508ae57 SHA512 0b9e8cd81488dc96bc4fc532a0000377a956c1912261617cd1aa30d10b961ae64cb0a1c6eff1ddbecf4863a2df71b6c9c2d04dd08163e8a397501131858da112
-MISC metadata.xml 328 BLAKE2B f53fb884836d43f5e5d68795b2905ae77d981c422c3a9326cd749533a33f870dda6a13a1946cca6cc0dcc53361303af3b820bca99c10cdd84643a6733347b24b SHA512 5e4ea2e04845f17b63d889c1436562589b6d02e199e5eac61adccefcace9038ef58c6b5934b10e1bb057b575795580dd73a557cea20cdee8f8185f6a3ae2d3fe
+DIST django-prometheus-2.1.0.tar.gz 24615 BLAKE2B 381aa345fac29e71e2b883fb485dce1d6ca3f13fc863d6ca9a62d5cd8f605f8cca727fbc3a3946e707d80f89d7fbaf544610cfb4857a45bc3dc13eeb22aeb4d6 SHA512 0c102467b99df409e31f99fb77d16558bd01c9c11f04ac0f80b59e486bc6e03979e16785083980c43ee3caad26b7a6bf618f9592fcca788ec2793a30d6b44241
+EBUILD django-prometheus-2.1.0.ebuild 553 BLAKE2B ab968f4e704555898fcf45ae2054cb2cd9c2a11338389fa8d730a65f21cdbbbca67a9cf511b6dfac54b10d3be5140632d069b7b4433b4f6f5cf3ff952b779072 SHA512 311687ee5cd990b6fc405ae873b02d1cf3ed36d3da269bc07cdf52df7d086039a82827a9a8c5ee470fb9d131a54782d690c0730a0b0f6786a572fa9104408f33
+MISC metadata.xml 352 BLAKE2B 4b1164a17399f32e071ee491334ffaea3bc09b2214de7c5bd05d3e0986ece1803a428bfd53af528009266ca836d5855df4dfeed9fe84059d617e6373d4296b7e SHA512 4295d46ce2da93c97b4f540a8ee85cb4a742c6c0499e4dd21d3e684125711e5d6b5e0f47c89de5e44a05d5373369db6ba353635a6af64cdc92dc19b00d7575e2
diff --git a/dev-python/django-prometheus/django-prometheus-2.0.0.ebuild b/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
index 0ee0b8e679db..108c87dc5cd3 100644
--- a/dev-python/django-prometheus/django-prometheus-2.0.0.ebuild
+++ b/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
-DESCRIPTION="Library to export django metrics for prometheus"
+DESCRIPTION="Library to export Django metrics for Prometheus"
 HOMEPAGE="https://github.com/korfuri/django-prometheus"
 SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
 
@@ -14,8 +14,7 @@ LICENSE="Apache-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i "/pytest-runner/d" setup.py || die
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index b4bca3123fc1..6d36a86afae5 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/metadata.xml
@@ -5,6 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-prometheus</remote-id>
 	</upstream>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index edce288ca205..84d6b4585827 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,13 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
-DIST Django-2.2.18.checksum.txt 2556 BLAKE2B a2cbb2f10c8173bfbb29033d2e33035a04ce0a6c997a3930f4fc59951e46ea31df23a664df1a11b7d652d7efb794b55d7dadb4e0868245afbb2951f630b674c9 SHA512 f48fda050be7d88783bdbdeafc5bf8dd130eb43b7ff08bb1ac7602f5e94615cb2f02a05787dbb025df3f01d70f789d03220651b8217de5ba48cffadb0d57ba7d
-DIST Django-2.2.18.tar.gz 9180844 BLAKE2B 4001c89674dacaddea279e4e9484cc820a18115bda3a0f8091797fd0924ee7b9aad0e520b1bda21b539e8b140dc473154e4cd6f11a16fb706dd3ee8e7dd8679f SHA512 8c38330042244513576151a9ae64293b9838df42dcb4204713859dd8fcd81154edf42738d0bd05770c9bbe13bfdb1f73781453cf1d14fbc31149a2cb89e34b59
-DIST Django-3.0.12.checksum.txt 2556 BLAKE2B 9012a130029c6fe73ace78fbdd32f1653bb7a7e84c343c394acc5563b7de9b5d6ec58734fdf79f2e7657f18644dd3a12c12c4a400a1002ad74d0891738ef4137 SHA512 46e7291f4d73472a118ff3aca4f597d6abde4a4217bb95ed84fda91efd0ed63e946d9ddf35ae65ff1e898462aebc32a3a43241f261099b17667958412d5afb32
-DIST Django-3.0.12.tar.gz 9255277 BLAKE2B 68be34ddad965bacca6bfcf045b5ab4072ef8a17f09acc674d2b5535b074d90c6881fd22edd89bdc82eefc90a2e7f561a041f9da066b85c13b10866f731a6106 SHA512 7f21a1a88a8c57d3b6ffa1a39e0df491e45f4e37181c4951db2a330266bf3ed8bf4e240a69a9b627dbbb090816c991b877b777e35b1c252a5ee08680eb3b0135
-DIST Django-3.1.6.checksum.txt 2547 BLAKE2B 509254e5d24cdddfb452d922554db12a16ee1c5840d61d17f57c7b209aa71e3b8c8279efec35508cafd059836601d85bca16a33c618b466c438fc323bcbab720 SHA512 d9dd2763285ae9da7cf24bff957ed2cc78ab088fa34ad45fe176bd869fb892a0e50d2b67fb6a0fcda08f85c68602a3b1f76c265e3776d762f2ee1f96f0dd116f
-DIST Django-3.1.6.tar.gz 9645871 BLAKE2B 96269d5977d422e62637a956ea8b1af7abc4647350aa4c913e986a7104843d2a4d6c6425deabe2358e819692a721caa18002448b780d4384493bf9078bfbabd1 SHA512 fe5baef4aee51cc84292d1f4d3681cff8170c1307aa172b86faa15771af2c3e0b4dbb24ae671ad8ed31c53ab38ed99c64b5deb69d77fc268d8a232f3463c3221
-EBUILD django-2.2.18.ebuild 2721 BLAKE2B 92d9024f73d57bd262ebf93e044ce3fff45e44407deeca47fc14125a79532df0e4bfc5f25813247825c26223395d5d2bd430a1f035fae12cc28d033f83929c3d SHA512 c161e49b7b6b5ad0e59a599eb3b09926f6919546d5a8244dfcfdc43aa1715823119b580ba9f70d7176b6946a871aa90fe26935e802d49f0debc7e9f946b2605f
-EBUILD django-3.0.12.ebuild 2884 BLAKE2B f8a5b927c85194c8ae8aa108f1d4b063874b2ead72820a93112f554dcd51f9d26d0e174866d39223c15a47ec80314a422395525a0e306c5beeb6cb51d4b94883 SHA512 bedf13845fd938d2d81957b4826e7a9c0a2dc91913c1a63214daf170e9f853e798e6957023e528d24e72948c765990e4250fc0d2b149a77550ec7f8a5e6c6ef6
-EBUILD django-3.1.6.ebuild 2744 BLAKE2B 523f4dbf3845f95f34882d6f50ca104f8cfd50aaa35d7d1a49c3709365a8382b70fd9547236faee3c6693093315a3d7b145666ffd16ba7e6188b07c1b2e02d7f SHA512 3cd63792e0d47c680bd073920f08f98838f30cfb8dba9b2dd5ad78d64d07e957dbc5ab06962df4ee95ef72026212c5b8c8a6b53cb1f98a9ed9aee6725f5c6618
+DIST Django-2.2.19.checksum.txt 2563 BLAKE2B 746ba6ba9ea4edba7641e8f32c6022be76b5a10814643cf40dfa78efba1df89e3fbdcdf05248a6622b7b7dcfec06ac882bc4326a1c9518cffac4f1ab5e339f7c SHA512 64e23e0bbba0030f591fb5839c9c95b3b4175a2af21eb88b51f23a56c732a942e0a3b0166d498e918bf95b9a2451f2fef408e85c5898b6ae13b3bc9adbdf4ab6
+DIST Django-2.2.19.tar.gz 9209434 BLAKE2B 0928a06d467ba9d643693cf6ffba358c05a739c6dca6199853a4debeb064748c8c56d57b768eb283ccd9cc4afe5fc192636d8270aec93108b4bcce57be5003ed SHA512 92f2200f147766349526d21b5240307e4f082f97fc5b80b55777330068a9da5eaa9941360ccdd729573d015d9a7a0430461f1ac61f749a0475c006981d8775ea
+DIST Django-3.0.13.checksum.txt 2563 BLAKE2B ef243cc9621c73ebf84e47292a18a41309eb51464a57a48084a3bfc086f9d9065c94d935136c47e0cd0f01243c4c49036a2bdaa96aac45389d25f1e085598ed7 SHA512 be4768c8ce5dddb26edfd4385da11eba9be3814bd58da6c74354d044860f6cc8805b1533169030c4a8d411d27152d40b5c7f067458dda9a11d893acd5c160baa
+DIST Django-3.0.13.tar.gz 9285769 BLAKE2B 9be51ec02119b79baa4f107f296c8b72920449eb846c3cd686b0d20417330eed4db1beedaaa3778ba45e0685cc4210325a4fdf04a979a028ad5360b9f160da09 SHA512 af4e4d1491ccd7edb4363f55a78f39850b55b544cceabaf8d94a3a7a866d29a63badfb41c834cefad3cadae612f2b074f9deacde5c5ee183c55f853c687c730c
+DIST Django-3.1.7.checksum.txt 2554 BLAKE2B 4df811f7bf1c502d4ab6031a92a07dbda24c6e67c31cd76dc68d1f29bb01ac376151f4e3f534a8293f7e10f98d0132b2f3359002ee424a9dbda3e5ab7b4e2f28 SHA512 94a93927fcb72cff5930ff824274ba5e6b0491e92d3b8b5973ed4884251cd16b1fa27816e02fd7bccdd671d8dc24523ef6713b54c10aae2cfde11e8ce5730fce
+DIST Django-3.1.7.tar.gz 9673009 BLAKE2B 89b1618365b09edb7714dbb8b8361d6d1918e673175e63536a31615d5115bfd5e2a7e3918991bcf4f576deb998019e449f4a8c37b5868a4b4ea82a0340984703 SHA512 a8a24f7f25ff2f3a7b5ebe4cef08c7f1303c78bd33f9a53c10630159d6895a738e863dc1034ad0817ad89275c202b4319aa5949ce89f36ca0b537c8a5c0c407c
+EBUILD django-2.2.19.ebuild 2721 BLAKE2B 2b58f02ed56f82fd16a64b091b6e7e7fc71566fd69a94c3ce425b1cdc4fabc57f0d8f0aee0aa8550c75d5c1a5ad27a98d0749c286cf702b941e1206c61352c43 SHA512 757efd17bbfca769b938ae245c2c1a9e21be7813b79ef674eefe28d6eef3b78ff2362bb1db00f1384a15f001e412ffb8ed9a6574ecff84994886124f7530884c
+EBUILD django-3.0.13.ebuild 2884 BLAKE2B f8a5b927c85194c8ae8aa108f1d4b063874b2ead72820a93112f554dcd51f9d26d0e174866d39223c15a47ec80314a422395525a0e306c5beeb6cb51d4b94883 SHA512 bedf13845fd938d2d81957b4826e7a9c0a2dc91913c1a63214daf170e9f853e798e6957023e528d24e72948c765990e4250fc0d2b149a77550ec7f8a5e6c6ef6
+EBUILD django-3.1.7.ebuild 2744 BLAKE2B 523f4dbf3845f95f34882d6f50ca104f8cfd50aaa35d7d1a49c3709365a8382b70fd9547236faee3c6693093315a3d7b145666ffd16ba7e6188b07c1b2e02d7f SHA512 3cd63792e0d47c680bd073920f08f98838f30cfb8dba9b2dd5ad78d64d07e957dbc5ab06962df4ee95ef72026212c5b8c8a6b53cb1f98a9ed9aee6725f5c6618
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.18.ebuild b/dev-python/django/django-2.2.19.ebuild
index 5f3663889264..9f6fa7fa5169 100644
--- a/dev-python/django/django-2.2.18.ebuild
+++ b/dev-python/django/django-2.2.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 optfeature verify-sig
diff --git a/dev-python/django/django-3.0.12.ebuild b/dev-python/django/django-3.0.13.ebuild
index 779e41fa3f23..779e41fa3f23 100644
--- a/dev-python/django/django-3.0.12.ebuild
+++ b/dev-python/django/django-3.0.13.ebuild
diff --git a/dev-python/django/django-3.1.6.ebuild b/dev-python/django/django-3.1.7.ebuild
index 79920fd3e7fe..79920fd3e7fe 100644
--- a/dev-python/django/django-3.1.6.ebuild
+++ b/dev-python/django/django-3.1.7.ebuild
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index d99cf489c61d..cad1d274189a 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,7 +1,5 @@
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-DIST dnspython-2.0.0.tar.gz 221903 BLAKE2B 540fb5fb12791dad6bae4007a77201092c8d5e64b7d82b23d5e3d16f48b49f73c90b85a6c8a83fa056a35cf7975ea2ad4a030f2b1fb1b87948bf1703adabb9d6 SHA512 3b38850fcacb0dd25ac0345201474f297c402617e8d706f3061c42172d697103075098e62ca0ac4e0e29967e00407f32f41789ac7bf070fba5aec0af9882e0fb
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 EBUILD dnspython-1.16.0-r1.ebuild 1208 BLAKE2B 92504043644a59c6ee6d14b26734b9ad6e3b1f294891c4774f6964081338184ad0316b070a2b9d088a4034581eedb0e2f438556dc9db11d608817462e6bebe0c SHA512 2394781da6a08d92c3f0fc7ae0c4fe8388059ec497dfda522e56e3c36185f45c4300ede46ffaa849f6209883618957e6ee2c3ad126d4a9a7b3ddb57b5a872c25
-EBUILD dnspython-2.0.0.ebuild 986 BLAKE2B cfb873fcd7cfb35a6e867e16ad38316f065d09277711ea47319bfa202edbba25ca32cf9963224531b5883d3e707f889dbc5dfe5f751abdfb479960a2e0b7142f SHA512 cbcc8de07b01a28c3cb373b85ee0d1eb0e3ca19c8ce3b524ab1fd5896735c2fce5fbad86618776bb65b51958955ade64a634db407e842578fed4762b6e32a9e1
-EBUILD dnspython-2.1.0.ebuild 938 BLAKE2B 78a0faa4c9f63a92685e407c445069cd77fcb081b0389126980d213f29d4c96d53ba7c577be3c5d6775d3fcefa7785c538627b0b84a8c07fec73dcf3c84b5af6 SHA512 63ab49b902c3705e2b40176003787c140aa2150c2aab16c396e49bcc8e53f0e08420cfc107aa08b45f030113999010638151aad9acc9c997cb10861f4caa5c61
+EBUILD dnspython-2.1.0.ebuild 931 BLAKE2B 3e7d0ce8ae971b1825dea9a56dccbbad7206b7457915fbbb20ef0898f539d0405531874a448e223c1063e4ca4293c3f4fa1501d88638b2a1dbd301679df384ec SHA512 fd3ab54001e5b576849c1e12895793e94c1bef9b0bc6ac8a702b988ef8fb54e6945eea4d7eb7a9b96a6896a68ad2329416dd44c72a32f6e546bca3c0baf003f7
 MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
diff --git a/dev-python/dnspython/dnspython-2.0.0.ebuild b/dev-python/dnspython/dnspython-2.0.0.ebuild
deleted file mode 100644
index 2712bd67e941..000000000000
--- a/dev-python/dnspython/dnspython-2.0.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_{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/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
index 8cee010f2df4..2db80186c174 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -14,7 +14,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="
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 57c64a361869..83622769b363 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,3 +1,9 @@
 DIST docker-py-4.4.0.tar.gz 246544 BLAKE2B d19b923499bb32f85728f88e479db330f442ddc32da06cad6f56cfff3386a020e45a0ede1afff635ce3d0e2d5e9112b0a4022969f75647eb6e57c13ef1bd6cb0 SHA512 8882a6547570d64c4cf9db7e1bd5ad13dca9a5b439631f3436587aecc1ed3386b230f9b6f82c07d9614f7d29d918ec6a3733fa6af6d8784a698e1b8459d4dcbc
+DIST docker-py-4.4.2.tar.gz 247164 BLAKE2B dc341e78642a8b44cb1f8eb2e8c58231779426343bee7afd41c0fd6a1ec089a26b96bb00be93f51fb0ad8e162e7442084c3ac74525785e7972b88aa6705c3435 SHA512 f42eef12c51307338aa5b73016f4033cb2f99c469fbc80c481753a2a8427e6661f82fe228328b4bc67cfb482ebda4e68e6bb435217e64e6f1299d32237d815f4
+DIST docker-py-4.4.3.tar.gz 247491 BLAKE2B 1cc69a700e58abf89588831bd6f99da4b3bab0d8d51e7c193568a9291bce9f13c3d0415a135612439154d2e0651a3ac79b0365386eabcf47059f2ed8e0ed66d9 SHA512 270323f2f096714d7b63f2382da233d061a3dc228279aa3fb89a1dd295321f63f8dd1a883d5cf7afb400341962ec4e060607a03e5e6df43f4f1e629d4e217d73
+DIST docker-py-4.4.4.tar.gz 247640 BLAKE2B 68b2e0d41e68fdf4826d61b7ab167321467b1b30f122f0b29955a62ac5f036fc0b60b02a8c9a6776ffd9a7cafb5744de44ec3b9284d0f266a1dd5c72fbec2879 SHA512 4106ffe353ce8c3227c30c38347f107e0f7da660f1c3ae68bf2c576fc6b270f6fae6774747c46491eae0fc85a48dfe246b7a22d8e45c74eff89ed43be285f0df
 EBUILD docker-py-4.4.0.ebuild 1113 BLAKE2B c5be2065ae90782a0b533f76fb7048d10f83a3db5b049b98409a85c94e9cb84c077b0434ffb3fb423bb8f491751efc58228d7006a4a6b087ae26f182a5ef8582 SHA512 b8f837c6bb07d948fad16ff2f79a4f1061ca1b87672b8bcb81761cb8b0af2852606a4c095aa4b498f8bb0c0f6e0be50e60212a33de63bdbb4ce0820659e9d223
+EBUILD docker-py-4.4.2.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
+EBUILD docker-py-4.4.3.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
+EBUILD docker-py-4.4.4.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
 MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/docker-py-4.4.2.ebuild b/dev-python/docker-py/docker-py-4.4.2.ebuild
new file mode 100644
index 000000000000..6cfc62e02e87
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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 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.24.0[${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.4.3.ebuild b/dev-python/docker-py/docker-py-4.4.3.ebuild
new file mode 100644
index 000000000000..6cfc62e02e87
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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 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.24.0[${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.4.4.ebuild b/dev-python/docker-py/docker-py-4.4.4.ebuild
new file mode 100644
index 000000000000..6cfc62e02e87
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.4.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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 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.24.0[${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/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index f769de831dd1..073ce2615902 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,3 @@
-DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
 DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160
-EBUILD dogpile-cache-1.1.1.ebuild 726 BLAKE2B 147b2d3d8dd6518fa0c1672cfe3c01ed8ab2f46cbc5d0217f291d3b953e0358315e0b66f6a1147a1cf73dbec0ead32f87c475652ff686ba0b0bc01f796d20092 SHA512 3068bacdb278f260388b11ded8bdc6c7a028033d9d034f5f14d63e2ba80511d6f873ec5f67fd490dd176c2b31fcbfa74770c679f5065479dd3527725c7a010c9
-EBUILD dogpile-cache-1.1.2.ebuild 729 BLAKE2B a0264e668c9f0eed0936a6dee7315c279b5e8db30174c543f6d2f2c901e064764f8379aceea23b13e04b17047e8d6841eccab592a7b9dd8dc19a60cb900c30f3 SHA512 034efa04ca66955a1db056a9ae2db5b876392c995deb45f5cdcac5e8ec6dd7e413cb6364a4dd56a7483833a863a34c6c4a6cff62a900d42cdfbeff3754d85ad5
+EBUILD dogpile-cache-1.1.2.ebuild 726 BLAKE2B 13edcf5770f3c705b46b37869aef9d33f9126922f67edd4dac7953ca371823946e16bc5880afc7fa6c9f059c9999fa1423c959d3d3d519082a2b65d4908a556f SHA512 47ac46f3dae3369271b9ce249bc8f335d78308bf62786f5af4685d3450351aaedf5b9e2e595fdaa66c58609f184a23c9f9f611f0d1b905ad068089bfecd900a4
 MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
deleted file mode 100644
index 002283604ed5..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.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
-
-PYTHON_COMPAT=( python3_{7..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/dogpile-cache-1.1.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
index 4174912da531..b7a9ca06d183 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index d4313318b5d3..7dac2d33b721 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,3 +1,3 @@
 DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
-EBUILD doit-py-0.5.0.ebuild 617 BLAKE2B 067b85cc73671540dc0f9d722c6a8e7673b14d384f628eee753b82a213ae30e21566bda4bfa3714877b78536b622623e9ff55d4d295e357aac758719c657ab75 SHA512 8604cb17231bfc6804a6f2a01e939be0296fa83b00ea2e49e7d4284acdc4c3e6b3cf637311c5a48929b72fa3b5dd95db812e73b3c33ea05c42db32c09bc3348a
-MISC metadata.xml 518 BLAKE2B 6051376faedfbd03dcb61444a4ee626766ce101e8c555706a3869d97c2b6ca870a1c4ad0df077cc74fa448bf61705513ed235baf228b9c32872c802f2baae9ea SHA512 8626185dc768f468e68c3cf7e731e0183762f7a07472f429e33d1576898a2cb59d3178eee5f729dfc8da06481156004c392e39ead68bc94808cb32e0f861293a
+EBUILD doit-py-0.5.0.ebuild 620 BLAKE2B a4369d14ec71f9f19f23e6cbc7d50014562a593134112f26f0edcf56c4fef53bb4df9c19196a487af276b4896d910db38909c5732f59c7dd047bc05a4ef58123 SHA512 66accf511b6a4f9192e40cb6994135a3dcbd80f6a372c87cf10f456246e6095c06a07855cd9c112e958a91be94904f7f10e88dbba5afcc96f75980e462356124
+MISC metadata.xml 543 BLAKE2B 258ba834bac2b209a7e4710f187a7cfef1c0fe3b305c5e9ee741d31ce13d358252dd21a577345f8a2542380f77e3ad16ba52c045b119de8fdc6efa8f5f00cda4 SHA512 0308572ae0c85a8aaa8494ba8cd29df7ca6ea012ef77055d67b940d99fe6d1cb6629d4a6a49887e7f06e628e94e1fdb47121cb2fd2397e101dc0c70b0522bd58
diff --git a/dev-python/doit-py/doit-py-0.5.0.ebuild b/dev-python/doit-py/doit-py-0.5.0.ebuild
index 34a757030a66..2ae281630603 100644
--- a/dev-python/doit-py/doit-py-0.5.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/doit-py/metadata.xml b/dev-python/doit-py/metadata.xml
index 80c77d8b86a0..2f12a5900820 100644
--- a/dev-python/doit-py/metadata.xml
+++ b/dev-python/doit-py/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">pydoit/doit-py</remote-id>
     <remote-id type="pypi">doit-py</remote-id>
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 03b0e149d21d..48f60714195c 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,3 @@
 DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
-EBUILD doit-0.33.1.ebuild 1282 BLAKE2B 854f788fb5a57738a7bef868e02aa1e13d9a370c0d9a961422eff9cec5616b652f210051ae640d5500298a9a005f2e66bc434531f91c4e16b8764d258083232a SHA512 b8840209a725c19de503a525a3c59dfee8253b77266187b45964e829565e70dd7c1d213cf3eea458d14e128f61d371a6c1a6885759f930489ba9da34d82b188e
+EBUILD doit-0.33.1.ebuild 1284 BLAKE2B 4fd1e101314cf06828f5ca4e467524b2872bfb648cb1d7335d8e2e738b19ef3c718bb2e7dadb750d594e733eaa72d8c596ce1b69efec52c8462cdcc10b0a7745 SHA512 f96fb9cc2636a7cb004179be02a077584364b2d65a653fd15af23f044b8cc8ec610e3fec839164e0403fd00c1890b2f27750a216cca1a784b48b53e91328369a
 MISC metadata.xml 537 BLAKE2B 14f6b2a75d51ca56c61e5700fd7787cb6653722ace4de42510ba1c781523a2050793398d2832aaaa92d87c04ce1f30ba86d0fc2c976ac2d1cd0e0ae5fad8da99 SHA512 fe7a8bfc06411b14d6df95f79c46fc66b68a4c9db0f15a63ece8c905a5dfcc67ef0a1a5f5af09ba0bad80317b93c2336fe788cdf6d390d344e1fed6ab02db889
diff --git a/dev-python/doit/doit-0.33.1.ebuild b/dev-python/doit/doit-0.33.1.ebuild
index ab53169e90bc..2cfebb5ba977 100644
--- a/dev-python/doit/doit-0.33.1.ebuild
+++ b/dev-python/doit/doit-0.33.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit bash-completion-r1 distutils-r1
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 4f3893303db8..e88515ff106e 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,7 +2,7 @@ DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93
 DIST dulwich-0.20.18.tar.gz 392023 BLAKE2B 891a02380eae06f2a6331825f6380917c0fd43b418149c30f640566f76b49996f79c7295215d3cf006af86d8ed5bd1465696bcbe402dcfd6b68748043eb4e376 SHA512 ae4311c5d460d7859728c9e9fa9e1888f228488a5cc427a637a7e3d1ae0de3effb1136500b13e0706da38158a245147b0996392b157e67d928caa339416bdf7c
 DIST dulwich-0.20.19.tar.gz 393004 BLAKE2B 89a63943a150ccd15549898689af68769b7f0cf25065e6cf9c9c5addb0fb3635fbc5c0fd23c79d2facdaf3086fd5e853e7ac3f9690f7fe40e0b561f0709651e9 SHA512 07a6b127fc1170a929b22cb04e34a0653131d175d3813fccc9e47e6d250bfa217bb0a2557d5e7fda6edcc5376809e6593dbd0fa52eb73360ba9c3dcdac69c81a
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
-EBUILD dulwich-0.20.15.ebuild 1624 BLAKE2B 349c954db5c2625e0d20e8075795e42e6765b54a929e2276fd25d9ffa8db211d4268358d5b4d75cb1288ef695a2025bb3599f710e73b468454bcb830e10938e4 SHA512 cc9762cb667344f9d2da5c80599bfbb97c0165cce992ff606ea43e3a2f91372aa17ffcaec5c74c70bc1bd6011ec65a5b8c636b7c024e04836967195423305981
+EBUILD dulwich-0.20.15.ebuild 1622 BLAKE2B 4575bf17b5e18a6c9b24e874ecfca0d0570011c7192ff015df65e0ef61410dd3f9db3b0d514cbba33a58321bee9c94375460a4d570b03355b11f55d7263cfdae SHA512 30e6a165a3b63a84d4e107b70a6a7a9bbe9fac37dfd7ca1b195b282a51c4a5547b948fcb5e7a57801d3e782c2cdd654261864ba46f7c9c7f8ca3aeba05b91297
 EBUILD dulwich-0.20.18.ebuild 1624 BLAKE2B 349c954db5c2625e0d20e8075795e42e6765b54a929e2276fd25d9ffa8db211d4268358d5b4d75cb1288ef695a2025bb3599f710e73b468454bcb830e10938e4 SHA512 cc9762cb667344f9d2da5c80599bfbb97c0165cce992ff606ea43e3a2f91372aa17ffcaec5c74c70bc1bd6011ec65a5b8c636b7c024e04836967195423305981
 EBUILD dulwich-0.20.19.ebuild 1623 BLAKE2B 50106cd3c4484d1e1feace25a67f11531fb12d8724684fa007b3bdb8a4705ef0d4089c6ea6d0acfc78b33a4089ac4a3ee372552f32140ef80e0bea2390a17477 SHA512 1de83698c4151d82879edff3acdc605597dfa7e6dfdbf5a6eea427088c4b5bba1810c7640c183458262a7a8e3252e76cea760ec52c1ff97d93e65f174d4a09de
 EBUILD dulwich-0.20.6.ebuild 1616 BLAKE2B d82dd9edb8fe9e96bf7bd7adc8d78f8fefd1e3a853fa851d5de6c5b48310d7bd15bbde07215586efc8721ad0408bf69ed5ea3f350415b337dc4a1f2d0109c6bb SHA512 867cf515ebb647f25bcb356f924739e412aa9746cc4842cbbab63ac23e8431ef2a06103fa3324aeff6ee04a9f66b3b142f06b7515cbfd2a20be6ec87e68f490e
diff --git a/dev-python/dulwich/dulwich-0.20.15.ebuild b/dev-python/dulwich/dulwich-0.20.15.ebuild
index c8d0f79e4e49..bbf70d70770c 100644
--- a/dev-python/dulwich/dulwich-0.20.15.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index cc5fc90897de..85041d9de485 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,5 +1,7 @@
 AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
 DIST ebuildtester-0.1.16.tar.gz 15564 BLAKE2B ae9c304fcdb9450c0b99eb75128d7e17790b87c541c87ef484a04eb1e74b18df44996e6a2d2ecfea11568f1e028d9279ac708bfa61978b4d8f176dd0183b8a69 SHA512 3e30894f6260b82a97e0000e65ab6a556c2055ab50ebbc7140b6716166b783574b87f333738d87e3ff11672f1b055df2acf483384e616e7bd9ffa42467c79743
+DIST ebuildtester-0.1.27.tar.gz 17347 BLAKE2B 4b4b97235b073bfa1fc78dd3e4f5d03a2e64b277a8675669061beef3185e87c01f882ae830fc5c11b1ba97ea5deb50e93b7cc02b78cef5a0046bb7f2c7ac3433 SHA512 f50fb020e47750c318d0198628721adf166ee3d8544be50169b2012ad72370f063b1367e521af842df0574e491d469e5c2a6aba1576a9f364c95e72a9579950d
 EBUILD ebuildtester-0.1.16-r1.ebuild 745 BLAKE2B 17d2fec7685e382d931d0e3e0b9872804caa978e19eb605b505fc0a6c8e12932eedd023f4a25f045131a58b4e2c2a779a109440d8b59d3dfaddb4ab7ace79194 SHA512 b936ac5077abd4def84e91943a057b85dd1950931f15953bb38c852aae37de0a7205de3d4b015512a41d8050f448218bb8b717e1cf75ac498d47de1b185287e3
 EBUILD ebuildtester-0.1.16.ebuild 732 BLAKE2B d877254a664f1f859cd658f847d3036eb2ef14d0cb1e8455f0c34e2f690fb4067b9daa720b41f7948098e76bbc44f3d14bc59670b308cf5deb3ab6dab60713f5 SHA512 fd09ef8e649e3987203f78be9c9a445e344803bf87b2996439d99187c7141c05e3252b5328b8b8fdf84407f914a41e855f942ac99cef8202b4bff1f715f71919
+EBUILD ebuildtester-0.1.27.ebuild 747 BLAKE2B b46af72fb9ef83aa005b144b0072edcdd06be51e77ff3cc63912b6ad39bae54420a5a13d28754a3942b1e84f8f084291475748c56a197140405ae8280dcf70f3 SHA512 55865a40e59e3079bcff7ce61ff46c28e0b787c3139d0a68966bd9caa1f966f08bfe5521c2141bb70d86c71f7d56b355004db7b19414c62f0cc61799a9cc4baa
 MISC metadata.xml 297 BLAKE2B 05f415213e45849ac677a97c4cff26321825063b9a1026150831a64fc0b164001c13c8d8ac34048acca005e188796ce05b7150d97951cc861962a21da07d1436 SHA512 fbc9cabab9c3d9f281384b2c937d13602811023027cc1a30f31ccc13b1cb45fb1f60754ac5b7626b865c20be0dfe928b1b8890388a7642e452a227f99e0617c7
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.27.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.27.ebuild
new file mode 100644
index 000000000000..b6204349693b
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.27.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 43eadb284860..fc60c664bf31 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,4 @@
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
-EBUILD elasticsearch-py-7.7.0.ebuild 2932 BLAKE2B b0cf8bbb4b1165b06fb8b5d0dcf35701f4bb93c8e4cdcc1ae20f6ab8838a9febfcf699d0e410697c663aff8d19dddbf8ff68a8fe6d09c8d37d5c290ddb09a633 SHA512 1e1d186c2d3d0f7a7e868cf7bcdda0f3b3514b3470fb0937d16357ebe8feb8cd120ac7c1cd1d7a686efd99ce900ddce00da3fd6f963409c948fd14d5aeffced9
+EBUILD elasticsearch-py-7.7.0.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
 MISC metadata.xml 505 BLAKE2B f91672ea101edbc85c7c726c3f2cc996f028f2cbb1688138a1cc8f3f4afed6531820bab6234830b75698efaa328ba38faa660b6c598ec3fb9dd6091eb5b7d37c SHA512 4e93c374721a8fc667640fc5cb8c78d0540cc4b45e4a06c3350a402e419465275d54d83d47ae44cc8f16c86e26b140456c98d7d3097d04b23f1ca66776b8c7cc
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
index 1b44bc6d79bf..d58c676ddca3 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 ES_VERSION="7.7.0"
 
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 889f6f56ab68..05918ed4b9ec 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,11 +1,7 @@
-DIST elementpath-2.0.5.tar.gz 194557 BLAKE2B 0c2571eff6fd850f42d2e3cd30598a5764d2f3a81f9cad756eda82e1212337e344314d60203d06b19200537aa8027e4c902de4df746b4e838fe42a1db39f25bb SHA512 c4fd4b360c88870ccb4102e7bca29cd979262b706b795b2a9314853543cd0a40c0ea4bebbac9cff9aaa0fcfefe107f574b41822be7e3c7328bb163c2bdc53283
-DIST elementpath-2.1.1.tar.gz 199609 BLAKE2B d28364e355c760b0e3b0f0695b1b4af1e05439546ab6413b29cecac934de1d4e6fa091c7e3d4d4f5da43e147b6d930fde4a3e2e9fcfeda1e646a91d27fd83dd5 SHA512 77414f37aecbe44d44cb51fdfcdad630d35fe00d6ff14dcc819851b5d844ba7f266026f6763aa70265c11cca922fb78f565d0fb33f41749594a9f256fa44ac1a
 DIST elementpath-2.1.2.tar.gz 204979 BLAKE2B d247e2dc3ed685e2ba9715ed44665f1162bb8c6983e9b4010d7bf32193129b43983fc31dc9db8f76e618dfeef81061c3d5515a6e369f5159636012afac272abe SHA512 3ba7802d4a4f81c73743963b8ee8cc293973430b521f67615f344d78bf259fd371630ce09d0acff223584ac5aa11cccdfe47fe34b0dfd5ff64faacd181e10d28
-DIST elementpath-2.1.3.tar.gz 206716 BLAKE2B 51060618ae8e67b8f033b493f6ddac38e457ee57ffb49f3740fcdf001975965a8d3add42a64cdc90c00b2a464018e503c58d48744dfcaf9383eb79d66feb104d SHA512 9713ecc7a6d5fe9a1cc7aba088cda8938c2b0c258c85b3a8b2b53eec3545ec0c50b62b7825435396423e32b9df47533701e95856621e26c2236497d17ef3b5a7
 DIST elementpath-2.1.4.tar.gz 208691 BLAKE2B 8317c8fa90d7feaff76357c19ed8373644d60985b1d53a1e0a702e26bf80887523a0f1dcf601800ac1618e8f681b3898b5d56fb4edbbffaacbb4a0efe58f67b1 SHA512 d965bd58254e601000da5be309ab18d3f5964cbc1224092e5e38b4523eb3ac2f7ae6e71fa6c3698b40b13484ed1d07bf93c80d45a9b3ad04f69f63bd18a42975
-EBUILD elementpath-2.0.5.ebuild 680 BLAKE2B 654d47dafbc0483c895b878f1838e44e40b47b859d2b72f3b69908d63561748e29bb05ab478f8a39bea5ab870d01062cbc322427e670670e242e51c0e19d8c7f SHA512 23395f39719e3c2e16d95deb32b551a95fe325b6ba7e21f58c05aeba2a155b65d5a946bfb8b6c1dbb771f53538a4c657e5eb7ed18e866f87ddde6ccc5dd87f55
-EBUILD elementpath-2.1.1.ebuild 688 BLAKE2B d90153de39661517d1c5b45af8434769f34df5d615a6604ce17ecb66c7e6acbb061a2d8986c0bf55716fc3ff908b9bf2b976abff302a1a64cf2b266f834d94e5 SHA512 20542792261591afc10c15862dc07114829d490a978a3eb358cf82ac85aac8a2522e31135c7d90df605248836b0f96f5e57b2fcdfec88d98a42ca92b4b591ba6
-EBUILD elementpath-2.1.2.ebuild 687 BLAKE2B 6d1ffe20524a52d47dc91355a368caba5492011b306744423f717e49535922e81b59c85394184169624300fa9ec05ef36d91c8e2212c5661e323af471019cc40 SHA512 a28f0bcf270d0b0b31240d9c0e3efa55e3dd698d5155d255eea8f065f1e0d3d5c62ebbf3d8a20cd6888a04541e0362957482147c9ada94837bb14c60bccdd5d9
-EBUILD elementpath-2.1.3.ebuild 687 BLAKE2B 6d1ffe20524a52d47dc91355a368caba5492011b306744423f717e49535922e81b59c85394184169624300fa9ec05ef36d91c8e2212c5661e323af471019cc40 SHA512 a28f0bcf270d0b0b31240d9c0e3efa55e3dd698d5155d255eea8f065f1e0d3d5c62ebbf3d8a20cd6888a04541e0362957482147c9ada94837bb14c60bccdd5d9
+DIST elementpath-2.2.0.gh.tar.gz 222412 BLAKE2B ac05a3ef816713377ec304962732c60f587972e903541748f0f4958aab0456da9aafbccf66d981b852a98d63b37224499af89125e34dae3fec6094f793f823b3 SHA512 db9950fc1d02d3207db73ad0066d681a8e3b293817e2b4fe0c133eff9e8d822f72d2fca4cd631802765d3ee82c2cae69beeae1332b427adac90bca61978d47a9
+EBUILD elementpath-2.1.2.ebuild 679 BLAKE2B eab5968905b8fc6c6872de574ee336e1bccef21c2dda88dcaa24b3b77e65a6125eba54f67e4e56a220aa7c387a3cfd1e3cdf05da722da75c17c18c84098f0551 SHA512 efe4c68ba47f3cc462eb07079a3302e5a82250003199eac7c4b7af5b778af7f0f7df1f1d5d314901738ec0f32935e89faed7df904068293d7c26b78e7f10fbac
 EBUILD elementpath-2.1.4.ebuild 687 BLAKE2B 6d1ffe20524a52d47dc91355a368caba5492011b306744423f717e49535922e81b59c85394184169624300fa9ec05ef36d91c8e2212c5661e323af471019cc40 SHA512 a28f0bcf270d0b0b31240d9c0e3efa55e3dd698d5155d255eea8f065f1e0d3d5c62ebbf3d8a20cd6888a04541e0362957482147c9ada94837bb14c60bccdd5d9
+EBUILD elementpath-2.2.0.ebuild 734 BLAKE2B 99b4edf3644f4228e31ce338ced8664e83d346bdfa3ccfe1464391a0886dae6450a86846ec1c7e97666bf8fad69c453cc176dd6c3c7d0fd52e4eab6883b6928b SHA512 0cd6e57ad641928f76c7188720b7b94d7b71baa94b020e76bac44518a0b1613e9fdef7367ec4f9994ed9c59b05a0c702cb6ef9db1edad0ca5e48aa3eb10cd555
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.0.5.ebuild b/dev-python/elementpath/elementpath-2.0.5.ebuild
deleted file mode 100644
index 029b5e534b88..000000000000
--- a/dev-python/elementpath/elementpath-2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~riscv ~s390 sparc x86 ~x64-macos"
-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-2.1.1.ebuild b/dev-python/elementpath/elementpath-2.1.1.ebuild
deleted file mode 100644
index af7780cd7e42..000000000000
--- a/dev-python/elementpath/elementpath-2.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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-2.1.2.ebuild b/dev-python/elementpath/elementpath-2.1.2.ebuild
index 73b63d2a6ee3..4d73295e2eef 100644
--- a/dev-python/elementpath/elementpath-2.1.2.ebuild
+++ b/dev-python/elementpath/elementpath-2.1.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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-2.1.3.ebuild b/dev-python/elementpath/elementpath-2.2.0.ebuild
index 73b63d2a6ee3..3beb456d1bf3 100644
--- a/dev-python/elementpath/elementpath-2.1.3.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.0.ebuild
@@ -7,9 +7,11 @@ PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
+HOMEPAGE="https://github.com/sissaschool/elementpath/
 	https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest
new file mode 100644
index 000000000000..e5cba10be773
--- /dev/null
+++ b/dev-python/enrich/Manifest
@@ -0,0 +1,3 @@
+DIST enrich-1.2.6.tar.gz 15581 BLAKE2B 06f104a11b2dc85c1d80a2b14c548aaac40c78795e86b1c6ae733f884fbd7af0776af53d8cdd15c15d6abb91ca89dd7f815823b419fc2b3de322b50e55844dd0 SHA512 07c280d3526538af9d718c6d423be50d67e8285007a6702b7f3d842725a63cb282192c29481cbea6cbe7da886b630e5694776092dc0ffcaac522ccf1e895b5a9
+EBUILD enrich-1.2.6.ebuild 574 BLAKE2B a69513a6d7b1297a10694102223ec43f6a140c1c6b818523a7015a7cb6a4c053e80cf9acd489ad5110335e529e81d0abd167b96409e576c1c1f3e3da81d0c750 SHA512 d15b0ea2c25b55214bab50e06dd6c736558a22e35028a8002b3b12c542e1c6fa710ab81818051507019dc0a4ed1e08f695132a1948d3fbb05ef032210880b988
+MISC metadata.xml 395 BLAKE2B 6db8a13adebe54f20dfa9498e572f58c2043173f95c8e626dfcdc01b3ca5170ece7fbf34d230b8605af7024f9540e772defe1590ef37eb59b94fc3e1c48a0211 SHA512 06d1c1d8c249995f2ca340ef2334f99c6d52d2f4a772c37c1b71375592ba0ace19ecc9272eb052ad00a6c14c1a74af0bdc1f18bdd84f0b05d359f4ef9421d23b
diff --git a/dev-python/enrich/enrich-1.2.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild
new file mode 100644
index 000000000000..57f3ea8d5536
--- /dev/null
+++ b/dev-python/enrich/enrich-1.2.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Extend rich functionality"
+HOMEPAGE="https://github.com/pycontribs/enrich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/enrich/metadata.xml b/dev-python/enrich/metadata.xml
new file mode 100644
index 000000000000..f64ef0857b02
--- /dev/null
+++ b/dev-python/enrich/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">enrich</remote-id>
+		<remote-id type="github">pycontribs/enrich</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 686d6236ca25..4745e307f1bc 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,7 +1,5 @@
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f817404cd2ad6cd6378e0faaaac7c9721e0ac03d3becee1962f44df3edfe0c30c55d7eb92c66b4a01bc94468d4f1791e40eecc SHA512 3a4f6985c3880a85578591ccbdcc0e76f5dce7c4c8897489d2f2976faf3e73e7ab1d755c91ddfa4cf28b1019e730580ba45184179c0ceef6eee859a2bf6ae28e
-DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
-EBUILD eventlet-0.26.1.ebuild 1765 BLAKE2B 790fd2aab4cb7eeaa9fe10e6b8ea6d5bb3d6d1dd0875b94da4ccec7c47da271c0646f9b5dacec5ddd7700644504ee5a3cf6b6ec46d81f1d9c37df7f74ca63b84 SHA512 92c6e1340f3b68835097554840007c1b8903c4c41b68ef6e709a2da7f66e6f1448fcfde55a5948717253fe6feebf372e4b41f52c5d17b228ac6d8ceef3025f8c
-EBUILD eventlet-0.30.0.ebuild 1832 BLAKE2B 2e1767937f09cde5d9727f85aced3772886f3cc3cea5f483da4d94ac82ecfe66dbccb10f77be7e28553ef1a26c3a587b781fa38aaf01bf5e6e9c579b099cb487 SHA512 3572203402f9d4f4316df59c04b7d56f6b4e49c1a3194d473706703375b88a5a5bf8eff6a9f5af2c3f9f273d1e7d1304ea8d875b1703f2528aa381b7843ee670
+EBUILD eventlet-0.30.0.ebuild 1831 BLAKE2B 8f45971352cc6fecfe468a0c59dba62fc62ddd06ffbdbdeabc69cfa579734eb7e20261a5458ed6f178a1d29d45e3dbfc590ae593715f92e1c889a4513fa2e4f5 SHA512 256c6a0502e18cd4ead3f607c42c609c6b811f6b069fd392f37f1f83ecb28b344659bfbf4569f388e7d0b3698a3167fcb462b3fa85baed681c041b60fc6c6024
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.26.1.ebuild b/dev-python/eventlet/eventlet-0.26.1.ebuild
deleted file mode 100644
index bca9fd1c14a4..000000000000
--- a/dev-python/eventlet/eventlet-0.26.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{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/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
index ad755eecf21e..ccedd92056ff 100644
--- a/dev-python/eventlet/eventlet-0.30.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 996747cf3e47..21dcb39dfe8c 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,5 +1,11 @@
 DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
 DIST exdown-0.8.0.tar.gz 4864 BLAKE2B 084e359b5797484486d9554f85e07bc671da5260bcfebc5cdf20583b91f13e52f9a4332afd8b69ab3c80313d18e1f1bd0d36415a2297589c5bc65c04fde18046 SHA512 cb80d355666b57f4c35fd5776d01deb36b35547d87d152d5b5a26d5c46ecfda28af10c54a3d4ac9bd6b69f99ff3e62b07cfcade07b4cd1f51969562931aee687
+DIST exdown-0.8.2.tar.gz 5255 BLAKE2B ee33e23afc86befdb421c8ac82742977a35f5cf2931aad5cdb5fdd4096682160810bbe09661ec59c10c86f7214bf67b8dc705b9e0ebae3e818c3b112fab91831 SHA512 919b6f8d57546c308b488cc47bd8d51700ffbf758477f3d0cc9de92936a2a70828475edcea011488d653f1d53309fcb2d951ac945e76bdc9a5d015f7ac34e291
+DIST exdown-0.8.5.tar.gz 5522 BLAKE2B 30e3d6e2f12aaa5783605b8a65c391e59b563a86defcefc8f5e322f93cdd4ccc561f6514254c41109047509b77e38202365b798c2b1e7838bec9275a607d0539 SHA512 709c0f2fb6d0944357c656f3beab7f151a48000a430f863cf56c529a49ee462c1c168f9708d77fd6fd5ef3fe29b11084303da1831726bb01943e1b817ba733a4
+DIST exdown-0.8.6.tar.gz 5480 BLAKE2B fe383a2092691afdb2a3fd8cfeffb78f62b23bd4dc8f8d5365102084acc8670c9f2bc3e4a0ade95a50ceffc5cc142c39dbd3e505678a238d6f39b82f6553071a SHA512 28cd68ed99d24c79a7764f7603242f2b1426f119864d39424b1326cecc5bc922ed610133099e7d03d384c485f4f67d1fefcaadee4e1f69ac8ece08136eb858e9
 EBUILD exdown-0.7.1.ebuild 952 BLAKE2B 0f696fd01e8307bef9da0962b93e9f65ea4512b8a61c0b0feb0d14b23635ed51331733bfdb5d243b4c72a5a1c82f5f567473a6fbea460898504648740bb44c40 SHA512 26b511a610da0f6ae791496aa2f5f62da209953905ed7a589aaa1af88cd3381dc9264d78df2682e453812fd29ce66828f0dba1bb2c90f7fa2892ceb6af9a0e07
 EBUILD exdown-0.8.0.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-MISC metadata.xml 498 BLAKE2B 1e328e87490d3e8c0eb1e34e83ef44dcf557851459015d87433fd892b012dbe805952e0f0fdefa68004f2024c7dc0a957de53e1458fa496a5bceaaab907da2c8 SHA512 52f4040fc042bf37b4f8d4d802d021bfb85ed2f510c1dea8dd1d2aa33674eebe6c5c4d24110609d200ef4b59529dd7ac1be30d2442381b6b36f5d3f11445026d
+EBUILD exdown-0.8.2.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
+EBUILD exdown-0.8.5.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
+EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
+MISC metadata.xml 599 BLAKE2B 699d7f94911474352dd3e72e9b07692febc2e75d72fc6059508d1801ec2e4687a4267e317b0516609a93caba8a1179fe759740f6c0b552154c46095c5ba20b0c SHA512 444f5480850243a17e72863b4d4ac23a4c97574603dcfdfd7df3bc504f0f407407b22284971f4f61651467feef93060c3bc5856de3ba7bb1a270a9d3d5a144fc
diff --git a/dev-python/exdown/exdown-0.8.2.ebuild b/dev-python/exdown/exdown-0.8.2.ebuild
new file mode 100644
index 000000000000..d8894682f3ed
--- /dev/null
+++ b/dev-python/exdown/exdown-0.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.5.ebuild b/dev-python/exdown/exdown-0.8.5.ebuild
new file mode 100644
index 000000000000..d8894682f3ed
--- /dev/null
+++ b/dev-python/exdown/exdown-0.8.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.6.ebuild b/dev-python/exdown/exdown-0.8.6.ebuild
new file mode 100644
index 000000000000..d8894682f3ed
--- /dev/null
+++ b/dev-python/exdown/exdown-0.8.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
index 99d8fdee9cb0..20313363a6b8 100644
--- a/dev-python/exdown/metadata.xml
+++ b/dev-python/exdown/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nschloe/exdown</remote-id>
 		<remote-id type="pypi">exdown</remote-id>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 7fab73a84b50..3aec69714535 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,6 +1,3 @@
-AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb8ede743f77bbaa20b1b2e5956ea08e04359459a2c6837a5b2bb64585b8bf3bb826236acbbd874ffa5950d8d1196 SHA512 938bdc6185a5251a7f1e5185a694774a1b6e1c1ad39dbc444ee248f338f2e8a15dc3761980224f9eb378fa4c384a2c83f96f8a3ce55da2a24ea04b85997bdcf9
-DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
 DIST execnet-1.8.0.tar.gz 173765 BLAKE2B c6334a98b0e9dc7eb5e83fef05b795371edd0f85a6cbad9dc80d14f2e944204812c58419afebe5e70514f41d5ee7507b6a224a94e8cee2544607bc28ef5b175d SHA512 a0ca76002270daa5cbfa00563a51a3412008f893f755a1eb84f53e228dd61a82bdc94fe6152e30d471b4caff3059c662bb9de82100ec2c96df4d014836452698
-EBUILD execnet-1.7.1-r1.ebuild 1184 BLAKE2B 746a1073db5a34a243773b5da3fdbbbac5739a55bc662430359b09182db8cbb803fa9eef74126375ae41ea3d182083e03ed4ea7e4243f1f4b630f83d9128b810 SHA512 e1983c8ae5fe4a4f016a346ef07637bad6de9b1a117124b8e96eba6e8bd575b4ff636e76ff5c8ac890649258b152d19f38848f9440ba70579fa039fa92a1d025
-EBUILD execnet-1.8.0.ebuild 1388 BLAKE2B 962749bd717d803f54aa212978b411428af36893829cd8df4f69d3018942ede3259004dd52843ab4ca2b7d42acfedf609ebbada5d7376ad22e2a95e3a706338a SHA512 2177827cfe65261af61e3051cae777a3c9a1a129dffc6c12143710dc91d668c202f32eb4fe25c3cd9d6764677989ed1d43d3808e2be8d0c9d561a93160e2ea9f
+EBUILD execnet-1.8.0.ebuild 1379 BLAKE2B 4f80856904a27e4bad696010175f9b8943a9a026b0161a22df9ffbe989c2fc9743d6a8f31b8420d4dc10081de0bbf702a62f59da9d01f256983676ff004358b0 SHA512 8e3d1df9b9a453fd2d6eede0ea7b64e9657e47c3db5b1794eaad7d66c877d5f30f57374899acc573ac14b68eff5b2d73f79be42156946ce159c2cf249b33db4a
 MISC metadata.xml 441 BLAKE2B be64fae1f1acc10cff3492e6c2cd802f9f3bee83d646868d3dbe2336b35c791f8ec0be4aad6e89aaad167f03163740cdde543c5af6dc71c0780754f97a76f4af SHA512 9f17e1724f03b55e0313dd4b7528ef1f190258bd39efe35e144ad1807f4037a08e4302f749153f511c1bd0ab01a885e3700eb3ead4764d44161c0f7080a55673
diff --git a/dev-python/execnet/execnet-1.7.1-r1.ebuild b/dev-python/execnet/execnet-1.7.1-r1.ebuild
deleted file mode 100644
index e7ac3f87bd76..000000000000
--- a/dev-python/execnet/execnet-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="https://codespeak.net/execnet/
-	https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/execnet-1.7.1-tests.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove doctest that access an i'net site
-	rm doc/example/test_info.rst || die
-
-	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
-		testing/conftest.py || die
-
-	# get rid of setuptools_scm dep
-	sed -i -r "s:use_scm_version=.+,:version='${PV}',: ; s:\"setuptools_scm\"::" \
-		setup.py || die
-
-	printf -- '__version__ = "%s"\nversion = "%s"\n' "${PV}" "${PV}" > \
-		execnet/_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/execnet/execnet-1.8.0.ebuild b/dev-python/execnet/execnet-1.8.0.ebuild
index 552f79b56ca0..5446c28c7144 100644
--- a/dev-python/execnet/execnet-1.8.0.ebuild
+++ b/dev-python/execnet/execnet-1.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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/execnet/files/execnet-1.7.1-tests.patch b/dev-python/execnet/files/execnet-1.7.1-tests.patch
deleted file mode 100644
index 5144201d2a1f..000000000000
--- a/dev-python/execnet/files/execnet-1.7.1-tests.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff --git a/testing/test_channel.py b/testing/test_channel.py
-index 017abb0..0983bae 100644
---- a/testing/test_channel.py
-+++ b/testing/test_channel.py
-@@ -3,6 +3,7 @@
- mostly functional tests of gateways.
- """
- import time
-+import platform
- 
- import py
- import pytest
-@@ -362,6 +363,7 @@ class TestChannelFile:
-         s = f.read(5)
-         assert s == ""
- 
-+    @pytest.mark.skipif('pypy' in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_channel_file_readline_remote(self, gw):
-         channel = gw.remote_exec(
-             """
-@@ -382,7 +384,7 @@ class TestChannelFile:
- 
- 
- class TestStringCoerce:
--    @pytest.mark.skipif('sys.version>="3.0"')
-+    @pytest.mark.skip(reason="trying to run stuff under different impls")
-     def test_2to3(self, makegateway):
-         python = _find_version("3")
-         gw = makegateway("popen//python=%s" % python)
-@@ -410,7 +412,7 @@ class TestStringCoerce:
-         assert isinstance(res, str)
-         gw.exit()
- 
--    @pytest.mark.skipif('sys.version<"3.0"')
-+    @pytest.mark.skip(reason="trying to run stuff under different impls")
-     def test_3to2(self, makegateway):
-         python = _find_version("2")
-         gw = makegateway("popen//python=%s" % python)
-diff --git a/testing/test_gateway.py b/testing/test_gateway.py
-index fc1cf6a..b06a18d 100644
---- a/testing/test_gateway.py
-+++ b/testing/test_gateway.py
-@@ -5,6 +5,7 @@ mostly functional tests of gateways.
- import os
- import socket
- import subprocess
-+import platform
- import sys
- from textwrap import dedent
- 
-@@ -153,6 +154,7 @@ class TestBasicGateway:
- 
-         assert result is True
- 
-+    @pytest.mark.skipif('pypy' in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_remote_exec_module_with_traceback(self, gw, tmpdir, monkeypatch):
-         remotetest = tmpdir.join("remotetest.py")
-         remotetest.write(
-@@ -233,6 +235,7 @@ class TestBasicGateway:
-         assert result == 42
- 
-     @needs_osdup
-+    @pytest.mark.skipif('pypy' in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_confusion_from_os_write_stdout(self, gw):
-         channel = gw.remote_exec(
-             """
-@@ -250,6 +253,7 @@ class TestBasicGateway:
-         assert res == 42
- 
-     @needs_osdup
-+    @pytest.mark.skipif('pypy' in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_confusion_from_os_write_stderr(self, gw):
-         channel = gw.remote_exec(
-             """
-@@ -355,6 +359,7 @@ class TestPopenGateway:
-         )
-         py.test.raises(channel.RemoteError, channel.receive)
- 
-+    @pytest.mark.skip(reason="fails if bytecode writing is on")
-     def test_dont_write_bytecode(self, makegateway):
-         check_sys_dont_write_bytecode = """
-             import sys
-@@ -498,7 +503,7 @@ class TestTracing:
- 
- 
- class TestStringCoerce:
--    @py.test.mark.skipif('sys.version>="3.0"')
-+    @pytest.mark.skip(reason="trying to run stuff under different impls")
-     def test_2to3(self, makegateway):
-         python = _find_version("3")
-         gw = makegateway("popen//python=%s" % python)
-@@ -515,7 +520,7 @@ class TestStringCoerce:
-         assert isinstance(res, str)
-         gw.exit()
- 
--    @py.test.mark.skipif('sys.version<"3.0"')
-+    @pytest.mark.skip(reason="trying to run stuff under different impls")
-     def test_3to2(self, makegateway):
-         python = _find_version("2")
-         gw = makegateway("popen//python=%s" % python)
-diff --git a/testing/test_rsync.py b/testing/test_rsync.py
-index 995f229..a3f69a3 100644
---- a/testing/test_rsync.py
-+++ b/testing/test_rsync.py
-@@ -230,6 +230,7 @@ class TestRSync:
-         assert len(dest.listdir()) == 1
-         assert len(source.listdir()) == 1
- 
-+    @pytest.mark.skip(reason="tries to run other python impls")
-     @py.test.mark.skipif("sys.version_info >= (3,)")
-     def test_2_to_3_bridge_can_send_binary_files(self, tmpdir, makegateway):
-         python = _find_version("3")
-diff --git a/testing/test_serializer.py b/testing/test_serializer.py
-index 892e474..2f7f2f7 100644
---- a/testing/test_serializer.py
-+++ b/testing/test_serializer.py
-@@ -146,6 +146,7 @@ simple_tests = [
- ]
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- @py.test.mark.parametrize(["tp_name", "repr"], simple_tests)
- def test_simple(tp_name, repr, dump, load):
-     p = dump(repr)
-@@ -154,6 +155,7 @@ def test_simple(tp_name, repr, dump, load):
-     assert v == repr
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_set(py2, py3, dump):
-     p = dump("set((1, 2, 3))")
-     tp, v = py2.load(p)
-@@ -176,6 +178,7 @@ def test_set(py2, py3, dump):
-     assert v == "set()"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_frozenset(py2, py3, dump):
-     p = dump("frozenset((1, 2, 3))")
-     tp, v = py2.load(p)
-@@ -193,6 +196,7 @@ def test_frozenset(py2, py3, dump):
-     assert v == "frozenset()"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_long(py2, py3):
-     really_big = "9223372036854775807324234"
-     p = py2.dump(really_big)
-@@ -211,6 +215,7 @@ def test_long(py2, py3):
-     assert v == really_big + "L"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_small_long(py2, py3):
-     p = py2.dump("123L")
-     tp, s = py2.load(p)
-@@ -219,6 +224,7 @@ def test_small_long(py2, py3):
-     assert s == "123"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_bytes(py2, py3):
-     p = py3.dump("b'hi'")
-     tp, v = py2.load(p)
-@@ -229,6 +235,7 @@ def test_bytes(py2, py3):
-     assert v == "b'hi'"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_str(py2, py3):
-     p = py2.dump("'xyz'")
-     tp, s = py2.load(p)
-@@ -242,6 +249,7 @@ def test_str(py2, py3):
-     assert tp == "bytes"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_unicode(py2, py3):
-     p = py2.dump("u'hi'")
-     tp, s = py2.load(p)
-@@ -260,6 +268,7 @@ def test_unicode(py2, py3):
-     assert s == "u'hi'"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_bool(py2, py3):
-     p = py2.dump("True")
-     tp, s = py2.load(p)
-@@ -273,12 +282,14 @@ def test_bool(py2, py3):
-     assert s == "False"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_none(dump, load):
-     p = dump("None")
-     tp, s = load(p)
-     assert s == "None"
- 
- 
-+@pytest.mark.skip(reason="trying to run stuff under different impls")
- def test_tuple_nested_with_empty_in_between(py2):
-     p = py2.dump("(1, (), 3)")
-     tp, s = py2.load(p)
-diff --git a/testing/test_threadpool.py b/testing/test_threadpool.py
-index d469436..a473e4a 100644
---- a/testing/test_threadpool.py
-+++ b/testing/test_threadpool.py
-@@ -3,6 +3,7 @@ from __future__ import with_statement
- 
- import os
- import sys
-+import platform
- 
- import py
- import pytest
-@@ -29,7 +30,7 @@ def test_simple(pool):
-     reply = pool.spawn(lambda: 42)
-     assert reply.get() == 42
- 
--
-+@pytest.mark.skipif('pypy' in platform.python_implementation().lower(), reason="broken on pypy")
- def test_some(pool, execmodel):
-     q = execmodel.queue.Queue()
-     num = 4
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index b1ab891886b9..70b28f37258e 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,5 @@
 DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
 DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
 EBUILD executing-0.5.3.ebuild 1073 BLAKE2B f85315fd1f818982010ed056d90581c3db7c703be4f911ffffbdb8fedf99d0d291dae31dca3c553919134a91c7494ce3d331cd109cde38199ca3f5b0a5f20ddc SHA512 c3391e3e768438e29e60bc4e54744a1c10db21d424bddeeb9a5f70da2bd23cd77d22e9c99d97e896aa988f950c26c90e213d0ebe9c8b4dcb73e00a319ec728ae
-EBUILD executing-0.5.4.ebuild 1089 BLAKE2B 84a7d664c75a76b242c5ab8af21c40dc6ed5c61f98a3bb12c688d4432508a242f03923860bbdcb9831646b52d84985da4ec4e12b901987834fb3cfc0c0bfaf24 SHA512 e0e698bdaed3fd0607dacf7a18a88aa00352ae5798dc38375518aab2163fada08416d1e04202fef9917e18b214451b15ee29477f0a8b1a4049078f0d6753d503
+EBUILD executing-0.5.4.ebuild 1087 BLAKE2B 02aed97679be62defddd3449c8229d4179ed347c83296c0492bdfef4e156d62777800f27287f7de35b5c0029eb6e991fb0518a2da10ff0795160f5928d1d4ee3 SHA512 31ba49d1ea1def909de6161d7515f0d442ae1e7eea83ce3ef9e844e5a0c76035b35c0fdfb6feb9faaa9cf788c063afaa1ac431a3836b0dbc83b54b962b416bd2
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
index c8c5252472ba..e301b0c3d35a 100644
--- a/dev-python/executing/executing-0.5.4.ebuild
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index d70059c9a68e..7886521b7908 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,8 +1,4 @@
-DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.8.11-r1.ebuild 537 BLAKE2B c6ba31efff5397855b44a0dab53b61a9a13a51d3ecbed94a4b2976ca3ba344849885ebc471678f6178dcc8ddfdcf3fce1efddd3c75d3d686bbcd82b14d6cd885 SHA512 0c4cb5af67f109aecc154f831962b771369d04d7cc7e8bfe159dac950586ef824371d5565a9bfa351dad7e67e7c42b26578b5d88b6da18200cb2e87235ee6a39
-EBUILD eyeD3-0.9.5.ebuild 1227 BLAKE2B 4bf2d95c199b7a1db9094b24081d88198454ec95cf662480fa40a672c0824475717efa0e7ab0d50692893f6aa625d525f5456e8e0db3290e14daaa8745c30a0b SHA512 0cfe995c308cf347383871bf6a40f91036116974ddc3e80fa7429e3e2b2551c861e1914bc0be8dea801cb460bd807dbef612e5e657e9815509c0e49bd3bd89cd
-EBUILD eyeD3-0.9.6.ebuild 1236 BLAKE2B 1862b24e1bac50b415041546622fe5f31315bc0376d45301278ddc652f95b9d81345d48b7e9442979a6cf79bb3ff09c34e17ad0eb4b99962758733b2590489d1 SHA512 252971a52fccfae1bf64ab8a511f6c5f2a2ae30a837dc18266e0f54c9c8bf00ffc63742e2e07b7f8d61ce923ad22c49364e0f63b16dea526a2619ca5e30373dd
-MISC metadata.xml 474 BLAKE2B 3ad8e18743ea0332a57b1cd8a4d0ef50beae58cf94ab8796abc64e5c02b1c4a7335b9b14de612ee3334cd11454c1d67bab63a49873aea7f457be1633fcde3205 SHA512 38d9fb375079476f9db94e0abe5f48289c852fb09de4ca830b0ef19488c72db8acbf6b94c51753aad0b5848a71f191fa4c2e05b065d6c3fc216ce4cfb6ef239a
+EBUILD eyeD3-0.9.6.ebuild 1230 BLAKE2B ff2c7191b18d8340f4a24ec5605c588a35c8139dd67ed4441c1a284e131196f5ed81eccb80e38b9b3567b30357d13ad129cad69aea35493676a2791467340cfd SHA512 87d7f38e4a88eddd70c0de8ff6d19607ae0081f1a927b691618f7768e4a30432abfbbed384a23c6c37aefd9b26c4826753855a3192181ddba3c48e6709e7ff60
+MISC metadata.xml 498 BLAKE2B 3d978f42129bedd19518980a3b7bc238b256590bc488e6b2d8afdd17ce9a93124861473f0fe7d80fd69cde6a9b53b1789f0dddc7e3de3e606a63751023d385fb SHA512 a4addfbe9bfb257176ba9ea264ac822f299d3ce643fcffc8f8fbedcfb033015ac7fb1832f1a053f1b188d9198d4505a174cf2747829358d612219e9f53d3e718
diff --git a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
deleted file mode 100644
index cf46c945c545..000000000000
--- a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="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
deleted file mode 100644
index 355009b9d7f8..000000000000
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 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 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-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/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
index 3196362443a0..cb6fada8d168 100644
--- a/dev-python/eyeD3/eyeD3-0.9.6.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index 0171f487730d..edcabc2c627f 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">eyed3</remote-id>
 		<remote-id type="github">nicfit/eyeD3</remote-id>
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 0b946e4e1076..25c7b145c35c 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,3 +1,3 @@
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
-EBUILD falcon-2.0.0.ebuild 813 BLAKE2B 546a58eb1df0ca6cede711fe39e9d175f20d819e4118e7329746c2d7ab33b651d03f1c71127b57663de1f0b96094b6adfe236914a6e4ac5993d26426cba569ea SHA512 0d48173584ff650a4911a9ab035f4958ad89a9f3d8d598b8884d820740f731d51fa5047fd29f79c7b8db1ccf65b250db7d1b34fe8b77bbea7763e5979a2fbea9
+EBUILD falcon-2.0.0.ebuild 1123 BLAKE2B e9bd9c392d0e1acf98c5b70d51491ec351dc5238ef745feac774af71fcdbbaec4f31da7251fb9053b3ba7d10734882b8f390fcec86c6ee155f251573004e9022 SHA512 8697a1835ee097791f460d8c5868c8448c007cba38bedfada1c9ee3f781aee32832157c06990c29bcd9c1c96b36fa2fedb11149f5b7cb83d4553a6b3666a412d
 MISC metadata.xml 369 BLAKE2B 06dfa8b04b07cb3cf23e776ac3fd31280a5ae39f4497e95216f83bb1a24c087354e7958215b2c05e0c5eb702bf4b706ffa3fd8d3d389f6a77cdaadef3f3b8165 SHA512 063721ee00983c17be24d047b93faeb75ec901d45f6888564ce11c6b9e7e097bdcca92c25213454a5e8949c20206bde1a906c74eefc6b0f7e562e4369465b8e4
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0.ebuild
index e22b065f73af..ff5be1f6d87a 100644
--- a/dev-python/falcon/falcon-2.0.0.ebuild
+++ b/dev-python/falcon/falcon-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
@@ -15,20 +15,31 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cython"
-RESTRICT="test"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+BDEPEND="cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
+"
+DEPEND="${RDEPEND}"
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
 
 src_prepare() {
 	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
+		sed -i -e 's/if with_cython:/if False:/' setup.py || die
 	fi
 
-	eapply_user
+	default
+}
+
+python_test() {
+	local deselect=(
+		# mujson is unpackaged, test-only dep
+		--ignore tests/test_media_handlers.py
+		# uses unsafe serialization (unsafe_load)
+		--deselect tests/test_httperror.py::TestHTTPError::test_custom_error_serializer
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index cf33d088a449..2fe11d53fe53 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -2,6 +2,5 @@ AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d3
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
 EBUILD feedparser-5.2.1-r1.ebuild 1132 BLAKE2B e823ff9c50c41b06770e80d13ed07b6d3d92446b438824420a1c5482048577038c212d8881ebb3ffd0f6ba9a39f42aa470c11805f03b13c49c80bdbadc9eb3f7 SHA512 fd3cac1c99f3395bf556ecf9db77ec8c09810e538c6eec0fead5a24de5b10f1a54abaa43e4e1e8e1fb72fd8957e460d008eb2455d17e779c76e7ff27cf56d0b5
-EBUILD feedparser-5.2.1.ebuild 1193 BLAKE2B aff3ad788dec171039a203e35ac9bf186a47895be0e1b32fa052bb8fe5368775475a072b695b69f4769c23842ef1ba42dbb2c304d02dc83b17b5cb9b6edbb2df SHA512 c26d61fbc65d7636452d4f82f8896e2f8a1e9ba587867061e91b53a2cfaa23885484bc80a8f213c414d6e4bf5d0f531fc2b18b5e842c5d1198b2a0ba9959c06e
-EBUILD feedparser-6.0.2.ebuild 894 BLAKE2B 697b98dea129dd86ccdf3c1d1b9cee6439ed25d066cc7ee30deb7897af3d1c099852bf216690f309dd8d433b393e123552417f81df2411197dd76eb6007616db SHA512 63fd9f6c2978c0845f90bdc056620cd5247df3cf6323bd5b4e03c264924e8bc97e3bd789bd79a4e7f1e862cd26d5ce8695cc511ec0f85b2ac435070a1dd58fea
+EBUILD feedparser-6.0.2.ebuild 893 BLAKE2B 20d31fd8c3a9b2931c47565c7cdd8ab44da8894b6aa8f7ce7cd005f7d27b3126d6552b9ba95f7a11c9dd5f9677d56cfdc933f38b4f5037c813bfde6023fc1cc6 SHA512 516c746b3fb215a16ba7439d9ad05560d2eb619c095328576cdf6e2f4d5c7fdb53c9c53dbb395ef0f427bcce5f6ed7594b9d498973ab4385008d5bd18115255f
 MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
deleted file mode 100644
index 96ba7d59bf02..000000000000
--- a/dev-python/feedparser/feedparser-5.2.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_{7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# sgmllib is licensed under PSF-2.
-LICENSE="BSD-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# Tests have issues with chardet installed, and are just kind of buggy.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sgmllib.patch"
-)
-
-python_prepare_all() {
-	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
-	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
-	cd "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3* ]]; then
-		2to3 --no-diffs -w -n feedparsertest.py || die
-	fi
-	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/feedparser/feedparser-6.0.2.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
index 7cc94f15b6ee..32e1126a6b75 100644
--- a/dev-python/feedparser/feedparser-6.0.2.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 98f6c562e9f9..e20bb459d31c 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-r1.ebuild 628 BLAKE2B 225110b61671e46b22e3ebf618b5894a8413979d416dad57f409068e5931ba4a99f1e9b80f289b9ff2646cc82d1b1fca881eda811a294d37395008329f53a6a0 SHA512 a6b8557190d1d09172071b2fba471956a4bef17cf53e96ef25416ef0d020984a0969be703e3361bcfc522a97a5e97e557b5fb334dff359dafd97fc053ed57402
+EBUILD filelock-3.0.12-r1.ebuild 634 BLAKE2B f63641f5be0fc141008a07747cd9ddaa980931258c8a00b16db1080617519d9037ea6bb9c695a18b2fa5605b8f3717f9c0a8a570ec802d2cc0bd9884c59c02e3 SHA512 aa4b0b5bb5eea982522abdef8d759551e9c9c9efd783cfa3f6680aee1296da6830e6d30bf8a869d444e9be8fef149398b7caa7be7b068219d61a1dcc49340765
 MISC metadata.xml 380 BLAKE2B 24bd8ce3147524d0dfa757c9ea5aa3d5cce58bf31072cccc5390408439654631a016f17b1273d8110db978e5ffbc80fa4187230999ff7ff80c01835d0c63f9bb SHA512 b0d1d979278459dbc994176d6ff66c3f8490235046d2bd1356494b982ed881acf0f0d56ad16cfcbd5d5cb6b7167fd96dfd631507a49c3ccf67ee011b9d9f5c7f
diff --git a/dev-python/filelock/filelock-3.0.12-r1.ebuild b/dev-python/filelock/filelock-3.0.12-r1.ebuild
index 459ab0c9f198..0a955f34739b 100644
--- a/dev-python/filelock/filelock-3.0.12-r1.ebuild
+++ b/dev-python/filelock/filelock-3.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 distutils_enable_tests unittest
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index cae22e709f5a..9bf0f92eeca0 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,5 +1,3 @@
 DIST flask-cors-3.0.10.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
-DIST flask-cors-3.0.9.tar.gz 29222 BLAKE2B 5c13218728c1741c455efedcf46af0b7e2c765e41ad256eb52413f06544d6d0d1d755ab336bc4a2a44627665b1252246073acfd201622604db825dbd7e2501ed SHA512 1b80b4dbc928e076c8c415f4514877c2e44e5b658b200178dc9a63b3342e46a7da62eba80d6703cdfd6ac74302aae2ff072531a587e7f04e5c1715d8b7592654
-EBUILD flask-cors-3.0.10.ebuild 807 BLAKE2B c386ddad2d5a2e0c34a6f9a7d2493f259257a9cc375ad06473ed2fe6baa56543d9b657a3f8157f2456beb612d1a4029b97c38017f77a21ff0e054a3deadc8bce SHA512 f0e84ffa15974cb83d91b492ffd648dcb2e435208c650b99eca0315bfb21144da5398d3047677472251bffc502a6a281880a6a28d06a643dd7c13d1702ae6809
-EBUILD flask-cors-3.0.9.ebuild 805 BLAKE2B 1769ee742f4a7f8e50c6394ec6632baccc0548fca23344ad9045fe16aced74a8b5989f20fabd12cd3ac92be85006a03bfac156e0d96ee235a6e17d13c252c401 SHA512 88e081e1b31cc676f5f9969e178697c101f4eaba19234b8e0c529dff5989e11d329bf3738f1f4cd60d5ba581d6f14281734b608b6464bbdcd02a1b3e599cb4d5
+EBUILD flask-cors-3.0.10.ebuild 810 BLAKE2B 60bb22b310d0d550d02c24e9f1d28f2d64d8a5976f76e016fe56d7e1bcd3743595d2299d962bf8fae3db0b651e7524896b21ca0890ddc0281159d7fb6f4d6de3 SHA512 4ae10cb5be99418bdb0430350ac56d7f558c8797db0e51a5f4b37008b149cbbb7c81e53d50fe51698c741d63191e0a49e0e780ae46d53ab413c859709c3a2326
 MISC metadata.xml 539 BLAKE2B e07720b476d151810d692a4dc4d0bc5712fdc9477731272e46de0f65a14fdeade798c7c9e91e4eb85e49293f7e52a2c03bfbf69fa6b024a2ecb8cb75fc469073 SHA512 c90f218c17ba4e11e9d3cdfb057179ccd58fc95242cdc8b4fb213b326ff7d7b267a5ce8b68851bc0637e1d6b0bfcea8ad7f73e371818b25706cdde635b35af9c
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
index bb4da6fa9664..fb63fbbbae0a 100644
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
diff --git a/dev-python/flask-cors/flask-cors-3.0.9.ebuild b/dev-python/flask-cors/flask-cors-3.0.9.ebuild
deleted file mode 100644
index 0d4332c8a57b..000000000000
--- a/dev-python/flask-cors/flask-cors-3.0.9.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_{7..9} )
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index acaff926395a..c7a269991175 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,7 +1,9 @@
 DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
 DIST Flask-Migrate-2.5.3.tar.gz 12652 BLAKE2B 4a43cb3849ffa31afa00031ffbdfc130d07a8282184ca43c58a9b49fe94c456ee46a735fd6df9f9e3fa00ae0c82c1688852a68f2bf278afc5b08d64b31a473e7 SHA512 f26db1c6ceddceb635cce4259b4508ecc8dc26dbfa67397205668883129835840050d909337a73712d3b1ff3e0bbfab74f5ac94c2ac472ec64f86e64789107ac
 DIST Flask-Migrate-2.6.0.tar.gz 12671 BLAKE2B d8d1ab6fc7c077cc9c6dfe5de26c7ab0f2bcb45455f28fdb1bc03b6ac23a063f5c4103d57050a3e0818debd59cd9927ed4833d1cd924a2147ae16f766c045d82 SHA512 91ce86079b8f438357e5bffa809dd737c26ca5cb553ac9bd315ce5039112842e2a52fbf3cec3f6548eb13def8d641be2a4e12dcbe01995b1ab073af989dbbb68
+DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
 EBUILD flask-migrate-2.5.2.ebuild 861 BLAKE2B 2d3459c197039ae77db7b77ec0ae3c7bcbe705650de1ce4c8fb1c3cb7ed305e1a9b51b8ca4d41128671905e78ed6aa89477a93094ed3793d7c578494d8a225c2 SHA512 115f6fb886680ffe5b03c4991a645d1a62e1f06703f2c895dfb025278568b75173d5f475adb404aee9548e4f5be5646a15c471e4e3ee207f3fa2ef0344c8efd2
 EBUILD flask-migrate-2.5.3.ebuild 773 BLAKE2B 5a63c31af79952d09ed28481dcca49fed98e5f1d6e1be27616017c0286267bf17095edb26bade3f3cd0348251b8f8f1e005723d7b99187ac228a3097c0d217cf SHA512 bbc8844ebcc889240a8426bc13c472eb310ce160c6aff1fa951431ad48dab05b3b81abf7e473a0f1ff1abbaaa3ea03aaec54f7959778235a7c5cba3535c89b57
-EBUILD flask-migrate-2.6.0.ebuild 768 BLAKE2B 27f77046038a9cbefd6c506ef6cd25c3d0996bf35c3e618d8dcceec3752b16f5dc9a4aae8804aaa969d527a25ef7b2cd18b3b2ef8c894a6b975645e65cca36d9 SHA512 1528996035b69011fd482e359ff90f3f6050836fc7214561442669a56da86188d0122e945ba3c344e287449c6e88b6a939d79bb082ccae0947b6e05008d21b5e
+EBUILD flask-migrate-2.6.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
+EBUILD flask-migrate-2.7.0.ebuild 769 BLAKE2B 67b5cad5c9be9025cce56618293bb2af69d0ca13077ac5322db12e47428e6c48d917a835031eb867a84b1ebca8326f3bfca5d3fd5527943fbd14a8cb270e7e13 SHA512 0165d0d3c2aa0e949dac289762d8b464b479b7c26aa310c8cac941f3c72565c30cae8d204c0a535aa5ea3f8b692e5052e786b4e59fceb115adbd75b889b02750
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild
index e6263b56c2d3..e72818dcefbe 100644
--- a/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.6.0.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-migrate/flask-migrate-2.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
new file mode 100644
index 000000000000..862a4f3171e1
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index d003f6da6c52..548493499707 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,9 +1,4 @@
-AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
 AUX flask-security-4.0.0-test-install.patch 590 BLAKE2B 54f4b8e174af28b875d937f727401dbc323a9326f98f7a045742448f227929246af6d1e1bfd3a45830618b433b5a3e60a1b01fcb0202e1bf01e3efb13b023fc0 SHA512 13da8c4eeb967e730ffff647ac9345a33fed7e2c8de2db21f6f10c9c10cfbdf8d263804032884298b528c00103705afccab81110839df95409635b78a139fc67
-DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
-DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.0.0.gh.tar.gz 381592 BLAKE2B 62f8ceb5b6912839ad69a9f26793a831304f0d03cd40c73bd7c6701421d22955bec1e43713b2e07004ff9686591370378d9ff6e2e61e6bdc9a6472f18b28bfad SHA512 1d616121d0220bdef6081f4feb2c56b6feb346609548ad74c7bbbb60f4d65e9b3ec92a35fa9e077c35db9ab398d921461450594185956d05d5dda063fe972b72
-EBUILD flask-security-3.4.4.ebuild 2191 BLAKE2B c849507f90f3ccf8c7b9b09d787ea15dea55a61d8ab40537779557f9ee28bc36cd52829bf55d570d5218006cf4fd2b13c9bc67ed5e2e11527c17dde06a3d9f13 SHA512 98425abe2e65f5564bcc76824c97d49a56c7745fd702c4e614391a188e6c06381d73acff33f98e1c46785fdf2e2e13d7984126050bea1b6d9369db1f4edd97d5
-EBUILD flask-security-3.4.5.ebuild 2191 BLAKE2B c849507f90f3ccf8c7b9b09d787ea15dea55a61d8ab40537779557f9ee28bc36cd52829bf55d570d5218006cf4fd2b13c9bc67ed5e2e11527c17dde06a3d9f13 SHA512 98425abe2e65f5564bcc76824c97d49a56c7745fd702c4e614391a188e6c06381d73acff33f98e1c46785fdf2e2e13d7984126050bea1b6d9369db1f4edd97d5
-EBUILD flask-security-4.0.0.ebuild 1952 BLAKE2B 3e4f18d16599e11a96fba60837f622c27a93a4a64cf0a4ba5948093e9fd865efee05a4b9f080b50b245eb9dda5d64edd14c59d278a8f023699caa40e000e9842 SHA512 ed4aa40e66ff20bdfb3423781f51ea50612c0fb1362f305a3107452f1c8590dd86a5c28c0241463b92238b7e0b0a6dfa28b8387cb3d4e8f812e902f7c25f4aa5
+EBUILD flask-security-4.0.0.ebuild 1950 BLAKE2B fc96c8cbcca9444dffa1587dd44d2a195c0126dc244d874ca87f28744d67a209a24c2143a63f7fdab913645e439e9308975babbe554a8fb2e8e672c3a0a3148a SHA512 64dd7f4f5522a92b840581a4e87e31d3075c19809cfc1bc0a048fe1aa5811623429e1d9ff07cf9cad0956217952e8f39cb32560065be1d028071a817f5455c8c
 MISC metadata.xml 416 BLAKE2B 1da613b370aed838bdfe6ffaa616c80aca54cab6030680212db38c0bf1ff783d24db11d8dd2056843621668b25ccba850b2c3d6d62b378ade78f88b263c5573d SHA512 3ab74e9f590c343323fd3d9438bf2a487b77019eeb986e4a0f461c991a00075a70246812cde79f27a337c6ba385e162148a4382063888ff7f2fcf8405bf9573a
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
deleted file mode 100644
index 484e816908f4..000000000000
--- a/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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.4.ebuild b/dev-python/flask-security/flask-security-3.4.4.ebuild
deleted file mode 100644
index ff4924b074a5..000000000000
--- a/dev-python/flask-security/flask-security-3.4.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/mock[${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@-p no:httpbin@' \
-		-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.5.ebuild b/dev-python/flask-security/flask-security-3.4.5.ebuild
deleted file mode 100644
index ff4924b074a5..000000000000
--- a/dev-python/flask-security/flask-security-3.4.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/mock[${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@-p no:httpbin@' \
-		-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-4.0.0.ebuild b/dev-python/flask-security/flask-security-4.0.0.ebuild
index 7260574a0d43..36b468909aac 100644
--- a/dev-python/flask-security/flask-security-4.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-4.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index eb2257e95bdb..b6d7d4d9b6fc 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-r1.ebuild 1336 BLAKE2B 1d9cd737bd40369f5d8e7372376d69546d1979aaecf38bd22980a86e7b9f4027f42645d68aba5bee2ce099f37064bfd40495ccc6728fb35ad2d92f3ffa45e7f0 SHA512 f4c81fb1f96574a06a20a1d8ae7758f598b07d9957bd6c82faffe1415344ca5ddd482cea55dc54a83cc86990cd6afb1fbae25f93282e9efb0d238fad17814cad
-EBUILD flask-9999.ebuild 1294 BLAKE2B ae302167cf6b24cc2e943e7cd26d74617cf943aadc906d6a2391158c3233c4f57efe17665b52f01bb21009e1ba23f26bb1d2f0da6e5cfcd133a46896569bf0e3 SHA512 9b6449aa5fc532a1a446518646307801ae06d932c62d22ebd6c219a76b20daffd08fa38b3720c0e1458e9e01ba2c3fc078f36c6dca312d8879a665299c133228
+EBUILD flask-9999.ebuild 1296 BLAKE2B 78ee07fe3a1bbaed5da574ba3db1f735908aa83b0eeafc47b1d1683869a3756660134c6f6129397df5b27c7156221aafcb0bf414b76a09c8ac3121e86597782f SHA512 86fa9d9bfff0b5ecd2d3c9cb71ea8c4b4c320cd3dcd20da43a3afa9d1b69c601cbf980ff31738e2e30c0cba1559afec754fdb9af06255a80bbb54054a4531f35
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index caf60a91263f..586061db9361 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index b2bec7882e6d..1e9c5965aed5 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,5 @@
 DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
-EBUILD fonttools-4.18.2.ebuild 1384 BLAKE2B 4e8a5141288ac35e417e96cd22784c1d9642c6012032d2c320a2ece5af99e376aaa06e8c5a9fd0b37a57567d43274f852917089834944efc2d3c7dc28b970058 SHA512 6fb079544020bcfc72b51704ac2ea1da3e21dd8772e0a0fdaaf127e9ca72a154b508241de9925cc58f75388d9b01c8ae87bb8d67857cde8819e8f49245373a81
+DIST fonttools-4.21.1.tar.gz 2531249 BLAKE2B 7f507f85061c67da0003ed2c4f685b22ccf0e6c5067adb934772ef0832656bbe092d1282b30b5a40071cd3a3219f5cfd810e06e9cd3f85ddd8fa93538134c943 SHA512 8c54809ab9f39e34f482ee6b17dbf8b309e8bfa0bde783e24195c1f2949ded64591c5e79565136ec8492c0095d593db20779d3f28b933f8e40e54b610130e0f4
+EBUILD fonttools-4.18.2.ebuild 1384 BLAKE2B 5b85d8367c403fad1710a93d76e4131ccfbc9a6f2b6cbde64c8a91489825f455a160cf21f4766f28560791e8267b3c51c6db7db160fdd7de4a685831ce654908 SHA512 659f68fb7deb7735869201c3ace83ed7a6cc38e8359b3c4af860d109c8e9decafb724d1744f3ee6587737300606b89be63d4368cef2f12044217a500240137c1
+EBUILD fonttools-4.21.1.ebuild 1469 BLAKE2B d6d83b39df02d6bbf34c9c4f79c0addb55dd423a5f68ef6dee3769cefed638d4d420b85114757cf90da8d944fdf109501ff7dd282e1d5368f8f0a8fbae710eaa SHA512 99796a6165ea1cb5b25885492fe7ec67a6ffbeab14d5755dd79e4af9a2c06818904d64e792ebe8a12bc96fee20b6aea412d8fa008fe7ae1a8baae5ee4a2640cd
 MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.18.2.ebuild b/dev-python/fonttools/fonttools-4.18.2.ebuild
index fe67a350af5b..d0292f5917e4 100644
--- a/dev-python/fonttools/fonttools-4.18.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/fonttools/fonttools-4.21.1.ebuild b/dev-python/fonttools/fonttools-4.21.1.ebuild
new file mode 100644
index 000000000000..6627fc915f27
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.21.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	pytest -vv Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 81c6c9a29fb1..b9c4448586dd 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,5 +1,3 @@
-DIST freezegun-1.0.0.tar.gz 27426 BLAKE2B ebbe77d50f71cd10ad77dd9010fbc3dd9411a781300a5d196f4f86a76a374a8416980f8779705a943c4638ffdf99250640afe577695203b87e77e2daa1be8b38 SHA512 b6e19cf7799c0689eb756f6ce922797f2f0622f03d13aaf81c62d777d00b660b6619cff996f7a89c54b2e9f33641401e04e72a455a03ba0c7dfca09b64cfecb0
 DIST freezegun-1.1.0.tar.gz 29923 BLAKE2B 8a49bcb2e2e89e09ab14b6b48f90c145ddba2a7e0d005e33a002316c01b29899766b0b011e47f510be737011752044a7cc5967fdff3e0e14dc77da92f5bb5b27 SHA512 41d2bd18c5115416679602c53aff10891dd8e97402f641eeb3819a3b84d34351c238dece8e68fe267d572693ea08b421510726b6d7c9fdb1d6d70ddc96954d54
-EBUILD freezegun-1.0.0-r1.ebuild 683 BLAKE2B 9015463f3488b0546c6d63547aaa8d75d5d1d1d33f32a6599c466149ea00e6ba1a4949a32f40d1617b947eec7ab443083bbd73d3a79bfe5d88967948a9db1608 SHA512 82a5cd01edfe3279f453ca5a37b163d1ed28d6e9d64e69e52ebcc9ce0cb2b010181ed316b85b51aab1b9fcdbd58cd7c4a53a7bc4c27bf8af5a54957fd7545de3
-EBUILD freezegun-1.1.0.ebuild 692 BLAKE2B 7475a7417d9e7bf5601c3d68c533aae095a27df4fb6a6af1319db5667dd303014b9f4fb9a4e793a91cd892930b6eb1bc31fcab35b7621943d8dd4e31f1c923a0 SHA512 b57d8dc258a7982a368602f42b07e394faf204eb093ffba65fb0174861d7824a2ee22f78982807a566b5bff8ee44310144378dc689a53b1d01da19f45edc43df
+EBUILD freezegun-1.1.0.ebuild 683 BLAKE2B 9015463f3488b0546c6d63547aaa8d75d5d1d1d33f32a6599c466149ea00e6ba1a4949a32f40d1617b947eec7ab443083bbd73d3a79bfe5d88967948a9db1608 SHA512 82a5cd01edfe3279f453ca5a37b163d1ed28d6e9d64e69e52ebcc9ce0cb2b010181ed316b85b51aab1b9fcdbd58cd7c4a53a7bc4c27bf8af5a54957fd7545de3
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
deleted file mode 100644
index 5cd43783fec4..000000000000
--- a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/freezegun/freezegun-1.1.0.ebuild b/dev-python/freezegun/freezegun-1.1.0.ebuild
index e51cc6b9ad6e..5cd43783fec4 100644
--- a/dev-python/freezegun/freezegun-1.1.0.ebuild
+++ b/dev-python/freezegun/freezegun-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 84760930ec7f..dc8dad2e1948 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,4 +1,6 @@
 AUX fsspec-0.8.2-test-cleanup.patch 3768 BLAKE2B 7c6467294e9295a02b5a7d001314335c96b1dd415903917750427fa55b2c178fd3d363f9b5bd7b9f54bca70f8e944afdeddbe125ec8ef6b03fc61fecce02d92d SHA512 99bf76a51bc7e5294b6e93e1ad4509039aeb614b87ad7eaf0005993345f57b68019fb4d16546cc6fff56d47b20e2648dd550e7aefda132da6883ef49cd6255cd
 DIST filesystem_spec-0.8.5.tar.gz 255904 BLAKE2B df400276dbc53a453e9e9a00acb2e93a86a5f239237533bab036a16bd48d6d709f68241febe75f6f72281162ba4a563a087405a1064e18805ce2501095d778fb SHA512 20001fd02348f15e764a9e20eab98267f6746bd7e86187914d3db3098061aa62cb296595c3519696ae1e99ef896d49df0fcec846aaf6e5c281dd1a344ef6c393
+DIST filesystem_spec-0.8.7.tar.gz 277744 BLAKE2B 4957b716d622ecd2a1bb381b291253970682dde2c90a0e8dd76dfcc3ce3c9ba55846d97df8c1fcedd4e0d5af1c10eccc6c94418f2e78e9fffde846d12c11e170 SHA512 6eb89bf1e19ac1313aad2217aaaf4686f2e2e831a2cd339f9e12b8319fb080b82f0b90b10af53c2e6febd98a34ae8520444fee3c6394e7ab5fd5ca68d56e5454
 EBUILD fsspec-0.8.5.ebuild 1190 BLAKE2B 96479c9f48d82e88c9aef43f78b62a59fabdfa34cb7d83ec1b381a511273a8d0c1cfadf2f20e2d0dc5256dfb5a8c908b22f91016745c5e3bbcc848af9feeeb32 SHA512 90d6f4d4251f7fc7724504c0391bcbb0b1f273c03b2b12a9c519309d2e6ee8d0aadb153a3579d63c59f00178bbb7b27f2b672a264b0d7812a9d0cb7d3beccfca
+EBUILD fsspec-0.8.7.ebuild 1239 BLAKE2B 0d3df1633cc92ba479a238392a98986b3b877c0881df094ffdb4c95c00937acbd4476b388574ba9888cccda798b4c29eac3135f10f91d5971301056f3da68cd1 SHA512 2e97040adc6f698510fd109de6ed3a511d6e4e11852885431ed3da35a9d995d42204f719c76d8308e0c4dd574b0016ae68a59d23da674e20a107f2bbb9da8146
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-0.8.7.ebuild b/dev-python/fsspec/fsspec-0.8.7.ebuild
new file mode 100644
index 000000000000..b0dedf55ecb8
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${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
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	pytest -vv \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 77a7f818f41e..a3d157ef85fa 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 719 BLAKE2B 650d25eb4a87d3d038cead306a38183c71808810de08200cd77672a0f504d40f0f98a80df3f8568f0036957148d179974df634ed2b5da7bfa6ef13c058790fdc SHA512 b8148184f091a2cdd7d4f5a7a51f447a4d4d115757a544252f445c271419d1d39f921556d98c22106aeb0fc236a4dc057032cb659cb9b4b0d13d9b1d886627c1
-MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
+EBUILD funcparserlib-0.3.6-r1.ebuild 648 BLAKE2B 87799ab21ee36bd93c595962234141bac487eaf769435370d4ee70732b9327b34e84423d62b568d71784fe9af18a02977bf1e30918ee0acbbd96dfe3e3add786 SHA512 97b1a9b1c410f53113962b94191edfdbbad94904ea78f2c179e812139c76a9cdfa0109f1ac4b74ba5bff2090d2f7e16458e2a289784959b9cd8ad011fb21ebf6
+MISC metadata.xml 340 BLAKE2B 3887b5c0f79a5f63b5e1aceb5334847f6c38d9f6d1c21662c4c64375983c508cbccabd6bc34927ff4a6e4cbf0a19401713e60fdf4b24ea4f5568cd428bc2af04 SHA512 e595ca8451bdf62cbaf5022886865b8079ea2cc8ed850cde96ee7dccee2edde3b4f27058c419ee67f63ad130ecac18df663c802f6a72a46002aecdefcf23bbf7
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 579ccf680b70..45bfb91ec8cf 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Recursive descent parsing library based on functional combinators"
@@ -14,10 +13,6 @@ 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=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
diff --git a/dev-python/funcparserlib/metadata.xml b/dev-python/funcparserlib/metadata.xml
index 48fa62ab4ac6..8fe533e7bce8 100644
--- a/dev-python/funcparserlib/metadata.xml
+++ b/dev-python/funcparserlib/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">funcparserlib</remote-id>
 	</upstream>
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index bcafdaec2ecc..1e4cf5f8f4e4 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,3 @@
-DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
 DIST funcy-1.15.tar.gz 605884 BLAKE2B dbcfe02981a09b2914096c7df9e0f37582dd4250bced71df92a1b10ce655291470f5ecb32ea4557307ba075e121d3199e0928566f9c25256c391ab821363023b SHA512 6e54da954bf11de55251a2732e9cee5617947322ea16a6a918ff3c5d7cb448756d29a39c4e997186cadc30d24270ccf4e6d21af9f108ebaabaed68e0be96f624
-EBUILD funcy-1.14-r1.ebuild 676 BLAKE2B 24503dec38398b1977bf16e0c79fb1cb78a7addafe892609e55bb3834c19fee1ce026158254f3cae37eca1e2484422f9b8d9df9a1ad9aff2f536ec0174ebddac SHA512 6949d06e941affad06fb1c0d6de1e9b4bbe05d96ce5ed69347504e55aab272c5aaf0bf490c27dd07c0f3221d09858424bd9d7b2768d964641b0d921105dccd3d
-EBUILD funcy-1.15.ebuild 632 BLAKE2B 1019f50a18add0a32ab9718e857106c70c6b11949e8b380b6cba7b006d7f70ccf0b1fcdfcb96b504a1474269cc25cebe736e63d621abb39cc85ba19c2885be8a SHA512 618f65c96aeacda4f1b6618cc8966b62e3374ba208dcf5e3eda455bce0bae17a2a104c8bc1fa9116ee8f6732d4e784a8fab316364ef57c15ed80f0016c896760
-MISC metadata.xml 315 BLAKE2B 52b30267367a6838d8846e5635823a23d55d16b3ee571d44ce1ff2ed866b1641b4b9dd31017e4f2fb0980e0f3ba74bd1aad168c1c2e7e02c3d193298a3259d30 SHA512 099a8357f523c5c62240f0fc43d7ba5b03b4caf4a6acbdc1a26941ca2f4b551a178bed0802afd9de1ddfe6df6920dc6d48590ba1b2a4cd8741d807ab652964a3
+EBUILD funcy-1.15.ebuild 630 BLAKE2B 1cd92a85031bd437c0a73ea12d8be4b578a3ce1f3e9b000b45a566bfcecd89dbd18223c9bcd849564ec62ec7980362a5325a97af8c354644d93458af7b6c3f4f SHA512 2f3b658aa905ae303cf1fbec857a96f0c9b6419c1b8455fcb5cd9669967fbedb8d630d4485e886c763ab850a98e8aeb865c6b778af57321e2678da1825da31c9
+MISC metadata.xml 339 BLAKE2B de7938f68ec5c436102116bd2e8cb0ed1d1ee585af8224e2a01e321b4e48506b027db8b352f474d7b2af083ab876fc7760ec8a295c39aff3daaaf85dc4bca76b SHA512 a34dc6ebc1228a28571bf3a3a27839e096c4adb17aa5fb0a317c992a465e08df9695b138226325ca5afdb1eac61d7fb01bc11f37e6b7b58092f7d9d089e2ea12
diff --git a/dev-python/funcy/funcy-1.14-r1.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
deleted file mode 100644
index 9b4748b8b250..000000000000
--- a/dev-python/funcy/funcy-1.14-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="https://github.com/Suor/funcy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/whatever[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/funcy/funcy-1.15.ebuild b/dev-python/funcy/funcy-1.15.ebuild
index 204c3872a0de..d4c6fcabe835 100644
--- a/dev-python/funcy/funcy-1.15.ebuild
+++ b/dev-python/funcy/funcy-1.15.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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/funcy/metadata.xml b/dev-python/funcy/metadata.xml
index 4484fa7a80e4..c5d6410f12f2 100644
--- a/dev-python/funcy/metadata.xml
+++ b/dev-python/funcy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">funcy</remote-id>
 	</upstream>
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index cc893ab618e5..dded30c15b97 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 630 BLAKE2B 8609e6b24298fb6d0c92c67dda140db581b5d23e21bbdee619ac089c3510b76245901c6de563f36c445bb226c99ae5995460bba9613077c7b577be7a9ad00bef SHA512 27fe399e3b23fd40188750aae729e4f1230a273af088493bd76c1a93f0ac8f7263e036e99a9fe12cc13fd7645a02f287c3dd28482bb463e2069008c178c3c6af
+EBUILD fuzzywuzzy-0.18.0.ebuild 632 BLAKE2B 20c7dea4a1916fd6f421bbc945c8905508b121e460074ff9f701c99d18d663037340ad5a5222594a5304fe7885209102511464b3f46b0b3029f4ce13b824eac8 SHA512 277080f548b9fbd8c960e51b433005c921a20a987005055d78ed74e758d43c4bc3e08ca8fb7da3167fb2d6b09e313a3af7494c8adc784023ba5644351442e6e1
 MISC metadata.xml 350 BLAKE2B 5be22a76bb8ef1192943820a9912f7f70c7effdef36090c52641717ead53cf8b74c82f3a6f1a3718d4c7a93f6b5acc1b367b43ee022d05d427a8de3f61b9b4da SHA512 556e5115df47dafe0ec68cde9cc9e452c5c25adb6dbbf6699e9cc59937ac5ff334a65b94d9310d94c2cb2a491b9ee0f84c6ce9787fd1d5d799b9dcf796eeedbb
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 302b62854ca4..06bac5c7832a 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 04eb8e5e97cc..ca6b56f2212e 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,4 +1,6 @@
 AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 BLAKE2B 5f0062699487ce5f73a2cbba96a6e8ca30f00a3bdd73b7fd5949eac518e01fbc8912a462951b7307a4da02d6016c869e829040ba530974db579d2d16a8c73197 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe
 DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
+DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
 EBUILD gcs-oauth2-boto-plugin-2.5-r1.ebuild 1439 BLAKE2B 68f5a5b72320ee2c80cbae066a88b52e78372ce480e85e7ff81732a7633b045c4dc9119888d065a94b819cd5bb8a21ff2e6ff283af11024c78cd550ee99ca88a SHA512 bd0bedcee70366c3474cacbcd4a163117a06bec61941855ce157a5a6b38a7723010d16799849a7f8114336d294e468e5cbb8ed7bf4d34f742c86f56880c41ac4
+EBUILD gcs-oauth2-boto-plugin-2.7.ebuild 1211 BLAKE2B 20ec3d0636161344386f906867c25dacc57acb0628579708edf84d0b1c954a7db9b55517caccdd36899001c63c27c9e7eecb16bfe958d16d27675a9916298f6e SHA512 bc1af718b3f5ce71dbd6bf8679c4bfb587b82f65d30e3c131e2881dbf4cb5623a8553d3dd218517250ab4a60971101522c68ef98d021aecdcb8f10206faace61
 MISC metadata.xml 455 BLAKE2B 90fdb39fc05f73d9b518701a2a44fc5d4b225a51de2c17ce73bfd5e0b3c0ab8eebfe67b7088b297698fec45c4c5b923c20afbfb03404207dfb7d87fbfdd631a5 SHA512 a5b1acece768d7ba6fb3520c71e3387f1e8e367880b6c45150f94513990da1cda93d9846913b441a0aa66f7e915e3c2a9659790bf9e136788d99ea2af85ef351
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
new file mode 100644
index 000000000000..29da63ab3aca
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Keep versions in sync with setup.py.
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index ede2ce425155..be4c1315b5a6 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,9 +1,3 @@
-DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
-DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
-DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
 DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
-EBUILD gevent-20.12.0.ebuild 2186 BLAKE2B 457a8048d0a79e657c7b8b4d2dcf0a6490013de4cd760d29115eecb9c677e4d5b48d0a52f8fc84f630ce8e2ab14b29cac1c0e06ea9f192c419aa021747470e26 SHA512 2159b0a981c4702d8b546ee0cd8528bec669cd5ad9ebdb21b17994580884906a463d5521c1301d8a5fb3dc8d05881c142efd4ecf33ab98e2e8c6317c1d2bd1b8
-EBUILD gevent-20.12.1.ebuild 2190 BLAKE2B 4b57abc2b15968ba66a8d33d52a4acd072d3e504f45f6db1e7187beb92facbf4a99dc8561b495315898dd531cf897a7ded54de611d0870223b1ad00ac92aeb01 SHA512 f56c47d989cd09a4c654479cfbe35dd9c05b7b6c5be7b7839d0a526171fae3d763f82ff3b6ad23401f25d662b214ed7b5ca83f0b2e218740efd9ebb049007c7b
-EBUILD gevent-20.9.0.ebuild 2183 BLAKE2B c663ae0fca9149ba286d9b01f17b60526f79f6022f7f1587352396634794c0461e177ed5a78bba767fbd67b84c1ebdc6bf7eccac36776e1358a54b9229170457 SHA512 a22f898ee01ac6a93fc6480fe368bfd56c6199f581db8e1782c6b9e4a11a75347658c9de8038030410f1354f156d27e360f5b6d815029a7d949660129f472187
-EBUILD gevent-21.1.2.ebuild 2190 BLAKE2B 186f40f4fedf6c7c6232ef37a3264b54f9c3eab24dd6051dfd88e24474c9494d9f1cd7b4e2a6589fc1b6b9b9cc263383c36f0f75aba9c917455d21e41bfe3c45 SHA512 8c52a2004d6fe5a6deb11ffa64e4417a20b6a0fc7b55891b5d22a8e6e40df9923b7a338dd52414292ac53e0c5293544b1a88914e41acf9d4d2ee22fa5b15415a
+EBUILD gevent-21.1.2.ebuild 2183 BLAKE2B 64552697e225404bf9f9a976343c9012152f530a1b19c01f8647321321620364f968faa1f8f850c10d61a61739a77874100d3161fa49af4f08441126a4deabce SHA512 98400060a87d3777499392e79e2f1b403b7c97162d3065a90fd5d4ea628df79e91cfeb7d18dbf4e595e5b285e050a4d1d5188c14198014e6c424f96ef0bd8b54
 MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
diff --git a/dev-python/gevent/gevent-20.12.0.ebuild b/dev-python/gevent/gevent-20.12.0.ebuild
deleted file mode 100644
index abdfa4f3151b..000000000000
--- a/dev-python/gevent/gevent-20.12.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 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} )
-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 ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.17
-	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}]
-	)"
-
-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.12.1.ebuild b/dev-python/gevent/gevent-20.12.1.ebuild
deleted file mode 100644
index 43a7f0126faa..000000000000
--- a/dev-python/gevent/gevent-20.12.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{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 ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.17
-	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}]
-	)"
-
-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.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild
deleted file mode 100644
index 61a02d602511..000000000000
--- a/dev-python/gevent/gevent-20.9.0.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{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 ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-	>=dev-python/greenlet-0.4.17
-	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}]
-	)"
-
-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-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index b590d89c024b..c4efd5a1371a 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 59e1883abc61..b333aa45c1ed 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,5 @@
-DIST google-api-core-1.24.0.tar.gz 129718 BLAKE2B 08bb8aef03d5f5cbc96c06c01d103e1e569f15bad5084ba24a5e13f732b10d9d97a299fe22db7dfdaea73809e9458b811de87a028f77dcb00ca62fc069af63b1 SHA512 9517e86389edb824fe178128003fa245857de47f4b2416e0a345b66e02fe5fb109b7a72f2e9adfd52478862165548ce6945761a5a2ca02eda4a0187ca608760b
 DIST google-api-core-1.25.1.tar.gz 131189 BLAKE2B 3b5ec782b0492a699d146539d95f613c07aab00735a08287eb93f3d458f98bd57b5e46082fde37aa4dd9986c24443ea22707ec18ec8a4dd2f80f5bb937bb4153 SHA512 cd29370b5a3eaca2c9b5076b6df12b114f28132fcbae63e7574dc9380b7caeea4c1ed476bc332ed16845efe85a44775391ba4f6ceb705b7ece49837056cedc25
 DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
-EBUILD google-api-core-1.24.0.ebuild 1308 BLAKE2B 05999842db534dcaae28b91275e276c847f2af9bea31f3981564b8444fc7d9a31bf272b0e4a34b9f92c681aedc9d3818edd6ba3058aad3e69920901080045e36 SHA512 31ad56f8d9fdd22b4b802e96d7af2f708601cacc4c42b03e158dca14c5b76e587241dff7dbf503e0983a027f7908a165a4951f9703277907b80f5204799971c3
-EBUILD google-api-core-1.25.1.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
+EBUILD google-api-core-1.25.1.ebuild 1220 BLAKE2B 998bc8b03c3c5e1364def5a34324dcf2a2f83a7e67b93ee39c56660392abd0240833963aed60746807476a24ddfb2abe33a695e7cc1914c339f63946404b2b3d SHA512 a6521e2eba9b86d54f35660429f21a280032ac316bcac7cc835ea7cc6eefdbef08ccdef41f8b380556be21d66f49d95cb4806c14dea5de4f202cd35c9f7e58a3
 EBUILD google-api-core-1.26.0.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.24.0.ebuild b/dev-python/google-api-core/google-api-core-1.24.0.ebuild
deleted file mode 100644
index a06e39fc1438..000000000000
--- a/dev-python/google-api-core/google-api-core-1.24.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.25.1.ebuild b/dev-python/google-api-core/google-api-core-1.25.1.ebuild
index 452b0c651760..5da7f339137a 100644
--- a/dev-python/google-api-core/google-api-core-1.25.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.25.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 202b0fedf4ae..4c32172279cb 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,4 +1,4 @@
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
-EBUILD google-apitools-0.5.31.ebuild 1031 BLAKE2B 671d9cb0ec7d94142c4ec0fb9989342244224cb2d8414527c9d034fd4ca244740c302fa30a3010cd60d9438386cd689ce82e7dce230ecc6a636430fc0aee1d15 SHA512 69ed5cf04f2569fdbab2a481edf7b07579c837985cb0514f00f1ffde4867707fb30a3c1a646fdc16501eb72d3447b30f8a97e292b57b2753649c94c985e0e0f6
+EBUILD google-apitools-0.5.31.ebuild 1032 BLAKE2B e1bd81f6d4d2de151504492bb1eede7f4c8c5b718d4a5c6597581d256d5a29faa4104ebbaaf41140591d5c69dccbad521e9305dda59b1dc99e605b413bdfab3d SHA512 5097ac9cadfa8cde6dbc6295a03360f5d94e7c758aee92f96a592406d6e2fcf01c8e80cd789f6278fd8720aa815c34f4cc7d60fb874099256caf48362cbd990f
 MISC metadata.xml 373 BLAKE2B 22089d9370239a2a4378657684c61a9093b442f958990491392c82a196e8ef3440cde1fedaeac7c3b3bf97cee724ef4b279c57af7720f647a39d2afd9dd6bf2e SHA512 d4dd3dd7e9eabbb4be5888fc5538eb3be2020cf58cb29308d8f93c4fc910b9595f09cc4bc86dd07577023714cfeaee0971139217e4e2ca77d65115d7da9d06a3
diff --git a/dev-python/google-apitools/google-apitools-0.5.31.ebuild b/dev-python/google-apitools/google-apitools-0.5.31.ebuild
index 032851017ba4..ad6de9040174 100644
--- a/dev-python/google-apitools/google-apitools-0.5.31.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.5.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index b07a3cdf8ab5..5783f1ec5b5b 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
 DIST google-auth-1.25.0.tar.gz 121940 BLAKE2B 9c7346b134153321fe7116cc77bdcd0d07b2d4a5264d4a982f23a44458ba17c03ef8d204d2c6bd697561c11563bbff1d093ec4563700910ea3bbd9a063006005 SHA512 1c83f18904b646264263c8ba20c13bcc61572b9de397331564b1c2e65083a27e6393dd9435b03789136d2fc2b43750f784d21a3dc670a58cc4bade9de267f195
 DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
+DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
 EBUILD google-auth-1.24.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
 EBUILD google-auth-1.25.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.26.1.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
+EBUILD google-auth-1.27.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 MISC metadata.xml 419 BLAKE2B d8a88d0022eb8d396a504bfc90741d9274cb0e0c7f816444ca70533c6c4c0aef8d74e59a65141515a8db8b6768f43618ebba5e997494670f4e05131c34f7e609 SHA512 222e76f72e487b126c2407764023f7b4861e286015ad1e8204bac13e5c7b036db3a7c71908068061c5536535f354a82e547685c29c614af891100b80a7bcca3e
diff --git a/dev-python/google-auth/google-auth-1.27.0.ebuild b/dev-python/google-auth/google-auth-1.27.0.ebuild
new file mode 100644
index 000000000000..61a646b39ce4
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.27.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/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/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${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-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index f12a293e4c8e..82e1b0c5e5cb 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,3 +1,5 @@
 DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
+DIST google-reauth-python-0.1.1.tar.gz 18302 BLAKE2B a21e174f7dffe48810679910bf8d6712fb4176e5608f2a068d575df3643c4db15a74dae92c15f4ffdc344d287c31a8eb58f94b0384e2d9fc808c072dc8f89043 SHA512 81705d4080b3d7fb0a73741f9f498f8014ec94aa165a5b112c8af8fddc8f040dc43809aff6df39354c8d975db0ee8d62d003c11b173bd56fcf9add1b01644930
 EBUILD google-reauth-python-0.1.0-r1.ebuild 1072 BLAKE2B 597b29f6bde4d224be9d9b7a42ebe784fe953bfe042c2dfba954fd53c6d7c7cbeb1b55f0a7ce62096d6cda14584a075f73fc30facff18e838be00dca1fe7f8f7 SHA512 0818ee2d31373f2e6bbe8d58064653c4a38ae18920431394637d68acb1874ba9036986ecd26af24e3073bc9a4bd4a3656539c054f44218ab0426dde1ea8e0206
+EBUILD google-reauth-python-0.1.1.ebuild 1083 BLAKE2B 3cb3b322ac286f50c2962d6bcc29ffd036753b0a4aa932990834ca6c64c89ba478aed20ebdc308d2614cc89e277b2c85ce43c6b863f9ff4b4736cfde96c4e0aa SHA512 1868081cc00f617e0d012357a3ee61a5ab5ddc528da1dd4f7cd5b67a82c5a371c4762409488ee854387952bf942c88be919f276439acf195671517f9c90aa62d
 MISC metadata.xml 387 BLAKE2B 3c273fa005cf2d68f977f8556723ae4577d05998471f3cd845f7335c84c610d4d4af9c971b6ee2edcf51b621e24eaf2083c20dabad714111b2d21cc99116d376 SHA512 7fcd5ff43d0f70d110f62c197f5e8f4ed6bf3192c457402c0d4bfdda66f32ba5144008d07e87d1661289ffaf1f2b637f7467dc1a50b65cf6606c17caf283b96a
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
new file mode 100644
index 000000000000..ae794b24b60f
--- /dev/null
+++ b/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 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 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-2.0.0[${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 )
+
+distutils_enable_tests pytest
+
+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
+}
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 7e4e66638a72..58029e342694 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,5 @@
 DIST googleapis-common-protos-1.52.0.tar.gz 39383 BLAKE2B 0b2a21b62c1e48cec91b6fe0d141baa1c1081b621c27d60d0a045932388d8c1b8c1eaee3219cdc3af1919b19358e6ec759e109865367b1b7879b3af05f7ec9be SHA512 470d949379a6aa21875b1c5851de54391847f89136b0b7ee84ac68931388a6294f53be167b6095265b2c2c0f30c7d8c71a4e5a546638670d24a9bd544538ff1a
+DIST googleapis-common-protos-1.53.0.tar.gz 106651 BLAKE2B a38ae93d0fe639bad571d74c9f2d011504cd82175e19aad27deda467676936c7df804ded50ee51544615609ce4fb6a6ec629fa175fbda7b2119c73747b6c58a7 SHA512 2ae8230b712ab6fc8328d3e3ba55ace28b9ba5fe3a300899b4a1f13d5d8b3bfd19eef9d1829747b57c56169351e4aa14380551d009fe6bd46e27aa22e7d3b9a5
 EBUILD googleapis-common-protos-1.52.0.ebuild 686 BLAKE2B f183ed216440b45b00ea9467c68d404fa1754e644e7f99e2d94aee0e14ea1355069f4d484beccd08426d8d9c6f55cf73471957bb963feca84a6bfa0d5c0e05be SHA512 2eef3684e4f9ada92a363fa44e80a40172c56886ed6397545452fda7f2c2d2d89e26f0d14863f5c7b0698374a3a1251312f059cb23b982d091326a755c5ad33d
-MISC metadata.xml 360 BLAKE2B 817566cf751db360e4d4f0a3002c9fc36067c983b197fee5175d63f58f057c58404aab2a14e4d33132e25078d3d7bd2015e1b89a6ba702793015f3b42af0c213 SHA512 c84b7ec502160c9f7d6f79d446474f6684f710579efc9f4471b0499b21902334d4f3d0e1c6b9ab61fec40c6c411a80821b43756d5e59c6e6649aa3af8d452163
+EBUILD googleapis-common-protos-1.53.0.ebuild 697 BLAKE2B 8e33a8f271939c71c512da7e236f336bb4bd8e3509918967cf2105aa0ab56bc0b206a1064bebbec2307cf3585beec9e76688af99114bb215c88de077d2a93632 SHA512 2cf03a03f06f666745375210c58357f97a798775f33e2f0d7b4fcd6b18fdac2cf1c80c86d7cd2f5586c19b60027b12d754366aeb0e8e1d1f31be89b444734f4b
+MISC metadata.xml 461 BLAKE2B 4879bb23acd0647cb580b5b4a75d5ba870021b23f44986e95d2126c4014e4642f74e59a84e535411236f2539376d13924a59f33e6b0bed09d9f178de72e4fa83 SHA512 881b2c13f1a376abcf05c60d650a6e6c8b0d6dc08eeabeba0d6bd636fd7ff0466767cf30824cf00dca21639234ae5c903bdaa8c3c7f87e853d425b620a6dbf54
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
new file mode 100644
index 000000000000..c804a5294fd8
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 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 classes generated from the common protos in the googleapis repository"
+HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/metadata.xml b/dev-python/googleapis-common-protos/metadata.xml
index 5d6bf1704c98..cac2d02d3bf9 100644
--- a/dev-python/googleapis-common-protos/metadata.xml
+++ b/dev-python/googleapis-common-protos/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">googleapis-common-protos</remote-id>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index dc8c39463132..bfcef055c522 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,5 @@
 DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
 DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
 EBUILD greenlet-0.4.17.ebuild 929 BLAKE2B 6eceabb77c0f99fca2f091e6eb5d7d998722924b7148bcf770133aa752b463dbfbfe6d300d8b3288feb0c5d7b1df92609fb4d930122eef717594048fe132ce5f SHA512 48086f6f5e56a2a6f21419bbcdf03b30919ddd02c41c2bc7c850a015c7e5db2c2197d285fd2074f967e50a224d235cd8caaf731d64b9aceb7b4d4ff66baf6dbf
-EBUILD greenlet-1.0.0.ebuild 676 BLAKE2B e96fcae9321c27875ef181651a8d8cd5dcf5b19cbdedde2ba0643446ee376d5eb55b219b915f6a1149b18537fffb5f40e8bdb307c86f7f7f6a808da00bf5944e SHA512 61864d6051fd66f620fec61506214ff1ad341c9acfb627046986ae389815693eaaf99a0158bb91d46bfc330a6e6a55a7286407db1890dfb08530ed8e33874af7
+EBUILD greenlet-1.0.0.ebuild 670 BLAKE2B f7cae622718d30235e6ff130ea2f2231f485d80a0b764b09496d4ba007362deb80c8c1a1a3e5a71af2ae6342e37803132ec1cc28fd762cc44bcccebafde9eb89 SHA512 e8fdcd158a40818e9075ccf076807f6edfee3a145a77f02aaa2b7c1f08d83d94f5d65c479147a9eb65c34f7b860c00915fb8bd27eec1b5ddd9072716dd317470
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
index a3b1723080b5..f5301cdd8c4e 100644
--- a/dev-python/greenlet/greenlet-1.0.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.0.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 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx doc --no-autodoc
 
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
new file mode 100644
index 000000000000..1c5a05445687
--- /dev/null
+++ b/dev-python/gssapi/Manifest
@@ -0,0 +1,3 @@
+DIST gssapi-1.6.12.tar.gz 1064583 BLAKE2B 0daae73e37d1f101f77030db4b4f5d78ec720157d25542c234da22ae4615b329ab54379b9a7f76f4c9340c849a1ec3c7d0ed3b4b5bad45411f807f8e21b45f1e SHA512 bfc6154dbed065227d1022218329ace3fde228173d1695c10e293b6c01a36030781afcea50cdd41ace243b6b783542fe828d027e79d4a79ea597b84ea578f90f
+EBUILD gssapi-1.6.12.ebuild 531 BLAKE2B 29708f8252718b968a7a1fd330109d7ce4c99dd4a7acc9d074439bf3b2ec5f78e737b63d4cdf9aef6dc4efb4b0d2fd4f4ad45f2f3cbb9bba409b734602ffd47b SHA512 779d507d48ce94446c00ead45386ad09c5b83d78fa3e9ca254cfb2bd9fbc50fa4139a18325075786584ccf8dc4e15dd8fe696dfc7560cabe5f10110f2ef2d203
+MISC metadata.xml 357 BLAKE2B 89cb512a96325edbb676db0e5a2646cad0ea04247c61fe8d6ef0d2923c8ae33dae2550d6317f93d67412e4205c33e104a539cae50f33670ad96ccd1c42a535d3 SHA512 d9c76406e86afeda5af523561c9901e97ae672c4cbe4449b9f34a7285968199b975c4ca7e84f23868f94ae3ce795460ab761eab65980142099bd50bd767e19fd
diff --git a/dev-python/gssapi/gssapi-1.6.12.ebuild b/dev-python/gssapi/gssapi-1.6.12.ebuild
new file mode 100644
index 000000000000..6ad9aee417a3
--- /dev/null
+++ b/dev-python/gssapi/gssapi-1.6.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 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="Low and high level wrappers around the GSSAPI C libraries"
+HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+SRC_URI="mirror://pypi/g/gssapi/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="virtual/krb5"
+DEPEND="${RDEPEND}
+dev-python/decorator[${PYTHON_USEDEP}]"
diff --git a/dev-python/gssapi/metadata.xml b/dev-python/gssapi/metadata.xml
new file mode 100644
index 000000000000..fd392aa0a3b8
--- /dev/null
+++ b/dev-python/gssapi/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>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">gssapi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 593e1f7d12db..d98311ec72bb 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,6 +1,3 @@
-AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234
-DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
 DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
-EBUILD gst-python-1.16.2.ebuild 1607 BLAKE2B 1aa78d47124bbf30ebb5935aadaa604da1e210be332b6729e1fecd3f5ec236391cba222768331c0636037f2a966868a862130ef370c9840baaf3d6edb3026984 SHA512 1468188abf402361dd050bf9cf74b41e672e8d51eed084fe80d59a2344aae86b207269114dd342955b82c5596240f887d9071432df65d9dc50e7ca32ea437c31
-EBUILD gst-python-1.16.3.ebuild 1558 BLAKE2B 4309170c795f3e85264118217e35a0c4de8dd450dbaf9d8c8747c3bc7ad20e5c624c25aa1c5b07a309510a753db09ba0c53692f6f7ba725e7738e695e145029d SHA512 e7b41500c58db496a581e0630b71ba5759736b4e486bdd87812c9207214036f4fa64043763e3126cb153fb5afde1babb65720a607d2f87ace3b13ea9a2745976
+EBUILD gst-python-1.16.3.ebuild 1557 BLAKE2B f450322c1a7c716e7925f4ee4bb43d18735d67a51c7241f1a405334cf99a546c83ce629ea7be0870252200e5ebb724ba959727be64a43127a929c758153e24b1 SHA512 8650098d45ff16f614430a0588db3a0cb6d3f941723e0aca9709b34f1128386113bfc19bb6dd08407afb223b359b69148ce91fe18a86e61f9b024f5bf349f128
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/dev-python/gst-python/files/1.16.2-python3.8.patch b/dev-python/gst-python/files/1.16.2-python3.8.patch
deleted file mode 100644
index c4b4ddd11221..000000000000
--- a/dev-python/gst-python/files/1.16.2-python3.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 22f28155d86e27c4134de4ed2861264003fcfd23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 13 Dec 2019 10:46:20 +0200
-Subject: [PATCH] Fix build with Python 3.8 by also checking for
- python-3.X-embed.pc
-
-Since Python 3.8 the normal checks don't include the Python libraries
-anymore and linking of the gst-python module would fail.
-
-See also https://github.com/mesonbuild/meson/issues/5629
-
-Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
----
- meson.build | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 744b7ce..fe4ca7a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
- 
- pymod = import('python')
- python = pymod.find_installation(get_option('python'))
--python_dep = python.dependency(required : true)
-+pythonver = python.language_version()
-+
-+# Workaround for https://github.com/mesonbuild/meson/issues/5629
-+# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
-+python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false)
-+if not python_dep.found()
-+  python_dep = python.dependency(required : true)
-+endif
- 
- python_abi_flags = python.get_variable('ABIFLAGS', '')
- pylib_loc = get_option('libpython-dir')
--- 
-2.20.1
-
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
deleted file mode 100644
index 77499a6a6ae8..000000000000
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit meson python-r1 xdg-utils
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-python3.8.patch
-)
-
-src_prepare() {
-	default
-	# Avoid building plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
-	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
-	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
-	sed -e '/subdir.*plugin/d' -i meson.build || die
-	xdg_environment_reset
-}
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython="${EPYTHON}"
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
diff --git a/dev-python/gst-python/gst-python-1.16.3.ebuild b/dev-python/gst-python/gst-python-1.16.3.ebuild
index 11df6763cff4..eeca9ad3564c 100644
--- a/dev-python/gst-python/gst-python-1.16.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index daca280bb107..9bbf5a0d4641 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,5 @@
 DIST h11-0.11.0.tar.gz 97509 BLAKE2B 51e4eee959f36775317ac67450c80a6484309efcdd5adad3737d2d80ab5d9808d5d8aeb0118aa79f88848c052c330542ebfb4c03b96bdd805015fd9ad9f9fd41 SHA512 13dba59afd949d715fd693e5224e57dea5c923eb91b0981a5b5987bbe6e6e00e32552e1602353a48458615a8dd21f2a561961747ae15291eb3462fe42cef3f82
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
 EBUILD h11-0.11.0.ebuild 454 BLAKE2B f78136138b336e0a139e062166fbcf29893f8249e3b090bb50bd2216bf89f856d3c2356b0c48e10ab513e3a16cdb187914e9220d58af0dc58058d11a5a73019a SHA512 a2f39cfb9e27dce3163cbbf03addae034b4fa72d85f9649df0c7ffea94cc7253a3288cbdae2ca28e00d93af94fc56e7994d86ab4872040329a4421604f39bf30
-EBUILD h11-0.12.0.ebuild 460 BLAKE2B 9714613da42953e990b9ae67b18dcbac79c2c68ada03ad39ae73072b7b7d0b45654f380626b38975c77bfc53496465993e9b5d1ce88ab04b769621cd1eec7da7 SHA512 7049b383e59fa9c75ad0f251c1adedfa984d0beafc6b9735b4af4efbd4d3727cf02357f6795d1893617f8bbbf38f4700feddd3ba4ce76620ac4979e3351f4b62
+EBUILD h11-0.12.0.ebuild 459 BLAKE2B ce46eaf8dd1e9d1cdef4529598d792ea375ea461edfaa9e009ed4d84d29c1e5ab72b19970e08bba31327715bb74242ad35bb39f0f3e22e1c5feaae299665a79a SHA512 86f87b23e767f56df77ff634f25430427943ab1a1734e6f66a994d118329fce159b2b2847625c2e9923b1332fc15d86f834e0fa48e06f83b171a0d7339b148e6
 MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 5e90dba17e8d..5c7e3d135185 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index b4054a604c41..ebc80113b440 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
-EBUILD http-parser-0.9.0.ebuild 879 BLAKE2B 297b630ef2917ae640312c815d12df30904ff2d016abc960d09a16c7df57efe7cf91d6eedd0358404628a6a25bb4fd0771ff1cb8a65a624ea37682087ceffe11 SHA512 c23d814825845a7a32617bfbd486891038bde71a9b3fcbdd74fdb47b718fd883b8ca0c2580b1a0b328b58a55033a24acbe85a824176699bcee81b7fd6170550a
+EBUILD http-parser-0.9.0.ebuild 881 BLAKE2B fcfcefc96f7eabc8f1f1337798c24b941be7db9f2f229df2518d1162ffdccf826732f906e28048360c71bdca8fa09ce0716894de966bd9df98d76d1a2deaaf8a SHA512 bf2bd9b90f3ee18ad8a59fc0891f0dcb810acc6bfd5a2b5898f962c111c833f7bbe6623488adfc85c2f7c9746e620bb282c4411dfbf2a44d6c47ef0b26f4f46c
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
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 c12734bef0fc..2f96d3d1b687 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
new file mode 100644
index 000000000000..21c0643a01ca
--- /dev/null
+++ b/dev-python/httpcore/Manifest
@@ -0,0 +1,3 @@
+DIST httpcore-0.12.3.tar.gz 57587 BLAKE2B 3c0e7a210b21e54564c4c6077fadf66344b887662c71b05a1ad4a2c0224a4d703eccdf576d4443341176edee03b6776bfd49aaef2ea2f29f02614677e1dfad85 SHA512 b31535231dc2b6a5f1c9c0c538628f75360f04b4747b447ab0a7168ed32d0eabd463335c2f7fa782dcabb4cbc32891a2839ae50e0999d5a791c01b02533d38f0
+EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45822de6236fca8aa463237631c3aa4b887cf6a583185c70a86ef094428b23e0d7a5fb15947608ed643ed3aeea008 SHA512 f0ad494b042433a60ca1475951aa7ef8697906138af616f8ab083fbd179d3bb79e52323e658f36d92172066017f44be640dd73b4880eaf76a4f6383e739d4a25
+MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.12.3.ebuild b/dev-python/httpcore/httpcore-0.12.3.ebuild
new file mode 100644
index 000000000000..9d5010440b81
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.12.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="https://www.encode.io/httpcore/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/h11-0*[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# anyio and trio are not in the tree
+	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
+		tests/async_tests/test_*.py || die
+	sed -i '/^import trio/d' tests/utils.py || die
+	# pproxy is not in the tree, the associated fixture
+	# must be disabled to prevent errors during test setup
+	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
+		tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+	# Require Internet access or hypercorn (not in the tree)
+		tests/test_threadsafety.py::test_threadsafe_basic
+		tests/sync_tests/test_interfaces.py::test_http_request
+		tests/sync_tests/test_interfaces.py::test_https_request
+		tests/sync_tests/test_interfaces.py::test_http2_request
+		tests/sync_tests/test_interfaces.py::test_closing_http_request
+		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
+		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
+		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
+		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
+		tests/sync_tests/test_retries.py::test_no_retries
+		tests/sync_tests/test_retries.py::test_retries_exceeded
+		tests/sync_tests/test_retries.py::test_retries_enabled
+		# Require hypercorn
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
+	)
+	pytest -vv ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/httpcore/metadata.xml b/dev-python/httpcore/metadata.xml
new file mode 100644
index 000000000000..c4f9f49cff39
--- /dev/null
+++ b/dev-python/httpcore/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">httpcore</remote-id>
+		<remote-id type="github">encode/httpcore</remote-id>
+		<bugs-to>https://github.com/encode/httpcore/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 17d375e81b22..4ceedbc27c01 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.19.0.tar.gz 263522 BLAKE2B b35c8dcf86de17a5d8eac86a9a6b4110fb247925662e24a7645a67dfd0b2e640dc29875b41673c5a91a083f17e9619fd40dd08cf2c9ee7f48c8069bc14a50966 SHA512 9193a0e8e9a58a3f0e9b27fdf827932482a47b88af297af6e5f004164ca0b72feeff513b8191bf7c48d6714070a1390ae54eb8a2c6840f54f2580889c7837c7f
-EBUILD httplib2-0.19.0.ebuild 1384 BLAKE2B 26789a048ba3592fb2a7e6493d42ea964ffe5b4f0b6be030ea6428c68b048acb0ef82affb0aa398ee33479ccab45bbc665739e9a7cd48f74feafc08bf1970e5a SHA512 2ca8ea7a37229402322dc2b1b9e542ad09ec1c0a56bf05fb856af87059b6e656042f7132ff88c765f2275c722e194e0040672e1ba9dc9e0acf80d516c3bc9b32
+EBUILD httplib2-0.19.0-r1.ebuild 1426 BLAKE2B f8ec42207e2558879838e960cda07b848a1ea57c5c4301e1c8df0b1677b9fd9bf7cd61b11aa764f19b063a96c46c8f769a809a5726253929d4b8020a933cd253 SHA512 c79bf6cdbeab38532eb57bd4dfac935bb0a9d427736ccb2650a842e87b3c095d46cb07c8bc70b4382dbf07ded3a686babc713877710d465bb74136c9b2f29b6f
 MISC metadata.xml 405 BLAKE2B d6f84c1836d38410590b2da8878ee9afe2b3b8754900c140e0dcb2a8098c998e078db1d93b7d5d5c0cec8b714a4447f9bc032e98d4c4fdb84649b32c3a14e405 SHA512 3b3a073097dfa5c018db5f5a3d8c5b3a65fdc56e9c0fbf3c00610a3a256596b7b6c5d40c20e7fc91007eb27bc7d1ec358f42a4d01f37ebed3656f88896df5f40
diff --git a/dev-python/httplib2/httplib2-0.19.0.ebuild b/dev-python/httplib2/httplib2-0.19.0-r1.ebuild
index 38f41cc3a92a..24d843a24400 100644
--- a/dev-python/httplib2/httplib2-0.19.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.19.0-r1.ebuild
@@ -15,7 +15,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-RDEPEND="app-misc/ca-certificates"
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 631866868aed..7561839fa9f1 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,3 @@
-DIST httpretty-1.0.3.tar.gz 411707 BLAKE2B b2211457c937e19f8110bc28446a2b78a8042a742341c0492589def7447e819f051d301e9d254260778f349302ccf6fc163a9f2280a55af925ae353752450320 SHA512 a6349257376c12198d0bf7923245c34f6b8a0889946ba0c2551fd3379a8d9a8e4610de81c66f945656c1879ad3fb1485f2f4148634fcc4e156b9f0a59f7dd758
 DIST httpretty-1.0.5.tar.gz 414946 BLAKE2B 8bbaac3d53fbf5744f7bf8ef952bd9305112934af24809a233ef0446886e09b7d2a897e69aded12d9e715580305d729609365b0be55f8d324cc48e6aa0699d75 SHA512 2e5f4834848ab1a0b84230f000afb0409b30b3cc1769d36ad61f712f56abc8d6076e7507598f791fe343ce282cf9e26939add71ef794ead2836badfc2321d6bb
-EBUILD httpretty-1.0.3.ebuild 1335 BLAKE2B 56ca8131d236d1ba5ed2f0b1b43a6b1648a61e7ed1663b9410baeccac1358757ada926f7f5152fdb71ee66948c4a4cbcd1711a2d94c942d6a9b242fdd5bb4a3a SHA512 56c77ca2799e6f25d252bc5db2ccdd8da5ab6c2d4aecdc2a2ac046af4038125d88a931247290f9971fa7bd94d7a3688860fa72c8099ca437411764a0b8f6b9d4
-EBUILD httpretty-1.0.5.ebuild 1342 BLAKE2B 0acbfaf2080816c23bf5156ee80d7235c4392de91ebb1ce26439e9881394e2589ebb79ff78d07e91c1fc2e3c90d22e6a7fe72c0290c5c2f851381d9bc35f8d4c SHA512 67a9f6c54cbcd1d2a72fa7fe9aad52e157b09f76fd7df1c0514177bdaadf60a8df3dda9904e8646956997469be0f6b79ab80abbb8f15c632afde22e048d69bb7
+EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691d951cabff545725c42a89098786064544b83c466cb07ecf5de05d8313b54c48f11c7872523310f685ef20a0199c SHA512 0ab4ea2ca20b103c10361d858e89238583bd547e371b6bc19bf89bc3091188be0e44ed9fcd92090b55c20de1ee1ded8b34f9015a9afdf280adf03703f8766983
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.3.ebuild b/dev-python/httpretty/httpretty-1.0.3.ebuild
deleted file mode 100644
index 2d8ba525802e..000000000000
--- a/dev-python/httpretty/httpretty-1.0.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_{7..9} )
-
-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 arm arm64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${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
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.5.ebuild b/dev-python/httpretty/httpretty-1.0.5.ebuild
index 0b217df07e41..0e08b6be2fcd 100644
--- a/dev-python/httpretty/httpretty-1.0.5.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
new file mode 100644
index 000000000000..c821cff3c6d2
--- /dev/null
+++ b/dev-python/httpx/Manifest
@@ -0,0 +1,5 @@
+DIST httpx-0.16.1.tar.gz 965347 BLAKE2B a6c5bcdda595ffcfb824194564ebd93760a9180e60665a9540fc6a2822b1be4273b940fee61cb4b49c2d97a5f4d71b1caf32deddec18d2fb636465b3868aece4 SHA512 d76b2c94c655c187ab150f20b16906034574d017a67c4a06c456d55071434cc0ba7752bdceda86aa6b1a1fe9109fa11594e4ea679cd7d2a77898fb40fa5153d3
+DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505 SHA512 9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd
+EBUILD httpx-0.16.1.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
+EBUILD httpx-0.17.0.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
+MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.16.1.ebuild b/dev-python/httpx/httpx-0.16.1.ebuild
new file mode 100644
index 000000000000..aff93e055f9e
--- /dev/null
+++ b/dev-python/httpx/httpx-0.16.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.12*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Require Internet access
+	sed -i 's/test_async_proxy_close\|test_sync_proxy_close/_&/' \
+		tests/client/test_proxies.py || die
+	# trio is not currently in the tree
+	sed -i '/^import trio/d' tests/concurrency.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/httpx/httpx-0.17.0.ebuild b/dev-python/httpx/httpx-0.17.0.ebuild
new file mode 100644
index 000000000000..aff93e055f9e
--- /dev/null
+++ b/dev-python/httpx/httpx-0.17.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.12*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Require Internet access
+	sed -i 's/test_async_proxy_close\|test_sync_proxy_close/_&/' \
+		tests/client/test_proxies.py || die
+	# trio is not currently in the tree
+	sed -i '/^import trio/d' tests/concurrency.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/httpx/metadata.xml b/dev-python/httpx/metadata.xml
new file mode 100644
index 000000000000..f5203f06f339
--- /dev/null
+++ b/dev-python/httpx/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">httpx</remote-id>
+		<remote-id type="github">encode/httpx</remote-id>
+		<bugs-to>https://github.com/encode/httpx/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
new file mode 100644
index 000000000000..ba02443a5a55
--- /dev/null
+++ b/dev-python/huawei-lte-api/Manifest
@@ -0,0 +1,3 @@
+DIST huawei-lte-api-1.4.17.tar.gz 29441 BLAKE2B 75615092a1d8ee598a99e9ae7a0567e11a72fad21a8304005364bd21e4ecb9bf9efa9a2d5c8de86c6d7442ec12f06079819c20ca9e2e4646255ede961b1a1275 SHA512 bf4a6a43d02b56f0aa799e2936d7fd0afa88da4dc18c152c635b0ccb87a7ca9afcf1fcdee3a37d7ab232d5cd4688e24499ad35a1969d97db405b818cf17d33c4
+EBUILD huawei-lte-api-1.4.17.ebuild 721 BLAKE2B 71bf85aa97eb3af1953fdb211219004b09a397c3f043fc5633c4057d51cf14b3e4498221a13d6ecc2fe89b8c5086d51e082f998adc4f79ebcecc144a4f189f8d SHA512 b32e54eaa152875742ba85195fbd8c7686adc8103d8da0f94bbc967a0057620f7f4dfc24ba7e1a816f059123432323cdd24fe3efe7cd54d1e942fa0bc9548c62
+MISC metadata.xml 385 BLAKE2B 962737026dd3a7daaced4e561f39defb5abfb76570a6cde7e083699f79d95000f6818bf65466ccfde2407b00db401c27d507b954ee8f546c4f5ec92335ed1088 SHA512 d70d91e85572133e2093376e55daf6a501270339cac68f19b26d563f20650f890177c02fa3b264fe3b6c62e51471a5dc484827d0ae2cdf8a657b95dbbb47691d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild
new file mode 100644
index 000000000000..0fe85aaad74c
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 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="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
+SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# https://github.com/Salamek/huawei-lte-api/issues/86
+	sed "s:'pytest-runner'::" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/metadata.xml b/dev-python/huawei-lte-api/metadata.xml
new file mode 100644
index 000000000000..7c8d9faf0487
--- /dev/null
+++ b/dev-python/huawei-lte-api/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>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Salamek/huawei-lte-api</remote-id>
+		<remote-id type="pypi">huawei-lte-api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
new file mode 100644
index 000000000000..bacf06a40389
--- /dev/null
+++ b/dev-python/hvac/Manifest
@@ -0,0 +1,3 @@
+DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
+EBUILD hvac-0.10.8.ebuild 1337 BLAKE2B 54e332ea5a21dab765c2da086cd35ae0ecb03f65db484e35cd84b0eb686f823f7d0ede10903e65b5ce824067c12a55ff22b62b6c8f9df7d5ad7238dc87c3da45 SHA512 cd9d8f51940498aa1749bee33833fcb1edae278abf764a87da4bdd01ce25ab944af827381b6ef232eb416ee878699711e1488875fca0b8ab29804bd1a29d7125
+MISC metadata.xml 498 BLAKE2B 2224fd54ef676fd4fe31407f31a17dbc6242114f226ce90035b098eb535d0fb15ab233526b0315058e9bcfd6a598203d232492211262241d14505366e135e7f3 SHA512 7c04d4e4d08711701974302e13a3b1b72441aa55b4ad4cc745136babd08f151b14067eef698963a461b25ca8c7aee8ad27d483c02dcf329bf0fc6717fb7fcdb7
diff --git a/dev-python/hvac/hvac-0.10.8.ebuild b/dev-python/hvac/hvac-0.10.8.ebuild
new file mode 100644
index 000000000000..0f2858e5609b
--- /dev/null
+++ b/dev-python/hvac/hvac-0.10.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 python3_9 )
+inherit distutils-r1
+
+DESCRIPTION="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND=">=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# https://github.com/python-ldap/python-ldap is not packaged
+	rm tests/integration_tests/api/auth_methods/test_ldap.py || die
+	# https://github.com/lepture/authlib is not packaged.
+	rm tests/integration_tests/api/auth_methods/test_oidc.py || die
+}
diff --git a/dev-python/hvac/metadata.xml b/dev-python/hvac/metadata.xml
new file mode 100644
index 000000000000..06368ace8f0f
--- /dev/null
+++ b/dev-python/hvac/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">hvac/hvac</remote-id>
+		<remote-id type="pypi">hvac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index d747b32a4fa0..904ba7f690b8 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,5 +1,3 @@
-DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
 DIST hyperlink-21.0.0.tar.gz 140743 BLAKE2B d432692172dc5cbb4f7cc1dbbfaf87871f0d9b2519334d112841abf8d958232516249472611e986b20e6fd298f5013db38f214fa332e1b121bd80a420b4cc614 SHA512 9e0e9273dde1b0a41329a74fbb26c4f327b87f387ee64b9a2ab641ca5cc8b9ea0516884415e9adf1d4880ae9c053a5cba2c550fc508bb56fddb44a543d5da860
-EBUILD hyperlink-20.0.1.ebuild 677 BLAKE2B 863a1fe8f0e0369c76b2ff107869f910f3336062625ae27d7a0a76cd2c21296454856e4d08de1fb79401096790c55ed79c1bafd02d73089affa8505fe49a570c SHA512 026c657872b5a9fcdb63a812cfc35e704b0d5e2d2546164db8dbfc757de61fd08451102dd115cafbf4db2a7fee9571bdfa5b25ddf03ba9fb8b8da88e21a46c30
-EBUILD hyperlink-21.0.0.ebuild 685 BLAKE2B d1cb797a8afc5c016b8c4a896bf833bed8223a3dd7326a5df9bf4ef17c5b3ece086284e5bfbf73854ef841060ca8a71c94499a3b3cb6bb78624928498f15f99a SHA512 646e39d2d2b98136c221c19027b90b6f336f69bd0b25fc295c87005fc675c3a255a0b6e502485d036f82cb2fb0b3266a9d348410f01df60b219bcea5aae20a0d
+EBUILD hyperlink-21.0.0.ebuild 676 BLAKE2B c96c4d436268f7ca7164ddca202195f5151e507fc4549666c02b9b39e87e9cb4ff7e5c73876e0924a64932323ad22cbe18706dba2d0276e0bcb13ce3e12dd8eb SHA512 76baf776b0b082288186c380bbbc71b5cbe92027f281c00b58cce9582119995074051be36efa52f97582a59aed0c5426163a00ca9c9ce08d2ec1015738df0a2f
 MISC metadata.xml 758 BLAKE2B 36fe15b27fb5bd52c60917e90c20fcf6db9e7c5eb094420cc8dab852748decbc6a0d40c15f4c0402bab1c8a014ce5346e5a55f497c7ad4fca7c2c1d9cd91c304 SHA512 ec95c17a3743643c0666c7a12aa3a2a2c91fc97a64bb21c7429e00e23d42f82897e57e8eecef2f7fe72e49238061f190a0b1e1b81d3b938051bb17a008335abc
diff --git a/dev-python/hyperlink/hyperlink-20.0.1.ebuild b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
deleted file mode 100644
index 58f4ceaa79dc..000000000000
--- a/dev-python/hyperlink/hyperlink-20.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_{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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-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/hyperlink/hyperlink-21.0.0.ebuild b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
index 48f99bd74f08..85b1db2b1216 100644
--- a/dev-python/hyperlink/hyperlink-21.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 9235e204995b..7ad2754df889 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,19 +1,9 @@
-DIST hypothesis-python-5.43.4.tar.gz 9104105 BLAKE2B 08b8c9ac7ac72afcc4556ae2167af7b4ab79d505da8c9f6a11c91d211f26ccf320c8f5ed41458f5e34f75614ad4aecdbf6df62275868dc079c037390dcbc9e08 SHA512 065e1bdd878eab35f38105e8da3f5cf108670a51fd48ea1996bebedf8c8a152386d0eb5284ed43d4e588695a408b3a455a2e4757430e31bb5dbf0ece1f64d294
-DIST hypothesis-python-5.49.0.tar.gz 9103591 BLAKE2B 158cbc38f6f2407d437656a7b94b5826193d427e06eca59d91b3fe85667282ec3392d72e7bbdf2bd952a495871a86814275883e2dcbc80758fcb3e68936d6d20 SHA512 96b7f98e7d87f82dac52a7b2de2bc0c29507cee05ee9a93f838e090e45a9f484ca75db1ab83ab52361b27e4e0f2747914ec09324fc188f6100c3397b1596778c
-DIST hypothesis-python-6.0.1.tar.gz 9104122 BLAKE2B c4702a2c94fb5ecfc44543b70995150090949067ca986f5671a936d5da651e2e1ed072457ed1238ae04549709019722f7501ff7c2a37c46da3d25b43fa416b08 SHA512 3981a40ba61ca38140582f46b1ebb1ac2fc0816e8210c37ddc91249515d035534208c6ba926f367607bbd79792383eb166c1f4710a8a5ba5e04876383ac44644
-DIST hypothesis-python-6.0.2.tar.gz 9104422 BLAKE2B 1f932e2e2c7f3b3f56863fecfeafe3d811fbc19dbb459b3e7497fb14d6b6ef73bf4c7c60957a4170594805e443a4730d5a0561fb2e6cb3ba10da801ef655a8b9 SHA512 7d3689c6964f5158b4ab7b638d43c44b145080e47b832405c50971ea986b2c78c9be648de78c9783c6adc34e117b90b2c2e4b684783a68acc6bdff51ee085248
-DIST hypothesis-python-6.0.3.tar.gz 9104754 BLAKE2B 46b713820790daa60b4a7d56bca4ebc72482e9d39b6b37c929b91eebb1f48324e56206f85de78c7744f65d54dd678075aa040f1a745e56a8db217ffc26f3ced2 SHA512 7762c6a1da52cf21f1fb7333cb6f7d302e825a9fe4ad13b85cf94f5f1b450410ed2bdbc40cff54a23629c758e8513d1a39767e0b415db61a07ff74489573a916
-DIST hypothesis-python-6.0.4.tar.gz 9106652 BLAKE2B 4a35185605476d70ef6c768f4fe76c75341cfe18e7c0ba45e8c1c445f4f49d376bd580fd8b0910fc35b123e5f1756df0c4e848d79789b531bf5b35180980b3b9 SHA512 834b5c19760e9639baba0fcb3e5a09fb1d94c4ab763049e5f16df7fd8db357bc300041293b951a9078752fd05dd9cfd5b39fa45d78742e92ff77a17bb49d3f43
-DIST hypothesis-python-6.1.0.tar.gz 9108138 BLAKE2B 30ac9e8b40fb073e15dc480b19b6d448c14c04b6b0e405720c05fa5f93532986e5956e27e28d966aad4378b7168d1a923bb28a87db87529d9995e526fa40e44b SHA512 897758e3bd6295dd8acf192a180a244277dc408dff851b7964878b3efbadf5c636961048cb8af89478e9ceceaafeb796526ca846355711f27dadc9c099517e44
 DIST hypothesis-python-6.1.1.tar.gz 9107792 BLAKE2B 50d3b284f0ab1b7c1a25fbf1488b8fea74c66aaac07d58e3271f187e54579011311ef3c20cf5525e84058382c516e6cf1495201e8b6fbd45fe28309a25fda0e0 SHA512 7d6ef548333b860dd868a9aa2a220191c237ac8e843cff835f423332fa561377ced29a9703cf0a49c76594a986048c1b1a1b8df5b38b2848410cfd7708168d58
 DIST hypothesis-python-6.2.0.tar.gz 9108590 BLAKE2B 73a6b71c68aec1ec51f791187bbe5be679d5e3b4da9e66745767dafb109d298b0c61bd461ed838a0c75884d155fb408bddebc75d1cf887629da5cf5d6b053e03 SHA512 b249124f90d1d68aa6e106965b0ae78e37f095be0adc1833895f0895357d46c907074e2abe458be566708ba006b6c4375908b40ef89d52300fd41ad63abc2e52
-EBUILD hypothesis-5.43.4.ebuild 1855 BLAKE2B 04cac34c32cb48dc8822251b8de7689222b7eb93a1ad7f985aed916519a5c85ea21af3c0c21a4323eae8c0f7e3018f1e59b6e9c28f82980a4896ef5f00cbc321 SHA512 735081ad22b1b6615d6f6bb719c26082de0611cbbe97b6a98c3fba371049d207bed234a37ec1ddb2f55278d622e334a47a13f7257bab41d460440cd4b236843d
-EBUILD hypothesis-5.49.0.ebuild 1863 BLAKE2B 721d8627eba7231ac487a0dee5c710a729254aba0844bf16fbeeeb897d70372f005809c586a47f0da2420bb751d889280097f41c11f58d7732d997342922f562 SHA512 8f0645e7d793432207454e7e5cacaa369bbc1bda41f81b83df5b5ce4b614b18e29733eb5c944b9f7c1835c1bda90140f167f32f4432dc73e2d78ae2af7a5eb40
-EBUILD hypothesis-6.0.1.ebuild 1863 BLAKE2B 721d8627eba7231ac487a0dee5c710a729254aba0844bf16fbeeeb897d70372f005809c586a47f0da2420bb751d889280097f41c11f58d7732d997342922f562 SHA512 8f0645e7d793432207454e7e5cacaa369bbc1bda41f81b83df5b5ce4b614b18e29733eb5c944b9f7c1835c1bda90140f167f32f4432dc73e2d78ae2af7a5eb40
-EBUILD hypothesis-6.0.2.ebuild 1863 BLAKE2B 721d8627eba7231ac487a0dee5c710a729254aba0844bf16fbeeeb897d70372f005809c586a47f0da2420bb751d889280097f41c11f58d7732d997342922f562 SHA512 8f0645e7d793432207454e7e5cacaa369bbc1bda41f81b83df5b5ce4b614b18e29733eb5c944b9f7c1835c1bda90140f167f32f4432dc73e2d78ae2af7a5eb40
-EBUILD hypothesis-6.0.3.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
-EBUILD hypothesis-6.0.4.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
-EBUILD hypothesis-6.1.0.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
-EBUILD hypothesis-6.1.1.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
+DIST hypothesis-python-6.3.4.tar.gz 9112374 BLAKE2B 78867f0ff142d6059a20c437c3fab333de06eff5247d93c1e70f75d801e54984c20da01322b7d4d4999cb30f2c59c6e7cf955fe60ecc0e90b452b8ddf6b6f2ff SHA512 7baee8758d86afbb0a8a16e18b2f14d3870ee2f5623857fc691ca1afc7f0c6555b367fbe758ff02c08af492b4569ef2aeb8d61bf3bd91ac458312a43b02d02f6
+DIST hypothesis-python-6.4.0.tar.gz 9112974 BLAKE2B bb2312e1ae838e9a58741709f5d55d9593991c2600330f4917c8e8f86eb8219a0826e87aa810ccfa731e5a14f1d0985cb3342c73ba5b8ad5d8e01419689e180f SHA512 2899557ff872b45347f8865ff9bf07da97e2bfc3f4827ead2d4b0648c664bd9ef7ae3d48e5f5158b4dbb2d5063831ae8a1a7ef0ac97f2ae21318c6198850865d
+EBUILD hypothesis-6.1.1.ebuild 1849 BLAKE2B 9515ada34767c85fad60ece3c12a46243e74e242c579c19b091683f74c69a729c0d3cc564aadbb1f67ac44f8a91e829b036b5960fb3f0c5b6e2eded695e90b52 SHA512 c5eac04dba95a69fd204c9787a02b2ff69dd8f5d20bf622a5f6a774bdf59f3f990894b960fb47428bb751a42ee4651d6c149e4fd6e0b18f61b3d5983625f6a42
 EBUILD hypothesis-6.2.0.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
+EBUILD hypothesis-6.3.4.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
+EBUILD hypothesis-6.4.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.43.4.ebuild b/dev-python/hypothesis/hypothesis-5.43.4.ebuild
deleted file mode 100644
index 49e4dd7f1522..000000000000
--- a/dev-python/hypothesis/hypothesis-5.43.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-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 ~riscv ~s390 sparc x86 ~x64-macos"
-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..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		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.49.0.ebuild b/dev-python/hypothesis/hypothesis-5.49.0.ebuild
deleted file mode 100644
index c1156f901681..000000000000
--- a/dev-python/hypothesis/hypothesis-5.49.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		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-6.0.1.ebuild b/dev-python/hypothesis/hypothesis-6.0.1.ebuild
deleted file mode 100644
index c1156f901681..000000000000
--- a/dev-python/hypothesis/hypothesis-6.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		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-6.0.2.ebuild b/dev-python/hypothesis/hypothesis-6.0.2.ebuild
deleted file mode 100644
index c1156f901681..000000000000
--- a/dev-python/hypothesis/hypothesis-6.0.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		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-6.0.3.ebuild b/dev-python/hypothesis/hypothesis-6.0.3.ebuild
deleted file mode 100644
index 973ce1a66b61..000000000000
--- a/dev-python/hypothesis/hypothesis-6.0.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		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-6.1.1.ebuild b/dev-python/hypothesis/hypothesis-6.1.1.ebuild
index 973ce1a66b61..60bc6007a399 100644
--- a/dev-python/hypothesis/hypothesis-6.1.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-6.0.4.ebuild b/dev-python/hypothesis/hypothesis-6.3.4.ebuild
index 973ce1a66b61..46ee7df74d3c 100644
--- a/dev-python/hypothesis/hypothesis-6.0.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.3.4.ebuild
@@ -17,8 +17,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
+IUSE="cli"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
@@ -32,15 +31,15 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
 "
 
+distutils_enable_tests --install pytest
+
 python_prepare() {
 	if ! use cli || [[ ${EPYTHON} != python* ]]; then
 		sed -i -e '/console_scripts/d' setup.py || die
diff --git a/dev-python/hypothesis/hypothesis-6.1.0.ebuild b/dev-python/hypothesis/hypothesis-6.4.0.ebuild
index 973ce1a66b61..46ee7df74d3c 100644
--- a/dev-python/hypothesis/hypothesis-6.1.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.4.0.ebuild
@@ -17,8 +17,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
+IUSE="cli"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
@@ -32,15 +31,15 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
 "
 
+distutils_enable_tests --install pytest
+
 python_prepare() {
 	if ! use cli || [[ ${EPYTHON} != python* ]]; then
 		sed -i -e '/console_scripts/d' setup.py || die
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index 4f14adbdaabd..e47984875db1 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1,5 @@
-DIST ijson-3.1.1.tar.gz 124875 BLAKE2B 6f20efa076cf9e9a9f22eec65c7658440cc2ddffc2bf88054025f76f2df48e395d1c11a52501a45e7b5301448ce5874fb3e62d9111963f49f976ee68836c39d1 SHA512 c693444ac757c3b6e1f762d4a877a82b11ccaaecc922d34b868d236a78d9cf8f8648cb6d1188f0444caf61a0758f3080d3bfbd79c1ee51114bbd7c0a34bc633e
 DIST ijson-3.1.3.tar.gz 125658 BLAKE2B 3866c89b3dab6f55138b51d52c55a1b2c83e4e26d98e08724cd3d96ccb28a7d2a5fb1889e59f499cfe3b4ee8642933f88fbb18111ac94a8195a97109fbf8a08f SHA512 f4da9e44cc42fac7d9eeb6ba897ba7c3b477e07b4fb6e91abda59a83638d29dc41a845ba9ff5907130657a78ccfb788a6b88d8026f58b2095174e6939e25ef8a
-EBUILD ijson-3.1.1.ebuild 573 BLAKE2B bbebb7437e64aa0d95501f45d435777fe6c684b42dc95c621d0dd961fff00811ed57de5162677abc0fce7a897c1fbff8359fdd52d7a41947d02db39a3287160d SHA512 b8f849a215349d51e6b8882fc25efa33374701e82098a8a24e2946d510bc6f9de3bee18b7d52b95ad4f896e634d7c0991ca820f54679b8c4207a2712a320e328
-EBUILD ijson-3.1.3.ebuild 572 BLAKE2B 26ea214088edce23a2281f7e89fa4092ba5a2582ad390d46bdb903aa3b2bd95e4bb61458b9d4a0b9c797867beb86ef7d84e77db92e0eb731f40b5362230f09ad SHA512 2b388a05e54d90ab209ca70d17544f74633c46fef637adf04d21646fe81162dae60a5bc78d2830b432781ea743c79d4d81b2017a3bd22a00e20e7e91336950eb
+DIST ijson-3.1.4.tar.gz 125725 BLAKE2B 870439690c0b776d04c3023fb910d0f9ff2ca573be728c06802fbbbd5de1d5dcb8e677b778d30cb134d181dfc4ffd53c686af3d57458501d9548ddbdba8bf6d7 SHA512 7e64c4fec84fd6942c83809849eefc1c299c597524c0fe73e2cdc542e113faad8f35cc5219b0bc4e05842ac69d8608089d7cbb2dc006e404c184505392b21baa
+EBUILD ijson-3.1.3.ebuild 570 BLAKE2B 1f20bc61b9f59f43bcfeceba16ef5acd0b4a196f856b6a6df4e4322525411f80cf31a98499b50a3bf4d5116e0dc2bea22e5e975cbb485920772dae80d5959bcf SHA512 940646abfc15f78e7474c53dd06654e9f1c4f3d43c40862d4728863d06a195020a24b143a30a57f4fd2a0a33237099753d5691ed1af78b43b38fd9de4c639ab0
+EBUILD ijson-3.1.4.ebuild 572 BLAKE2B 26ea214088edce23a2281f7e89fa4092ba5a2582ad390d46bdb903aa3b2bd95e4bb61458b9d4a0b9c797867beb86ef7d84e77db92e0eb731f40b5362230f09ad SHA512 2b388a05e54d90ab209ca70d17544f74633c46fef637adf04d21646fe81162dae60a5bc78d2830b432781ea743c79d4d81b2017a3bd22a00e20e7e91336950eb
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-3.1.3.ebuild b/dev-python/ijson/ijson-3.1.3.ebuild
index ec8e59db0f52..ebf6208f293e 100644
--- a/dev-python/ijson/ijson-3.1.3.ebuild
+++ b/dev-python/ijson/ijson-3.1.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/yajl"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ijson/ijson-3.1.1.ebuild b/dev-python/ijson/ijson-3.1.4.ebuild
index 31e0b1239f2a..ec8e59db0f52 100644
--- a/dev-python/ijson/ijson-3.1.1.ebuild
+++ b/dev-python/ijson/ijson-3.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 
 MY_PV="${PV//_p/.post}"
@@ -17,11 +17,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-libs/yajl
-"
+RDEPEND="dev-libs/yajl"
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 543ae724d2ac..34aea5dc8a1b 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,6 +1,3 @@
-AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
-DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
-EBUILD imapclient-2.1.0.ebuild 977 BLAKE2B 3b19d3889da214c3d6e8e83194f0ce70a8426ac62444fa25eee38fd4f7bdcba194a2bdcf73cfc3eaa58aefd9fec5688e1bf5ff6f08adf21b178baea8b48d0f32 SHA512 c61b95efb6d9388c008f3fe94d0b8e6d4988600c8c1b7fae15bc2fe29ec3eb9eac8e3c0a48c5f892370f138d3b1c29c5c404bca12f8d422f30877dcaff4d3eb9
-EBUILD imapclient-2.2.0.ebuild 634 BLAKE2B 636bfd7e016e3272486ddb7f4039dddfb3bbd04b9aa4590f3b7970180acaa27e26a3f243199f813d4c1d10efce31eb5d1442a081c70276bc309ba550c58a770e SHA512 081f0931eea439f930d70e5f2de00ef8dad52c0ed44e2f98f94a329d3470f3c77a8044d8b0e86a5a59cc7f75330d2d04afccf98c046ec9ea33d580b32d48af90
-MISC metadata.xml 367 BLAKE2B e8e78992c7b20719db0dbf8ad12b3be2233755a23c252067d4108854721f71e5210154ced2ec1ad17c6e0b2196ca328a5d8b651ae138c66b5d6904f5c97e6fc5 SHA512 d4fcecd0bba2fc7c51b71a05cfff6ebc4c823e7cb0ee56d58ddca5596fb9fd59bf132fb285c3570280fa91a95fc51a75f442854163372ad383506489ede29e40
+EBUILD imapclient-2.2.0.ebuild 632 BLAKE2B d3c7eee95f1e59a30d59f422486067bad8f70017697a3364c044daa95fb8c5fd35730d65218e5b6dc0f466da6eba3e9b61a2d936d2927388563f8f584eebf1e2 SHA512 1cdbe03a30833bb21095d5d9acb7427bccf974603ab250eaefd433f168b0c007489f88f39ad7a43da983c6b7aaf88f92536551e5174e870382db4d464b8c4fb9
+MISC metadata.xml 391 BLAKE2B 4ecbaacc88911d9cb4e071aa9621451aa1bb81af27b2241040f8fe138bd863f2a9000d80e5c0d69f5c94e828d045f48db9fb01283f731fe904695a45beb3fc16 SHA512 07ce6935970d9897e98af7a576c679be236c37b419292ab95bb63bcc7cb2d505dc12966d6eac9e83301073b366f7f63572620b18a6c47359b99ad8003b833370
diff --git a/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch b/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
deleted file mode 100644
index d9a429a27671..000000000000
--- a/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26fb9c9794ad0b2541320d71d5704fce5642a53c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 10 Aug 2019 09:15:37 +0200
-Subject: [PATCH] test_imapclient: Fix LoggerAdapter version check
-
-The LoggerAdapter behavior change has been backported into Python 3.6.4.
-Update the check to expect logger.log() call in 3.6.4+ rather than 3.7+.
-
-Fixes #383.
----
- tests/test_imapclient.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_imapclient.py b/tests/test_imapclient.py
-index 91ccfa9..0f12823 100644
---- a/tests/test_imapclient.py
-+++ b/tests/test_imapclient.py
-@@ -604,8 +604,8 @@ def test_redacted_password(self):
-         adapter = IMAPlibLoggerAdapter(logger_mock, dict())
-         if six.PY3:
-             adapter.info("""> b'ICHH1 LOGIN foo@bar.org "secret"'""")
--            if sys.version_info >= (3, 7):
--                # LoggerAdapter in Python 3.7+ calls logger.log()
-+            if sys.version_info >= (3, 6, 4):
-+                # LoggerAdapter in Python 3.6.4+ calls logger.log()
-                 logger_mock.log.assert_called_once_with(
-                     logging.INFO,
-                     "> b'ICHH1 LOGIN **REDACTED**",
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
deleted file mode 100644
index bca796278b14..000000000000
--- a/dev-python/imapclient/imapclient-2.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_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="https://github.com/mjs/imapclient"
-SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# fix incorrect assumption about py3.6 behavior
-	# https://github.com/mjs/imapclient/pull/384
-	"${FILESDIR}"/imapclient-2.1.0-py36-tests.patch
-)
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.rst NEWS.rst README.rst )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/imapclient/imapclient-2.2.0.ebuild b/dev-python/imapclient/imapclient-2.2.0.ebuild
index 14f71e42f9a5..584b7a19fed0 100644
--- a/dev-python/imapclient/imapclient-2.2.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/imapclient/metadata.xml b/dev-python/imapclient/metadata.xml
index 810750331cb1..6569c46b35fd 100644
--- a/dev-python/imapclient/metadata.xml
+++ b/dev-python/imapclient/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">IMAPClient</remote-id>
 		<remote-id type="github">mjs/imapclient</remote-id>
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index acf15a562e9d..ecb7731be8e6 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
-DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
 DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a4018715282b176f448e0a9f2cb16320812c1f9ca18f797b2ddfa85a96d83f6ff9540b486abcd8b5a38fa7f9261abbde4a88962e765d SHA512 d17aae60ca79ddb3c2e60218144e7a3e055b2807e8ca4e55f0d0c1ae428323ab7d832e4178dd05a60f1de2f157497a6261afa7baa8f91bec85d042303869fb67
-EBUILD importlib_metadata-3.3.0.ebuild 1124 BLAKE2B 4638a48f81b82f368fc805c11e5ae2da1ea40e21de8bbd2eec56d5189d8d1b7ee4fed82e922f4767c77d2f490785baa0e2a5827cadf4df067dbfc7b73fb17452 SHA512 f5e6c62d3528d0f2dc4c517f23990c0b6b46f51e4beea035287d7762eac87fa677b7b9045fcbfd16cc74374b5180279e4cf8a18950e53f9a415cde93331998e7
-EBUILD importlib_metadata-3.4.0.ebuild 1132 BLAKE2B f993380a4f00c9bbd46aff735031adb6165d2b5be989fbe73cf56ba5a73b527c5ae36f3d01ca917cca7d56e346babaf908ecb4479a1fb7fbfc5ed07f160d2825 SHA512 9de1b984f97372f5b7c72d878d8f369512dafecc8cc34b38aa586b7e7a459afcc7dc651356ce9236dc8febbdb17d1d57e4ab180438b4fa73f8d5094bc094b289
+DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
+EBUILD importlib_metadata-3.4.0.ebuild 1124 BLAKE2B 4638a48f81b82f368fc805c11e5ae2da1ea40e21de8bbd2eec56d5189d8d1b7ee4fed82e922f4767c77d2f490785baa0e2a5827cadf4df067dbfc7b73fb17452 SHA512 f5e6c62d3528d0f2dc4c517f23990c0b6b46f51e4beea035287d7762eac87fa677b7b9045fcbfd16cc74374b5180279e4cf8a18950e53f9a415cde93331998e7
+EBUILD importlib_metadata-3.7.0.ebuild 1132 BLAKE2B f993380a4f00c9bbd46aff735031adb6165d2b5be989fbe73cf56ba5a73b527c5ae36f3d01ca917cca7d56e346babaf908ecb4479a1fb7fbfc5ed07f160d2825 SHA512 9de1b984f97372f5b7c72d878d8f369512dafecc8cc34b38aa586b7e7a459afcc7dc651356ce9236dc8febbdb17d1d57e4ab180438b4fa73f8d5094bc094b289
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
index 753f44d0b774..b862beef9042 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
index b862beef9042..753f44d0b774 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 431d6746ac3c..5ab91f91be14 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,9 +1,5 @@
-DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607da0625d32e415e294cfd5db94fb26e13d257763f2d3795c19ee7d10fc1fdc579fc0c34a484d28aff32c20553d18fafc7b850 SHA512 1fc03c9d141a094ca6ae0acb9ff0668a3f3aa76b47ce2149691b1d85d37a3ba9d329dbafd8b94961c537a4982cea1bd3ee34bac069819c51d725208f45b24172
-DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
-DIST importlib_resources-5.0.0.tar.gz 30603 BLAKE2B 66a22891e28e282919ed3847e69d36655ab8052f4f6c743ceb43456bc5447348302b61e5e3d3553d006fbab45c706882680265613497eedcc97c732a1776183a SHA512 eff23d8d365f105069910efe6e95f63a7e6c2cea7ca707cf4085c6d9f9c4f28065a1ad937d06ab3549a0ac25da5fa950af7b56a52d892125265252e0b79bf7f9
 DIST importlib_resources-5.1.0.tar.gz 31435 BLAKE2B f3e39117027a07de6c781e8b9bc3809a8fda4d1d5305bd514f4818a89a15e567c7c3c9533b263d8a2874e8fe0a580a55739e784a7ea2c7190a3eba7a422fab2a SHA512 f8ea8719a038a0b14845678c3ad836a6285b69bd3af45a45bb1e8d3ba401c72b8da00907a03297cde466551b169ba3f02133231e6f8d935d39110681ada35c8e
-EBUILD importlib_resources-3.3.0.ebuild 825 BLAKE2B ea0edb8230cd6e81b2aea5042d4f7388de7bbe12bcaf1634c99f99bed8c99904327d4ba3a0a646d490adbc47dd5001729a38364f6b7c0e1b6cb1628010f3b979 SHA512 47e7cd9073550cb4b92cc0ec681cc546788bd5cd1b49c392e03b66b3b6e20ab83e5543378dc589e3834f42b43669deb264d7b73bc57f1063e475ab9173373b41
-EBUILD importlib_resources-4.1.1.ebuild 834 BLAKE2B 568a9c54b540ea9c156d50d2d896755a901df833b64e40ec1fc872e40197846983a888e1e29ce65d7b7165ac9dfcef7c1dfb1dffa11c12acdd3bcc525f0057c4 SHA512 59bf2547f6fad6b0740429d3167e831c6c147d6b11054169059a9988f655df3879ba64255ae8428be41651f351870357b351fd7cd9e79f73d6cb17e82deae749
-EBUILD importlib_resources-5.0.0.ebuild 834 BLAKE2B 77c9188a5d7c0ced4f7dc886ce12e200d59d18a343938fe1128bbf32c3975b4b30176138f5d2ea6ff6a3ba61bb89ae6aa3d431bf0e4ce22ffd3bf8fe6956a371 SHA512 d010c64f25c22b9ff11ce9b871fa5dfec5a132d05b3cb40d73960fb4b76f335b5a41094373e0d15e244381dc30e318acef280f18741d3e49d4ef1656a4493be7
-EBUILD importlib_resources-5.1.0.ebuild 834 BLAKE2B 77c9188a5d7c0ced4f7dc886ce12e200d59d18a343938fe1128bbf32c3975b4b30176138f5d2ea6ff6a3ba61bb89ae6aa3d431bf0e4ce22ffd3bf8fe6956a371 SHA512 d010c64f25c22b9ff11ce9b871fa5dfec5a132d05b3cb40d73960fb4b76f335b5a41094373e0d15e244381dc30e318acef280f18741d3e49d4ef1656a4493be7
+DIST importlib_resources-5.1.1.tar.gz 32125 BLAKE2B 3205ca16163ab3e186c4d2bb255c3cc39fde632ed28bbeb3c8a30e771445de9f02020e1a78f9705332ba279ed3bd9b4e1cff787ceb14cbaa7bc1f72eaa9298ba SHA512 2ee6f8a5f9c501647cd0b79f91041cefaa0b2822dd093efd8cc2917ef45e1917b7a9b493a62b28393de65fdb008f726912fefe61cf1a1aabaed312193b801033
+EBUILD importlib_resources-5.1.0.ebuild 825 BLAKE2B 9489f827e07979b15cbb83609d7372cb07e35b1653dcd227bf3883807a8f4572ad85396b6e7d179ac70ce92b939adca7f13954ff0c8bd8ffe410509f93f03723 SHA512 6762e1d8b5a1e86dbc5b139f5afc7a59460c3daac7a4ada849c2fb6df66c62ce12c5ca77dcd62573876ba49f2020dab3a609e6f833c8e52a47c50117990b0a02
+EBUILD importlib_resources-5.1.1.ebuild 830 BLAKE2B 202b6e72a123540ea2ac6241831ac814a648989e411d75e40a63f44cb1d31114ea877bab62b188f64881983a8273b5ce94fb7a647213c41a8b02be1526b7e556 SHA512 8c78ba7c7b2470e0d18b4c720fb756fc7967e26369f94ea509da875a848b2651c4e1c75b29b90917b97b58af964f866668b813c6a51c1e7881665bd414d98ff3
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
deleted file mode 100644
index e24612a4b344..000000000000
--- a/dev-python/importlib_resources/importlib_resources-3.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-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 ~riscv s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(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
diff --git a/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
deleted file mode 100644
index 8edb5b33d3f0..000000000000
--- a/dev-python/importlib_resources/importlib_resources-4.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(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
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
index 680eb6ca1ff1..d4e6f86b0f67 100644
--- a/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.1.ebuild
index 680eb6ca1ff1..832a9c131a5d 100644
--- a/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.1.1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/zipp[${PYTHON_USEDEP}]
-	' pypy3 python3_{6,7})
+	' pypy3 python3_7)
 "
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index e35e89b69c3e..c78143b98df3 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,5 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
+DIST incremental-21.3.0.tar.gz 17058 BLAKE2B a6c49d15eb73abbab129e675d937e795a47aca10f74a8d5fc80ebf6575ca996cc7dc16aac9ca02c7a206cf8f59b239f3fc04fc00b28827d0a3c76a88189dabf7 SHA512 b8b50151cd2467e552d9268decadbb839b047cf58a450b72e0437ffc5f9af7d78c20a24193c0668cf48dd6264b852d9cee68e59529018e0ca07825e0c185d1e8
 EBUILD incremental-17.5.0.ebuild 773 BLAKE2B fd58c24b3b759a68ddf5becae7aa8a35ed7241dd1fe587d1272a931851aeb13ed7f7c3edc520cbafe820c57244323bcc9aa3fd68e02565b1814bcde92f4b66b7 SHA512 95fe0d9240b00a6abb1d3c151a8c4be4a6f399fe5735d72cc6e25f5fd7fd5245eeaf89bf25c9218af00d572b31d2297f33df69157acd0b880f1e80dcf81aea09
+EBUILD incremental-21.3.0.ebuild 782 BLAKE2B a42b81694be9ea792a603932f9ebe8f7057e24f48eadf80d210b436eed157fbc8a3f97e3ffb7d108f4ab7ce19c25d13a3400244a7437c0a7383f7ceab4ea2bcf SHA512 e81d04376741bd816f346dc29f0689f1b5ac0489223cf8de6f1cb5ec7f3245d0741cab82576244d2503efa7147af23c1afc4d625f678d75ce9b0226e865bec07
 MISC metadata.xml 500 BLAKE2B 5bdd21b11ae3bc588f4391be9e08f0ac27f4f028ab8b86225eedc3504260a85ea8e89d443027efd25bd7c46e2fefe0c2f3cd2ce8cc2ce0bdc1f99c3ef6944af1 SHA512 ab126925cdce36ddb4b8b59c296d8e61172e281c9d2e1f45e17bfd174fd0e8563cc967a360898a23513be8cfe8515af2395e6e28f1bcffeda22a53d1df3a8c2a
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
new file mode 100644
index 000000000000..cb1d012c7a34
--- /dev/null
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+# TODO: revert to rdepend once this has been merged:
+# https://github.com/twisted/incremental/pull/59
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Incremental is a small library that versions your Python projects"
+HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
+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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 574edd374862..198ab88fa3ac 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,7 @@
 DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
+DIST inflect-5.2.0.tar.gz 73664 BLAKE2B cf2327eb0aca6319b43076a0f52d7e5c52bad3be45cbc094e620d6219b0b05021d05c289992b36d3221d1e582352497fb278d9225ece49ddc0630f91199b1617 SHA512 2883ffccd28c436908783855a282ff4346c74b14fe5899ed6b9fde0f0f1b97063119f7fbe927f1bf0d16761623abcdfe21439c12311bd2a11a70245b89fbce0b
+DIST inflect-5.3.0.tar.gz 74127 BLAKE2B 20c591012a5a6692c3da3a39f4aeaaae290da5ba723af5c9ac90f7d28112a1894acf082633f8f673f6d903f756b9bb70c6c3366762e872cf7ca6c6d5edf1c99c SHA512 f5baf65fb7a6ba59c91a36a17acb0abda3efc74fef56b3a3d99c100b2c6e94c5aafb08ab37310ce410631ac928e9c24a4a4c5e6b5c7d8f907c3d999f4a70cce4
 EBUILD inflect-5.0.2.ebuild 849 BLAKE2B 23c8b4619e1923acdbc74144a27279c04d5f82d899716d4c35c7222c4f891b89ceb225e31c5333b65b041e9ebd0c15a774826efb6ab8373398bc30d3354460b6 SHA512 bc5ba7603dfc2891c59b9ce45f17f473ffac088dd3328e97c2bdf4d7eefd0ebab2d0f5ebaa611627ae19ae5fcb0f9dd58b46edfede63ed1a04c9c5bf1cb4aaa6
+EBUILD inflect-5.2.0.ebuild 694 BLAKE2B e1d5ee9f15f6f7c7852b0598497adc9693ea00d98b971f0f922f610dae2576e1fbfee8c00bce3c2b6001a2c173ca06a2acc4cdb374bda928c9f964628b04d5ee SHA512 8dc08f652e86a05948b26aa2e681039900e7590e0cfedef118cf04ab382f3532ea0e221814024364251b15682fc78af1df973b98310cde24d7874bf0b977de91
+EBUILD inflect-5.3.0.ebuild 694 BLAKE2B e1d5ee9f15f6f7c7852b0598497adc9693ea00d98b971f0f922f610dae2576e1fbfee8c00bce3c2b6001a2c173ca06a2acc4cdb374bda928c9f964628b04d5ee SHA512 8dc08f652e86a05948b26aa2e681039900e7590e0cfedef118cf04ab382f3532ea0e221814024364251b15682fc78af1df973b98310cde24d7874bf0b977de91
 MISC metadata.xml 556 BLAKE2B fc273466492a4a7c43d631fa5ec3d7f0a4896f5d9da637334b74a2824228974f7cd38958fc14ce89055e997adb81bb88db1c1e31d68e96527f2767d6193053dc SHA512 ccede3941149e254e1f64242fd4f804a089f8235308a8dc137820beb6ab78f8867292fa27cb467051fc036baae280b19d5f386053c6c7e31ec682cd7bdab901a
diff --git a/dev-python/inflect/inflect-5.2.0.ebuild b/dev-python/inflect/inflect-5.2.0.ebuild
new file mode 100644
index 000000000000..df06252821d1
--- /dev/null
+++ b/dev-python/inflect/inflect-5.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jaraco/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-5.3.0.ebuild b/dev-python/inflect/inflect-5.3.0.ebuild
new file mode 100644
index 000000000000..df06252821d1
--- /dev/null
+++ b/dev-python/inflect/inflect-5.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jaraco/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+distutils_enable_tests pytest
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 68bb7b5589c9..c3d33f3160e0 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,6 +1,7 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
+AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 DIST ioflo-2.0.0.tar.gz 838200 BLAKE2B 876a38df5e6fb953eef6e65bb793fa975a4fed8d4f698029e26747a4887a449bcf5cc5c9fcce081f9b93faeb34d0f783b2f81e17ec619d7ca95810762eae810d SHA512 b4b70aef65cffe067d7563682a2cbeac0a07cd4722aa2de8fb56fd127c99df771dc5d3d22be24aadd628a26fd1b7407db684ea7257b45eba8f8376f4ad226a87
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
 EBUILD ioflo-2.0.0.ebuild 715 BLAKE2B b72173e3f103bf4511392924bbae46d594799e73454c4f997c74a6bbaf33d1fa86a254d7d4d5f512a92d4e8a521e761faabf1e07359920e1d692b3f7a29a09a4 SHA512 b50ab250cddf468e81f5dbd62d78a8a23c36e4fd863ad813a027084b7bbc4871fce17382f0b3cd0268d09e9fa918cbd59e84612aedf1efe8dd62f4ddc3103942
-EBUILD ioflo-2.0.2.ebuild 836 BLAKE2B 0181eec6a6ce7f734959b77f82423df99f75840095fcd1d0aa76c43d84eb241eec300c36f0945656fa6c1b956b9bf305c2764e2fbf552e49d55d7a5e4b8a4f04 SHA512 2998ff85f8ec1370617cd2b336828ddbc276c458d72579ad731fff85f82098bd1749fb669aed927ee5284c6d4ba7be346ee36933b399807d49e976795bf2cf11
-MISC metadata.xml 469 BLAKE2B 6f4917852ab3dfe4f17348f5ef69b0643073de1e4050084dae6deb6b3007869c05357dd17302173da52fa198f51eceaea47a873c3d19be90c83695e2d5b15b57 SHA512 ba0719079195393fcd3b15da3c410e2590d38dbd58877cbb7b0c9be11a575c5f700085d62d1382c217a928637178817d0138965c4091748280ad7b0b2057a13e
+EBUILD ioflo-2.0.2.ebuild 878 BLAKE2B 9b62845003d1f985ea9a1c1497dcc75382dd188a395cd1f9a89e29179d568f357ed7f18c97f2f9de7498d59b9f0d7a9a184f87c09898bef86ebd4d8584f87a3f SHA512 8edd4af4630d2bb4df792a3f2c25c7f5db80bb02d10967b6c594449f42a55679240c68f9d85a70eba1bece81a2dfa76fa13264db5c2355e8549eb3123e0797d7
+MISC metadata.xml 493 BLAKE2B f303d71fb596699fd8867406fe983144371e9da8143c3ee4dc4761f466503e2f6c38dbb81195d9f7c3c2a3eb40354d52401f66c231afc24eeba112966ee7a686 SHA512 2e787e4dd8f0d9f212da69c25f4a58e609d120dff641405708f08d206b07249acdbac2d6e151379c54f5c960e340f8f31c986f231fab74986d1db71539a87436
diff --git a/dev-python/ioflo/files/ioflo-2.0.2-python39.patch b/dev-python/ioflo/files/ioflo-2.0.2-python39.patch
new file mode 100644
index 000000000000..dca7d54850b6
--- /dev/null
+++ b/dev-python/ioflo/files/ioflo-2.0.2-python39.patch
@@ -0,0 +1,131 @@
+diff --git a/ioflo/aid/aiding.py b/ioflo/aid/aiding.py
+index 6840d07..525b311 100644
+--- a/ioflo/aid/aiding.py
++++ b/ioflo/aid/aiding.py
+@@ -135,7 +135,7 @@ def nameToPath(name):
+     return path
+ 
+ def isPath(s):
+-    """Returns True if string s is valid Store path name
++    r"""Returns True if string s is valid Store path name
+        Returns False otherwise
+ 
+        Faster to use precompiled versions in base
+@@ -201,7 +201,7 @@ def isPath(s):
+         return False
+ 
+ def isIdentifier(s):
+-    """Returns True if string s is valid python identifier (variable, attribute etc)
++    r"""Returns True if string s is valid python identifier (variable, attribute etc)
+        Returns False otherwise
+ 
+        how to determine if string is valid python identifier
+diff --git a/ioflo/aid/classing.py b/ioflo/aid/classing.py
+index 2bd37b5..493f5dc 100644
+--- a/ioflo/aid/classing.py
++++ b/ioflo/aid/classing.py
+@@ -5,7 +5,7 @@ meta class and base class utility classes and functions
+ from __future__ import absolute_import, division, print_function
+ 
+ import sys
+-from collections import Iterable, Sequence
++from collections.abc import Iterable, Sequence
+ from abc import ABCMeta
+ import functools
+ import inspect
+@@ -123,7 +123,7 @@ def isIterator(obj):
+ 
+ 
+ 
+-from collections import Generator
++from collections.abc import Generator
+ 
+ def attributize(genfunc):
+     """
+diff --git a/ioflo/aid/eventing.py b/ioflo/aid/eventing.py
+index 837778b..f76ff0c 100644
+--- a/ioflo/aid/eventing.py
++++ b/ioflo/aid/eventing.py
+@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function
+ import sys
+ import os
+ import datetime
+-from collections import Set  # both set and frozen set
++from collections.abc import Set  # both set and frozen set
+ 
+ # Import ioflo libs
+ from .sixing import *
+diff --git a/ioflo/aid/osetting.py b/ioflo/aid/osetting.py
+index 6e6fffd..a99a09c 100644
+--- a/ioflo/aid/osetting.py
++++ b/ioflo/aid/osetting.py
+@@ -6,11 +6,11 @@ http://code.activestate.com/recipes/576694/
+ """
+ from __future__ import absolute_import, division, print_function
+ 
+-import collections
++import collections.abc
+ 
+ from .sixing import *
+ 
+-class oset(collections.MutableSet):
++class oset(collections.abc.MutableSet):
+     """
+     Ordered Set, preserves order of entry in set
+ 
+diff --git a/ioflo/base/acting.py b/ioflo/base/acting.py
+index c4b7bb3..95ad188 100644
+--- a/ioflo/base/acting.py
++++ b/ioflo/base/acting.py
+@@ -5,7 +5,8 @@
+ 
+ import time
+ import struct
+-from collections import deque, Mapping
++from collections import deque
++from collections.abc import Mapping
+ from functools import wraps
+ import inspect
+ import copy
+diff --git a/ioflo/base/doing.py b/ioflo/base/doing.py
+index 5af023c..c074380 100644
+--- a/ioflo/base/doing.py
++++ b/ioflo/base/doing.py
+@@ -3,7 +3,8 @@ doing.py doer module for do verb behaviors
+ """
+ import time
+ import struct
+-from collections import deque, Mapping
++from collections import deque
++from collections.abc import Mapping
+ from functools import wraps
+ import inspect
+ import copy
+diff --git a/ioflo/base/framing.py b/ioflo/base/framing.py
+index 3416289..6a33a35 100644
+--- a/ioflo/base/framing.py
++++ b/ioflo/base/framing.py
+@@ -5,7 +5,8 @@
+ import sys
+ 
+ import copy
+-from collections import deque, Mapping
++from collections import deque
++from collections.abc import Mapping
+ import uuid
+ 
+ from ..aid.sixing import *
+diff --git a/ioflo/base/logging.py b/ioflo/base/logging.py
+index d78a5fa..dca7460 100644
+--- a/ioflo/base/logging.py
++++ b/ioflo/base/logging.py
+@@ -10,7 +10,8 @@ import datetime
+ import copy
+ import io
+ 
+-from collections import deque, MutableSequence, MutableMapping, Mapping
++from collections import deque
++from collections.abc import MutableSequence, MutableMapping, Mapping
+ 
+ from ..aid.sixing import *
+ from .globaling import *
diff --git a/dev-python/ioflo/ioflo-2.0.2.ebuild b/dev-python/ioflo/ioflo-2.0.2.ebuild
index 34911e9c5510..a773fad8c775 100644
--- a/dev-python/ioflo/ioflo-2.0.2.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..8})
+PYTHON_COMPAT=(python3_{7..9})
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
@@ -27,6 +27,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
+	"${FILESDIR}/ioflo-2.0.2-python39.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/ioflo/metadata.xml b/dev-python/ioflo/metadata.xml
index e648c6f51e34..b9efb4055bfe 100644
--- a/dev-python/ioflo/metadata.xml
+++ b/dev-python/ioflo/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ioflo/ioflo</remote-id>
 		<remote-id type="pypi">ioflo</remote-id>
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index ba369f9aa588..c132a9e284d5 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0-r1.ebuild 655 BLAKE2B e58803213eca8c57af9820c80fcf18113b6702d6c14953bceb4b36ffe8a29b73cefcd2797d76ca8329366d3452bd5aed8fee9c861ec8444b62e5937a79db8e8b SHA512 6c13f3fe9c4d6007e9d70fcf1561179b7b1b0106fb5134382f9392403bc26cbf1a46f3e2904d69e96442c38c5e111e60bb231b5b3d2ba7a351af28198ab09611
-MISC metadata.xml 377 BLAKE2B c76e1ee73259d76f678031bfd79b03b1a98be93072665bdbae8f3cf5ae00774f027b4167af61c0dc0ac7641ea2933b1b9263e6cc4dc056484f3926d84559173d SHA512 7d5148d7ef6391fca25410d2e250a6ea786d41f91f5af08580ebeb71e3a3848385ec3e4003a1fb0bfc91d98145e2aa21f43fa9e4db7c529140d2b63b1fdf9db9
+EBUILD ipaddr-2.2.0-r1.ebuild 657 BLAKE2B 832ccac23b81d82dae9d3b966a55d03eaa03d6420227365b517fca71819f17cecc4d84f8f35e9a515c90a721e57e4dba2f89f9f41db60cfea94fbd39668c9987 SHA512 a3ad3e64fff25b8295427b8c274d0d93ef9066f77ca8f6d6bd7a6416cb58f855d1a599678cc18a034c6d915f82bf40ad01d997eb0fc3a5507dc55b7790c4f770
+MISC metadata.xml 402 BLAKE2B 1dad72e6f84c952bbb3096790c3318a2d92b5a3c19affec50d6ced9595a24aeb2a98c1c2bc2a95076fbf53a987433034622902fc5480864835a82bcdb62f5e9e SHA512 faf8046b616b389fd6155ee7a462d4ba315506ff1c7b176178facc6ee1afa127f56fde8068fab167027f5aedcf26eb49a3dcf65615d71041e0a8b70b586daf5a
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
index 838c92d1fdd6..36a2df82a523 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
index 9e6731f7c693..b855b44800eb 100644
--- a/dev-python/ipaddr/metadata.xml
+++ b/dev-python/ipaddr/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">google/ipaddr-py</remote-id>
     <remote-id type="pypi">ipaddr</remote-id>
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 666318bcc874..6553c58fb1bd 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,5 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
+DIST ipdb-0.13.5.tar.gz 16145 BLAKE2B e0bae825c2ce6b640e73e8ad8615f5f4e9c18a00e8c081a66ef0adab3429792a07c8434ddc8b236f938b7efd263c51f29bfe3f8d232d8bca20ab0cc2eff8165f SHA512 3ec05dec884a0006435fd7e5eb68bc76c6dacb1b0dd3f68c10c8c2a9dd3991bd6e498dcfb3877e5e534240ead1194787049ae3815fb8579b7bdea2e8c91970c3
 EBUILD ipdb-0.10.3-r1.ebuild 536 BLAKE2B 07e119a2fefe2dd1387c75988a0b4aa9fe73e47d288fa8e1e51fa75b54ab60f06adac72a6bcc2b8e68aa5ecceecccebd392d0c08a32d6514b3370106c54b89ec SHA512 17fce962ef688d754ac4c3f0fd251d5c66bba339b25c7b902e51b67f64280b0e12b47853081305a6c6085165453369014aee6895a94f2ef62b1874dc568437cc
+EBUILD ipdb-0.13.5.ebuild 544 BLAKE2B ac0f63b0cfd9c8ded56e182ea14e89c6cb638b2792c7a85b9d079184623918513ec8b4e87e8294ebdb2b5e1097868b7552585daa7e326ec3f7ac8a7afab22c93 SHA512 f67f553a7da1b85205e56c55103450fbcbdf092093e463d8ce76320af7fbb53ae5efa96f9f1a1fe5ded4bf48cfcf20e311be977f99d1bf5a727851a1d394dfe2
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.13.5.ebuild b/dev-python/ipdb/ipdb-0.13.5.ebuild
new file mode 100644
index 000000000000..ed817ad15142
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.13.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 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="IPython-enabled pdb"
+HOMEPAGE="https://pypi.org/project/ipdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( HISTORY.txt )
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index d7fe320047a3..7199ce37e5c5 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,5 +1,3 @@
-DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
 DIST IPy-1.01.tar.gz 33641 BLAKE2B 10d5ac5c3df00a562393ee762e9ad0f458ecf4745f894ab23e686b7112842adcbb3f25064c0010630745273fa72280ba5ef92a951d687d0f46f341acd6c041ad SHA512 f0983254523025a1819d543877d9651fb6a9e39dabd3b043488495f681b02e43b544a0121658a0430a418a1c39b360a59db1699af87a75a16a2bdc29fcb2b74c
-EBUILD ipy-1.00.ebuild 1151 BLAKE2B ac80bdf58329ebb15d1d82f5451b7f5f95ee83e21d6c386f5e855b5b29d802c070ac8fad01c9ac306733a64453a2d56173434cb5b231ff48690b55fb957c6d95 SHA512 8f94664e26a18da51104f1799256f1e487b5bdbbfc2823e78dbd957cd35535bc439092aae0e5d9dcc1cb49eef0e3fa15b872073b6b3942518545d93247e3c0d2
-EBUILD ipy-1.01.ebuild 1106 BLAKE2B 1cf4b913bd71a87e87fa09ef86ea68338ab9cb34d7a29472970a9c7fbe1d7136ff4ce519be604593d5e1b6ae4468fb76f02e8cf7f86fbdb07b352427c7ae4045 SHA512 081b54c3260df1845d7436fcc97ae82d871eecaa46db78f1ff482885bfb449c78e9099ac596287f5eae094301b66fc1bc3a1f79ffcc4b7ad4a3e50781e2cfbe4
+EBUILD ipy-1.01.ebuild 1104 BLAKE2B 2a916647e99083d5cf520f79b03e4e6acad18a5a43ff728e7c3951c798f20f89a85a04eef006512f4f5adbc5480081d022b758b1d88b9cb2be07a7f67e01f45e SHA512 f494e3eb0021bc9924dfe0eaf8f9ba614c26249e8e68093fbb0f0fdaadcfeda6af54e6bc06c2118cda432baae40efa62f82201c1698fcc9cfbad5232f475fcf4
 MISC metadata.xml 403 BLAKE2B 20229385e1b06c38601686268fbbf06c3f797933946b58fad8becc44166dcebe0969ec658a7a5ebc8825cb46d11ffe6c141daf4202f290b891ea1bf4ed0be531 SHA512 07d57dc63949778a70b1c6e2976943d747cf425fa35c86409d6458783f517eac17ecd2443a9bac80d599059ea9487e1c6b9f60ebd283b1978844d22ca4c20486
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
deleted file mode 100644
index 8a8a3fc87436..000000000000
--- a/dev-python/ipy/ipy-1.00.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_7,3_8} )
-
-inherit distutils-r1
-
-MY_PN="IPy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="examples"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	# 1 test fail under pypy, persistent from 0.82a, not a regression.
-	cp -r test_doc.py README.rst test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"${PYTHON}" test/test_IPy.py || die "Tests fail with ${EPYTHON}"
-	"${PYTHON}" test_doc.py || die "Doctests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	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/ipy/ipy-1.01.ebuild b/dev-python/ipy/ipy-1.01.ebuild
index a8260ce8a9d2..fc72e6719760 100644
--- a/dev-python/ipy/ipy-1.01.ebuild
+++ b/dev-python/ipy/ipy-1.01.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 4a7ebb8c6d39..ed645e17cef5 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
-DIST ipykernel-5.4.2.tar.gz 111450 BLAKE2B 0eece34722e5233f0baaef6119dbc15e35c736579c67da02d4d8528f816c0ea4cf65d8fa16b09b820a4c91c023ba7c61acd720d0f5e9b9a43a66099cdb613036 SHA512 4e6085a1656764b7e1e2787f4c89a08d65fb8280b0435874b16de4f70e43f5091783a1b546c7cab6d6354e208bae062bd9403980777c5727b41a4f8f7cf45f21
 DIST ipykernel-5.4.3.tar.gz 111751 BLAKE2B 01e4af9fe94599c912d6d6504ee4af9666b05155b43031aced3acf7512bd8b67689fdbdadea505d961ab569d313d92992cf7b50791a38bbe1bd3d67ab2a844de SHA512 4959de99ecca609f8123c01dc9904711a03cf0de5a388b9e04aa3ec0be985b6f37ac64bce2fe395039b16b7b54ad0632fef04fec30f2439d05499d8afbfd5258
-EBUILD ipykernel-5.4.2.ebuild 1053 BLAKE2B 93290a17629926ef88d916b58588d8385fa87d631af830223117ca082ecd50a5c36d2bf42d69bc936e0f263e7e75135108a3eeecf77d3086e7f5f3159653a44b SHA512 61800045c75ee22ff948197232a78623664b20ed2b10588a5f09e6af6899755368cf3c370985ad9c61276ca2c4bb2fd769874e39bb37d9aad7051113ffafe39b
-EBUILD ipykernel-5.4.3.ebuild 1082 BLAKE2B 4b286aa53c1809da12f244c6ebaa50dd4b1546cf3a63e8878cae90c03043d1ee541e81cc9d56fd2936cddfb8b6a349fa2f7d81e171fecc639d2801ddf41b4777 SHA512 d0d8f557cd1d787ffe434d3b71d9106724c22519b41879af0a1620a4aa81de7bb8dc97486eb94fd07f2d3f70b2c895d72c33b91960c21b4742032cf6540cec29
+DIST ipykernel-5.5.0.tar.gz 112600 BLAKE2B d1df26095e9badd5eb1fe4665bac01c254375407ac3af1f014d78b9e6dd6613c6a5830c09a63191ea84c36fc31a5d9faf73b1a29dab1a020e225636f6f2f0c90 SHA512 b1726d765f4debbb4c5efcc5e2d9745d8e51ada8e1417b31463b7c9546c6887cc6c0787fd32729b4013544e2bd41829dfd289dbb45b0c5dbb026eb57a47ec51a
+EBUILD ipykernel-5.4.3.ebuild 1079 BLAKE2B 1b0b13e792c84e73cbbb2f752422858e69ad90950e4a33467904ed73c7332753e224b139816cf387108c821bad9052b69dfc783261402c6a1b748799e15f5afe SHA512 f9272d0811c0ac4cc3d3b0ca897c0f432fad43e02d9132c980d2f87c913d9079397e2fe8e51ecef255f58c78c54e6a8c18ee41a8394d14164e56292efff06fda
+EBUILD ipykernel-5.5.0.ebuild 1023 BLAKE2B d52ce75939892e8f55728188426d219261fb0c81c916a7773fd882feed5c5e64a48ecc61f559970680a430c0db41b022e1f508f35f65d9d3c833ab5d15d7c7a0 SHA512 8a9428b3042cd951a7ae957fc85903560f2b17f8ca783c65027c843ceffa4d7cc6eddbd1a63b0cb3b9a78a02f901d7cbdf6d760ceee6bf231893152b98435d37
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.4.3.ebuild b/dev-python/ipykernel/ipykernel-5.4.3.ebuild
index 98b278cadb67..b48515088d38 100644
--- a/dev-python/ipykernel/ipykernel-5.4.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.4.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipykernel/ipykernel-5.4.2.ebuild b/dev-python/ipykernel/ipykernel-5.5.0.ebuild
index 122f1a169827..348b95bfdf81 100644
--- a/dev-python/ipykernel/ipykernel-5.4.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -15,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ffc2e46447f3..c9636b3a0563 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.19.0.tar.gz 5225775 BLAKE2B 1909d8336e7fc90959da4ca33ad7edcb8c2dec0a5aa20ca6f643ef53482fe7bf0d52e2bbec7cf97e72a1fd4d37af45ba01166febb25f35b52d69ffc062f0f0e8 SHA512 5350a125da3050acaea4899939a3b9d779009a2f5769fc9f3aa514ce029df050069ef9310d3255ad62f28912b4dec39207267248d3a2c3e9131cffd691322622
 DIST ipython-7.20.0.tar.gz 5140776 BLAKE2B ec01caf874ab9c331eb1f074f9e70acb521fe6d4abe3e8f086d9e9e77cd710c3b0d88c6d7b071abc6962eee8141b65a012ec772cbec3450db25f086fc66cf1c6 SHA512 2fff1a64c3d83e794e76bcbdf54e105f499321d9a7e5d3221cdc3e15a96e90543fd465b8dbee4836965286e7c1f1ea6d13e4d3d88c095164858bf71c161111fe
+DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8
 EBUILD ipython-7.19.0-r1.ebuild 3703 BLAKE2B efb9a0572c9368abfee6b103dd44517a5700fa1a33cb00e07f61bd286dce2de9a11eb16fefd6bec121871bc6504ed3be2aa2109efe1114442cd4c0a3620bd73a SHA512 8c7c1260c7b07e09282e01090033e702a5fb118c56e0e091a265c5a3bfe5129a17f702cd6ff30a1fef6bf732a678bf1efac4273f7088a2262f8c39202e6fd19c
 EBUILD ipython-7.20.0.ebuild 3708 BLAKE2B a1423f8a27cf4e4f404c1944182b667eba23abfbb947e32c73d0764934b63282dd05c016db5794378bc3a5e34911474520a28709c3ef162fdc16d19f807c0346 SHA512 2d482219964bc6d1b29209bdc1d0377fed71e4258cd7dd912958d40d014eb10ae012c07eb4db28f9392d9a8c7696125d2de22fe454f2d1cdcd41c0c60f22bf7b
+EBUILD ipython-7.21.0.ebuild 3708 BLAKE2B a1423f8a27cf4e4f404c1944182b667eba23abfbb947e32c73d0764934b63282dd05c016db5794378bc3a5e34911474520a28709c3ef162fdc16d19f807c0346 SHA512 2d482219964bc6d1b29209bdc1d0377fed71e4258cd7dd912958d40d014eb10ae012c07eb4db28f9392d9a8c7696125d2de22fe454f2d1cdcd41c0c60f22bf7b
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.21.0.ebuild b/dev-python/ipython/ipython-7.21.0.ebuild
new file mode 100644
index 000000000000..e314d1de9986
--- /dev/null
+++ b/dev-python/ipython/ipython-7.21.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature 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-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${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}] )"
+
+BDEPEND="
+	test? (
+		${CDEPEND}
+		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}]
+		dev-python/sphinx_rtd_theme[${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/iso8601/Manifest b/dev-python/iso8601/Manifest
index 3ddb60269141..7d5ca23bfd81 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,7 +1,5 @@
-DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
 DIST iso8601-0.1.13.tar.gz 12205 BLAKE2B 21dbc1f4212ec76bba2105e15eaeaac1a3bbac9f296e91e813efcb0811e75e45c4dcb5500bb29446e401c88035a602746ebe9394abc65b4d9637a12a2bf96a00 SHA512 0a16e2699ba3f33cec57acdd2be70c64d0e2655f08d30581f56997992945b700e6bfb14164f1f422e073eefeaefab4377a56ec6b3800156347e1568172c32737
 DIST iso8601-0.1.14.tar.gz 12722 BLAKE2B bbf56603d976d9f015ce04ed61c246b1b57e4edce1a912ac7ac5c932d122ca3855e917a7993b3e2d7ee6ba9ebbc9be6c554e69880abc30488698d8c354bf8ad4 SHA512 a461eb6cd011fed1ebec583b80ecf85b542c80dbdb4ad0213131febe0b58567bc0852283443c87923662b85e125ab66642b876b16ddfc3698445dd80e67e0720
-EBUILD iso8601-0.1.12-r1.ebuild 543 BLAKE2B 9c984f1b47eda93e1a66f32019bfab03b56796a7dd4a1da209e6df50af6fa88bd7ea0be6aaf619b43d6e46cabe2cc37d16bd570d8ec5bc5070789d3c6c733300 SHA512 3587e1ad424a4b155da0655126d0eb75c30c00144c261a9053ede87b5a1a38f5a5e831dec6833e29af99cd157c547943cf97a3f2f1998e2f16baa52bcd7c0940
-EBUILD iso8601-0.1.13.ebuild 552 BLAKE2B 03387f6542ce63ba3717dd2a028d5248f2db820abc1177a55fbc55a7a6fc50b41b26da31d61d62ff2525a9f0853a2fa30fca258f3652236cc0c7e338a5ba52af SHA512 a8e5affc2a04913886f073bce6178c0aee9373e86ded920efa64297371c5644a9a17900f6920e0370d21dfd479d307ac63c5f8a2d1480d0fedb9e8e756306165
+EBUILD iso8601-0.1.13.ebuild 543 BLAKE2B 9c984f1b47eda93e1a66f32019bfab03b56796a7dd4a1da209e6df50af6fa88bd7ea0be6aaf619b43d6e46cabe2cc37d16bd570d8ec5bc5070789d3c6c733300 SHA512 3587e1ad424a4b155da0655126d0eb75c30c00144c261a9053ede87b5a1a38f5a5e831dec6833e29af99cd157c547943cf97a3f2f1998e2f16baa52bcd7c0940
 EBUILD iso8601-0.1.14.ebuild 552 BLAKE2B 03387f6542ce63ba3717dd2a028d5248f2db820abc1177a55fbc55a7a6fc50b41b26da31d61d62ff2525a9f0853a2fa30fca258f3652236cc0c7e338a5ba52af SHA512 a8e5affc2a04913886f073bce6178c0aee9373e86ded920efa64297371c5644a9a17900f6920e0370d21dfd479d307ac63c5f8a2d1480d0fedb9e8e756306165
 MISC metadata.xml 394 BLAKE2B 11ec2e471953befe48f94577e708d873fc6aeca3ea72af7ae5d069badb8bc87511685de5acdc289e4d77cf1cfe99ec9ac16a9fcb7edba73adb48c8df7b2ab634 SHA512 dc0926ce7410798e86865bc067798027ec1b4be5fa9962db67248cc806cc3e5486f288df86c045bbc938f66a941472e49f2c17db2da9b61ed3ae5a4fe2f202ea
diff --git a/dev-python/iso8601/iso8601-0.1.12-r1.ebuild b/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
deleted file mode 100644
index 1cfde114660f..000000000000
--- a/dev-python/iso8601/iso8601-0.1.12-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-0.1.13.ebuild b/dev-python/iso8601/iso8601-0.1.13.ebuild
index cbb31758601e..1cfde114660f 100644
--- a/dev-python/iso8601/iso8601-0.1.13.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.13.ebuild
@@ -13,6 +13,6 @@ 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index d67904f965c3..b52fd036d198 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,8 +1,3 @@
-AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
-DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
 DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
-EBUILD isort-4.3.21_p2-r1.ebuild 822 BLAKE2B 35de749fa138eec4367a0e8a65bba0e2bb9e8367da0f75e44f3b02ad4247f4f79e98357a47347f8cf07a109e8d6915d017b112a5f808000e2acbc998ca783ba9 SHA512 047a020bc731a829729bc196984afdff65d48e4c6cccc7b39efdd8f2001fe085d991275adae9480dfea5c84c03d4c0cf4d1c5f527a860e30664cd8b5c8175ec0
-EBUILD isort-5.6.3.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
-EBUILD isort-5.7.0.ebuild 1713 BLAKE2B 22ff043ca3a2d2786b17eb8279dc9de41501148f9139bcace19cdaa27003e50836facf3c110fc5b1811d7b00c01596e71390f53ca3ed1383fffe62ec6f59b0ab SHA512 b506de00524e61b590b8a4f1f47e2e90cacfa8eca56e7ee9178ba1dd3381a1251268fe26a0e2e292448f430e677d0886ab9dfc3d1ebdcb7d09482b4724dd0234
+EBUILD isort-5.7.0.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
 MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/files/isort-4.3.21_p1-tests.patch b/dev-python/isort/files/isort-4.3.21_p1-tests.patch
deleted file mode 100644
index 9ece5ff6de9b..000000000000
--- a/dev-python/isort/files/isort-4.3.21_p1-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test_isort.py b/test_isort.py
-index 9d9297c..725b1e1 100644
---- a/test_isort.py
-+++ b/test_isort.py
-@@ -1539,6 +1539,7 @@ def test_custom_sections():
-                            "import p24.shared.media_wiki_syntax as syntax\n")
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_glob_known():
-     """Ensure that most specific placement control match wins"""
-     test_input = ("import os\n"
-@@ -2599,6 +2600,7 @@ def test_new_lines_are_preserved():
-         os.remove(n_newline.name)
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_requirements_finder(tmpdir):
-     subdir = tmpdir.mkdir('subdir').join("lol.txt")
-     subdir.write("flask")
-@@ -2675,6 +2677,7 @@ deal = {editable = true, git = "https://github.com/orsinium/deal.git"}
- """
- 
- 
-+@pytest.mark.skip("Not going to pull in Django for a couple of tests")
- def test_pipfile_finder(tmpdir):
-     pipfile = tmpdir.join('Pipfile')
-     pipfile.write(PIPFILE)
-@@ -2979,6 +2982,7 @@ def test_skip_paths_issue_938(tmpdir):
-     assert b'skipped 1' in results.lower()
- 
- 
-+@pytest.mark.skipif(sys.version_info[0] == 2, reason="Broken on Python 2")
- def test_standard_library_deprecates_user_issue_778():
-     test_input = ('import os\n'
-                   '\n'
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
deleted file mode 100644
index c07bf368c128..000000000000
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PV="${PV//_p/-}"
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="https://github.com/timothycrosley/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/pipfile[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/isort-4.3.21_p1-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
deleted file mode 100644
index 5476eecba44a..000000000000
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing --via-root
-
-	local skipped_tests=(
-		# Fails without -s, run it separately to avoid unnecessary output
-		tests/unit/test_importable.py
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-		# Require "example_isort_formatting_plugin", we're not going
-		# to add an example package just to run a few tests
-		tests/unit/test_literal.py::test_value_assignment_list
-		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
-		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
-		# Same here: requires "example_shared_isort_profile"
-		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
-	)
-	pytest -s tests/unit/test_importable.py \
-		|| die "Tests failed with ${EPYTHON}"
-	pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/isort/isort-5.7.0.ebuild b/dev-python/isort/isort-5.7.0.ebuild
index aa43c9d530df..5476eecba44a 100644
--- a/dev-python/isort/isort-5.7.0.ebuild
+++ b/dev-python/isort/isort-5.7.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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index b5c66809b16a..9abe8d064cfb 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
 DIST jaraco.classes-3.2.0.tar.gz 12277 BLAKE2B 4512d2ef96a6dba8c5f226da5947e69beb21a7bef20402fc1ef3cd8a0495bedadaf261b1d47757af10838897923ce0561ac063cb2d6d53c2ebf2be909c335dc1 SHA512 89cc24826c647ebb4a08ceb76159e6d123b7067c7f725989195b073895f1482a04db82e3e52059faf825a6dec7c9b9201859267de06880d4a80d397a7ab209b6
-EBUILD jaraco-classes-3.1.0-r1.ebuild 1603 BLAKE2B b4f1903268d18089a5d1cd73ce6a55328918bc9310dbfac0bd48cbf614e2d3dd1c255d4ae43f4b0d356a3b91188059f36d6131291b5557ff2bc1dd3d1bbd9a23 SHA512 68c9604c0939d82a52f7b7b5d0160efa1d2f5474aa2397e97544e0016687f336acd7bbd93f26ab4d09a225ae15bf2fa88574b61082728cd1c257ad07518a24db
-EBUILD jaraco-classes-3.2.0.ebuild 721 BLAKE2B a5e0892315d5a070a4ee63c217b255d349d2ef6bfdbaa440689793f012dba3a6c277989d6075cf8d28d3f6f2f594316ff74762c321b78a75292e2e6b3e7aa2d4 SHA512 c1f9b5aeab60992e650c285da976b09329d59c9983c17d267fb1c0c71e9571497cf987b87c4df92c2564d1b7514ad3eb835ae9b1f86aae8ec1811d8b0f0e923e
+DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
+EBUILD jaraco-classes-3.2.0.ebuild 713 BLAKE2B 95b97d38418d2e2ddd90f6cbc74e253438a0dffe48c286f81a1f3bc163471e77475b67862f02a421d1c00b5de07ba58e585c14c40102059f69e14ddf93887dc1 SHA512 5e4b282249fa3e6ebfd3dc4917f8eedbaac1541e48734278e34fc0874fc4502e152ca04018f3937da8c89efcaac402f7bba8f55c7593f14869488b1aea30747f
+EBUILD jaraco-classes-3.2.1.ebuild 721 BLAKE2B a5e0892315d5a070a4ee63c217b255d349d2ef6bfdbaa440689793f012dba3a6c277989d6075cf8d28d3f6f2f594316ff74762c321b78a75292e2e6b3e7aa2d4 SHA512 c1f9b5aeab60992e650c285da976b09329d59c9983c17d267fb1c0c71e9571497cf987b87c4df92c2564d1b7514ad3eb835ae9b1f86aae8ec1811d8b0f0e923e
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
deleted file mode 100644
index f3145026f6ea..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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}':" 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() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --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-classes/jaraco-classes-3.2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
index 20b9ab27a6cb..4e4708f23252 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
new file mode 100644
index 000000000000..20b9ab27a6cb
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index a9c913b12ab5..56a2fd3db083 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,8 +1,6 @@
 AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
-DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
 DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
 DIST jaraco.collections-3.2.0.tar.gz 18195 BLAKE2B 51510dd5053563319eac1c412deadac0a5f99ce3144d44150b5835ab92a05529998676fdcb577a5e725b19b4953c47c662e2f3eaa791de955c2493014713dd11 SHA512 cfea2de312781ec9d7a51752570432ec85e62834d02582023378ce0815e0c25f4d4e6afad8486559aa4e3f6fa6e602df917fdb11ed7a72423bea7ae816675258
-EBUILD jaraco-collections-3.0.0-r1.ebuild 1532 BLAKE2B 3511343a3e25b7b7551adf800584c1e7fd42a8763718e9eca67ae148644dcc5e0199005b3234e25595c9045ff9c349d9269adb1809cdc42cf5c599fa1f864b14 SHA512 449aac38984e34c4118f47e9a7b8d7db8f9f775d0bfba902249a9def6b6ec47578d56745f3497902da5132ee5d6c1b5e9ad0093eb43e86cdb4357d6fb722aa96
-EBUILD jaraco-collections-3.1.0.ebuild 1310 BLAKE2B 1846a33f46ea924102582c88978fbd44e2ce39ff94c0aa67bfc780eb4da27df40c5d2c6824375f15a48be574012416d6c821264227c8149dd5fcad8e89951e3f SHA512 d0a3c77a15877a1599e63d0f96f2de9a03583305ea6c110ae59f66126fe1df0765a7a946ec6cfb8908c43dc502c835a5cc1c2bb6340075145dc9a7a9f7749d83
+EBUILD jaraco-collections-3.1.0.ebuild 1305 BLAKE2B 72d1428410fdd7650acf922562c08d996e1978dff0b930ba0de74329bb53047d9771c931d59264054f24494e1d54b01739e488928f88e9a77773b07a5aa105b8 SHA512 8a10477dfcb76cbd604ec76270600309d151eca321488a890fea294a69fd33bd7b3dc8f696cc497e31816df83ec735dac0961b4fb66199a387da1e11d7df9b35
 EBUILD jaraco-collections-3.2.0.ebuild 856 BLAKE2B 9b923ba6734b9791308661c9a8467fe13509591394fc7b9f5ee2290339465b3a10a55a2092ab1ef00568c68b3f8e6b1322762afe0dbd5f6d19606007305a9bee SHA512 3d954cf162c6e1977d02724083d142d944c3a89bd820bf04a6244fea2140e23baa307102465fe455ea0502dd1dd8112093244bdf4e25fd5e112d383a222aee10
-MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
+MISC metadata.xml 683 BLAKE2B 39d22a937701983234b04b29b79785efcade578cfb3d94f694eeb1f5fe90e82831891aa689df78ca118e2c53d7be1ad61046a12656d430cceaaf4f72630ce827 SHA512 7493fc3e325c36c0cefeb6683a97994e5c8627d4e9bc1ec0b0fb2c595c1ff10756ecc2738fa62b991e6a7993b847d780fdaffdc609171bcf255a13b37b7ccce9
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
deleted file mode 100644
index 73978bf92b19..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-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 arm arm64 ~ia64 ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: remove six when the following PR is merged:
-# https://github.com/jaraco/jaraco.collections/pull/5
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
-)
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| 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.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
index 1ec7de6137e2..198c443a3e10 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-collections/metadata.xml b/dev-python/jaraco-collections/metadata.xml
index c5e5153c8dbd..34f72202eb1f 100644
--- a/dev-python/jaraco-collections/metadata.xml
+++ b/dev-python/jaraco-collections/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.collections</remote-id>
 		<remote-id type="github">jaraco/jaraco.collections</remote-id>
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 86d6834242b9..f9d1d8ef69b2 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,6 +1,3 @@
-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
 DIST jaraco.context-4.0.0.tar.gz 11257 BLAKE2B 38faeb6036ebd2fc6cea9f29dc7fbd89b0ea60819e280e36c8c4f0f90e9ba2552524bfc0f3fc16601cd43276d19e166d9de4107ced885f88dea11efbe0a79913 SHA512 ec76e03d3d5a2148dd49159b303ee278501b9744d3e4d096d6aca516658fb04da020d1cbb1c8eb3dcb58097266e0419883d23e4064c295ced3846540177e57ee
-EBUILD jaraco-context-3.0.0-r1.ebuild 952 BLAKE2B bd9b7fc0713917e034fc2a820cdbf664955a901e9a6e0ffdd5185fb935963aca72d1820b8e8b6dd67a01167058476cb44bdf0a9bf307e81bced6191ef94c249c SHA512 27a3d05a5764908a70575eeafd9e0f58fb9ca61b4128b5693366e32aa990d264513b2fc5100f1d6e77d89ee331c7865bd8ad052931bf8270d010ef131c72dbb3
-EBUILD jaraco-context-4.0.0.ebuild 582 BLAKE2B 37a6a83d0b98850f6a78575cf127dff19e5a54413b5f2307c67bdc7bbae671906aa07424f5ad2bd03ae821f2358c5e869fef11efd144f7f8bda34383cee25522 SHA512 3fd0d6021e91ac74d51a7f3c2b04e7612a240beb48ae3d1681835683d4b65adca88798a7ac36ee393e88a478dc14942ebc9e923da852175b794a96c9cd256344
-MISC metadata.xml 317 BLAKE2B cfd50bbe9635fc0ceb2d21cf84d762cf58fd40f66e9ede979905602ff5d2845795f28df6064478076030f3b56ed4799cb92604f1be2a81bb55201295d5e98b75 SHA512 b519a157b94749a5fcf760018711e956b2bb7dfe776843493afa04dc37e7c46c659f47ce4d4b8e220fd57f26e030576b5f4acfd8c6e76d1fe97609046419e721
+EBUILD jaraco-context-4.0.0.ebuild 577 BLAKE2B f5fe7fcdef462188996a0567ee395984701b223d4cff64c39f5fdb62a1b7801ab6f5e3c3cf975afe604c5e4b8b65c93f6ab8d0665495806f34c469dfbbbcae8f SHA512 2c1d3f1bd972e21e0d32a81a737b1286177f9250306b5e902c12028f157b145d0ce28c3a61bcbe89317b20a259314a8f0f77cbd5c0c914e39d92cfcfdaa33734
+MISC metadata.xml 341 BLAKE2B 5bd7c572c056011422868ab3b241750093ae67ba18da6734d7c32fa420ce9c5c2bf9176f8cd17efab2267a999342b16367bdf566c8d91edc02cf55430e86d7c0 SHA512 4b51ee5ca8dd65994777696c640dde59564bb124c4cd759e6a2462391c3f98fb0410e1744c2863ef5b19e47c8e54a23904336e3e9ae35e8a17b5c351fcc6f734
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
deleted file mode 100644
index 3b69581ab2b5..000000000000
--- a/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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-r1.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
deleted file mode 100644
index f709277cbf50..000000000000
--- a/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-BDEPEND="
-	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/jaraco-context-4.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
index a854993fe130..dfde80be8dc2 100644
--- a/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
index 1450a0c4f114..9cf411ba05a9 100644
--- a/dev-python/jaraco-context/metadata.xml
+++ b/dev-python/jaraco-context/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.context</remote-id>
 	</upstream>
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 0f1a9a1d98a1..13e94f07012c 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
 DIST jaraco.envs-2.1.0.tar.gz 10207 BLAKE2B 80a2888ab655b1c524a80d33f8c15b08257b2d4415bbc30ce0d60f8f4a019f8f1e0f05cefcb2b4f64688a0e6ccabb227c5824c27c6f63f6ecb926e0dc1ad208c SHA512 e9cbe17a86bdcda17ba1378373d729d850a2a4b0d0924a059dea0fc448964d55522da99a27c507475973b5d3cbc822ca184ebdb877207019f1daf6d5fffcb7d7
-EBUILD jaraco-envs-2.0.0-r1.ebuild 994 BLAKE2B 100daa10c99954f237d0fb9f3e7f98c0eb7c0e47f75a77dd9855ff34c2eafd999bc34da562b036ce6c9e41a75416d2304d1d92a417bfb757f3cef326c650cb6b SHA512 1e603c74a1f74dca49b1c460ef379d7c16a652a98e8ba9bb938bc37dfe2c8b21486916007a9dc8df0cdc5e6d7fd3191da7f24b80244659e69ef251835d94287a
-EBUILD jaraco-envs-2.1.0.ebuild 988 BLAKE2B 5f5f54a416f89ad72e50de43aba873f0cd841e6df0aaf019a2a4d9406d6acd8ec277a1aea77a8758539600e12eb4beb407a6856a31bda60de19731c0def54058 SHA512 e7cab77af12a8b54961fbf94a7bd4bda62cfb86059c598f7823d14d5d0e87a2c62d84fcd908a09ba173ff36ead6df9a4f345852be70034354289017ee166646d
+EBUILD jaraco-envs-2.1.0.ebuild 980 BLAKE2B 28bcaeddc3e27b1b7602ed7c6dcfb06b89957620ff1239aa93cf48a8ac6333b7e39261f97e3a246eccadb701746757e099b07000674568eb698246468aef6ade SHA512 8e1ab36698af00b71b9ba365bd9f276680fe231796916a4addd86ac2d095f002d4781161d8b09906c4c531dcc71ad627cee2c4abe5ff8d47a6e302764eb20fff
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild
deleted file mode 100644
index 6ca24dc705da..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.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_{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="mirror://pypi/${MY_P::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/path-py[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
-# toml is required by setuptools_scm
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-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.1.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.1.0.ebuild
index 37c714f98b2d..38aed6830d1f 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.1.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.1.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index a631b2a166bd..7811f9483ac9 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
-DIST jaraco.functools-3.1.0.tar.gz 17006 BLAKE2B 0807138aee76c5ad5b09b0887aa4f294248380d2171e272b70e7de2eb59a39c775c534c6123ec3f38987073c25ffe899a56020bc5a6047109c110f7ceec32ec3 SHA512 81a56d3325106e65889f90137d2f3ab57198e2b5905dbe067a056057dee98ca8a715fc46384f9ab15a081d5d7fd309d69ffb77be9c2b24a9a8eda817fbc0b1e3
 DIST jaraco.functools-3.2.0.tar.gz 16863 BLAKE2B 8085ebb0afee777073cafddc575286e765c5af5871c4bc45974eed1af9650d0edbbedf5233c5f9db080ab348c9c6151a1b22a7c21af6364fd56a3098640b0908 SHA512 aef71a96341a2f65f825a06e28b06b754a5fd52d4b04396f3ab5c264f27f342353d77485d76f081b35a08dd16ac06fd5bef3267cdc315320affa25e433964eef
+DIST jaraco.functools-3.2.1.tar.gz 16888 BLAKE2B 87dbc4a68f508a3c3169496c3f57d9844e90a6523b5526e486bbdcb1de996fb31025100e25929c0527ed27dd57ff67c90020d7cddfd70ead2a78e69ec8f65f8b SHA512 279dbb9307f864e3616f9b91ce5d55068df166a30695c0f81bcfae0bc2a1e0df5fdccd157210df3dd73ad73a6a955c1344ec441f925a651cd13a7f460e7a88e1
 EBUILD jaraco-functools-3.0.1-r1.ebuild 1381 BLAKE2B 7a7c76a28f436e050fa26646b972f285860c90eba3a3e61f359a6fa20065630b37415a523a6c0bd2c41991d30ae4f699ba134795c7d636bb0da6f3700e226385 SHA512 2eec210383b6930a220a14ca0bfac3a75ffa1f7e58aa2633ef3efecee5b1fd29b933f4828f101b1cbf1155ea744881e04a12352ab4f1feba7961f6b92583ef48
-EBUILD jaraco-functools-3.1.0.ebuild 1322 BLAKE2B ec52860bbc45f4799a010a88f9766720007cb4333f8e589a0983dccc8ab5d2c5c2bf7cd4b1a4d3b08a04044da0757c49ca5fe52302974505dbcb8a08a88162c1 SHA512 f3fb7b69380a9bc948990a967addc555b64be11a80ada5581107a53a0bafc68646bc9452eed8ee03c86bc59027ce7d8f479876646b4207576466d38aebcf05e9
 EBUILD jaraco-functools-3.2.0.ebuild 868 BLAKE2B 769a20554c3fc8e69ea292965f024de9e77ec1d7926dd089a841949bfc40511816297b992ac2a6e1544bab4db27cfbe306c2fd716d6ef6794961e1219dd10532 SHA512 40600c17575227badfd10e2afcb2eb946f5d217643c9a0e70c636d001cc6a9867f6f323e1e0285e1d21184f24b29de768c6679e0c90f8fb38c637fd99da2960c
+EBUILD jaraco-functools-3.2.1.ebuild 868 BLAKE2B 769a20554c3fc8e69ea292965f024de9e77ec1d7926dd089a841949bfc40511816297b992ac2a6e1544bab4db27cfbe306c2fd716d6ef6794961e1219dd10532 SHA512 40600c17575227badfd10e2afcb2eb946f5d217643c9a0e70c636d001cc6a9867f6f323e1e0285e1d21184f24b29de768c6679e0c90f8fb38c637fd99da2960c
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
index d2cd6266c107..9005f03c9d1a 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,16 +32,3 @@ distutils_enable_sphinx docs \
 	">=dev-python/jaraco-packaging-3.2" \
 	">=dev-python/rst-linker-1.9"
 distutils_enable_tests pytest
-
-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/Manifest b/dev-python/jaraco-logging/Manifest
index 9b330f6c6814..30a6d05a0a40 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
 DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
-EBUILD jaraco-logging-3.0.0-r2.ebuild 1349 BLAKE2B cbc22203a47fe3161f04a0841a0b6d93a7ee6f9222488ea0d9eef05d37b9ac2898aaf0afa9bbcdd696b50be006fe9a973ea2a52ba89aa3728f317aa2a41c68b0 SHA512 e7b822b734398c56230673e7947c0e4f0acdc70ddbae5dfe2d31dc0ace03561a705e289a3e51699d6afa192eab83f163b96dc2ad6cf9aeb00c3b726072c95148
-EBUILD jaraco-logging-3.1.0.ebuild 1169 BLAKE2B 343e0e02b3d91d8bab7b0a3412a01b285b037b01f9d27974a5d4b11b769291ed85d2a866d597035786f1b0db1d87530759bb33315fba18b5288e63c389162b66 SHA512 f17c452d31a99eeaae1075da5e0e1a230413f7de69a8415f80fd5538efdb132021d6d20d99ca049796512babf88e1fcaf9094c4e2d3096835482671fb0b696b0
-MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
+EBUILD jaraco-logging-3.1.0.ebuild 1167 BLAKE2B fb7631f9ba063727344dc77479aa710eddf110249830711626d2824dc74fea652c7ba7549d5d245ec2703e0cf519704e117d7c9b5b5df0537e127c7b0b7156f9 SHA512 189077cac2711f37121dc161ba00eb90f42f0f3db7db0a309366ef8d44c0e5031b3b0c524c79539baed3f7f01a20fe2c06672a01494c2dbd8bd3cc0aef827653
+MISC metadata.xml 476 BLAKE2B b278ae21af60f72c0fa30a3d0f9c7cf19e804a3e535cbc06f65d269aba0df6e5017f51287616121425de82b74db171912dbeabf2ccdf2321bf2bb7e6308976da SHA512 96a8d5d7cd623cf44ed73d3b0dc2f3806938ead211f525b6528f21fe7aba1105ff331e56e55bebeb70c839e32168a6a581061cf5415f479b41e751d11c988353
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
deleted file mode 100644
index ef8fc32c2d09..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-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="test"
-RESTRICT="!test? ( test )"
-
-# TODO: remove six
-# https://github.com/jaraco/jaraco.logging/pull/1
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
index 78cad9cf3605..2e8b75674ba0 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/tempora[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/metadata.xml b/dev-python/jaraco-logging/metadata.xml
index debf779333ec..f582335aea01 100644
--- a/dev-python/jaraco-logging/metadata.xml
+++ b/dev-python/jaraco-logging/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.logging</remote-id>
 		<remote-id type="github">jaraco/jaraco.logging</remote-id>
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 5b55081fa327..e81ad443019b 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.packaging-8.1.1.tar.gz 14580 BLAKE2B 6ec709571d74a9c840652b565e42b5301ab1ad71df823df6fb972c110d7bc0dbfdbae0dd3cc7123b29076a42de0d2b716ef2bab8dd58ffeb2563a868d90bdc90 SHA512 c0724e8694c3019bf3be24d99c7cde6dca65851e288ae027eb0b0fdfde9e1260804db3f8690b3bf69abd1e1e50733178c0387a859b0d634e8096dc49537f5877
 DIST jaraco.packaging-8.2.0.tar.gz 15295 BLAKE2B bfa8ca1547586122a5e142681be573ff0c7b95e0a5f5df25cf32dbafb4cd105509d6f7dcd9673e9f31bfe9284811721d778596a5ca3d25e41c9b1d88e8eb90d0 SHA512 469eecdc0648a0262e901462c3447450b1e3ca229ffd3747ebfedc7f80e84ff293680ff84bce0d83ee356bfa35fd0db64c7b0d61e02bad191bcdb5713c770789
-EBUILD jaraco-packaging-8.1.1-r1.ebuild 1280 BLAKE2B 513ac12fbb7fa58757490135d753d5909e1155daa8f0e637334056571401cbf463af2d5c53fb2453a254571427bc8385c9422c6fde3a9fdf8f7be321effdac8c SHA512 652c9c30ddaf10f3d37d1bd391486bc6ffb0d11bd2362169cfc231cb9db69f412151d7e37dc6c567138bce664e65a7f60bbe7aa3cd442ffc0c8201bb671844f0
-EBUILD jaraco-packaging-8.2.0.ebuild 1218 BLAKE2B e62f09a7027f1378797a949a9f01e3ba5ec79014eb0b98db0f1ec393eafc318993b466af43b4722c42805f1f3b8c6a4d18707b026bbb7b70235d493b51bf8240 SHA512 bf551844361009c02675e8673d8d42ee6104d9ea80bd9712a966f7363e3ff22447cdb212fef2aec6a4d4cd1e4bbf10f9d0431a4a2f4c5875a55a6fe163283254
+EBUILD jaraco-packaging-8.2.0.ebuild 1209 BLAKE2B 615ced19d2369609bf54ea3df3845f46f023fb83d630e2f89fcc676b1e8413b426c85b7a6a335e5991ca4ffa353e5bdf7b1512507c13f3466470c49f6235f467 SHA512 43f09d81494312f5ab71158f549fdff68fe6a9de19cc867743a330dfd5b19e18a7221ec0d0626b3e4b88cbf2f14dc034f6d0518039ccaa222eecd9288f377e7a
 MISC metadata.xml 675 BLAKE2B 36430dbb7cf6f29c913d02aaca81aeafa88e15cf44529c81835ae95c1b7a023a60d0116d50f04fbc424ee6aa49a2fe0eb56ed93b3a91cdd9d3bdda3d0377be91 SHA512 1532e2554229bec8576d60f8bd6b1f170fbe7a869f6b3505bd84efe33472b66b83cb08a5b4cbf201966d7e140a0571a89ff9dc3f821ded1181213841e551c506
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
deleted file mode 100644
index fe0d15352809..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-DEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	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-packaging/jaraco-packaging-8.2.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
index bb41d70f3eba..e8d3c3e05c7b 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 46e5a9a391e4..4179c6f465c3 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,5 @@
-DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
 DIST jaraco.text-3.5.0.tar.gz 15453 BLAKE2B 53a3553f09a6c33734684477fe1228b159269a6a7e38aa8381af54f17162d1658be1f91157fd092544141bd086fdded32bec2fa0103c4c6978301cae3e199a04 SHA512 da566f1a6d8343d05c51ca3f4635212094ddbc84fe9b460dd7630030a9b5bb28c97ccb0de5928da50230a182985c7e5bce8903d4019ce5afb89067ad938dd152
-EBUILD jaraco-text-3.2.0-r1.ebuild 1432 BLAKE2B 8e3f11196a7d25d47456a16f68bb5e38dded5e3943cfe2b923bfef97467cd42f5668e15e0cb7114c6e6b27ab772ef0f8ea3ae034a60e5a687a78ab1fe383d428 SHA512 a9b8a87e126935a7afebaade8ffdd1e2e98139921254fd9ab33bc367829139b6b2137e3ddb07628fdd5e6d65da17921ea2c7b457af94edf5c138af7f99b52dc7
-EBUILD jaraco-text-3.4.0.ebuild 1246 BLAKE2B 247f049504af918b9db50f812ae661abf65e09cac0b646111158d6ad8bb992b0e5e94328fcc262f774d8bfe203aa3580ea543eb0c67174622ebd30e503e33a45 SHA512 3e2e2a8e8be3d2fa80c2736fde975c1631f6822cd0f4df7fff0904f99684f862436d18cfcef6cb187daed056c7575ad1ee2bdb00423077950a361973b35bac0f
+EBUILD jaraco-text-3.4.0.ebuild 1241 BLAKE2B dc94c90299a92e956120a393d00dfc95fb2c289e5117e3eac59180cb7767341624f0567f8d682e2bd75f38ada051e7b955ce9fbb7305cae70bd15aba517ee521 SHA512 e2a7cf42291efca0bef7fc8260faa59e503330aa5eabd87768719353b216a85b3397f6b8d362ba23d214b47d1b0995932ff9898181e0fb6abad9304d96e478d6
 EBUILD jaraco-text-3.5.0.ebuild 778 BLAKE2B 78e2fccca36614cfc931a5fb6c7c6e4ce9a5bfc97fe294982883e4e8b641efe52d018928a20651d8527887da103f61ebff8933cd22cd801ec219022e096f1ea3 SHA512 41630f8370de81195dd39d28d44dbe58486745946505cade3b2bcbbd397e6dc3f0ba109d21e8ad08c1f2cb9c91ef0dc358c1e4a48f88555b1f035aa1bfd9516e
-MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
+MISC metadata.xml 655 BLAKE2B 6bd01547bc069cfdd2a6d8ef05d0f62b17e54b54ac3d45ce3c66d765a5db88c52750d3f80053efe8eca8c36163deb36268e5a1683e65813d42fe1f033306d4c5 SHA512 94ad62364c1159d64d69d8781ed42f642d3877c2e6776f0d863d6b89fd085199d03a65f251b9fd1c21628d3210160ef120250ad7956d1589b8e06207831d2937
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
deleted file mode 100644
index eb261ec246ad..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.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_{7..9} pypy3 )
-
-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 arm arm64 ~ia64 ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| 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.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
index 88fc3ac83bd9..787d8a63c4aa 100644
--- a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index e1433b293fac..4e38311d16fc 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.text</remote-id>
 		<remote-id type="github">jaraco/jaraco.text</remote-id>
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 94afe843ac0a..dde8984e3bbe 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
-EBUILD jellyfish-0.8.2.ebuild 935 BLAKE2B cbd828dd391d1ad211c6dd7f23392fa01c246f7d541e40901fa6857b1d79d86df684e163b8309f9337f8c784d035fba40612c1e8c041454b5599231d2719c507 SHA512 b7cfd3b79025130643f9ea57db524900251100da5c6e6e2924b6363158b7daf347c44dc8346abb2421adfb187dd356e2117760da409d7783a3c762722017908d
+EBUILD jellyfish-0.8.2.ebuild 733 BLAKE2B 66a2825cded274ed0bce8e7a8a266972a21f37ffb11924f5e2671857cded5c7ced9ee1d74c5929d9686c5cbe1d571d952b475162ff0fce4f380cbff5ef731fab SHA512 5a7954b2553f6ae03b6491d38b36173372fbf2270481b88b15e078ceeae98594fdd917d92620b4d34e7c4c3dd1fd3e387032dcfddd03f0fdd7dc9181d71f8493
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.8.2.ebuild b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
index d53e8eaf9cf3..992a3ad23ed9 100644
--- a/dev-python/jellyfish/jellyfish-0.8.2.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
@@ -13,24 +13,15 @@ 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
-}
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
 
 python_test() {
 	cp -r testdata "${BUILD_DIR}" || die
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 8464ddaab690..dec7c7e7eae1 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,5 +1,3 @@
-DIST jikanpy-4.2.1.tar.gz 536588 BLAKE2B f6bf531cc57814d2740e1d325bc521dc92651a1a467b65277086130d9c00de7b592e81a7f82e12cb35ac8d8c7f1bcc6201f945ab9c49befb8b89093e627eacc1 SHA512 7f690745a790836ddae95aaffdaa59ea60d0c2b2d9c64be7548372719c826239d3d650931652ca75d8e35f1d4354c0b80ebf0d7e80a4fa4b65ec3bbd4bef1cd5
-DIST jikanpy-4.2.2.tar.gz 536658 BLAKE2B b8f34f506aa93c68586d59d0ba37e1731e509f8ce2e0cd4f157b6ea5ae8b333271f528992998c92c19e08358ca14508a2bfae6fa167a750bb732fbcd3ccb13d3 SHA512 117aed3c968214aae659437b795cd4e326e0d94a536005861edad861b6e08d50be346063d1d75c3874ae2d1b3670cfa2ab566e340aa58ff6137a94dbd6369bed
-EBUILD jikanpy-4.2.1.ebuild 529 BLAKE2B 32f1a4d397e4c2151ddc7b41ccdaa50181954a9e02e87e0daa780f00be0d0c87cd39298c77e0c8eb20f8357c95b59d74a38d06b64dfd1a97bfdd33c4057e6515 SHA512 91fa1b3b8dde8a0da790810e4a2e649594a7a4a7a2da6d26e00af02aa00edd67595f893b41ce8f445d31dd2cc17badedb146453310e31ecdb58c8b7e797758f1
-EBUILD jikanpy-4.2.2.ebuild 529 BLAKE2B 32f1a4d397e4c2151ddc7b41ccdaa50181954a9e02e87e0daa780f00be0d0c87cd39298c77e0c8eb20f8357c95b59d74a38d06b64dfd1a97bfdd33c4057e6515 SHA512 91fa1b3b8dde8a0da790810e4a2e649594a7a4a7a2da6d26e00af02aa00edd67595f893b41ce8f445d31dd2cc17badedb146453310e31ecdb58c8b7e797758f1
+DIST jikanpy-4.3.1.tar.gz 725938 BLAKE2B 5e011ae4b6d267ad6a6a99b2d28a3f11c4b8949cc1682524d966ac441cce9c527465455573ec873360865f9b913bc14b5c4448ee681540a01bbb95f67c38dec2 SHA512 43170c3512393c50fd859e7481cdd6cce874bd54415959c0660d0804f10546bd22b836bf3c27a86946fc771e92192e28dd8ee02c71796f799b4cf748102d5e3f
+EBUILD jikanpy-4.3.1.ebuild 675 BLAKE2B c8e320f2608a914e8b4a3fd2a9904f7f273e8eecde82c445705248795769c2caab393801f5a50ff44603157ea205457a014ad91151780f3736e3512b1c5efe80 SHA512 652152bba9b93a07d2244da71ed67bec4ca58d22fea4e49732feda3a44af3e4768196bc02fcf352dab16f617d4fe7a0f00d4320924eafafe43d249a67632c9d4
 MISC metadata.xml 378 BLAKE2B a984a5ec0db760455227f9506abdd294feab0fe6e5c18c1a489c789e80b38c0ab854b0c195edd7c132932396c4c5628be65677f6ab945371d0d8414fc08a03a7 SHA512 4ef2469712d9af410a4000b3ea5bbac2bb3c837042cf3bd0348b53d57ba463652eff2ae5dec045fcfc897740f2810a43c03b94e79a55b72ac15154e31be230be
diff --git a/dev-python/jikanpy/jikanpy-4.2.2.ebuild b/dev-python/jikanpy/jikanpy-4.2.2.ebuild
deleted file mode 100644
index 0f87ecf04f6a..000000000000
--- a/dev-python/jikanpy/jikanpy-4.2.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=( python3_{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/jikanpy/jikanpy-4.2.1.ebuild b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
index 0f87ecf04f6a..8dac8ee8e239 100644
--- a/dev-python/jikanpy/jikanpy-4.2.1.ebuild
+++ b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for jikan.moe API."
@@ -15,8 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+BDEPEND="
+	test? ( dev-python/vcrpy )
+"
+
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	rm "$D"/usr/CHANGELOG.md
+}
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index a218cffec1e4..97a2df1bd6ad 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0.ebuild 592 BLAKE2B f47782405c40232c7c0680b4db870867be2c67399df7590989164e3c495b6895e817b03a1d0c1f067f1bec6db7b3e6f0198398f8a0cb7cc8eeace71d70204ac2 SHA512 bffb0d0a2a6cf724ecef200bd71e585a38c64c95178edf269b4f5f38a090f1acdb31f2b29afab98791819f230b83713d1c22ab97c1453e57fec92baae7c31697
-MISC metadata.xml 375 BLAKE2B d28fc82eb5b6b82faf9e3874182b44290f10a1d2c2e7bb58e32cd46c6d724028e0bdf27670052f1665655ea0843900a1b978534ff8b32db986aa49531d4db76f SHA512 23697fa9d297ce1deaed947d2f5c98cfd85d9f10e4f703259db15d6deeacbed1ac4f297eed4b58d07b23c798ad738680c945395dc68f15cb0d083f7acb6d99ce
+EBUILD jinja2-time-0.2.0.ebuild 594 BLAKE2B f140eb9df242854659fc5b8cef33c0da91354d5646be42e7e4b7691bc1bcc9b02343a70d84ebf14cea6911f2d5c735a2ba16b278221d4f3079886a09bc080c14 SHA512 2e2c02dd4bf426679a71efde4587e86e9065976b0957c42aee92d8681096d10a2b88eab7b90ece8c41266a33d0d92cb0587cf50a88b723ff2d3637653942ff61
+MISC metadata.xml 399 BLAKE2B 0285d9892b8f0cc34cefa7075d87446b623cdd6903462050bf79b4acb7f9f8b85fa91bfe78f96b572deb358799fba9813511dea9f10d9626692956f361433297 SHA512 7201a78d046c873b53b74e515afc7d29972592ab2b4c71d71292311feb72404cb8973160c0e852d51402972a262d28488f2fb474b80d11f510da2b88ea5a9202
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
index 634048921a5e..65faf85dccf0 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
@@ -18,8 +18,8 @@ RDEPEND="dev-python/arrow[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
-distutils_enable_tests pytest
-
 PATCHES=(
 	"${FILESDIR}"/${P}-arrow-compat.patch
 )
+
+distutils_enable_tests pytest
diff --git a/dev-python/jinja2-time/metadata.xml b/dev-python/jinja2-time/metadata.xml
index 07e8079b8492..45b0dd336bb9 100644
--- a/dev-python/jinja2-time/metadata.xml
+++ b/dev-python/jinja2-time/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">hackebrot/jinja2-time</remote-id>
 		<remote-id type="pypi">jinja2-time</remote-id>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 0cea1f00188a..b362fdef2884 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,5 @@
 DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
-EBUILD joblib-1.0.0.ebuild 1165 BLAKE2B 8b5a7d5175750c23a1e98be9e0c5f39133e212eb2c3ed23427e8e63d79bff62f2b18abacfd2f7d0b7c2100503bc7b484c604cc5a7cc42c031fa129b4c00f5c74 SHA512 b55b4bc8eb6dd5524ecb09457b8ef877e27124fc4f790f045f15d377ea9d83fbf00cab1f6e91bd4da9787d4226828467aef53eed60477144e56240d7d294763b
+EBUILD joblib-1.0.0.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
 EBUILD joblib-1.0.1.ebuild 1167 BLAKE2B 38bb93fce3235dc2fa170188629092b6dbac8284e513cc07bdce24aca0c2337e15215c6c729acef9498051ef520a39c11c4a2a87eb29037da9aa69b742123e13 SHA512 5f5e403bca9c84346285a9413d00ba0ac2190caca9859e0c3af0b811d30f3f25842e2502fc69a5ccba00da2198c1b8cf894d125e64fccd48d2c7ae1d7f879966
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
index 0cfebb301220..6066ffdcf33f 100644
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ b/dev-python/joblib/joblib-1.0.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 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 8512e8b2addf..d362d31ef68f 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,9 +1,5 @@
-DIST josepy-1.4.0.tar.gz 54174 BLAKE2B 67117e7399422d0cfe2c47f9e5ed11a3b93617e673cf9ab1344334f7f11f0c884f45202e8e5e65ebacc00f527becfdbdda9ea246b8e96ba15e516bfc2fb33ba9 SHA512 a5038a4bb42c5a55d665a551743a976b209c24d8aa368d2b6acf0957e953bd4044d9dc41bf9d460283f44c14b7dd7ce2a860563fe107663d4a4deba0c7834e40
-DIST josepy-1.5.0.tar.gz 53979 BLAKE2B e08b3d7a9ce5b123ec8731de27bff63638e68a052f2e6c8715c77f6e4ea644eae1c8200d6d2135853f27eb8caa2e24a04cfc563bfbd01884eb247fcdcc4c9d4c SHA512 39ace649ae4fcefee3eb7fa749001645711de39dc17fd47f1ebf52981929e21bee9b6316d09c61b5478d3d652afc0659e7d5110d1e222e8dcbdc2bb831cb2d8d
 DIST josepy-1.6.0.tar.gz 54066 BLAKE2B 18afbcf47d97e9677a3b75be50a4e61dd7748326eca1a7b736c0c9edc3918b2082c1cac8b32481bb631bef106b0e9895b24be054600f22f38bb45401333a28f4 SHA512 d08eb731b1027cd0b57639ac0c3d987d99d78daa54a9fe22d86eca90c9c5ab73bd8193d3fee4f98a4c55392015d1c5ee32fbc6589f511a6951033377cc2e1168
 DIST josepy-1.7.0.tar.gz 57186 BLAKE2B 8bf89ab844b65057838c1b274d15d8cac7ade2af9da04fc5193e9ba99e2062913cf5f819766d16c66951622299a06bf87a6cec41079e350f460661eedff4e924 SHA512 cd3c509acfea58eb92d7e0a8d28d6138569cb42ac85b75b284a48517afa634f6c739f3d62198ee0a17bb60a159af4012cc9ffa77378db680c418d52660d39ab4
-EBUILD josepy-1.4.0.ebuild 801 BLAKE2B e2ca8b46c483cf515def269c7d1b436b307cd9762bc6cd33a7c5e9b661506c95bb59eff663d21b433eac2b88cc9c8ad76988989acf1ec0efeede235943844a00 SHA512 c92aced52b67e18ce73424016af761da1b823af2d48dca007f26e62902b45f206ea9626dbf3034746b6a6bc40a5b7280a347619e3323bf0910d6cfb6f7e3b546
-EBUILD josepy-1.5.0.ebuild 801 BLAKE2B aa11fce75b4ee9d420c0461ff80e093c264c3a0fb591c22758a26b8f74db698d74ee8063b8ae1f8c559f6061573b652782ce960582748ff3e35b7381a6bdf5e6 SHA512 a3c9bff233cd0a0423215683c37f428b5044c671937293174173c104346c3d68989bd8847dd5234b8965d810d722fb25b7c1b2f20433459e587d55592a188ae1
-EBUILD josepy-1.6.0.ebuild 802 BLAKE2B 2676e1341879fba00f1227dcd4373264a4b36f6a2ae5bc483e28c7922f4466a11420ddd7a291be803dcf105036fab93080bbd70d3bbff49aebe905852a3df163 SHA512 ed0011bd80cb5985bd9516f7c9a15a67757d77ad4db6e2a742dde580bd0db48b33d1c19867dc593e550f1e9cd46e35e79a6950b8b9a38d8649815a925552d12f
+EBUILD josepy-1.6.0.ebuild 800 BLAKE2B b6fc9b6658d2145f247827f66dd4add6093e6efbf8e567028e1e5f12a42f3515d93dbbf54fc550db288ff6578f515d87a61c34c12883bb51adfeb1673c1fc8b5 SHA512 68f2b6dbcdc22012abffdee6a895ef2b04c29ea823100a676d0eba6244dd93ff8f197b3578d2b4afa9856c5f8350402e54b3e5b37cefaa2aeeeb857b449162d4
 EBUILD josepy-1.7.0.ebuild 802 BLAKE2B 2676e1341879fba00f1227dcd4373264a4b36f6a2ae5bc483e28c7922f4466a11420ddd7a291be803dcf105036fab93080bbd70d3bbff49aebe905852a3df163 SHA512 ed0011bd80cb5985bd9516f7c9a15a67757d77ad4db6e2a742dde580bd0db48b33d1c19867dc593e550f1e9cd46e35e79a6950b8b9a38d8649815a925552d12f
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.4.0.ebuild b/dev-python/josepy/josepy-1.4.0.ebuild
deleted file mode 100644
index 8512d2adc30e..000000000000
--- a/dev-python/josepy/josepy-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
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove coverage/flake8 options
-	sed -i '/^addopts =/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/josepy/josepy-1.5.0.ebuild b/dev-python/josepy/josepy-1.5.0.ebuild
deleted file mode 100644
index 302e12abaebb..000000000000
--- a/dev-python/josepy/josepy-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove coverage/flake8 options
-	sed -i '/^addopts =/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/josepy/josepy-1.6.0.ebuild b/dev-python/josepy/josepy-1.6.0.ebuild
index 08704af967d5..92a593dfa31d 100644
--- a/dev-python/josepy/josepy-1.6.0.ebuild
+++ b/dev-python/josepy/josepy-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
new file mode 100644
index 000000000000..69d17e06718e
--- /dev/null
+++ b/dev-python/js2py/Manifest
@@ -0,0 +1,3 @@
+DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
+EBUILD js2py-0.70_p20210218.ebuild 1104 BLAKE2B 7468b86817d2cc6eac70d19d84a28667520ac46b075e1967dffedcf8042fdde7f5974174816977aaca8ebcac026a2fe363414f61e618670ac72ac55b5a8b57de SHA512 13c446847663b6b574f74d0b6ed7873c4f28a2bdefb944a12354e05c6c9cf2e19d86c0db302378adc9f4464f30ff544cffeb6a5a85526c855f0d50b28d319f84
+MISC metadata.xml 546 BLAKE2B 725ee93573250bef3db5d8bdc1bc4cbb6c8af06a8f1a395564843de779151a447d28e56ccc64456659d72c066b1341a8215f8f259f1861d53d5aaa921e25d751 SHA512 40a016ead490a75d46c2eb031911d5869870da7adeaee05231d3f38602cb290936a5986b2cd8f22f68489acfb0b288aa12e383f8dce2f225a7d223e9c9b52a4d
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
new file mode 100644
index 000000000000..ee455c5dfa5b
--- /dev/null
+++ b/dev-python/js2py/js2py-0.70_p20210218.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="ea16b519a0f72e17416859a57890b8388fce6e39"
+
+MY_PN="Js2Py"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
+HOMEPAGE="
+	http://piter.io/projects/js2py/
+	https://github.com/PiotrDabkowski/Js2Py/
+	https://pypi.org/project/Js2Py/
+"
+SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
+
+python_test() {
+	pushd ./tests >/dev/null || die
+
+	# Tests require "node_failed.txt" file where the logs are kept
+	if [[ -f ./node_failed.txt ]]; then
+		rm ./node_failed.txt || die
+	fi
+
+	touch ./node_failed.txt || die
+	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
+
+	popd >/dev/null || die
+}
diff --git a/dev-python/js2py/metadata.xml b/dev-python/js2py/metadata.xml
new file mode 100644
index 000000000000..03e41f2cd8e4
--- /dev/null
+++ b/dev-python/js2py/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">PiotrDabkowski/Js2Py</remote-id>
+        <remote-id type="pypi">Js2Py</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 2405da0ca2c3..b03284282ba7 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
+DIST jsonpatch-1.30.tar.gz 27787 BLAKE2B f3294e3382baac604c31c12a790b0836732a66fdf3b6cbfbab58fcee4558140dc84a408af94f2f5861aaa17fcff49ac254f42364e5d0ba1039af0a2fd518da93 SHA512 190507eb6d6b4a81e7e804690672863d5070c140a47090b70df36d8180644618395ffc179dabf6ba24e44268b74f670abdfd260c54dc3251b12ef4b7ad17d093
 EBUILD jsonpatch-1.28.ebuild 841 BLAKE2B eda03acc39dba59f02ad14ba31a9817a94791a1b986cbbaf918d88a7bfe466e2585138a0f21cdef26631fcfc2637d463e4d1bb030c7c2d9812fd55e6d4efb24b SHA512 300e06017daab02ba62ef66b386ff2d3a6ccb0f7a9566c8d094e82b6d2a752ff8a015a59f9d8a5be84bd03bc0d8677bf8123e79be9a6e7d2210810c931629cf1
+EBUILD jsonpatch-1.30.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.30.ebuild b/dev-python/jsonpatch/jsonpatch-1.30.ebuild
new file mode 100644
index 000000000000..9b885b42ed8d
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..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 ~arm ~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/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 15001883d8bd..a83c694565be 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,11 +1,7 @@
-DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
 DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
-DIST jsonpickle-1.5.1.tar.gz 109560 BLAKE2B 07dd2a469f0bf6fe531d34b5f2d731c6aca863899ce804f44c14b38f93b8c8213b1bf4fc4cc19dc26dcb40d71bfded1115060e54570742afd393bd0d63f12d2d SHA512 ee3694e961bfbb6cc985691fb4821cf831dd6a2cbbdc8c6d1ba8e43fe7a4bba3d4b6868a02f76b88d9b036cebf51b217171504a6647f26b0e2d11727baee62f3
 DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
-EBUILD jsonpickle-1.4.2.ebuild 1441 BLAKE2B ef8bfc14c6235e351bfe23125149b85c4b4ed261d971742545b2a36136637910975f74b063830784d032e2217e5ed59544a9a8803f75da61ef0681696e09dbe6 SHA512 fab8686bd27f0159b00beec66e3cf27e8deb4eea25a6a94ff67c61e90b90993e83dcf48bea3eb178e3654a628e851cc6d706941361a1a709ee3470bfe3dcc5e6
-EBUILD jsonpickle-1.5.0.ebuild 1443 BLAKE2B dd91fb08e3b02a0d3985ed2def4a62ce5eb1cadcef87c84b17f96aed887073c7eed8075bf4940dfdc19dc93f5bec4bd3025f178d72374b5a050786ed9a09b0a0 SHA512 806f4021ef0c33e45b6a0e795a333e379e3866e444cba63d50f7d6439726b5468755ed652fd1d2d485e3296cde8ee33cb6e7793044a9b53254bb3726a119a06f
-EBUILD jsonpickle-1.5.1.ebuild 1351 BLAKE2B e9d71e869e66e574b11fbcb6e2a8c4cf84c1ace6cb3943d9c3d8a40e26fdc4687f75e49a760aefb416017ea93ec831fbbacf2874bea5b84131a21b49ca74ac96 SHA512 7f1c16287447b4fb4224260124f7a1f74b4757cef90d459f9046d20075a6a17035eb8663c3ac9d7db9279eb3a2936ae639fed0986cc5a7f2044c1b3d60743b31
+EBUILD jsonpickle-1.5.0.ebuild 1441 BLAKE2B 3e53b617db74e0562b01e2a501cebc92cdf2d3ec58f197300d00eb2914ebbbde79165c85173cc984f77018b59aec611c73564139f1898d1f1bd0019973537d43 SHA512 375c0138302140a53373b6e5e1095812348b5d7bd994797866f2fab66839e6df894a4748c18ca7a2e0ec5b3932a234ba4fbe700035c0180746120b50fdc6a82e
 EBUILD jsonpickle-1.5.2.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
 EBUILD jsonpickle-2.0.0.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
deleted file mode 100644
index bf67e24482bf..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.4.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~arm64 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}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	sed -e '/pandas/ d' -i tests/runtests.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
index 1b45fa6a4c52..6e5f3a477d2a 100644
--- a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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/jsonpickle/jsonpickle-1.5.1.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.1.ebuild
deleted file mode 100644
index bfb5cf69380b..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# 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}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 4b557a3507bc..77fa6cfacdc8 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,8 +1,3 @@
-AUX jupyter_client-6.1.6-msgpack-1.patch 1048 BLAKE2B 496c8bbe540b48b646bd6989e97d378d42316b241e2b26d83535ceb6403823a6adb9b431126df2419750f958427e1cba3908bc952c2b5a3e27a902dc4108e790 SHA512 06357fbb0f4986b1711b784207e704ae1b90ad9abd2affbff6c3d34d78de664c3593cdf7eebf20390fb5efa6da0fbf58a3337dbeb79a8d81efab00b825f110d9
-DIST jupyter_client-6.1.10.tar.gz 293620 BLAKE2B 87052ae5b07195a6a51d6308b06d0543850e23a7494602c61811270b8eea619b9337ee0e9069f9d905f1397aa5fc48710b5a894b21fb0328d397168508d34dbc SHA512 8a6d63b95e95e3230882ea67892fe87a24b43d0e85aa910ff8056c2067bb2bc2640d1896f851d0441234f9db27c2a876925988d141b2ed35287ae3e0e5b1eacb
 DIST jupyter_client-6.1.11.tar.gz 293651 BLAKE2B 73a8567927c452a6a6a591eed04d592c6bb52211214e6d27ae816a2ce07a61c3f80991a2209b42c1d679ff6d3ead564f6ac97e6500473e0e5bd86bad83db07c1 SHA512 3cd6c3d299ea7097b04ad88b08dad8c23d90c5feee18bf441434a6069151b85717c4d00d2c186c463995d26383442c4f63c86565b1606e60afb61426515f9a11
-DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
-EBUILD jupyter_client-6.1.10.ebuild 917 BLAKE2B 8edb1fce5d8d45b3f7e844e1a8b4297c4d7fc218525e53a301ca96cc92dc87bc8e13f2392f2be6e5a7e4ded7fb25498ca534df0c226ed93cffa5ab1559c950ce SHA512 f21bf0726139d7a89ae265a9c4fc8fc21b5a8652235b9832c7d949ebe74847cf42b931afa740873a4426bea81ab9cf030f90df16564236854896a72b50c27d2e
-EBUILD jupyter_client-6.1.11.ebuild 919 BLAKE2B 279e30d213e6c5c3d9c7032783c1be0760ef7c5d72cb04d66ede06abfbaa15423021f4c2de7017efc6abc9901c5520ddc5c5d2984606f47cd70f5f58cecd5dbb SHA512 8e6592e6f7c3e19073443165113b2b5f029d59a3f22fa67c022f7781080f1091d73eae44c8a8d1385f5b8a439608b6833f1c89cd066e9e2b08a3ca5d55dc3038
-EBUILD jupyter_client-6.1.6-r2.ebuild 930 BLAKE2B 4cbcc58bacf59c59c4347dfd59852e2a48f275d5a1406e09ad197a2f24a8770cce08bb56762e2fd244ae083e3805c81ddc9e02816faf9f5a73672ce6e0a0d81a SHA512 fcb0072eec5c7609fb6f40fd3d4ae457bb63cf277eb9dfd0d32c74fc4518f59cb284bb07456c9e6ad5b9cd82ba60eac1c7e833b0d7f8f7eb0e3e2c85ee04eaa3
+EBUILD jupyter_client-6.1.11.ebuild 916 BLAKE2B 1990debc99f8b0d521dba190cd798b436f95a7c5c3ed521ea582d5d00f24b34956ea3ba474bd435067ea2a11ab6b0f5bffb9d70d65b6567c95ddfa534425706e SHA512 8ba23fd56807471edab7da0d32d599dcd60410bf7e890b960e35ea940488c94552a642d3da0eaadaa9fed161666ea4a5701d303c560bdaaccd189d638fbfc405
 MISC metadata.xml 779 BLAKE2B e9744283eb51cd9df5ca7a65a29d80e7712e22a1c4f039bac233a4301a821bbf616a59bc5f923dca0edfc16e32fee9a676a6aa90fd8011beaeca68ee97d63355 SHA512 3e07a943513fb5d2d0e689572c39084c63ef2b54503843897dc1492adbd9fb217a3a26931e48f2bef2fbb99e32900aec85968a9597ddf54350e174ccd82a7b4b
diff --git a/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch b/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch
deleted file mode 100644
index 34a95d04ac78..000000000000
--- a/dev-python/jupyter_client/files/jupyter_client-6.1.6-msgpack-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb973fa33952c1a803097852c031b3979dae607c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 22 Dec 2020 09:38:13 +0100
-Subject: [PATCH] Fix test_session with msgpack-1
-
-Replace the encoding parameter with raw=False to fix test_session
-with msgpack-1.0.0+.  The encoding parameter was already deprecated
-in msgpack-0.6.2, and raw=False is compatible with that version too.
----
- jupyter_client/tests/test_session.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jupyter_client/tests/test_session.py b/jupyter_client/tests/test_session.py
-index d0ec662..45be9a9 100644
---- a/jupyter_client/tests/test_session.py
-+++ b/jupyter_client/tests/test_session.py
-@@ -304,7 +304,7 @@ class TestSession(SessionTestCase):
- 
-         session = ss.Session(
-             pack=msgpack.packb,
--            unpack=lambda buf: msgpack.unpackb(buf, encoding='utf8'),
-+            unpack=lambda buf: msgpack.unpackb(buf, raw=False),
-         )
-         self._datetime_test(session)
- 
--- 
-2.29.2
-
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.10.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.10.ebuild
deleted file mode 100644
index 3b7ac8d7e06b..000000000000
--- a/dev-python/jupyter_client/jupyter_client-6.1.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/jedi-0.17.3[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="
-	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.11.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
index 8f92382aed2c..e8fe30f2796a 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.11.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/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
deleted file mode 100644
index 50c5df6246e6..000000000000
--- a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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
-
-PATCHES=(
-	"${FILESDIR}"/${P}-msgpack-1.patch
-)
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 80151b0a9d3f..ac4076d98d46 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,5 +1,5 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
 EBUILD kaitaistruct-0.8.ebuild 396 BLAKE2B 7c85b1b07edff988f1ae67abc63276b0aeaa5f1f2967c2bfd3bcb51caee0ef191fb4fb977a8dbd9fcc397baf19a2ae1ae82b63eade5adb5214fcce419ec5755f SHA512 f3174e4a6de2b8be8755aae30dc0da4cf8e383d7fc8017d02b359fb73e1ec66ff07004060d653eb911eb23940411813e71c0506fccc12741d4bc353f4521140f
-EBUILD kaitaistruct-0.9.ebuild 353 BLAKE2B 614248e7df530291802409d2119ef3bc0280e4981543ea455e62eafce8e5b5a6ffd13a99373df2b80983156a2f744485ee43218009cd359d190db57d29d34954 SHA512 26ef29024f30df32832b67f47811b79e41c5733d84a970d2a0b26e447548e9f424233666341a51d467e6b5c55090191787595dd4864bd71e8dead7d3bf33e9c2
+EBUILD kaitaistruct-0.9.ebuild 352 BLAKE2B 052cb18460a97a79ea48138a0bc5c14cd70808045f2e2c437acb161b142c8d0325216adf5d8e8b83cd98073c6aaeedb4ad1c506edff6e56497b376122f2047d0 SHA512 e1d5261465173260edad4534f106a4daafe93558683780015643f98bf4bff7ae495730f168d0ee68cefd232ff2882dcddc67d4b89e33dbe171177ab7a2b245c0
 MISC metadata.xml 754 BLAKE2B 2e243bfaaeb4bf110e5a229ded97a4dc9021031f527415f4f59978aa1f37df1d00b76142ff13de317e8cdc28665555800465696c4f13b812d199a523b15c8cfa SHA512 a50ba1aebf1fe3d7ac4f294b9edf20709a542ac263ae3a2d33029dc424136c6a689680933430075c9783032cb893de5563b810974da724bb17b556ee5d6d08fc
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
index 8c0c61dafd5e..bb2e92b93aa9 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 3c4f549c7675..d4cb68e50224 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,3 +1,5 @@
+DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
 DIST keep-2.10.tar.gz 12959 BLAKE2B a6c7c507f3e6f905fcc4878909cfaa56c767266499a12fa12b6850a1dfade3b33d5ade1d2f53b69ecc0480816b496c75250742672fd1a9de14c747abeae7f3df SHA512 a72901e1f66d756626ceca1550b0e539e4c9f56ebb80d96f87696482420b7f75e07d06eded538acf8866e0d1e65e83da00a23ed328a4e37a6f82a607bd5c3bfc
+EBUILD keep-2.10.1.ebuild 626 BLAKE2B 9b2c5e0a6fe64ce734ffa6fe5a85b1773d4f40cfd4ed557ed9872ce0a14bf4a8d39d94fd050855d3b4bbc59b525ab3b21763ba40dcb5a0d1f529b7d42dba9372 SHA512 a49064275fcd74adfc319a338ad94263c6423531f0ba83cf48f951fd465d3d8be5ed9dd6079353e4187c3dd08527715a6e0ff98e632ca996dcd5a009f01d1682
 EBUILD keep-2.10.ebuild 624 BLAKE2B d64e604a3feaa7f7441d02afa9d1a9e3241beb7f00921944088459a14dc81af6feac7c960e02e40e7b6226bc9a9f149252a4c472d38185d975c2b0c693cac4d7 SHA512 b9cd6774ef98a17f43c22394ef5d65f95f6367db674f3b34c2308968a0ec9f235f5041fb83b07411deb2f229732dc8726335473470a021472b5dc22a9d483ca1
 MISC metadata.xml 367 BLAKE2B 3cba0cfbd2305906c338a057e45e14275d6120d9f004016c6eea9d5b08e5e01cdb4527340bad20f3117f7a175f139e257ed5223d8f1464ad3b8d2ea8a527dc23 SHA512 823f4e5967d83aff2dfc677a4ce92a019fea8c3c2354c461bfbe0d97714c32db4c023f929c9a49b311433734148664616f66721da90d6ab6ae9957484506a823
diff --git a/dev-python/keep/keep-2.10.1.ebuild b/dev-python/keep/keep-2.10.1.ebuild
new file mode 100644
index 000000000000..f471b77bd944
--- /dev/null
+++ b/dev-python/keep/keep-2.10.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Personal shell command keeper and snippets manager"
+HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/terminaltables[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 5ecca9b49531..13eb60e0bd9d 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,5 @@
-DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
-DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
-DIST keyring-22.0.0.tar.gz 47693 BLAKE2B 88a151327778e5e039c43caa68e53705d985d6ef2b7b668df1d941160b843f47a0e2f6f79c9afc39bc66a36373c0374333296a3cb98f1c65c620a8fad3f43fec SHA512 5e9e27cf9b09f042747909b442864a1ea0669b36f69592538b487978a582e16e58056d6bd68b35566143000ed3f5c7733e3ef471c66935a811e09fc4b7f56f6f
 DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
-EBUILD keyring-21.7.0.ebuild 1164 BLAKE2B 1fe05b5116aa9ad7881b0c96a509a15add778671991e2acd0ef7673cc7ce2fbf2e84cb3e8b347cc8cc7da4c75e1bd6beea511e628b715a5f50a0996c9d9054d9 SHA512 b9e7d5b5e0625103b1bbd8e0cac7013ed67e75a73add0e3cfec4abdb2827daad4a2a037831067a66db9d2553a47c312e53f756d236dfe57fd8e092e3ca00e2e8
-EBUILD keyring-21.8.0.ebuild 1172 BLAKE2B f5076f3b1717c0734ef7051d556c1a516d96c941d424a8a930edc7282830e582b5d33c5011beaf3918978857e96767f6b83e26e2fd6a0013dd7e82a634187527 SHA512 8b00bbc1e7975a89077c1aaab25fbc33846bdf651402b77eb773162ca039fd06a0bd5ac7957081ef5b90a3613a42cd9460bb78cf154f9284c868d2d0d535c045
-EBUILD keyring-22.0.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
-EBUILD keyring-22.0.1.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
+DIST keyring-22.3.0.tar.gz 48195 BLAKE2B f990c1c5fd87115cfb22a0e1d84712c1299334e5db89049f04718dba9b31dddbc0ec91950bdf529310955341d1250a6a62b1f1b76b0d552cb7cbf09748892b3d SHA512 c71ba8ec7b69661b2929ed5aa7b8baca7b5164a267dbb901adc2b7bc2cef1eb0ec8931f1021d69cfb0e31514ff922dfb03fd784feb12d1dc7229d4e5e759bb5e
+EBUILD keyring-22.0.1.ebuild 1082 BLAKE2B 8008a84045abbe9c0f6a8be39f37406db51be0c832878ca48116912875eee6327aa22adb59411048ecf479d1485bf5a942a01c5beced336c682492a63a95bad3 SHA512 dce2c1374f2b235d2fb20c99d327074b8b3b661d31028c48c4262e8e142f9e961915dffd04a0697118efc829dac852c27ebe0fd1aa0fab122b76d28a3d61d9eb
+EBUILD keyring-22.3.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.7.0.ebuild b/dev-python/keyring/keyring-21.7.0.ebuild
deleted file mode 100644
index 8d3f371fb8f3..000000000000
--- a/dev-python/keyring/keyring-21.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..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 ~x64-macos"
-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/keyring-21.8.0.ebuild b/dev-python/keyring/keyring-21.8.0.ebuild
deleted file mode 100644
index 6953c7f243bd..000000000000
--- a/dev-python/keyring/keyring-21.8.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..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 ~x64-macos"
-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/keyring-22.0.1.ebuild b/dev-python/keyring/keyring-22.0.1.ebuild
index d62127ef81b5..d5c69ea2f5fd 100644
--- a/dev-python/keyring/keyring-22.0.1.ebuild
+++ b/dev-python/keyring/keyring-22.0.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-22.0.0.ebuild b/dev-python/keyring/keyring-22.3.0.ebuild
index d62127ef81b5..d62127ef81b5 100644
--- a/dev-python/keyring/keyring-22.0.0.ebuild
+++ b/dev-python/keyring/keyring-22.3.0.ebuild
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 3626d643f62d..9e0ead83a559 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-EBUILD lazy-object-proxy-1.5.0.ebuild 925 BLAKE2B fa42653d64084b289940155a925e2b84797e7748548943f85ce051e4f69ca55cc21458dd11d0d96175dd3c7dc4bc6dbe9ac5f07f8a411de626540bb02fd247ee SHA512 23df533c3effb873099fe61bf46f3893d13ee195bf38aa50c7dba7fc9bcdb6b853d704628771bd52194d321e1668ed266b12d0e69160c2d37d6d74ad5ca48fd8
+EBUILD lazy-object-proxy-1.5.0.ebuild 937 BLAKE2B c031bc13979cd26eaeedbb7f447cdc01650a22dafb61edd0e2d4c347324c038dbefeb9fbdbb05be59cc8a2076bdb07dc4fdcf9bb064ad783ba73e5bc25395b81 SHA512 444decee287a042ef82ff6eb28fcef4346575767750f8b322cd5e2085ffd06fd4dbe84e5a7d4bffa82a4c776898a585edc50431ce921968e5c181cd73bce3123
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
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 52922600117b..41cb2484aa5e 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 16b4746324f4..4459d16bf5cc 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 455 BLAKE2B 9037bee22e9a26961b0e793dc01f196b13d2a664bdaf80705c50e3a0c8740870cda0670223527d7c9118fa53e371cee9cca4d43ce538647ce65eb8431a6dc225 SHA512 ce27600aab18cd7811ee5586ad6d4330d4fcd9c21a98bf0b661845f39b35a1135e7f66584a351912c1b9603a5485e16854cbf5fe211791a2e35ee57d15dfc658
+EBUILD libarchive-c-2.9.ebuild 462 BLAKE2B efdc767c1dfefce8dfd1d1df81bae7e3be2d12b076546ecb00e0162bfa40b5c8a98d691ca524b2f2d3eb9c6e3399b34baa2903ead5dea4560ae061f35d66ced1 SHA512 1605dbb6f51199a788b9e86c33b0c3d3d84df31860a1c48a2c42abb3963443626aec9572defb077c2b4dfc18e1b2328f9ac6e9fd8cb68dd11e4f9edfbbc28c6c
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index 4e74c46d66bf..53823d5e1ba0 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="app-arch/libarchive"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 50aba4394f1d..c99008829fce 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,3 @@
-DIST apache-libcloud-3.1.0.tar.bz2 1613381 BLAKE2B afc607a76ff3cd24961cfaf916b5813cd59e84d523f9a642bb8222d889abb44d6357d230b001ae03a0b021160384d6c6d8420e85825aa8d84f7619e900c4c9b0 SHA512 ef2fc4754281adc336d656d3a707710feae0f6c22f33156830dd0b299d06fbf9b890817f68192106320944f851265c39f175b5fae5f85053706ec2f0ccd04bf1
 DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
-EBUILD libcloud-3.1.0.ebuild 1061 BLAKE2B 6f7d4c6703e3abbb4edbdefe4a984a2acaf8709c7981ebf48c4d4d74045877a74f8c6c61540cc22cc5b6fc0e836db8680b5cac7ca77805a9a0ed6033044656b3 SHA512 60ba9cd2667b393edfb36bccab17674fc4f6f81a11063090da653369a914fcb2a439367d7077504d5c1794920f9ce4770d93b4d11e72f0698eb92fa9f3f265d1
-EBUILD libcloud-3.3.0.ebuild 1195 BLAKE2B d9eb0bfdb80537a2083f4990c9d7fa16edf810524ef2fa5f5ce86632273b65cbd468e53b7500972f9883e8240f6e0930550ba11ff315a01124ef8653ad2d438f SHA512 14463c74dad0458ddc3e3dc7713f529f8f28e65d20dc6369b2476b56938443ccf34e347850bb5ef8950077239d3ef46becea5578c0358a0a99294ab95a6ba9aa
+EBUILD libcloud-3.3.0.ebuild 1193 BLAKE2B 873c259778092c31bbaf41d1a61a7193369f012204ef958dfe998ba1d32459933f8777d070bf33aa7ef59f8d6d918a04faed9158d3706e7510cb5053cc12df4d SHA512 393fea6dc4f23038c93f0d865d23a6672e0427ce12f93dd4115132c41f2940a5558fa192853895098c49c46688e56dc9b17acd52ae09d84ac84269ccc407a3e0
 MISC metadata.xml 324 BLAKE2B aa05dc2d968f9550a607cc367c5ab6c3426a41e35cc9a29baaf25050978543fee5bdd676a4606c45fd9104ab6dbe2f2c2bf8f7c45d1b95805503f1cf20668b75 SHA512 809416c2bc54a84624712c77982b57734b6510c66dc731f517574949f13b2aa37b97c9ce4e5ea649262a4731a435187f271d0922e87bc647b2e696bfb40eab0d
diff --git a/dev-python/libcloud/libcloud-3.1.0.ebuild b/dev-python/libcloud/libcloud-3.1.0.ebuild
deleted file mode 100644
index 26afd835ddd2..000000000000
--- a/dev-python/libcloud/libcloud-3.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
index f6d8810c64c3..db6fb2bc09cc 100644
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 1082fba22bda..179f779f9faa 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,6 @@
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
 EBUILD libvirt-python-6.8.0.ebuild 994 BLAKE2B 59cb3b545706226b8fb90dd7e76d4bca7893cd8b6593a0f51578f4ad92185eca39c26eea80797fd2b20428a3629db8db3a94b735cc1c5b70cf99f3db7bfae598 SHA512 12540c4bee991e3e097d02700aab5105cf4bd23a69eaf34700c38b3217f11d12a69cd6e0401642a7d1564ee8e3f89bb6b7e23d542c00a4d89e54d58945826e1e
-EBUILD libvirt-python-7.0.0.ebuild 994 BLAKE2B 90d2e376d09a0d1e222e98e1f408abe8d8b5c9d502aa487ebe0b67470cd2bfa8193ed58f5682ee2f2bca3107a77d9ac8b0977587e4eb9f41e3a23c1cb00be03e SHA512 092e94e7441e52f70c972c57403d3072eaee6dc40f9b4f3e00915849d34248c0c313e53ebf648ea8a2f6c7879ac14d7f784b69e70292a8dc459f155db293448c
+EBUILD libvirt-python-7.0.0.ebuild 993 BLAKE2B 4b6ed2e5c55632b14f782c3efc43a6cf9eb1b7b7165315d42c5db3568d27220fc43e7ae608bfd5108e24744c708de74cd3079e526010d0b5f848b221934ab267 SHA512 ad79b00a48034e03f4065f2e91f597aff14d7f429e20ee384d9706bca06c19e61cfb662bdfbe3e84ae6671092e3b747d9e4f4525a2090082ef3d0ec4f441c13c
 EBUILD libvirt-python-9999.ebuild 994 BLAKE2B 90d2e376d09a0d1e222e98e1f408abe8d8b5c9d502aa487ebe0b67470cd2bfa8193ed58f5682ee2f2bca3107a77d9ac8b0977587e4eb9f41e3a23c1cb00be03e SHA512 092e94e7441e52f70c972c57403d3072eaee6dc40f9b4f3e00915849d34248c0c313e53ebf648ea8a2f6c7879ac14d7f784b69e70292a8dc459f155db293448c
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index cb778ad7f1cb..6b628a11a99f 100644
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a9ca9ab89097..c4d94b79bbc9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,19 +1,17 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
-DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
-DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
-DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
+DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.0.0.ebuild 900 BLAKE2B 90b478966ab5582ca0a073dad5450f29068bd75f107e48fa1371304c9e9d87e202b9e85f5cf03b30c54c3f3e4b2c950253e987cd3c44473797cdfe031f5085c2 SHA512 0c461cf8ffee04344f22291b06298ccb63cbc57bac6849a39da9accaf64077046f5ed927db13963ba961536f84f2d71449fafbd5e91bb602a56ff3e5ebd8fa7a
-EBUILD lit-11.0.1.ebuild 906 BLAKE2B 9e7f47f55e7f33ca5644f654e8d6f200442549b6698c18f0bf6b6cb78a5ccbf8151bf08cbd103003445d87f4816b366cc281aaa3c2318d12025c5afbe813f0bb SHA512 bd5907f22002671d674fe0f5cc40fdb3895ce271bf3cec2a1c0047317c11153aa98dbfee415c165fe9c9637a6d809a182f50e0240fca7026211a10a247f38d99
-EBUILD lit-11.1.0_rc1.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
-EBUILD lit-11.1.0_rc2.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
-EBUILD lit-11.1.0_rc3.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
+EBUILD lit-11.0.1.ebuild 902 BLAKE2B 1b2524d3c5216f47c0a81ad24594af8af9310904434a9dc4a32be827aa41fc65d236c6bd0c3d1dbe7db904b81ff6851ab36dcc128e16a19d3ae959f1fb27f5fe SHA512 fbec68212c533e9f37f46b2a421ffc4ebdfedc21a52bb92460b61dfc9eb9d1ce9d70f7d293abcd963b3ff5d297de417ec6ec33066849434a0aea6058ff5416b0
+EBUILD lit-11.1.0.ebuild 906 BLAKE2B 9e7f47f55e7f33ca5644f654e8d6f200442549b6698c18f0bf6b6cb78a5ccbf8151bf08cbd103003445d87f4816b366cc281aaa3c2318d12025c5afbe813f0bb SHA512 bd5907f22002671d674fe0f5cc40fdb3895ce271bf3cec2a1c0047317c11153aa98dbfee415c165fe9c9637a6d809a182f50e0240fca7026211a10a247f38d99
 EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 124a91bfb39964af4222f3dcd88250c2c91d9c399e87b00b721e14b75d08f9aa9f2b55a105174bc8a2764664c287812e823621e272742b83f497d2f9ee9f8a1c SHA512 238e92e87e72989a6818be202f5602dd94fb4e8f9a172736d9f0548feb1770d7befe77fc23b00ddb5182dc7e8649cf7e639b50ca26301fcb7bb596ec8b59401e
 EBUILD lit-12.0.0_rc1.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
+EBUILD lit-12.0.0_rc2.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-13.0.0.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-9.0.1.ebuild 857 BLAKE2B a323b54eda1cface36f35b011ae2a44d931439b3e277e59f38b1ee8672398ad427773296e56ab46d52c9388bac409eed79a93459e701115d9dc809e2995349b5 SHA512 c611b762802614d0c5adb0e739b44b37a3a88dc921628ffbd2d33af7a17d9a5ab150b7508c7511a72ae687d1953bd127470840f91cb074148aa7c9aed9bbf6c6
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-11.0.1.ebuild b/dev-python/lit/lit-11.0.1.ebuild
index 4cb68ab291ef..dbcd74000ef7 100644
--- a/dev-python/lit/lit-11.0.1.ebuild
+++ b/dev-python/lit/lit-11.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-11.1.0_rc2.ebuild b/dev-python/lit/lit-11.1.0.ebuild
index 2076120cc165..4cb68ab291ef 100644
--- a/dev-python/lit/lit-11.1.0_rc2.ebuild
+++ b/dev-python/lit/lit-11.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-11.1.0_rc3.ebuild b/dev-python/lit/lit-11.1.0_rc3.ebuild
deleted file mode 100644
index 2076120cc165..000000000000
--- a/dev-python/lit/lit-11.1.0_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 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 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-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 )"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# 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.1.0_rc1.ebuild b/dev-python/lit/lit-12.0.0_rc2.ebuild
index 2076120cc165..2076120cc165 100644
--- a/dev-python/lit/lit-11.1.0_rc1.ebuild
+++ b/dev-python/lit/lit-12.0.0_rc2.ebuild
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index b9418a6e3586..98dbda6352be 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -3,6 +3,6 @@ DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa205
 DIST llfuse-1.4.0.tar.gz 478758 BLAKE2B bec4d6b53936bc79ab4ca8fce7b34d60e39aff6128a186d58caeac68ad135d7d29bbd667cf669e065256e31e257ff4516ff967759d6152672659df0062d03e6d SHA512 8ab92912279a478ba50cf0c151cce3ce1125de27922a97c4da4b3af4ff0714e3a2c5a9e6fd10b87653eb552509491084f018ae3ce4feb7bf952de00a5be3eccc
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
 EBUILD llfuse-1.3.6.ebuild 758 BLAKE2B 86126eee45c991350817dccf250b869be8cd667af9127df243d10d3824c87510af00a44237ff76ad81ba52eca6f15f82a7a4b33266b74252efe66d552f8c349c SHA512 dd8e2e4d8f8b04d886866d74826b494e10e7bd18cc5314617402c662b08d0a246fbd76a456a8f1b79dd15b91f428baf3042774d62cb7b6aa0774c376ecaecfcd
-EBUILD llfuse-1.4.0.ebuild 760 BLAKE2B f1558bc8228bc767d26c0be65363dc9c2a156180e7e8f2e83f9b93c8f816423e9257f5a6603b28d072ad4fa0beb57de8c053b2968b4ba0ac68b300522f1d3d45 SHA512 851bdce44eff82d4c7edaab9fb72d22d04e7fa5f6425c3385a6d0e258507d15f5b5ebc434091e4c6e095cd156844aa2d332643f759017238d349371456a5b184
-EBUILD llfuse-1.4.1.ebuild 784 BLAKE2B a29ebd850e449a08f8f31ec8932416db03d102f6b14306275d1f2a3bc0f7e056a1e09c3abc7a5d505954d86106d5bd6fb4e2d5dbbe744a25cae290065952b3fc SHA512 f5b28a7ce1db49b33ef94baaee9b64b3a16d5c5d499c04a8ea805cc302fd25b5faebf5e949fc031f2d8ea1391273e36e632f3a806854cc9fb4497440714b5a96
+EBUILD llfuse-1.4.0.ebuild 759 BLAKE2B 718d8661fd2ce2ddac509b974c239d59d12fd411efe9399ed102bc43f900c8be0724e1574ff8479588531e7e9f51beca83f1f881a499eea1622ec693e55e8ba2 SHA512 6fda1422f22b1ef5fc199bd3e20374c5f313e14457442adafa5999ba30f748597e294bf53ccca209e41492f02f36911a7e33d447641d95f9b17fca12a70874a4
+EBUILD llfuse-1.4.1.ebuild 791 BLAKE2B 5adad29dd89ac20599b335f9220719b5ab3b5dace8074fcd0f302b7c776d6d349ccaca24be389e128fe35e635499b1567c1620cddffc076a1979fd08c5dc3beb SHA512 c79f0b9b8f6cfafa8995e0db09637e769b13bbcd95bac8f5485d4286343675d2992adf4e9444656dbb442f4b1ff51b448e6372c1dc0a16ffabb0ffde3331fbb3
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.4.0.ebuild b/dev-python/llfuse/llfuse-1.4.0.ebuild
index 0fb52fcd4287..9d166fe03062 100644
--- a/dev-python/llfuse/llfuse-1.4.0.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/llfuse/llfuse-1.4.1.ebuild b/dev-python/llfuse/llfuse-1.4.1.ebuild
index 4a4e52096272..64cb88e8e142 100644
--- a/dev-python/llfuse/llfuse-1.4.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 890ff140742f..4dc081cbf117 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,5 +1,3 @@
-DIST locket.py-0.2.0.gh.tar.gz 5598 BLAKE2B 9b8a1b3d4c3fed3e9ab8f37a1e7bd9d0aa65e618985368691802b1b66d0dbdeb7a1635ff72efec8a7351ce31ffc00413d5ee388e520057bf181a18a39ef46f0a SHA512 e5e5d34daf5c36b0ac4871ce0dec50c67b504be16755e38d7721e40c4f2c385c022c305ac1a9bd641ba9eaf45a2693a4a77b6fa6e95d6ae5ab34947e4ac30393
 DIST locket.py-0.2.1.gh.tar.gz 5988 BLAKE2B e50ef1794a49494434c730580510a4283685e924f6f3efb95067db7d566fa4808409fc339f3c8e3276ddf09f622cb165e9dde90094f764f662558ea32f85516e SHA512 517c580a3420283f945d28607fc765c571edb2c0fab52d5c76f24226d2ec85727d1ffe0c03c5f87f6ce6204e7db4d3c8f6e408d767a389bd93d34cc0de3e8bf7
-EBUILD locket-0.2.0-r1.ebuild 596 BLAKE2B 27de6b77b86bdc5ec867a6c895cad3c1e0e78e3de40bbf3338ad9ad0e5d9421fc3835b4009a7cba368acb78ba9225baf10398de664de3b73243f110df26c58c3 SHA512 85e18e40657d38a6b120e956db0973b84174b1eaa1cd0d0fdca962f13285e0cf1c280aca8b76fff864031e219a98ea26bd557b0c3ab1404831b42597fbfaf46b
-EBUILD locket-0.2.1.ebuild 570 BLAKE2B f888d57233293c03fbbe1e88355d6f03d78acd99885234b2a7000391b62711329ac5a23d8fa2f05a824e1842241f288deb749aeea6c9087c337a4227e9bb5839 SHA512 bb5af169c48c8a79898bbed1e9ea4ed5881f9a71638412df66c464dc3288c6752f45aa932a868f40d7ff62fa3409b9ca72920a00ceb57c72d7b102af6ce0061c
+EBUILD locket-0.2.1.ebuild 568 BLAKE2B 603d44978a7bd9638ef93f483393d9cf5c1bc6741fd8f0f02ff6c9b4e88dbee764b174a3a3358d7d251ef7adaff8a41229c37d689c37095dbf0cdf7707ed949e SHA512 664bbbd999304b02184ff56043ddd8568945aec03292efe95c0e1d38f31933a9043c793cb39f19668b79b8a1286316f8477ab108ee6ed416d62913e9518dbd36
 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
deleted file mode 100644
index 7f31aefbaf98..000000000000
--- a/dev-python/locket/locket-0.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
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=locket.py-${PV}
-DESCRIPTION="File-based locks for Python"
-HOMEPAGE="https://github.com/mwilliamson/locket.py"
-SRC_URI="
-	https://github.com/mwilliamson/locket.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? ( dev-python/spur[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
diff --git a/dev-python/locket/locket-0.2.1.ebuild b/dev-python/locket/locket-0.2.1.ebuild
index bf78cf9c96a9..3cb38276b156 100644
--- a/dev-python/locket/locket-0.2.1.ebuild
+++ b/dev-python/locket/locket-0.2.1.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"
 
 BDEPEND="
 	test? ( dev-python/spur[${PYTHON_USEDEP}] )"
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 5b4ce34a35a5..27717d44a8de 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,3 +1,3 @@
 DIST logutils-0.3.5.tar.gz 27703 BLAKE2B ceeabbc64603da949e771531fd1a7cff6bc760ffa98fcb952eddc5da39d019e202949dc596398ea68397c573cb9c2bace77f8e5462030e68d2f5768444a23b45 SHA512 0194bf4f01e7a29d4211495dc5fead9d4bd5bc1b791d25ff38ad28960a229a9bcdbaa7e6d3b5a4105eef6c9aa159459d6529c2615df113e7ec1ae93aac5cce6c
-EBUILD logutils-0.3.5.ebuild 478 BLAKE2B e11270fae172d93def9d1a39d1ce90924041b0151f78adff61ec0bdbb528cc10b78cc20b9e8db3c14615ddb9dbeb590234a636793cbbf5f33d70fa1fcc721481 SHA512 d41fe881064d6cd5b5f354aaca086b6534e4b3678facb30b389a43cb3ff3731e812202586aeddf00adae4caec6b7c18f6981c8e892dbe0ec8922fcfe7e06a6c4
+EBUILD logutils-0.3.5.ebuild 479 BLAKE2B d5d715abf26755abdd8859c8a2801fd33264967801cb22f6c119a2b1de8fdaa57ea8f17c33cedcc6a9ebe29578a255ae702072c6904f98f4881f4d3e9dd4be40 SHA512 dca83ff69b066ac5b11e9ff0e716401dfa552554c0614252d2b6fcbd16347e06bc3a1fc2c954e0e116881c9a599295e1cbedf18695572a409fc8cff0171c7ab0
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
index 54afb491434a..d64fc314ed74 100644
--- a/dev-python/logutils/logutils-0.3.5.ebuild
+++ b/dev-python/logutils/logutils-0.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index b4acba3d4783..8ac20630812f 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,3 @@
 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
-EBUILD loky-2.9.0.ebuild 874 BLAKE2B 7358eeafe20665d89e1109b851b7d3450b020d16d4a3c22576143e295c090182977d04f3da9d7997dff2f52fea27df704eafbe70b342b207ae3e46420f81a836 SHA512 fea5145ca5624c888fcc797cebfc285e3e36e868bbbeeb091021bdddb73bb64999972fd0de50a555de0ad36a2e09a8f4a48fff1bb405e7fa9301266ac190bf09
+EBUILD loky-2.9.0.ebuild 878 BLAKE2B 74097796492b0383ed7018a272ac5f683f7f95037000b3ed4016dfb1635c34479f6a6d926b49a3d14dd5a5ada7c64dd4ce423577417be067b2a22a442e4606b8 SHA512 9d8be95852595a33352f71c1ace72e4c6575b45f4238406b1d98e535ea94c3f4809567e0f208da084f3fa36a95c838e6b42ebef4fb245b0d082dfe29644ecfd0
 MISC metadata.xml 285 BLAKE2B 0a3a6c5d0dd5f4ba9ee472ae8d58d5ccc0c0a4677793e1b0350193fce534d96513ce5b16610e90ba5f8cd3cb71e03db6c45566e1d55ebc5fb52bf6f30b740d66 SHA512 ab759fe515785fa9dfc92ed5e3e71e67b32eea0f7c1d0ad7165bc41713e8345ddc04549bb771dd92973365ceb53b4465fdbad914b4d1f7f76232e278edec2577
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 052734156609..70165402b043 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 0bd280fff455..34c94d37c57f 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,8 +1,3 @@
-AUX lz4-3.0.2-test-fail-skip.patch 680 BLAKE2B bd222f948084901cabb7e09e525707d0bf5182de216e8705a362fd7b9abdf376e3ea1daf3457fee96bb377e93b16a33bd163b9aee93011824147efc81c7f8b9a SHA512 77651611e228b103bf68f643c67ee7505b293e17d3b29f47e4a385dea334c441e77a7494cf1f72dc8a4713e89ad37ffac465fc36fa2ee0c044f1f47c355ffe07
-DIST lz4-3.1.1.tar.gz 154325 BLAKE2B 2d40728087aea735aeac4d39c415edf94f9aca83c77e4a36fe53f6f32f6c1595c0b1ad97c11f6e58cacafb95e0e12d29336d9f072d4f0d47f2d522f552a368bf SHA512 b6ddcabcb323b88eeff1fa9cb91d379d6435ab51b2b51e080138892fbce57d92c8175e2ae1ef72e8a2f95429aaa4be66a5e8cd9d4dbc5bcd6b44ec26b7df96db
-DIST lz4-3.1.2.tar.gz 153729 BLAKE2B f7d8b1b6dd4ee59d07eb4c2108516f939041bb1f131c62925986c2ad49406222c3eeac5232528979d6277aa5c1a950999f7bb3e984ffe26788e9d92a7eccf2e8 SHA512 bd277baf83a4d7819c2deee64e053fc030c5ccff8d5ea91762bfad2c38d5922f5305f8435b060821e86480be06716fa826cd05f407188077cc20637122e7c397
 DIST lz4-3.1.3.tar.gz 159016 BLAKE2B 2ab86799cbd37b96550ebb5d0e1a3c301cbcee2a42c6da189f5ae0fee4eb9c5614860dd044363e2c9312e3ab275eb527a116210604a72bd74354f49589d6567b SHA512 170b5330a8ec0eb4d69f3692c54eaa384fd4de78a7e7db95721d2f1e521ae9558f814e63bbb31db2775a81f7cd7eaea1420ad2c96406cff95d25bc5d30811aba
-EBUILD lz4-3.1.1.ebuild 767 BLAKE2B e29ad9613ca3d7f31bd330f1a87b5ab2210988dd7c59f009e7cc77cd1cd8ab0a2f7777ae5b011fd869e29d34c261c9673866637cdc9fbc125048f1d01352a63e SHA512 51609e49e47b5f3c3288dcedd1efb0a021a9c31399fe78d08ecb362a43639ee23259e6cfc0920a2e04e61eb41ff515a7e3f8ca34c1128ddbb539686f8aeae869
-EBUILD lz4-3.1.2.ebuild 647 BLAKE2B 0965d769fb0b5b9294a3a87e578bc50fccf041248ca0b40d535fb2342d67e2fbfeb8d96220af53cd68e23ac990c8420ff6ef5019c85e27bb3c7306597c3e192c SHA512 091fe989070ab4c230ff97101d29b5a82475f1e1074470cdf9bbe8a88d823e0a7606336e74e9d7e78193149e30efd97f57b62343747cc5f82a06eb5d30204614
-EBUILD lz4-3.1.3.ebuild 646 BLAKE2B 330a2584f65852797e7125323122ad7b8b3e57b77bd79bec6dc314628483622a8b735312c4c713f3790b079a7ddbabf786b535fbc864780a6ba461869eef709a SHA512 57f609249a703a97d33701484c6f770604c09635996226a4a00c9c36b844feff827e78642642dd93439b0b823cb1351870f3f23e6400b7db4d4079ae01fd89f4
+EBUILD lz4-3.1.3.ebuild 642 BLAKE2B 9470101b9ed2426821df1381bb8bdc254b906a20604461f8b41a48ea94aa9659359749f6b41b5e565b2ced1b4a5d1f4ec2fd3882f2ed88a87a2bfdf7f6eabade SHA512 13a779d610c97607030956144ec9d2fd88a03bb5f8863bbb36d543596f49f83ad1b7fe5ed0627380034b2ab5d7faa2b35cefd33b6b7adea543a73de3ab7a0356
 MISC metadata.xml 453 BLAKE2B 50a9701ace3633dbd38132d90aa352056bd40a14f04ba2e38f5ee644a15d1f0df3d1b8289b060b5778fcdd865189b76767e445b9e4c204acaa3684b7ef165e5f SHA512 7945fb025f4da1ff27cdb803bbdf5c6ba005a66def1b80ac35c5676ef7310c1764524f97b0de7177679f8ca41627c0955f172ab1e4594122e1d6e4338fcc3c3e
diff --git a/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch b/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch
deleted file mode 100644
index 40e6be63ff01..000000000000
--- a/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tests/stream/test_stream_1.py	2020-04-29 13:00:05.213776356 -0700
-+++ b/tests/stream/test_stream_1.py	2020-04-29 13:16:33.958779776 -0700
-@@ -172,6 +172,8 @@
- 
- 
- def test_invalid_config_d_4(store_comp_size):
-+    
-+    pytest.skip('Known test failure, bug: https://github.com/python-lz4/python-lz4/issues/199')
-     d_kwargs = {}
-     d_kwargs['strategy'] = "double_buffer"
-     d_kwargs['buffer_size'] = 1 << (8 * store_comp_size['store_comp_size'])
-@@ -231,6 +233,8 @@
- 
- 
- def test_invalid_config_d_5():
-+    
-+    pytest.skip('Known test failure, bug: https://github.com/python-lz4/python-lz4/issues/199')
-     d_kwargs = {}
-     d_kwargs['strategy'] = "double_buffer"
diff --git a/dev-python/lz4/lz4-3.1.1.ebuild b/dev-python/lz4/lz4-3.1.1.ebuild
deleted file mode 100644
index dce203cc7ad1..000000000000
--- a/dev-python/lz4/lz4-3.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 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="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}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# known test failure: https://github.com/python-lz4/python-lz4/issues/199
-PATCHES=(
-	"${FILESDIR}/lz4-3.0.2-test-fail-skip.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/lz4/lz4-3.1.2.ebuild b/dev-python/lz4/lz4-3.1.2.ebuild
deleted file mode 100644
index a3e561216594..000000000000
--- a/dev-python/lz4/lz4-3.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 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="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}
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/lz4/lz4-3.1.3.ebuild b/dev-python/lz4/lz4-3.1.3.ebuild
index 75a86173de1b..d0b08c54db09 100644
--- a/dev-python/lz4/lz4-3.1.3.ebuild
+++ b/dev-python/lz4/lz4-3.1.3.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=${RDEPEND}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index e5f889ab4565..abd28d0a3a07 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.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
 DIST Mako-1.1.4.tar.gz 479823 BLAKE2B 048c63c6caf493b9809dbcda8d1d697a7a25c8d22e97f439facae64b26d5b8f5f3002ff65529e9599e6069482fa25d6db95d810175f7f674f5af02cbd3f9f5e3 SHA512 4844c1d6c8d0d474b4ca4e1b31d3557747fc7e30f70a1976163a26b46b1b45c4c96ca6101fbef252b4e3bb4a61635d2a2c6d1c2933fde5b82bb1a1306f31ff84
-EBUILD mako-1.1.3-r1.ebuild 1096 BLAKE2B 86928333f5142e131b314d69aa1b6dc16022927e2e394ef426ab5b1b9e0f347e5a0d1db072b54abe0876af27761d07efd93498d083ac954233a72cd0231acadd SHA512 97dcd3809b3fe205ea9278e5fb4778486179e33f21bdf4de0bb7602e70c03b5869348368ab83d129e5c6a3a8ee4db3132b1a5011a871d5f679c22293380ec1ca
-EBUILD mako-1.1.4.ebuild 962 BLAKE2B 3d9574057923d5822c39e241ec07851d593ddcc2b3de3937885cb5b62b6687dd035f880c2bf9c87dd31ce27cb790a36956366d4ee8bd54aca9029d2f639e7c16 SHA512 1c0d70b40c6ae13f6d0ae5d7f541c91aac865d30f1233664db44c4b6dc428dd6ec7980c925544f6b53f33100cc65f3ab34400f972e88ba6723daf7055edce406
+EBUILD mako-1.1.4.ebuild 953 BLAKE2B 1cf69b2e410fe842eb1ddc742fafcfeef8365bcdc82753c713e4b181db19d00e51fe75590cca438c7c813c1ae6f7e3fb918e62ed634a0833ddfacc721d93798d SHA512 cdb397e6004609033c1c41ec8d8d1bec59e2381f9346cf65c45c59c0507787c4499730ba2972e4031805d1bd6b58cba439064a03fb779851be1184504621c134
 MISC metadata.xml 449 BLAKE2B 335ad5322f8e6b149cdc07c161bae35957f1d387ad0ab1ae4563ed1896211aa2889e9b285d8209b57397da95b5791d526d71f0eb1cc768c3ceee4be5af84ba6d SHA512 94e6ec358a7de187702ffc41becb7792714498195c6a384d5debf10186af534506955d5575a68442de0e41140800fb134c128e22ac919dcd40b8b11ce2a3da26
diff --git a/dev-python/mako/mako-1.1.3-r1.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
deleted file mode 100644
index 025d56dfd892..000000000000
--- a/dev-python/mako/mako-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1 optfeature
-
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-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.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
index 4f374f9abb56..a676d9dd54a0 100644
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ b/dev-python/mako/mako-1.1.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 1d77889e36f8..fdb0ae3edb78 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,5 +1,3 @@
 DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
-DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a
-EBUILD manuel-1.10.1.ebuild 613 BLAKE2B d88f3ff621176ed0aa102d853beadd97f7bbbc79e4b3d140d18a7821ac584ce489bfd1aa202e93823ad9180ae03533ad218370f1252e036766f8862bb383fc32 SHA512 081624c14f49755e08900e26d0d4f336bdc7dc39b75ddfb44afe7c717e6d66bce1184eb8cef8ecc39ab5521ac8ea0dceaf93b283b97e6b76a049cc1c90a6ac24
-EBUILD manuel-1.9.0.ebuild 682 BLAKE2B 705c3a3f6cc102cc13a1b37cf252b4ec962417e109439cc2d7ba8af2177e5c4ff02a502ad1ba28b069e11075454071c04e8c1839703ffe4d20bb81ec7a57c91a SHA512 cf0b1e875ed4bec17a8009c015e26c9265b2f62be4a0c0379897c47eaa3cb9d1824aaa09272f6d6a1bb1523e675fb364233fa0a3565e4a718355f2d27840a23d
-MISC metadata.xml 366 BLAKE2B 83752dd97822bc668d83ddfb27d0a0f42e0a071638cee9ef51e90c23d29b1048f3719a7e108bceaefd141a4d8a54cb56634fad8131c5eeaff08c3ef49f26e3d4 SHA512 59102b673e4a87204e7892c39129bdf18a1eb2195a22bd9944116ac7d75061f42293d8bdfeade84364031f1a4c77b1ee31fc97e6866cfb6be6e12b10197c6f49
+EBUILD manuel-1.10.1.ebuild 611 BLAKE2B 369f47a31ebaedfbb7552cfd5c6311a469b161ceb74b2a49a669a39fb55cadcc65b23777e4f3d09afa65e622377eba700d70b1f6d290f6eab92558e27da822f5 SHA512 6dc46489130a4354829f8c57354c19b1d932f4ec8386471f3d2f40ac305a6c378cd5e2482d1d2828b087222429bb1ec577cdac2d097e763be777eb491f5f04ea
+MISC metadata.xml 390 BLAKE2B a36a39705528b3a8e9d49a17f0c8afb55dfda94fb253f357ba900d29b585d936bbffdcdeeafdb59b0dcaaee748e5c6c572ec4758ccca8ed7b5c102204f96ffed SHA512 1c9c8fcc67a5c0e41f6d2e7b6969aa6665881bf769275b0bdfc153af82421a2920917dba3ec1a05ff82e72ab1960c1da4a8dd2cb0a404d8ba30a6a218a6dcc37
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
index a5b32a0a45e7..402aa2a23dc6 100644
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ b/dev-python/manuel/manuel-1.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
diff --git a/dev-python/manuel/manuel-1.9.0.ebuild b/dev-python/manuel/manuel-1.9.0.ebuild
deleted file mode 100644
index 61e17d04a80b..000000000000
--- a/dev-python/manuel/manuel-1.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manuel lets you build tested documentation"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-# Required to run tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-#DOCS=( CHANGES.rst )
-
-#PATCHES=( "${FILESDIR}"/${P}-rm_zope_test.patch )
-
-#python_test() {
-#	PYTHONPATH=src/:${PYTHONPATH} esetup.py test
-#}
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
index 79fde842e202..c4286d8446f6 100644
--- a/dev-python/manuel/metadata.xml
+++ b/dev-python/manuel/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">benji-york/manuel</remote-id>
 		<remote-id type="pypi">manuel</remote-id>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 6e6f114e126f..c8ae706a8032 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,7 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
+DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 EBUILD markdown-2.6.11.ebuild 822 BLAKE2B d1c0b1c327749c1e466280cee75ba4d332787955764aa93c38b62ef5fa43c677a1dd8953f0593095eb84261a1dcc9a7ab7973a3de8a5be90bc14a9861d65f616 SHA512 1157aee6ebd2534421b4731876bcd83f1f1a88496da81a833ec3dbf2617f7f8450d0fed1aed9ec7bf3a8ab5cd5c2654571cb79c72de8a665f714caae9aae9684
 EBUILD markdown-3.3.3.ebuild 1075 BLAKE2B 7a3dbdc4535c2efc623a7bdd8d83f167fd38f238bf8fe4baa33497ef6ca1e19641ccfd0f4b25e2da1e80edfd628679b8390c037772b64f13f0f8022d8a9d438c SHA512 c9d718aaf8e7b9b6ab425f90986866c0b0a23af77f59c340ca0ca384905384ff6c379e1a9033bc8dc636edbcf009076d9c70262746e634cab8e241f8f0e79450
+EBUILD markdown-3.3.4.ebuild 1083 BLAKE2B d67987834a7615e183497110151a93fba67a0a27a2ba7017c0fee76bd0e6afdeb9ba3f626b6fedb473610e69ad593f961ba489d74a1ee177f2a31b99b43a791e SHA512 b904672d15dba86de463b19420a5838d465803f2fb7f2eaf83c9c8ee06e72b313757a6de5d95bf7755c485aab1b5f2e59873a0e96d8849ddee1a29dd598405d0
 MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
new file mode 100644
index 000000000000..2f439b137c6e
--- /dev/null
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} 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"
+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}]
+	' python3_{6,7} pypy3)
+"
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && dodoc -r docs/
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7669d4623578..9fcb23f90074 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,18 +1,10 @@
-AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
-AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c
 AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928beeaddb22be236a17244f289c9032564d3bb1e2e5bd63f6017e51d71008efbd8c86ccc96eed0d30abc50537563720271 SHA512 445076feec916e508a3673babacbf8a8372a6f05c3d067eb77584c4352387d1bc3b1dc6c76beb18549df4601b50943d271c8db510f30748dbcdfc56727030b41
 AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878919e5d5183eac017928f12da0f9636d62ca42b1a7206e8f2131613bfa5249a835083c461c14c5be95091c37ce94902ea17 SHA512 45aaca6349269b5ab7476cbb82ba1dda6f8fa89100f7a8c7c1c5c037db1213b252daccfc5e905cb09d259f4e28d726c583d5a71f2da2421a787bb3b31fca6e5a
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
-DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
-DIST matplotlib-3.3.2.tar.gz 37939974 BLAKE2B f28e184a0fccd4192ba8135b70569bf463d08cae0f4eb8e7f997f417cb947500a9fe46eb5f979473b4d7d22c0ad03ab55aba4067082c86f63eacbf837b8606ad SHA512 cae68e63d879bcfb41b25df4de48472461f7987403d42d34c7205a65ed3ef567660309c04d2a55e155fbe1ef708fd9de0b0d66e71578f34c3ee93379c4ea1e1a
 DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdacf31ac900d5c06b22c7ebc7217d6cabcc76b7e29cea6af0b4711b5b1724ce34dd065f63cabcfd40c0fcf9788f94c1fe SHA512 36b482a6c36ee08c47f3c02c160289bbdec8746d4d246084723bd3e1fd632c6383f6db58c950a9773a6993d10f24dacd870a91faafc34864616288cd05b6232c
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
-EBUILD matplotlib-3.2.2-r2.ebuild 6538 BLAKE2B 01d48dd525bdf556cb63fbee4a058e00de373d3c8085d23e6b245c0b172cdf43d091e573ffb41c465d63bfb291c7e78cfcdfda0026325042b73219113dbdfdaa SHA512 34a88f01540b049952482a7a57fa5150f92cba167904f909c6ce1d7830b68af755d7c2b16c6237bfd896a8b7be3fb8a7f3ab3c6ea701cea607d770645219b54e
-EBUILD matplotlib-3.3.0-r1.ebuild 6660 BLAKE2B 61c626d44eae4bf79c97d57bbe831714faea8765a5c29a887537224e98cc100deff25a68c49584d2fe99ae097ca2853661644ad03b68c1888b4141523fb5f7f4 SHA512 223d3d5dd2caa07271faf6938724bab2d838999648729440f301b265d6d65ec5b7cb82d5fca18d2df1f1fc48a7bbd26f8d4df7dc160351f33f8a263e23f53a66
-EBUILD matplotlib-3.3.2.ebuild 6776 BLAKE2B 0df0ddabcef2d9028af37dc1e246be9efdaaa7893b91b71b983da1e4bb5850de5bb9839d328eee5f17df2ac82718bc2a9f5895352879cbda54acad83a3658366 SHA512 37b1f1acce0215b44fb0f1dafa5d6519a0733c684e052f4963bdd78e0f91023e5e48ab89b6027ccecd24ce09399a91e28224235b45ca58bde27480bc8bbeae99
-EBUILD matplotlib-3.3.3-r1.ebuild 6914 BLAKE2B 7083fbe325ee040c96acf3c42781341d1964deec55067f9701a341977ee32cacfcc118fb765ee20ec2c8ea82de1c1dfced99c46f28316091944aee598bedc9d8 SHA512 743b404ccd3d358cc3c6aedd5ef2c5071953c14c034abbf8efcab75e2a728aef6a24acab9a7f950c525795de9dff32842922f0527679e6f41c580bb66b9d014e
-EBUILD matplotlib-3.3.4.ebuild 6933 BLAKE2B 70baaf360eca8406ef11348ff9396d92474b25e3287d6cdd7af6e3208bfbc697eee201acbb6bee9abe200c8458b93cf414e17fba5f754acaca7e0d6403d25f0f SHA512 fd72ce1ae956da5f3ebebcec5e8af5d23ce247b357da45d9877e30b9b4f0b52146f82c619ee423836a6b32239e36d6902b00b8f178eb22045d7aa7f5a4ba98b2
+EBUILD matplotlib-3.3.3-r1.ebuild 6912 BLAKE2B 5f809ed5512b7e908b2daede9aac0e1ff5519140cc3553da1a781702e55eb1e8ec7428e2dfc6b2e4170559f8705c747b16e2b0bf3f1e94ac7bf7e55adea9de26 SHA512 ec81df574b7cd100de03b7851c51bda23cf2e3ac8b34ab86db91d5457c92c03aa328f557e5d61fb962ee6bb5222f2997cf25b2017628f70700184d10337cbd94
+EBUILD matplotlib-3.3.4.ebuild 6931 BLAKE2B 04c28da1a5692b7707db60e6687377f26db882a6e4d3f1cece0671c3666a17894331c0cd526c87356d16382c831058be364454e2fa8e49cdda91906028f1dfdf SHA512 f7cde7899fef918d308454ee4aec5aae5784f866a47360972cf1f2753c112b05f65f0376720d627d26cc5afa83c441c279c429451adb6775be07c72d31a7dfd0
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch
deleted file mode 100644
index e02e03e65edb..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: matplotlib-3.1.2/setupext.py
-===================================================================
---- matplotlib-3.1.2.orig/setupext.py
-+++ matplotlib-3.1.2/setupext.py
-@@ -839,14 +839,7 @@ class Qhull(SetupPackage):
-     name = "qhull"
- 
-     def add_flags(self, ext):
--        # Qhull doesn't distribute pkg-config info, so we have no way of
--        # knowing whether a system install is recent enough.  Thus, always use
--        # the vendored version.
--        ext.include_dirs.insert(0, 'extern')
--        ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
--        if sysconfig.get_config_var('LIBM') == '-lm':
--            ext.libraries.extend('m')
--
-+        ext.libraries.extend(['qhull'])
- 
- class TTConv(SetupPackage):
-     name = "ttconv"
diff --git a/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch
deleted file mode 100644
index 13755eaa33e2..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-From 7a65dfda781777872083623595c27dc1174b2ed7 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                        | 3 ++-
- lib/mpl_toolkits/tests/test_axes_grid1.py                  | 2 +-
- .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
- 10 files changed, 18 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 75636301d..af057d598 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -3673,7 +3673,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 b5ca0ed5b..885afa5f8 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 ec693288e..8af6b69eb 100644
---- a/lib/matplotlib/tests/test_usetex.py
-+++ b/lib/matplotlib/tests/test_usetex.py
-@@ -15,7 +15,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 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 506611e80a4fd12b3f633583d20119fc2f096ba7 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.
----
- lib/matplotlib/tests/test_cycles.py | 141 ++++++++++------------------
- 1 file changed, 51 insertions(+), 90 deletions(-)
-
-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/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
deleted file mode 100644
index c72b85e3e6f8..000000000000
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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[jpeg,${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}]
-		>=dev-python/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-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
deleted file mode 100644
index 5419196c0192..000000000000
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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[jpeg,${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}]
-		>=dev-python/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.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
deleted file mode 100644
index 84bd21b203b1..000000000000
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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[jpeg,${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}]
-		>=dev-python/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
-		"${FILESDIR}"/matplotlib-3.3.2-test-extra.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/matplotlib/matplotlib-3.3.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
index 469a6a712278..f9d13a43756c 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matplotlib/matplotlib-3.3.4.ebuild b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
index a103db251a04..c67ab398e61b 100644
--- a/dev-python/matplotlib/matplotlib-3.3.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 917bb5cc5f1d..6414f40f1a0d 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,8 +1,8 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
-DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
 DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
 DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
-EBUILD miniupnpc-2.2.0.ebuild 905 BLAKE2B a46f34e8cb27f91d2fe1d8c19d18176ae10b7a0d1bffcd0ca990e37e2beadd7a2a981b39cc37c3a228518932b32553eae12e3e3ec283ce5d2dc81cc0c59ec907 SHA512 92de4e56b0bd2f113ad30657cf0cfe1b9699a4e434bc309f87a4922931e5e8238148106f9a48cc50fd1ccfdb80e8cca926f3428936807af9183d3fca751e0581
-EBUILD miniupnpc-2.2.1.ebuild 909 BLAKE2B 405fc3476a644b3aa67b72101f3c00d093474787292edbdffbb3327ac7ece216ed59ddc0c63b0c50b4e078dad2de6e2c15bd42f50ec59b938546eaaf4283345e SHA512 e72da84b75741b34b8f74a2f6dd723acb8892b6de81b90c3624e2891d00b3f78c5ea464c5640c5cd84a285da269eada7556dda6b63cfaea74b4994620508585f
+DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
+DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
+EBUILD miniupnpc-2.2.1.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
+EBUILD miniupnpc-2.2.2.ebuild 909 BLAKE2B 634dc3701ce8f1b470a305c4f1d30a1fee7c1d14be9ef130cf02194df629d3c431bf56552e75e7ac3d675147a131ee5889a1d09a2330d9f7f4cf73dd3b2019d2 SHA512 0ec4e34ae1e5a1d244ed520855b1d1b4617d5009c0d743ae82d74f65d4d1183cf86d7a20449630c086aa68da3e39fc758c349b6cd1bf7ad12c5487bda0de9b81
 MISC metadata.xml 319 BLAKE2B 7f3ef8f9588fa7c1f464aa78a5edc9b8d43d3d163ea0f1172b2f9bf2305e3cf0b92b60ac6c9155ace330c646f9ac9fe36e0e6829ce06508fbcb9a76e0483f032 SHA512 4d2f45df1390d755a9539ab1e94542b234df04ab89549be6d3f9e9cefb43985cd2d4506bce76db1a6b64d0eb8f43ac1f6c3f093ef27d004b001b16c02594c875
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
index 07144052e969..40c18cf585e1 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
index 970455d9c657..da70c0b36cf4 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 27daad8e9694..eeb36b4e384c 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1,3 +1,3 @@
 DIST misaka-2.1.1.tar.gz 112700 BLAKE2B 0d50cfbfa127a51bc6da2abc3a91c8ce4706b6a1dbbfc4af14f85d47262ab1cca4bdca0ba7056e668570b20bed1f1a150124a2d5da45ff8866cb7007b2b9bca3 SHA512 4b9288d56ddd57e07985043acbb5a2dfec9b7c0bf385b689b17f2b062f5d7aa961e0dab8e237173e714b13aa5eabafc646833d5a78cf728035444d6fbd365bee
-EBUILD misaka-2.1.1.ebuild 565 BLAKE2B 37bb6b971c3682796cf1d653179c725e2d43bf573725d3acc0179cf54c49832f1d0c12e5fba4f3c012ff25e8a48ac1a4752e2a71ced680c0a33a05779744dd1e SHA512 97d4cf106b853ea5a987c6c283e392ef064b604e6e4727640ab5fcf15c700e9136fb5afdbbf82e7d0099e55290e0804312793209341d5c4c9a45fe3e522d415e
-MISC metadata.xml 377 BLAKE2B 3aeafa213198d9f896a53057f39d3100b73df03b405935bf5eb93ae7945932b89e311e73bb1a7a694e409a2dc3053c423e3b81892b161d129965117c8ece0855 SHA512 268990d497bd23ed03b1c7273fa8170dc2dfdac25cc9759679f3c9abe205593763093a384b0bc9a9396c31de1b12849bfa905570c6ce7439c5c11bf1461754f4
+EBUILD misaka-2.1.1.ebuild 566 BLAKE2B 20ed4c677b516f49f5429d6db17f03ba44cc5312194baf35c5198bd2c338cdc58075d5fb3f5c8da020406a5be08d6ec3d51ec1ea9d953a91c8e548d567539cc9 SHA512 700cc535423921af1e907c605507b45acf15b30b481af0a4587d5c60d550f4d14e2f62e65066212cdadb6bc4240746eafad5932ea1c01bfea6aa6b7c3d4767f3
+MISC metadata.xml 498 BLAKE2B 076fd4b5dfdce3f04d6082c7dc3215616dbeeb740ca103f87ed4c9eb9edc0a2ca8f48ff38bbdb5fa2b0412d1eae0dcfa514b8b086e66f49d5f5d62e5a40ebc27 SHA512 71ee91628d0926649a8888a9ccf74472fe08ad28c321441d398ef70fc5ee893e188aa4a9e3d2f0ea9b7320d5845aa3792ea2c95c93ea7042c68d65a64cafdf40
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
index 8e2bffc1919e..68bc5e6219e6 100644
--- a/dev-python/misaka/metadata.xml
+++ b/dev-python/misaka/metadata.xml
@@ -5,6 +5,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">FSX/misaka</remote-id>
     <remote-id type="pypi">misaka</remote-id>
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
index 2bb6f8f704e4..17ca17e0548b 100644
--- a/dev-python/misaka/misaka-2.1.1.ebuild
+++ b/dev-python/misaka/misaka-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 14b1c892def5..4448c0903c04 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,5 +1,3 @@
-DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
 DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
-EBUILD mock-3.0.5-r2.ebuild 1478 BLAKE2B a911d94bbda8fcf87aaf59f70ddd77d144eeb580efd1e19b670166870a37eb10603a1e61d0e3c9f1963c4f6d29ef00f25b044acae40dcf84024162fe4e1d673a SHA512 952225831c29b071c507c242af36ee2babc4862d514bba2504f6114d7df75cc94258fea0bc3c2f8e9c4d0ef599dbaf358381193eb5a1a857ddfc154a36bc064b
 EBUILD mock-4.0.3.ebuild 1671 BLAKE2B 5b501ce7f9725cdf5fc9e437ab52a89468e6fcfc8894efb91f06623c3913dc4d46d566622c741ec9481fa00d301d9b7c27192858797e875bf162ce4638622833 SHA512 a2ddcf6ff5358dbdc65217c3f863cabe90ffdf0abcdb9d4da761676b312466c8fb9552134cec8b5ba425028c236e39c96afe8a9ad11396be764f2d6efbf594ac
 MISC metadata.xml 389 BLAKE2B 0663f612b893e4f8dd7b7e28c624c5abaf1f3bcd1fc2f454e5dceed971f8b9ca9f3ab32f2ba51eaf88572e6178eb87669b98bcf852d731fac4c077d10cc89ef7 SHA512 e142011c0f4c7b3ea4eeac1c0431e3d3df8eea803dad50ae5dd0184e0fe070b009b9a1e6933e7a298751091dac4972f10adfbd6bbf713b36a28ad8f4b29f2a66
diff --git a/dev-python/mock/mock-3.0.5-r2.ebuild b/dev-python/mock/mock-3.0.5-r2.ebuild
deleted file mode 100644
index 863ddc72175e..000000000000
--- a/dev-python/mock/mock-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/funcsigs[${PYTHON_USEDEP}]
-	' -2)
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	# Upstream supports running tests only in their dream pristine
-	# environment.  pytest doesn't work at all if mock is already
-	# installed.  We can use plain unittest but we have to reinvent
-	# test filtering.
-	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
-	cd "${BUILD_DIR}"/lib || die
-	if ! python_is_python3; then
-		rm mock/tests/*py3* || die
-	fi
-
-	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -i -e 's:def test_copy:def _test_copy:' \
-			mock/tests/testmock.py || die
-	fi
-
-	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG.rst README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index f7e431e623e9..c750b3453150 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,7 +1,3 @@
-DIST mongomock-3.21.0.tar.gz 116340 BLAKE2B 5f6ff23bce50e2104a7772dd692e6341398b2fe4b8be07391285074e680661228ec50368e437fec201fb62eaafb5fa588c2cf27f9554602403fea3cf0eaabc55 SHA512 777d5eb7a4ffb2caa569149c600c0eb3bde2737d734f0f934787ee10af571771be201c9cb44b3464ef550e48c035de3ed31cabb2ddac9c0cb864516256cf5c2f
-DIST mongomock-3.22.0.tar.gz 118915 BLAKE2B 98c90684a58e582601acdb2f112a4d1fbfe043f979b9b07b12649a2928fc813c0d11c8a51851b0fa87c5fdc8615c0b923b36d2557e82bcd8f668a3cfdc03a2e1 SHA512 1033d95620a5a212a698f8f0f90679a1cae7c7fca97448ab7cff223db2cf45a230d4d5c863aecd20445bc9ab189ede188ee756b13f108eef81e088c622385d61
 DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
-EBUILD mongomock-3.21.0.ebuild 852 BLAKE2B 6b30889db4fd55051b4b7a5345e293952807d02f346cab8d6041cfcaa7cf3720c7082ec86884c62b6f26428e7bab385e6708339f7920d0abc1781c229ebb0d93 SHA512 2f1095e1b5fe2a06cbbe0151db18951f671340ddd8858746c471ee39e205ebdf860fee7a1c25e92e9b06db3f07ce27e8177c0ed636640d2f6cd277e0856c485a
-EBUILD mongomock-3.22.0.ebuild 854 BLAKE2B 871d24458a30cfecb8d440e2371a1f105b9073502b4d156191589b7a901f5ab3a2a4581546e5a3c85fc5da58a041070b464cb15fccdda317f838dc647ad59c6c SHA512 ab35a105184ab9207adabdfae3051921192d45b7bcb503f27371c344b78d5caa66c480cac58d339ca4a3802a72e1eb27fe0c339d6bf2d78c44aea6735650e1ac
-EBUILD mongomock-3.22.1.ebuild 854 BLAKE2B c6d148abc25f6ef97c8c9d4b7c1a3bfbdf7ad3dd0ad57a541db7031048c2d61786d9f2d552fcf584ea0c561d7164aaff2e6acab5419f5c553c467c4f359df8ef SHA512 8f42453834ce971fe5fdb2bed4939dc35e397a808e3acf239e5e396c0e1244c43cebaeb173949673af8dd0c1e59140756d784a34747c2c9b1b36762a1d81143a
+EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
 MISC metadata.xml 619 BLAKE2B 9b3bdbeeadf2a214e0e6dd41b6177080fb6ee475db19be125bc09efcfd1adb9624ed262ce3e739801eff91b7045bbcf3a51b78ba499a7c446a3ad7389493bb72 SHA512 b0bd3746abb8f97dcb9dd4893aa00612c2444fe1d39ad9b0b203f135f4422642809bee2c37e7fe3d783ced47c50bd2624c19ced3b9218127b799096ca7ee8182
diff --git a/dev-python/mongomock/mongomock-3.21.0.ebuild b/dev-python/mongomock/mongomock-3.21.0.ebuild
deleted file mode 100644
index d7fe97d04d29..000000000000
--- a/dev-python/mongomock/mongomock-3.21.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_{7..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.22.0.ebuild b/dev-python/mongomock/mongomock-3.22.0.ebuild
deleted file mode 100644
index 4e567ca5556e..000000000000
--- a/dev-python/mongomock/mongomock-3.22.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_{7..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.22.1.ebuild b/dev-python/mongomock/mongomock-3.22.1.ebuild
index 04f25e150dc7..ee1a2071f1e9 100644
--- a/dev-python/mongomock/mongomock-3.22.1.ebuild
+++ b/dev-python/mongomock/mongomock-3.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 5c4167c79d0a..03de5e4a7bef 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,6 +3,8 @@ AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da
 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.16.tar.gz 1761006 BLAKE2B adb48ac770e0753403fd41309ebc2085e5d9cdfad5dc791d9cc1216af10e55038c37526a8549a034a3327d821c56b0f6cdd775a17336285bfc637c09191dd78d SHA512 80a1335fea8d6dd42b4062365da4719d26cd6c18e5c186c950bbb844dce44e91ffe5e5173742f3b60d6ba2cab93d45359b43c2cb0ccf74d16009986457c243a4
+DIST moto-2.0.0.tar.gz 5054551 BLAKE2B be9b18909f90b22fe57d47e2eea50144b4ac8046dde0123249079f53c8f3c2ea70513b29cde1030ad923be7d50c6021351c8aa9c65bc0b95510a4f4de9d4d111 SHA512 285eff39004b291d112c455f44e30fe441d74c08aff614f5c97e7c52a68edb200d7077722f1e7bca38a63694aabf2ff56994cd1229e449b2f1afdf3945735fc7
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
-MISC metadata.xml 511 BLAKE2B 36b522a709569a2d91b99a4fdb1c482349f8e1d019b10bd2e71c62b50c3e8126e9e34b7973306901cf543345144d92909c3815417f9c3d87ce898b865d842bad SHA512 4948dedc752de4063c0432804e0cc7a530da2de14213e081fff69a7df348eacd64b76c950a9202968a53b6728ad989dadae9147cc40069e16dcbb1183972cbc8
+EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
+MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/metadata.xml b/dev-python/moto/metadata.xml
index de7cda739e39..2624516eea22 100644
--- a/dev-python/moto/metadata.xml
+++ b/dev-python/moto/metadata.xml
@@ -9,7 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <stabilize-allarches/>
+  <!-- no allarches: package had portability problems before -->
   <upstream>
     <remote-id type="pypi">moto</remote-id>
     <remote-id type="github">spulec/moto</remote-id>
diff --git a/dev-python/moto/moto-2.0.0.ebuild b/dev-python/moto/moto-2.0.0.ebuild
new file mode 100644
index 000000000000..8984175648d9
--- /dev/null
+++ b/dev-python/moto/moto-2.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..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 ~x86"
+
+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/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${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/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${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}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# network
+		tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names
+	)
+
+	pytest -vv -m 'not network' ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 746cfbab7ae0..f172d8206c52 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,8 +1,11 @@
 AUX mypy-0.790-py39-fixes.patch 6631 BLAKE2B 97f2960e231d70c7fcdd3439806ed60c9b81348e920385e7c4c0ed458877bd295199cac75cf2f5a428acefed292af57416423ce7f689667c61d0f822487c1fd1 SHA512 17e353e019064321c62fa3820a7e934a43d03bd179e0a5fc9514d55478d81ab2c851c028703478e5f9dabe2e8d8414335f27ab764bc7fded1afedb794cc09b1e
 DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
 DIST mypy-0.800.tar.gz 2119165 BLAKE2B 48ead6c893f7055f4b1c0167f61e07b647a15f3a13688e1a93f11ebfdfe70ec3ccba3678bb5cf0e61af8dacfa64c241e5b79f28af55e8bfc5ce0a81c409deca9 SHA512 e267fa288f9c538e5c1d0a115b353aabbfbbd46a372dbaefbf43abeae1e6b88cc1b3e0bb301881f20e20b4e69eeeff4be22cf330bf58eaad09b4ea152ab02c12
+DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
 DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
 DIST typeshed-8cad322a8ccf4b104cafbac2c798413edaa4f327.tar.gz 600618 BLAKE2B acc4397fba21db1bcc7b3ca0922fb561d19161579062e1ee506cadfbbb1de952e36fab6ce552bdca932757274c882a90a948e9dfc257905d7f2e90de9f22bf55 SHA512 728808a568074310bd700a6fe3d667ced01a36f4a6ed2fa6df9d7a784e3167e2c96f7b91dcca1f99d50e325165f3ddea6bbafeab2469a9105c1cb217f16beded
+DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
 EBUILD mypy-0.790.ebuild 2408 BLAKE2B c07db4bad815ae14842dccdfcd59bf3b3f8dee1bea6de40ad0d20d3c2927988fa34b2f92bd7887d6e6598d507064dd5c980dfc0aa32f47d5ddd3bc6101bfc6e8 SHA512 2b28d201a00b246c904888d7b738a288ecc0c1c0ddbbed26fdd7ebb38c84a64c1b368a42972d642d88950465973c03dbc91d98620160a18daf921a7f07a536e6
-EBUILD mypy-0.800.ebuild 1967 BLAKE2B 0d6a26e47eb529a7e458ac92b41c4b091257253e940dae34102ec8fc8457bfd205d565ec442541ce52254a008a205cb3de8d1b48dc11387da77e8755e71543b2 SHA512 23022544b776384440d1c499e5bd78d4b02333a4271d1e1dde25392a310a6cbfd25eea14df360cc90bd9d5509940e779259aa485aa18b7a74f4975c03b9a8466
-MISC metadata.xml 586 BLAKE2B a75692d2b46a9bac5362c4a5111de861297ae5829654d14fa7eaeaaad8eee2ab784017e073423a0e4c8dc845f035884de80c72c73921c01d5fec5b05c3a71c2c SHA512 79916a4aa04010ce67ad08386f0b7e03dfdc6fc0a6195b376c4cd1207ccc408b275efbb3338313db467e3b8fef7abaf93445dc92defa8b9043e497216e0f1045
+EBUILD mypy-0.800.ebuild 1965 BLAKE2B 43654bacc7196e199f0c84e1006cebb2b344fcd658227296f25f79ed34c43c12ffdb777b7987824da815d45e15dca35159a234c7d005df1a697683eea70e13cd SHA512 013464308be532afd39cb6c31bbd5258e4c4beeb67b569cdf721bd4a3ed2dddd466659e611437710fa7341feb160ba8ee6551cf43fb4070d3f072fd520cdb915
+EBUILD mypy-0.812.ebuild 1796 BLAKE2B 0f0804dcd2b1eeb673af6f9872b1fba813abbaccad65172826c3cc461c4614ff20d65d529aa1c3f7e11f016ea7ad09e28fdae15920c3892e8ec6c265dd02e454 SHA512 6d4e5bcd86459cfdc89b1097016e71e2cfca2ffd00adfe0fbbf9fa5726265b08eb1475a86f04aead3823f2cf8fc8804e0283890418b206d31b57744cf8bb82c9
+MISC metadata.xml 562 BLAKE2B 8d5318efba2b5cfca8db1d17411199e7d744e8ff5ab11899ccb882c13079a8c65e9d434cd64af37e7dd556078d4f0f9a9298d30840128a36e424526160ada4df SHA512 d8194e6ed968d98dacf4a5b86f7fe5ff9f0983fb5204ef43bde42896fb2496a0a36c4e5fd6e8a0e0d963d55065f95861b5e890cceeddd57dbd57d8b9e7c2df5c
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index 5965190b13e4..c7660c80368e 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -9,7 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python/mypy</remote-id>
 		<remote-id type="pypi">mypy</remote-id>
diff --git a/dev-python/mypy/mypy-0.800.ebuild b/dev-python/mypy/mypy-0.800.ebuild
index eb11d0095d31..98c055ca766f 100644
--- a/dev-python/mypy/mypy-0.800.ebuild
+++ b/dev-python/mypy/mypy-0.800.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mypy/mypy-0.812.ebuild b/dev-python/mypy/mypy-0.812.ebuild
new file mode 100644
index 000000000000..857be7420243
--- /dev/null
+++ b/dev-python/mypy/mypy-0.812.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
+SRC_URI="
+	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/python/typeshed/archive/${TYPESHED_COMMIT}.tar.gz
+		-> typeshed-${TYPESHED_COMMIT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	rmdir "${S}/mypy/typeshed" || die
+	mv "${WORKDIR}/typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed" || die
+}
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 60580f77f248..1c59c860d2ae 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,5 +1,3 @@
-DIST natsort-7.1.0.tar.gz 143534 BLAKE2B 3ab6c977aca40330fac0af9e4be36d973e88d931799b3135a81daf0a475988af5cc2f9abb30ade1498aad07d9c986e514c7c8cdbbb63da195a81dded4f6f25da SHA512 41293d70c3dc2214f9dc1c123f31cd7886341ae25c6342ac49f3d53d06ba15ecd8d666f1763fe790848c93668940a81b7e7f1fe896f0b91f180ca557dd922ac3
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.0.ebuild 548 BLAKE2B d4a5556414912dd09f1ba12a58e3caf606ee800e328673f4516ff02c7af437038456bc4466465689ecd742c0e78a167edba7da4665c2b842591d71ba2a2fdb1f SHA512 031b8b9b832142fa685c488817443bd7a011998df0ea5d8d16da79c77ca24b7a4d9778c73a86360994ea122891bce1cd6acc09823375e8aaf0ea0537c592033a
-EBUILD natsort-7.1.1.ebuild 539 BLAKE2B dd7b96823ac4a3ec695a4bcc3a2ae6e203c0124fc446427c58456f650e904282a1d7b27cb3a1fbf79ef91720800176e49d686e7f0cbe0f73b71c130a5b01c38d SHA512 a647c5ad6431aaf227c0ceb25c3bf96a777179ab55be30b689a727fdc39319ca592cd4a9f4439b0d58d8ded74d52b57df6e908178e063768038388bf591d04ff
+EBUILD natsort-7.1.1.ebuild 537 BLAKE2B 6b27c4f831685103adec3cef80af7107b1c31803136a9d71154e9af51f5df29829ea9d6510f17d25a1e5c344d3534ea66eaeba62d2127e26f6f3201366719154 SHA512 44ea75c82f352fd3d849e31f2e6802d2604070a2b2dd0d327b9100b0528e5409e7782b72c80b3b7be73005a1f11411a717931468776acea400deb54a2b449359
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.0.ebuild b/dev-python/natsort/natsort-7.1.0.ebuild
deleted file mode 100644
index 482d8c00b166..000000000000
--- a/dev-python/natsort/natsort-7.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 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="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 x86"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index 4e20f739fa86..e6a79b0fda57 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ia64 x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 3ba33b342c98..48181afc36fd 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,7 @@
 DIST nbclient-0.5.1.gh.tar.gz 69197 BLAKE2B 3c6f3e70c159f5209c637caf7d85ba8114fbcb47dec616c2b15db4dd80d4316a55d55f37fa7a1ad40ec3672c449ad1e693de3cefe0b37e8d67c4cbda3dcd6771 SHA512 a19b09d24fa7e6ba892d6cca65cb73bd37e3e13c4413324598bccc143ef0dc0cf91c5a549614d06b55368a1dff2bb8ef97e8079d08620b308b677a9b01740129
 DIST nbclient-0.5.2.gh.tar.gz 69270 BLAKE2B 8365e8097846239f22682784408a944ba6fa97ed71e8a57f0fcd6f87630ccb4ddf3f7a2636aa051342be00d8bac866eec2e259d4c2e914ea437398a562166f58 SHA512 e5c5dae3be9fc37078d358093307f45f30ada67c52d4cdcde56a09846e924d892f6ac98d0acf80207b59de2f4b08f64d12f62b98733e7776cc2a894d6e3516e9
+DIST nbclient-0.5.3.gh.tar.gz 69340 BLAKE2B ef2908037b350879b4494a9676550754b51c218c0b344c8f26882fac63d3de65b37329fc8aa586f71f0fcb24d0508c2aec81d1066021abd4c66ee1b220574ef8 SHA512 16a92bdab931c2cec133389bfd491c9f3f4ca7ff3b11a3eb70fcdb568a0aecb8cca65d5a1fb25ff9a6ed6d581bed04de8e51ac2d856fad386b22aa6a2424c991
 EBUILD nbclient-0.5.1.ebuild 962 BLAKE2B 820852a503819aedb821b50e033c90eb2c5aa95a68f5b392102f5c70921bd9da673f2613c21bd27a5511b6701a4531e316c847642beb619bdc48b8bffba225cb SHA512 ef727ef408af13e654980a8654edde51ab8716f50c8ab5876157d9fee9d66fc5591ef0407d03c8798e2b90eeb90726118cacdd83cc3df78925b9dec42a4feae5
 EBUILD nbclient-0.5.2.ebuild 969 BLAKE2B ac9c965e63e0751f2295bd87bc81150f4abe68410502191ea201fd2bd0cc24f66a461a5a683eb88995b01a613b2e6fb1857e044e086098ad5485f96d955c3081 SHA512 608dc11371bf89bbf3d50033bd98a01da4a3d8f6673e970bc714595ded4d590864b9dcf0799a828815fa2185be8b9531b0edf49965b48ffe0875b18252b40a22
+EBUILD nbclient-0.5.3.ebuild 969 BLAKE2B ac9c965e63e0751f2295bd87bc81150f4abe68410502191ea201fd2bd0cc24f66a461a5a683eb88995b01a613b2e6fb1857e044e086098ad5485f96d955c3081 SHA512 608dc11371bf89bbf3d50033bd98a01da4a3d8f6673e970bc714595ded4d590864b9dcf0799a828815fa2185be8b9531b0edf49965b48ffe0875b18252b40a22
 MISC metadata.xml 404 BLAKE2B 72a6751149738e4d2cacf081ae2fc8e960bf0314cccd4bbb2fe7b7edb568c9fc7f6de518b66bc7dde4c712aad07f424e77bf419b9a88a67110258acbf954bf25 SHA512 3430db25e62ec960e7f36bef9ef56341f1aa2654396421071fbfefc9464c815c6ff53b5fee9d66991c144e0d2996db930b5a5bd775c88ee1d5b961a01137cda6
diff --git a/dev-python/nbclient/nbclient-0.5.3.ebuild b/dev-python/nbclient/nbclient-0.5.3.ebuild
new file mode 100644
index 000000000000..6dfa8f2ac375
--- /dev/null
+++ b/dev-python/nbclient/nbclient-0.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client library for executing Jupyter notebooks"
+HOMEPAGE="
+	https://nbclient.readthedocs.io/en/latest/
+	https://github.com/jupyter/nbclient/
+	https://pypi.org/project/nbclient/"
+SRC_URI="
+	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/xmltodict[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index cb5ff125e600..eacd15a75cd7 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,6 +1,4 @@
 AUX nbformat-5.1.2-package-data.patch 1396 BLAKE2B 60991048ef5b01f1a243e10daf81384b9dc35ea0f56e0b2385d08bea57b65dbb8084c988a767f17cf97d583a6bc1917bd110b448810ca93213c6dc9d0362512f SHA512 d75d579edb77132ba5385de780ab104c80efe38aa18cef092edefccae23aa701c4b642d0cec05e245796e0dc6f4349a84ebf72671229b625f1adb907c779e305
-DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
 DIST nbformat-5.1.2.gh.tar.gz 152275 BLAKE2B 2a0758f33952547e5ef91f0ac0a8b98b97b882a8797c38feff6710a3a0824637f41396b152403e155e1af9805b7a85c189ba2a609076c591562e5f4bb783da29 SHA512 4fd574373c2f325b6d078a062878d139d741d30f9101f3344e0c7fc19bdf714f8ef71994134e76c90e1301102aac55cc490df8344f3ceb407002437f35d03944
-EBUILD nbformat-5.0.8.ebuild 872 BLAKE2B 77871014d6e031edb950013e857ce0c7bcb9ef2d1f2ca68ff1690e7d613c68c4edd859aa238464f03d86ed393af5ea0e9c5ff71ee6e3db4c0252f73144ab05e8 SHA512 f1a6aebaf9a08fbea9c94a958951800c3dc66a03e5f7eac13e6ed4ea3a925e0c4fb0f9b15e68c4ed183153f4dec4b11e76777fc2035c6fe91bac652ac3037c89
-EBUILD nbformat-5.1.2-r1.ebuild 938 BLAKE2B 2fe2ac532f80d3e078a0864ccd5def8742f2c0f431ad340061d8c252b005b734277bed8f363d48a4d74b5234e8615599ccd8fe3f985b0c6d0f6eb060746d40e5 SHA512 8e6133c4ed8cf37d26b7c902ac93dad293c7fcb67a406967f9a96a7b871cd0aecb8cb3d9e0ae35db2ea451eadfd6740301a3e4e56bd7d36a63f2d7f60e459d18
-MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
+EBUILD nbformat-5.1.2-r1.ebuild 935 BLAKE2B 52b270c6b77d42524378ff4c4bd09dbe6773cb22c810dfc16cc861c001694ad2cb8cba22ae40a791ee03a57f47f85631fa5a7ba23ff17dfa3b946893ea529c6c SHA512 514732c96b060fd333fce408cb79884f2056dcc73b78a2dffcf6865251d83ee1ecc46a474992177300f96e4d5661f86f27cdf75e0c2a1d64ac45bcbdeb1bf82b
+MISC metadata.xml 779 BLAKE2B 8608b59cf72c078896b57bf46337f7a0c78a727a4afa5272ac7a5420a39590977668d249cb84c994b9a402a0d59a43f3cb15433ed5eca0792d054fcccd291e96 SHA512 98249e1bfea7f79b978a5ae1e734113ff075c48fcfe042774ae48ccc0398bd17aba8a6267b7a58b4002d85e5e8af28e4a50c511900f7f400b6f3dacbc3cd64eb
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
index c43b5e4489c2..584bb6cdb999 100644
--- a/dev-python/nbformat/metadata.xml
+++ b/dev-python/nbformat/metadata.xml
@@ -15,6 +15,7 @@
     notebooks. There is also a JSON schema for notebook format
     versions &gt;= 3.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nbformat</remote-id>
     <remote-id type="github">jupyter/nbformat</remote-id>
diff --git a/dev-python/nbformat/nbformat-5.0.8.ebuild b/dev-python/nbformat/nbformat-5.0.8.ebuild
deleted file mode 100644
index fe9b56ef80ff..000000000000
--- a/dev-python/nbformat/nbformat-5.0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-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="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.2-r1.ebuild b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
index 2444649ad3e1..ff64616e1d02 100644
--- a/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
@@ -18,7 +18,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 215fbf1469b4..2c27856ffe9d 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,5 @@
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
-EBUILD nbsphinx-0.7.1-r1.ebuild 628 BLAKE2B 5cd38e1f522cc22993a1022ad137f592349a58a38c4f602d19d290bb6517b8d1fe4f8e145b43086c45b17b6c2aced26925ba8734900a6baadedadba420b7f854 SHA512 c6ff66bc9626620bfb5ca7a26733cbf9d293f306b085092d06a40aa81f7053e51845a047c57dd13b0e16fc7798e51b797fa4f201e002351a5d3f5557d93c94a5
+DIST nbsphinx-0.8.2.tar.gz 135256 BLAKE2B 9e2f733df713f5285bdcd876d595e5268a193e07c9d3d85e84f315cc1f11250be4e36854c307b96c0e03ab1f64e573896ef387eeea874553f7ca60c51bcba746 SHA512 b474bdbe291c498f8c392c9c5877eac12d9242e4784f2c8621825ed74dc264be60c1bc1b8ae4ff40809c4eb2a65b04ac54e5369eba3c3c79c1ad6b0a4c711bc5
+EBUILD nbsphinx-0.7.1-r1.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
+EBUILD nbsphinx-0.8.2.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
index 1ddddad25f0d..6d626dc40a76 100644
--- a/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ 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}]
@@ -22,5 +21,4 @@ RDEPEND="
 	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
new file mode 100644
index 000000000000..94b3df799087
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+
+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/nbval/Manifest b/dev-python/nbval/Manifest
index a199437d7413..72257a31dcef 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,3 +1,5 @@
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
+DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
 EBUILD nbval-0.9.1-r1.ebuild 740 BLAKE2B 69c62d981984faae61a0aeb70d4c038f78a791607fdb741495eb896d04e7e0356e8f928471ef51798aec14d3fb75b2aa73ebeab4a79f38813e274a161cb3af08 SHA512 c00a36c40e79a10161fd740f003172d39b07c753bc3e7bed8c267e6bb249f8d49f419337670f0bf06eb8a3cb4c9c6b1a7d915823f5122c389c4dfc6331753389
-MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
+EBUILD nbval-0.9.6.ebuild 882 BLAKE2B 174615b9642b9a0586aa844b3b88c90222f06439427d8eb962a2efba72422652185a6a0061f082173de2c56e54749496e847e9565d4ab77a21ccaaab4acbdd8b SHA512 8bcfd1fba1421a3ed90eef12a01502f5beb92b2af0fa957025c15ad25ef95fa46036ca931befb1170a61de534e3ab35e17cddf40dc30352bf0d271847f364fb5
+MISC metadata.xml 983 BLAKE2B deb9c0b7b10480d8d918b61c9c1110cd3168ba51ad49b0f4822761875e5e3aff5d68f502e023a1e5c7a744b2a867aae9606737be79c1593960a7fda4d277448d SHA512 a1901ee74f9260328bb99d3ee37642d94a15a7e9c266a0cfd509e8cff5bf012ebc8185c8a576dbb4e5ac3f887086639a917cd76174398edbab17060d43111665
diff --git a/dev-python/nbval/metadata.xml b/dev-python/nbval/metadata.xml
index 30a2a59d768b..d4c0c7296529 100644
--- a/dev-python/nbval/metadata.xml
+++ b/dev-python/nbval/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		The plugin adds functionality to py.test to recognise and collect Jupyter notebooks.
 		The intended purpose of the tests is to determine whether execution of the stored
diff --git a/dev-python/nbval/nbval-0.9.6.ebuild b/dev-python/nbval/nbval-0.9.6.ebuild
new file mode 100644
index 000000000000..dd0eb843e62f
--- /dev/null
+++ b/dev-python/nbval/nbval-0.9.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A py.test plugin to validate Jupyter notebooks"
+HOMEPAGE="https://github.com/computationalmodelling/nbval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		--deselect tests/test_ignore.py::test_conf_ignore_stderr
+		--deselect tests/test_timeouts.py::test_timeouts
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index f1da11b05e49..b90bf48adb2c 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,4 +1,4 @@
 AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.5.1.ebuild 1170 BLAKE2B 4a409155228282a2ed253bdb0deb3e560984c94f38eb66baa15e1b2f1e7ac73d07353423c321b66fdad27ad16252f4f276bf6c5053e84a6e2cb1bc199c808182 SHA512 84dfb1f0824413126ceb70feeda0b227258072a0238cca03819946752bf7ea95faf05e1a054637c828d6d04e884abc73d803843cf993b2e74537b17c0827511e
+EBUILD ndg-httpsclient-0.5.1.ebuild 1178 BLAKE2B ec6792783e0fbfd0db110511a908e7c22d369c4cfb805595471c6c7bfef8b1fb09fb6fd2236eb0ac23f277c6944ec20da0eb1e487f26dd326e9b2abab5324751 SHA512 f3106a86494d18faa8252d130b027b55cea99e2fd9fa4e882713327bcc8aa78b951ec3bb5b0947e588f6512b5e6520c5f4451375d056812202916b98bef1caa0
 MISC metadata.xml 418 BLAKE2B d8bbb595e8483ff5072ad8bb4dd0558aa87e0bcc9b01dc59b5816c42d9e465ab1bbfcb5073479a06b58a2bab3d637e4ed23abeaf899c5c5be6edda057afd123b SHA512 82ae35467b503a3fc7e5382efc7f023917bcbf67b7bd9ed2a01628c76865154e46ffd9e2f7f7eefe6a161c745d0da92585082a27b88b5e957839690803e99de5
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 993e675f7783..e44dc2439e8a 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index a88d52b21c2b..92e3b5cd080a 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,5 +1,3 @@
-DIST nest_asyncio-1.4.3.tar.gz 5996 BLAKE2B 399086236427fca6073b95ee898c9bb9ebbc984e36219b9f5bdcaff4d670a51985e1e3ca7597faf8b20ea3cb1610f5ad3fc12a30fe2207dadcd7d784c50679a7 SHA512 8d8e3384238c685211f4ae4e3a5c2d6bb0712880abe71b25287eabaee19deb3d669e6e4f2eead3d76825b460025e0cc4f8dc04197d140503b32563142c4ab596
 DIST nest_asyncio-1.5.1.tar.gz 5738 BLAKE2B 0aa7d9a71c75b97b1eeb40dab8b2b9942a6c2107643aa82429b3d27c3fcc3602494a86903669ec3ee4f577802463cdf05cfafc4bf0c6721b251a61b079d7381a SHA512 cb85ce82706d17081de58e4176bbc6bba9efd9eec99a36902dd689010d08d4267e742cabb89c088cc274aac13ed9929f09e0f55f375cee35e3c15385ed2fe0d3
-EBUILD nest_asyncio-1.4.3.ebuild 411 BLAKE2B b0d0a38261e94963259043f60b2424fea4a164c34f4f68fb53471d1bef6cbcffd4ae7cd7691ed16a18e27d234c33ed93732671ccce6dc5e5471291c53fc8f199 SHA512 bdb0af9c9a62f63ade25fb20f8a73185d2bda4a17b1249b0e446ce6bff222dbb2a8f917ffa83b16000ce1760d817d976d04bde920dafcc9222cbc9eb9da32ed4
-EBUILD nest_asyncio-1.5.1.ebuild 418 BLAKE2B dec4821732c85380515fd27b7fbca65f1a87bc61ac3ea013dd8144410696df3fd2e021baa1273500e794282b58e5af3157fb49f896cc618b956a0712aa286cf0 SHA512 707d4e0fff61a3e3776b0fafc2f376af7a82bc5631e28c4b94dd8208c92a50aff525d2786c704b07d6f9001391a59822c6d7dc4e4c5d53da73cbba1468f20584
+EBUILD nest_asyncio-1.5.1.ebuild 416 BLAKE2B 2d55541deaeb203a67c3e7096d4e567676389b76860076b15b00c4706ed4e597052f2e8ed5935d2d2663964252a4fb44c08d7953040207d46d288429bd565611 SHA512 0bf4116b44dc36fc88aa0739bcf145198b49328f3dc3b0c68a4be3a7399b2e042a2433885af6dedc1091632760495f73d66f821ef52c95fb0852fd81308b8245
 MISC metadata.xml 388 BLAKE2B 5997502316ff6f700e55980bfccbc7ddd0b4775d95866d76803b37ad0c8e6222cf13f2ad8cbee455d6327b4f96b66f7318bcf05d3f861ecd26288ae144f8a2ba SHA512 f55ce5e44a97d4cc234f0f17f231324b72d60213b9a0c4f94d6ee4cd24893cd6592f1ab8fc6c9527d482e430cf3268299ad08e3b7f76434fce2385a5f23af174
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild
deleted file mode 100644
index f324669e8827..000000000000
--- a/dev-python/nest_asyncio/nest_asyncio-1.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 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="Patch asyncio to allow nested event loops"
-HOMEPAGE="https://github.com/erdewit/nest_asyncio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
index 93c9ecc694e2..2429555868db 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 36dcf99858f9..0b3337dd5cd4 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
-EBUILD nodeenv-1.3.5.ebuild 440 BLAKE2B 4165c860b03286b31f40a633efa9d567f588e06a1dfe6bb07d0bd8120a36dab28c3b5ebe6bee49716070c0814844d232a23bc51949be46010e27554fbeebee61 SHA512 e5cfacda0868d80921976bd001a1b0484eb5f58baa125081ce7742fb4948e09b12cbeacf1f1772f3578b726de989ea1926a63981b996e6f5293d4f5303c81304
+EBUILD nodeenv-1.3.5.ebuild 471 BLAKE2B c286ff7cabc65a9b50cc7cabff22593eec5d852624afb4bf1fd35ea54fe881f9774da8b8d362f3585d1f620b17f33b464d6f7312769c31803400148de528ef2f SHA512 2f672269a59835dbe4806c4518da8e95a3842eff0b3435bd06a622c0e2e7dc9ea6597cb262df8630de7057962ba10648c0adfac0b76b4a3a517a1fc56cfc04fb
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.3.5.ebuild b/dev-python/nodeenv/nodeenv-1.3.5.ebuild
index 0540963cc21f..3cf4ca82c5cd 100644
--- a/dev-python/nodeenv/nodeenv-1.3.5.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.3.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -16,4 +16,5 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# requires network access
 RESTRICT="test"
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index fce63b4f57db..eb210892d3b6 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,3 +1,3 @@
 DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
-EBUILD nosexcover-1.0.11-r1.ebuild 621 BLAKE2B ba25938cfa0cbaebcd2db4e83ec011f8ec76e2b1aa236b68ed64204e17c951206ee0799729732df6f4cc30fff3886274fb0bf612113617247e49289ac14a7313 SHA512 364df3520f7e1dcab788672cc519dde117ef5fcaed549bf8d56e74e5d89c5bd4cba121486c8b8fe77ea4f53f0962414b7c6306cb29a93ed08a3cabd2da82aa2b
-MISC metadata.xml 498 BLAKE2B b05a2fb406d49aa821b926dfdee1f45f12dfdb8bbd40fbbc064e9b3823a9dd6ca85609f860cac25bcf7dea29aa4f6050324fa36c6950a9f2c7240e4ddfe94790 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59
+EBUILD nosexcover-1.0.11-r1.ebuild 557 BLAKE2B 77d8f2b449d395965e7421518461f354d99cc326e30a6b3531e287bdfd81d78dbd5893e9de1e447788512f73082d702f7a86eb904818d9100fee95dc1a58c8af SHA512 a74126e2fe223a26d6b181c0394b50f03791dd2af1388b6d2b5dfbac35f388ed76c2377da2a0b55911165ed3b383817dacd9899dfe80b9a47246931f28dd0ae7
+MISC metadata.xml 504 BLAKE2B 7ca30e311b19179293b6cd03955ca501c9c688c103c9fa1059ea1674d4d3e520463f5415d578b738e16895a1af2e89e79c24b4850027d14d0b5005429abd17b8 SHA512 f19274e0354bf19930dcc1253f46b1384d8d5306b793efeede7faa218797b5584df3f343127b46582a04c94d0bbe81c2f79b4e28ca19d27140bf12b01d1d59b9
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
index f825ccefa690..9985b6febd2f 100644
--- a/dev-python/nosexcover/metadata.xml
+++ b/dev-python/nosexcover/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">nosexcover</remote-id>
-    <remote-id type="github">cmheisel/nose-xcover</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">nosexcover</remote-id>
+		<remote-id type="github">cmheisel/nose-xcover</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
index 3ef465ff9f51..69bb1bd133b1 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
@@ -14,13 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
 
 python_test() {
 	nosetests -v nosexcover/tests.py || die
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 5b4fc2198ba6..b8897dfbb62c 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-0.2.13.tar.gz 9574809 BLAKE2B 8c5f59721ed3294162d9578955f0493007fdcebe5aecb3364abf22add5cedb12de99c63064574ea84b553cf2547af2ac2203e68b4a380527695edd72cf05f6c7 SHA512 8e46ed8d5c683dd93a14890df059a86824fda7f39011570cb414a471c380ed5464cfbe2ee6c8b0c2819d35fabf51ed5495df4c49d5c562fed5467ac2bde135e6
-EBUILD nototools-0.2.13.ebuild 1026 BLAKE2B f27b151d6993499dad34c453e5dc911cee1ca386d257f5ca040b14e59bc0c01a8ebe947909953e1a50c990e327ad4cbc9c647fb9fedb654e471a1e04d5d27041 SHA512 56d52e94623e1982b27c42b8e2c376b5f6fe9468069ce0df06415fe8c101ad830aaffa4d6abded7470f5fd0577201e52cf08997c4a72103d420867841e3a89de
+EBUILD nototools-0.2.13.ebuild 1026 BLAKE2B 2866157bba246f20adca67cda38820a8bcb4ecd49142837ff850a3bda675657ad2b3170d6d8a68888ba416390aeafa8780a67e128062ea3f5095d4c66b25a98c SHA512 ea28a54c72fdd33592062d8dee3e6445ae5be410fcafebd843a6d20b088c69ff6a6963b0a6d9bbf7f60886541b52dd06e47c04a01009e60165e1734973cf9395
 MISC metadata.xml 267 BLAKE2B 2d8b57fd5de0132fa382ac268575d15aea1f698eefa99b03a35c07ea1eb798dea4d25a1fba9deda173404f29cc99c8d519aed5ff5fb60d0779768fa53411542a SHA512 8c8abb99f1567921f504df5c39fd2f54a0cdc5ca1b5c348fa5b0a9c6a3822b474bd489821195ead44237f3ac873b0ac0b05597632a546a41e0bbbb97e71a2357
diff --git a/dev-python/nototools/nototools-0.2.13.ebuild b/dev-python/nototools/nototools-0.2.13.ebuild
index 96ed035ed2ca..eef113000fc8 100644
--- a/dev-python/nototools/nototools-0.2.13.ebuild
+++ b/dev-python/nototools/nototools-0.2.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index e14f9b2d1f15..d4e9772728f5 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
 DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
-EBUILD numexpr-2.7.2.ebuild 1221 BLAKE2B 14eae8624462beede5d6027222dcf56713a5dbb9d2c7cff77802e0604b894c759330777a7ad396358d9bd774ac451bb9daaa485d1f2aaeaf69c7ca888708e3dc SHA512 0ce14ab53b021447302cc4ad8ee50875ef412e9c5529fa17440cb80898130cb2b3140b2ac3552fabdd3dfd8ad16652913b0419b491b4c900dde3d1c56f8f03fc
-EBUILD numexpr-2.7.2_p1.ebuild 1255 BLAKE2B fb4640121f56c475ee98faa2c5c6a9d1598d12a30c25963991d2ba11c31084e2ee1a065f2f77875de33bcca6feebd096dec579d3d1db0b50524da991eee11cce SHA512 def2d3093029d233ed23c6ec5760eda5159cc38bfe8fe9678ce0713a856aed1bceb207a1da0c0bb61c54efa76181370aa097ca1cd15a0f92b2a526e0aa9be02e
+EBUILD numexpr-2.7.2_p1.ebuild 1253 BLAKE2B 985dad5546fb1b9e598cf2e5f26258cd159a84fe1293e1f32d3fbb7e82c9abef534067728f86acefdd60b793fe67fb27c449fa2b535d3ce3f9610d3346aaf501 SHA512 3d0e8b86171ccbd0f31df179f74735ea2a83262a5c201b74c165a9ca04262f11ad9adf95fe7407078773fcf5df2dc14c0871ddc4d4c70da57723ca9b7f5bf053
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2.ebuild b/dev-python/numexpr/numexpr-2.7.2.ebuild
deleted file mode 100644
index 62702d7a6f58..000000000000
--- a/dev-python/numexpr/numexpr-2.7.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_{7..9} )
-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="
-	https://github.com/pydata/numexpr/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
-"
-
-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_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.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
index e3924867b13d..b680a186a9ee 100644
--- a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P%_p*}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f84951d40c4b..ada370027fbe 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -7,6 +7,6 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 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.19.4.ebuild 3722 BLAKE2B 8c4f52962817ab70d1181da8e87978a5a48eafe23afe3d64aac5fa0cf8ef6095178fa877939f4be7cd1bc7f43415587d78aff06001ea787cac8bb83d3513df8d SHA512 623a3d1b3181981ef1702d476589e2659ee11ed45476a74c07365dc6fddea0b215950505c3f9b6c51cb05a1c5960f2c769aa550de6adc94b70c7c318cb69c00d
-EBUILD numpy-1.19.5.ebuild 3727 BLAKE2B 967121557541a3a87abb7010a8d7f266adc1874d27c327cd816de8c23ee4e619563c19a95131a8909f507c68ec22e459d15d224c85be5f01be01a43ab8d6790c SHA512 a7dbe47d9b44e9d5cceb21ff0dfed6ad9f66f9cbed9328a675587060a49dd087b2c9cbe6a168cad1ec39e0e459ecff812813275d08f3ecc7b6b902d8557c2699
+EBUILD numpy-1.19.5.ebuild 3722 BLAKE2B 364c8992a970041f70e2cfaeea819bae6d30c570cef70afe87f0a9756f6c6f7975e610d671e97ec3d4aa8f6c4a0a7b0e8ce0770adc57ea1bcf68cba48d20e619 SHA512 e373e576a3f53beb3d0deeb04b849ea68ca5dce490f0a79f478e1f5988632f3f9e8da2560f9f4b59c0bae5be37ff81f8713248aaff9d6ae8c8785d8d243b6a3d
 EBUILD numpy-1.20.1.ebuild 3727 BLAKE2B fafca319c164ac66f10193f4f364829d4a3ea3eb9e1e03b1261c3348b381e58b91700e12f70a7e026515f54acb1e06e93bca86e82d6eb7aa2f21c25e7e75603a SHA512 188b6584b9c3020768311c782920335386c714ecdb5b97fe1b832882c3df155e4b44fb2ff09a1c90ab5083318669e47aa696da42d31c6ca8fcb3953de05e5c88
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.5.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild
index e6c6ac7a2c12..202cf9422a00 100644
--- a/dev-python/numpy/numpy-1.19.5.ebuild
+++ b/dev-python/numpy/numpy-1.19.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index b9e4654d0f63..49b5f30c58a7 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 731 BLAKE2B 82e39b9ee6db971114c22c57a08d3c8430ca63eaac2ba9f24080aaceaeb176e795c802cdef34d7e8fe977631984574ddf8de663ab887e86a4833cbf0e8a6a1bd SHA512 75a0e81f558622f1b5334925da6f21337404c94972819a62010f72143c052d68ae3423a7ce811834ccf1661da1a618ec4c4715917fb2d89faef10b5e7692db85
+EBUILD oauthlib-3.1.0.ebuild 733 BLAKE2B 724548ecf8f9ccbfecc76babefb80be4eda3d9411b44ad15d44caa37287b878722d02d8739e13a3e78167a524275b1af5c0859d38c48c421fd05af37105ec952 SHA512 cfcaf21c9b4f8f2124655ffbc41016362941e8af7ae50646c348ba02d8b2aa04296ffea26d491fb4d857da01a94681f605c50ea97b106869733c50492be349a8
 MISC metadata.xml 368 BLAKE2B 537cbafa42a979bb60e657d4bfb49fb6dfa3d6a0c749af96bc4daa6d1c7ad070026d9cd0b089426b0f9a5e07ce609325484f66bbfb9a275b31ca1552acb70058 SHA512 9c38212110ac83cd19c1397ceaa7ec1451e58d41400084b3bfff0ea8afe14ff72a161dd9726950cc31e3ab6b5efb4962356de92f32a3c50e3e61009e40627297
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
index 583b8a465a5c..d3e0b6c1dd96 100644
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index a4eee843d783..d615678c00d8 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,5 +1,3 @@
-DIST openpyxl-3.0.5.tar.bz2 2421647 BLAKE2B 60fc12188a608891a63513177e8e3399b3905ee9b4c4ff1631901ce0d99c3e05bc9413813d3c4f7bb9034e1d839f91e9dea5e610795c701a40d99f1011b08c45 SHA512 5f60f746b7b4bd32a018972f7c18adc0552a6d6904fcf1258db3fab28f21aa7b17e386b355ede41365889146e9aaa09911748a26343788477fd72ad5d1264974
 DIST openpyxl-3.0.6.tar.bz2 2423464 BLAKE2B 205db09634730a1da6c24bc8c407b2f3deeac712b4c2cbe69796c538c6911ccb3e7e003617ab9563df12a74d6ca9fb2b1b83d8d75f3b91c168d2053a14c15d66 SHA512 6996800c54746dc41b902cbea378181cdab5db916fd6863c673df25f84f71de67019e34d0034231d7c588bf56be3f8e16b3a52c198dcbe74465d0b088090c24a
-EBUILD openpyxl-3.0.5.ebuild 744 BLAKE2B 34f83c6964102637cead1f75c3101a40a71430675e086d8b919bd8ec7ec4ab3efa4b5c24955010f11b8d0a9d881bd6603598082a7f85586caea77e465f1c40f7 SHA512 2ecf665b71dd2ab4392e1e3cb2d053ca579ac9850e7a70da62c7e34f25bdd022c7092eda56f3292b85816f0844c28526c2e9c1557d681ccbd865af51f7d338bb
-EBUILD openpyxl-3.0.6.ebuild 746 BLAKE2B 53ea73a892889a778d208ddb3dd3b5cfe15c9c97a1f3f7295e658e8844bd9d7ea622b5ee6c7a2e37b36a9d1439e29e2a357752a63b3b635c8ce161ee290e1ba0 SHA512 71060ada73329de3e06d4618872631ec2c5c21a3b79a8fa766f86ae548119a007b280f3cbad48466d1b868dfea461c5a6e405f3cff104df29639aa7912003dea
+EBUILD openpyxl-3.0.6.ebuild 744 BLAKE2B 42f98d2b8105d362e8deb2a92a512fd268ddd039cfa80852a34e817445ddb97ae9a7829ded9a60a8e599eb17333df03e39c07e5a9ac9dc8db60e6893943cf581 SHA512 f194262d4809c3944c368a0328f7baad5bfb17d08784ab59f3ee50c331e53b32c14aa7c1bbf723d3a2659fba4b3a4cd03fe6f39b1fd3678831a414ad7921453e
 MISC metadata.xml 535 BLAKE2B 59a57dfa41a492b88402a893a4c2e1a6bc624ada24584744ad2c142d1ba9bbad0172450e17cc2ab62068c7964c08066499b4cae59e39aef81bc7714ba86059f5 SHA512 30500339fc951ec3dbef77bcb5b0298b33bedc78ceb4733f9fac689da179096396da308214f012c40c54f718d74c6555b5795d763db197dfacceb46441b292a5
diff --git a/dev-python/openpyxl/openpyxl-3.0.5.ebuild b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
deleted file mode 100644
index d52952c870e3..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-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
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-3.0.6.ebuild b/dev-python/openpyxl/openpyxl-3.0.6.ebuild
index 9fd6af1a0304..d24e9796e587 100644
--- a/dev-python/openpyxl/openpyxl-3.0.6.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 14fe217a7460..ff82c71231d9 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
 EBUILD oslo-i18n-5.0.1.ebuild 627 BLAKE2B 1d99c3cb485baef522b2da404274645be249cafcc8c69ce1327d4508f9b96cc2eb842dd93d00d00a77f21e48998b4376215fe80b0acde105f10c43e3e7b02eda SHA512 e0a40dee6e819527388e4ed9ce9f2fb1e362d15115cf8d4a6cafd89be1b3a93177b9a2b767fea0aa9bf5c654f0913243a97749c0ace9ea83c196b4281b048fa7
-MISC metadata.xml 389 BLAKE2B 70118e890e9ac1e69a79f69fd9fd9b5e0407b7063687156250348f234696aa5ff2bbc208ff0c33b51e8ad86aa7e8b26752961fd1ad6787a56a15d86d76db84b3 SHA512 f083e278fb78f677996615aa69b7dd46a82484dc1d8a392e2ace0d1dfc127ca03606c3e0217ea68780872ce6bdd049f4b636e3ecaaa22da71031d4aef54faf78
+MISC metadata.xml 504 BLAKE2B 646830c9f625ec395265019b730dad69b5359ec85c56bdbd84b98149f05ab04381cd44f8952bcbe1a939dc0b09c7ee492043d4b0d2ece0b0b04bfc7124f6e675 SHA512 305c7352a138341af2ad61c72928e6b3a0b1f6c86d8aab8aa5636a7404161dce1500a482cdbc4c7c08ff7cbc7f1a518302195f9edd95ae65ba2657f1ff75b169
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index d912facf3701..622ac75e5084 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index bc7a2cdaae30..54d951892b87 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -2,4 +2,4 @@ DIST oslo-serialization-4.0.1.tar.gz 30010 BLAKE2B 0f5dae22ca096b1dd7e4eb35862c9
 DIST oslo-serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
 EBUILD oslo-serialization-4.0.1.ebuild 899 BLAKE2B f62ff87739420024229f0c57e3b479450392c303cd9006af91d6ccc70463ac390e0edba9ea43f523b05f263ed71e7daaffe6612aa4dbdeb67d8b143ffe403571 SHA512 22c86662d539a0dc1051f6f920793bbd3bd7ab7e791236d5d9c240e7473b0f9234719da550e8b71aa5ee547cd98b50450c488869aa79f6113734f727ee50ca01
 EBUILD oslo-serialization-4.0.2.ebuild 901 BLAKE2B ce1a73ce008a53152f872840a3194aa412a60acdc682d01f0175c6d6b5586a2d3c885104e80736658e451c37ad76de4330a8714c20742b69559d6bfad8f51515 SHA512 250c57422eba64fc8568d4d929efae6bc66aa827d807efb977a3b9ffd24694434916a81ac79793435f99a3d285a6bbe2c55f851c40be8ab0303bf8799f24b551
-MISC metadata.xml 398 BLAKE2B ac2bfcac65533a713645d95e7fedcef140c190e4018895e378a726f2f7fd256692fc142031cf5c6d760cbfac2a641e548d000e7c38cf07103d9f93025a662156 SHA512 4575d64908b176f9241be2c9b9981d33690e5af57034c3ff1f8b135f355095ac157908858ea9968c00e6b4d4e7ec2b229c972ed33438bfb0c65618194694ce6d
+MISC metadata.xml 513 BLAKE2B 019650e2c80bf2578f18cafd2479e411976d0e52b3dfcdc6f072e90c2349dd700de96fbfffd6a54729b5d2114f2b10e45760c43a1efbe93f2d903551aa4bbd6a SHA512 701020897031a3a452366bc192ffcfc79bb94c1af69487fd8d2f4c92e7469191d89d9be53994291053835ca06c00b613ad8dc09988938972d2620755cbf67ac3
diff --git a/dev-python/oslo-serialization/metadata.xml b/dev-python/oslo-serialization/metadata.xml
index 56c3dc08940f..ab620efc50d4 100644
--- a/dev-python/oslo-serialization/metadata.xml
+++ b/dev-python/oslo-serialization/metadata.xml
@@ -5,6 +5,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.serialization</remote-id>
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index f8280db25bd7..0edd7ac74e0c 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 797 BLAKE2B a3756a5745f51be3586f83da5f5b55c6bc94b07979c6f56d8478a1137faf5f091f421b957d937391bae682f19f46ba87c4e24fb621036a591aba8a11a7d1e8f2 SHA512 44d51c92442f950edee9ee5030c518df70b6517c8835bdb4706519cffde12e2bbba7b5c0e5824db2b0a5768f520e780c0a9e57ea983857182cd23c16e635a4fc
-MISC metadata.xml 450 BLAKE2B ed2843d297ca834a5c1fa48afe5a0eea2c85c4946c61b3cbe8c41fb28c56c33edfdbb2f092847adefd4f12e5c0501b1ef096561944ab3d67db20e85520e4e3ab SHA512 28dc3e14e04c5a12a3e05450e6fda5d48b94141fe16815fe693c68a5d5f571504d794521befe0cdc7097e274a6cda81ade3198239b48b15e3e33fbd8b92842b0
+EBUILD oslo-sphinx-4.18.0.ebuild 748 BLAKE2B 69e0c7ad8601137b9577905e6a749015c52f5bc987da537522afb3dd925c56f57217da9319d43c7c95a6e77073f55a11556cf19e3d0ed6ba47a78130da96fe4d SHA512 586bca56b7841166655ab1914473ecc780a596137183b0fbb7f66cde8d25aa8c0d35ec87da6201ca9b7c7a4daee559f814f70651e234cd3e8374155e753cfafd
+MISC metadata.xml 475 BLAKE2B f8b58d6ad4b1e89a60ac292069108af907439ce98264dde7ab08c83410521a732709e724a63955701b0a6bc1a981000874a8676139a2e717894757a51ef1ef34 SHA512 d03cd6bb3bee4df0ee1620085e11db50d462ce47b59af2cb21b748a65c884108a185447b7a2b16c60bd67cb59a0858fa4fbd2690c6420f2d20010d9b752af481
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
index 992b0a428821..aa9a0ad06e6d 100644
--- a/dev-python/oslo-sphinx/metadata.xml
+++ b/dev-python/oslo-sphinx/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslosphinx</remote-id>
   </upstream>
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index 1e2d304adf29..eefdbeae4673 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -1,33 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 MY_PN="${PN//-/}"
 
 DESCRIPTION="OpenStack Sphinx Extensions and Theme"
 HOMEPAGE="https://www.openstack.org/"
+S="${WORKDIR}/${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-"
+BDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 88dae69b8b4b..0288cb62751d 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-upgradecheck-1.1.1.tar.gz 15096 BLAKE2B 7aac69c8078d8f6e89c16801fc61bf9d44811b2333ed67d4f2b8a9e432dd8ecb1f90010b796965e838267991a16c0f5b19f25afc98cbb6458906e3af656f91da SHA512 89b7fca8a95195081e83b336d3e55a9c67802ff3b88fbb5849afa7c7424212c03c3a96a916a6a62bcab18ac002f73ab7a4dcc92859e6bcc9b4002798756040b2
 EBUILD oslo-upgradecheck-1.1.1.ebuild 847 BLAKE2B 2a1fd7d99fb4d2cbf5d572a257d063876873f0fc29bdd48d47ba23798a2925e4edc8d8e29e25d4c5d09a3e01c4111ab5511cb7efe0238c0c676f54a53b3bdeaa SHA512 fc86fe7b414798b57ef6cf94644ae676f84e79afe5cb31027c307ff76f06ace0acd1d12c9e131f8d48e8c9c3463826d3c773dee6fbd4bb179b053e8f689f3409
-MISC metadata.xml 397 BLAKE2B 50bee461fdbd803e7600a18b7a1ddcf073c2bc5eaf7d457b0d7d7cabc7e7e5b53da4875b1729aa9331699cf152eb0796af280297179f0daa1ed9d84fc1176998 SHA512 3620622e7c922e821acfc45d9cc1d7344eb65fdfb184e6588a00e4e0e2e1a9810637e45be997135f45d572dc417bc96c45dad2480ae1110dbe99d7d67df6af05
+MISC metadata.xml 512 BLAKE2B 09d6a1d534c20f95906ec848d520c0148ab325f8b3196cf1f3c980dd7fdc4b1323db8568d531be8eb44865aba3673080ff304a1fc791faa5d7668a586d90bb23 SHA512 07348d3050144cf668994ff2e7abfb5e5675dbf0a197a68171992983bc02a7cc9b9a7f6c9f1097b5ccd0855314e352e5f9457d872bcacd71eaa23a2dee31d402
diff --git a/dev-python/oslo-upgradecheck/metadata.xml b/dev-python/oslo-upgradecheck/metadata.xml
index d982e4d49536..5d9cdad2d230 100644
--- a/dev-python/oslo-upgradecheck/metadata.xml
+++ b/dev-python/oslo-upgradecheck/metadata.xml
@@ -5,6 +5,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.upgradecheck</remote-id>
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 66c493051a6b..325d636f4e39 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
 EBUILD oslo-utils-4.6.0.ebuild 1037 BLAKE2B 78cbf59da8cc7032ab0f34e75e19444e39435e4d12db606b4a96af7ccdb2f6d75572a0627ab2bc9f83fe51ad75fc0d893519b21f7bcab7f4d9eea17f60641faa SHA512 e129a2dbb02f9783d2a324e4603c582086e58687a61bb440878d6e05edc5d9e4e80639b72451e1c74b575c2bc93af0af24b930355d9fed8a5cd42bddfde2ecc0
-MISC metadata.xml 390 BLAKE2B fccb591d0e5acfaa74a65b37dcb9882d6ef03b62facaf88d5f422bc2815eb32f1616c917d5c7faaccf17abfaf377c35b6d07970ad2c58aa8e267b9b384f0a153 SHA512 7d2445b99524c026c551f5e49d60bd4d05cd6219355a212b444e64e517acef1b63e84bf25daafb3cd902edb74337672983e516389e8f7c3cb26e5fb129c60db9
+MISC metadata.xml 505 BLAKE2B 2be3ef3a19dd451b4744efcec650e0764602364ada8bc2e6d266f7ef7c540fc2ad856d014438b4e61a8468677dcc10a395b50ac2393b09bf463324af830533d9 SHA512 9f902ca86002de14fb0d0099c834586ae2159819fd0a0fd198a13eb9a7e0505d8b7b31b4c0aa7d6b4c454ff96f9177c2f4d873f8237c543979d5eb2b6822e97f
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
index 10f43e26e551..a94aab1f931e 100644
--- a/dev-python/oslo-utils/metadata.xml
+++ b/dev-python/oslo-utils/metadata.xml
@@ -5,6 +5,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.utils</remote-id>
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 930f65c1d57b..d908b5722ee6 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -2,4 +2,4 @@ DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de
 DIST oslo.vmware-3.7.0.tar.gz 334704 BLAKE2B f3dd399a1cc53904070f687e1d16915097ed78147270e32c3ce71ff7621c19229a5ad1ff345bafa794567a41d83bfa613f87e07ee08f04b90b62d403be0cba63 SHA512 e9a1b0303b7208fd8071ba5c2a677ec09568cd837489d329667f9e4eb93b5aa56490fa1cda9b7927f6ee071c5b44f302742f80bfeab9812d38c3c6376b5d117f
 EBUILD oslo-vmware-2.32.2.ebuild 2299 BLAKE2B 7f88647702e6ba9fbccec13f8de11d98c6a84ca380487a326b19ef4bdac7e1a8ff2c92fadcd6d90ad29b89a0c3c7e19c410ed809b8839162853183dbc39a6b17 SHA512 fd976000061fd1e9c4d8e5203b04f45e3af2d8ad73607abafb6f81a4acd6fcfeed7b8a2fd426f10f0d34ece3ae9a168deb0169ebd3d02fd8d96242b51fe0c892
 EBUILD oslo-vmware-3.7.0.ebuild 1329 BLAKE2B 6000318631a4f9106b3a37eba7e3f4b41027b3d7b171e5d2bc00626b049065ea5e4645bc74a8a27f5ee9401e95245083512dfb287db2c2d762a35fa151db10fb SHA512 13efca58e6627be24a2fe8aff647726fe045eaac4f27c0ae117221c929ea345fd3ce8a2a2551444a22df4a67ec5320429360d4a346fd13910524bc393870b7ef
-MISC metadata.xml 593 BLAKE2B 12ae5b1880121a203586e9d26052867916f2732343a66ad6e4348d7ce42da481ce8bcf145c812758e125b9fb381c4cab20fba42f8a90270e8d5c113844ec2d98 SHA512 f5e0c0510412e6d1c8436b6496870b0c9400ee1c91915f0cfb77a7276d0a39c248da1dbf2641597a4f4ece5a8641a1c2973788544062defca3b0b6127a6e033b
+MISC metadata.xml 741 BLAKE2B e75e7b1e8881a39789693e6012ff813834af404b0f0749dbcc339b27dbbe020135e3c62a4c018b68b4c2a49a212c4510450f75ae04c3ee5934d35773acae0ec3 SHA512 9f2627ea755e2cd5db0d363cf53352a206bebbdd023d4a528c580717ee87bab1aa1292caabaf5d9171090861e7eb1dc8ff32801cf6a1003917e08d9b684fb56e
diff --git a/dev-python/oslo-vmware/metadata.xml b/dev-python/oslo-vmware/metadata.xml
index fa6348cc31ac..9381b7916661 100644
--- a/dev-python/oslo-vmware/metadata.xml
+++ b/dev-python/oslo-vmware/metadata.xml
@@ -3,11 +3,16 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
   </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
   <longdescription lang="en">
     The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
   </longdescription>
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index b1717d59eac1..e9becf4544bf 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
-EBUILD oslotest-4.4.1.ebuild 657 BLAKE2B 10cb7e2836798ef761af26cddef1a69af644b3b076d3444e0b0ad19ad45aad2ad0bb1293505261de2a831ee4804dd789ad8da69a435f38e30bd80b75b4754dd9 SHA512 e2e0c65110fee47cd8d850ac344845cd6e2e3393134b8488e9dbb4349e83d72d4027f7ab2a5c5160071444b04edda814d94e9f4d870dddf4f62814da39ffa749
-MISC metadata.xml 852 BLAKE2B 423996fbdb94f2c1ddff02c10c5c122af18c13abf713a926faf2e8597f88b31668e6a9ab992590be91031aecc1edc5e8d8d124e1e7d4010413897f68b578feb7 SHA512 b6bdfcd5b63179535c665218dceae6691a75ad4f93db104a9f34426c57d9415a9e85303975810a55b0f6ff9b6755fa3d4f4af0d6eaeb191f8812794b489aed4e
+EBUILD oslotest-4.4.1.ebuild 625 BLAKE2B 65c72d58a57a8bb3083243f65e2efd89c3f38531719b6c381ea9118db43a8b593d85d57a5690cb980136606366e42fafbe59dac38c3bd32defd5dca6d5d5f13a SHA512 e8838681e94c4bf4419afd4f80dd4dc7ade043ea12f13816e06fe9058b7374071867782b0b28c8aba7ba9582299eb592f5e3327a6d14095e66b11df1c21c52a4
+MISC metadata.xml 876 BLAKE2B cf0d406713d4859baa20404513835b83439c92a99ddad4312ce94769c64fffd4d4ef0dd11c06427c09393b4f151491733efa0fef14e49acc2253f3bd0e9d60f7 SHA512 b38c2229b374a960bb060ddb65efe97b9e6fa6d9cd58c0f6de60702ba8ea736cef1c79d08491bc12c4b1dda633e2c7a6b053744bb28e47e6ad194014d28c6b12
diff --git a/dev-python/oslotest/metadata.xml b/dev-python/oslotest/metadata.xml
index 9a4fa610064b..744a6574549f 100644
--- a/dev-python/oslotest/metadata.xml
+++ b/dev-python/oslotest/metadata.xml
@@ -13,6 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		OpenStack test framework and test fixtures
 		The oslotest package is cross-tested against its consuming projects to
diff --git a/dev-python/oslotest/oslotest-4.4.1.ebuild b/dev-python/oslotest/oslotest-4.4.1.ebuild
index 481fd0b98eb3..7757b1705f2c 100644
--- a/dev-python/oslotest/oslotest-4.4.1.ebuild
+++ b/dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Oslo test framework"
@@ -15,10 +14,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-"
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 810adf62611e..91182273a597 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,5 +1,3 @@
-DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
 DIST packaging-20.9.gh.tar.gz 78041 BLAKE2B d87c66aa39cfb832a26a350981722ad40a9193b70ca447030405ee474586cc12e4ae5f4dc7fbc5da6944b717545f3d3f7caac376a3da1ab95aa26429723dc6f6 SHA512 fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b
-EBUILD packaging-20.8.ebuild 939 BLAKE2B 7592e43f212a7509ad7c4c309291046fc5bbd112a5e4399ee7a5479212b20c995b83014700ae205870c2a5257d2f072ef87efcf23f5521560f8d15f28bfedc06 SHA512 9103e7582e5c67d9c445590ba4d8a0598eecd0ed5686e6491206ab44089c0847db8ddd7978b45bdc4ed2b795ccb7a8748216a615dc6942e4e69b93224aacbc90
-EBUILD packaging-20.9.ebuild 902 BLAKE2B 7db389f5c4e6fac7b2b87494e808533676d1be62b365b7104623096ec65b8d5cfc685ec80a824569e0e4412af130c2820e71cc67685b31d346f5c98c169f61ae SHA512 3c8dc037a95b4e30f43af27986f3d9dea98c815f8b4797c8afddb2be8dfe3c178dda9109771833a2e4832334c2d6d147eafc28fbfd6f2e0ea06f4c4cdcf9e2b3
+EBUILD packaging-20.9.ebuild 893 BLAKE2B 6bf5e2476de2ba1ca8f9e8ef309a1a5bfac1312bafa66e414c7e92d0eae521b1c6c60038d0d2d1332d6460ce7124c744b21c035cf1b7b0dadcfa76232fddd82f SHA512 cd8b7b1f3080b8b0f19cef37b68dc3199f6b6812afcfdd2a33d33e0890012bb7290be6642eba9791ef613d79e5678e9e1eaafe27db46adb58ad8c2645eeb7e0b
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
deleted file mode 100644
index 38bd0ae4f8d5..000000000000
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-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 ~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}]
-	)
-"
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
diff --git a/dev-python/packaging/packaging-20.9.ebuild b/dev-python/packaging/packaging-20.9.ebuild
index 7b526eafdbd7..be4e5dac3f7b 100644
--- a/dev-python/packaging/packaging-20.9.ebuild
+++ b/dev-python/packaging/packaging-20.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 8e4fc752538e..9206368ef9ab 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -3,4 +3,4 @@ DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de0
 DIST paho-mqtt-1.5.1.tar.gz 144740 BLAKE2B 1c218f1109476fe9b28c26e1113717448377c53a2b9e01437f93d4a29f77e3b61f59492c263f160825ddcce25f907dbf72d3078954cc378d4846afb435d79bba SHA512 7e686bcc702f70c45ab061aa9833d42c4356d5002d27a035a685ca384a5b7d5e9dfd88ac95183816e08dd131463582707acd1d2e0f6de0f7dbbb6a6d0a615c97
 EBUILD paho-mqtt-1.5.0.ebuild 738 BLAKE2B 1a8736833e3b0da1c55b9988ac8295b23d48c2cd792de7adb7c7e77b5ae07ff60c670c58b611ccef8ab63923989c7a1761caeb6d1f1b5e86238e9d0738e91c4f SHA512 b2b2c14c88343032fa2db85bce618576a64344a8a4d7a8a67b03df92a8d19dea254e4cfc9b6ecb686628ad93c4ae9b576f916a7f6dac54460f9a2ecea1d45ef0
 EBUILD paho-mqtt-1.5.1.ebuild 786 BLAKE2B 36f66f1312114a2fcd2a20ce7b913faee6d114db882fd0a6a8053d975af66075bafae56602a69173e5b10fe331e4a3b75f42af981d136db22dbb9e43425fbccb SHA512 e727045607e66d503eb184508bf14d1a3bc34a3e2f6ed09855958340393f7e0dc00ab6f73740ed755c7314bff3825b86d66c25812ae989aeac0b56efd85810e4
-MISC metadata.xml 382 BLAKE2B 4b8014f52a3e0dc85819059010281ac9a570f2518c213697f736153333330ed616069f1b34810b9e74b600cccb2762089b9f81b8b04882dd6fdacd52f2817921 SHA512 8aa74f0eb6cb5a6d0cf897bc87514263cfb417634d76aae4299facab44eab8f199d31288e6bfe5f8c6a473f4c647dac9545b1215d6a66af17fb8a4b06dcb9a9f
+MISC metadata.xml 406 BLAKE2B 3edad370c32eeceedc28a3b879d939248e634b15ca2c011ce701dfd466751d1355f5909b9e58184e94b5903c1ecf1d17db650577fa2e4c5d94e83cf2471dbe15 SHA512 fc13d1eaab56f27293bc287d9cf76321662f8d6d429ccacd58faacc7b6cc1aba69bca105ff84688044212c3fc62a6bab6b55e4a693a0f5000189367dfb6f070d
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index 21bd771b3389..1a9f85887544 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">eclipse/paho.mqtt.python</remote-id>
 		<remote-id type="pypi">paho-mqtt</remote-id>
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index f32cbec3cf6d..ecfac83718ef 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,3 @@
-DIST pandas-datareader-0.8.1.tar.gz 255516 BLAKE2B 9bd63cd887ce011ff71671d962db7572b1281576f93f2c338d16ac3e4de46f2cba7817d17af010dc73208d550a0b752000321fab90466ac85988c393b95f36fc SHA512 211300746a748f60a141665210b842b4885dfc75165247d016c81715b98c894b06f758b1f16442e3136b18c9f9be422f8bcd1bbf037a247203273c31abba55c4
-EBUILD pandas-datareader-0.8.1.ebuild 942 BLAKE2B 479e450c86f57180b5996f8f5da9708f93a972420292703b9da6b70161c32f8b504587194264d3d2fe003834e657b8d27c21dc6a38a36e9e33e702bc612ef764 SHA512 2d2335d9be8322b4be15032d2aa99b01fda68c2b8bcb659490f6ad694cb2c24701b8a06e6673ddcef6f8e1e3c868afdfd50d2304c678a16d1a55078f73aff368
+DIST pandas-datareader-0.9.0.tar.gz 261026 BLAKE2B dc8211ceb718124095896dce9de0d752f2c5c7bce022dd5197a6b3851ad8727e298b34d0657f76c9c40ca31b1cf76d8a467af251aa9131f921990e6f4f9ec25c SHA512 5ef2e06b6d02e2bc213387f8649e02c9ebd6df679da8ce433d4e8dd2c66e8cbc214a9cf9a4bc83ac2c7ad917cf72a9e6b09c9398623718736114efdc2c3e2815
+EBUILD pandas-datareader-0.9.0.ebuild 966 BLAKE2B 4c6f49be7b8b57dd9167046d665109fd45fe96889416460e5fb55e012dd0c4ba03c05a65d87bad462336fd4ac17a7d564869e24cc58c883c3ad85d9a2600ba00 SHA512 1bb64bd7cb35e8f80e3f54a86737fee4222f2052944ab6f31a63a2e5891ff6cdff59ec181ddfa5674cb1535d441f9f72c95002a45b42d05702457986ec314f6e
 MISC metadata.xml 748 BLAKE2B 70a14a335497d3442aec1f3bb178df945728622aaa31d990083f277eb4157b32b79462d2a9b6c2dab1f64bb776fd712c2156c309c236ab63fd2e7f6a5729feab SHA512 2dc752a690dd84ad0ed7b56002f6991dfc3c9fc1c9c21d630dbdbd7f69289e3b97c68fb8d3b3a512cb11041656dc4c59bcf6f7a0279e093b7845729ea2a6dee9
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.8.1.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild
index 23b573b7571c..30dc4ae56e33 100644
--- a/dev-python/pandas-datareader/pandas-datareader-0.8.1.ebuild
+++ b/dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc"
 
 # Test suite depends on outbound network connectivity and is unstable
@@ -25,12 +24,12 @@ RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-"
+	)"
+BDEPEND="
+	test? ( dev-python/wrapt[${PYTHON_USEDEP}] )"
 
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 82ab2a0fed24..e67de05953df 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,9 @@
 DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68273ee870b386aa8562be4c8f667137a4a078eafb2a62847bdd6f73c390254e8024d483c21e1834a8c49d44d32 SHA512 a213690ea658554b78e003a30cc88a59e34195457401d84b1cafdf74433ad27c801c12b8138371bb0206f6dc083ae882eabf0e33cb5733fa313e9f3257d48823
 DIST pandas-1.2.1.tar.gz 5459053 BLAKE2B 49d99e7217d52f1233cdff20628da9028b7a8ce1d89a5ebe502c6e960ca9f7948005e7a63a15b76f9bc44ab5f15e00eef86c3b3179e6cad820e6f5072c7c78f0 SHA512 9bf9212ebdd07785f1877f5f80d6a5beb4637e8a1cf741e32a705a48724280a8e8daae209c66c1a3f00718b566127d77af578d6c72a5d9b68e2b03784c604083
 DIST pandas-1.2.2.tar.gz 5463571 BLAKE2B e27e032bb9d6abb6f40d1a15bc7e9796690f0bd099e5fc7704cbd5b40b37c0f277b462116bd7582263abef8f728d3109f6c4c425cac427f0c750b019fd5e8ad8 SHA512 288ec9f3a2042c2a376340ddc25b4e2d9d3c4de146468316378269d4b70fb271241acb9aa5295415d8bebabad859a9ea9dc95aa71a68f06c2eba73809b9b30e2
+DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 EBUILD pandas-1.1.5.ebuild 5819 BLAKE2B d2dfb6a5df813628a733c02c4fd4b7faade174402283c54a687a5b380f68c3b8d12909453575068ce5bb2f114a28bed3b449ecfbdc38cb445f4c3205c9e5618c SHA512 fe64e04b59c0c72595e61ebcd15eb7ae1131fb29a184c087b96ad91decd77ec51251aa99dd475f91c04d7010be12907ec2cd32fec1fd837528bf063306da5d22
-EBUILD pandas-1.2.1.ebuild 6129 BLAKE2B fbf314947b6cc67a966e664f5fd34611afccbc4a5de5b5c6c62a8ca7e45452984f8416979fa426b02dcf93f74e0c1a8226b30b66c0957cd40d2e1a75210b4c8a SHA512 9888c47fb7d822613a3b121592a4b403d562771b4d8d88ae3f1ccdd1d146e0463a77bbb9b983588642101503f38706a719e9a9a347618b287687de49532df00a
+EBUILD pandas-1.2.1.ebuild 6128 BLAKE2B cb4f841c4f752c08cee096fb1631f6e954426c074e2cf43f0f1a571397562497920e4a53cd4e1d07d93887765178115a9505113751bf29a96e0acf5854f6f7c3 SHA512 5b19b8cbb936a76b6b37c57f1300bb1d8f3a756ff10c0b4996a4f944c087ffbc67c32693f8ea7f919c2b8a69b62ac394fa099f9326903bf0003578cc1dd569c5
 EBUILD pandas-1.2.2.ebuild 6129 BLAKE2B fbf314947b6cc67a966e664f5fd34611afccbc4a5de5b5c6c62a8ca7e45452984f8416979fa426b02dcf93f74e0c1a8226b30b66c0957cd40d2e1a75210b4c8a SHA512 9888c47fb7d822613a3b121592a4b403d562771b4d8d88ae3f1ccdd1d146e0463a77bbb9b983588642101503f38706a719e9a9a347618b287687de49532df00a
+EBUILD pandas-1.2.3.ebuild 6129 BLAKE2B fbf314947b6cc67a966e664f5fd34611afccbc4a5de5b5c6c62a8ca7e45452984f8416979fa426b02dcf93f74e0c1a8226b30b66c0957cd40d2e1a75210b4c8a SHA512 9888c47fb7d822613a3b121592a4b403d562771b4d8d88ae3f1ccdd1d146e0463a77bbb9b983588642101503f38706a719e9a9a347618b287687de49532df00a
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.2.1.ebuild b/dev-python/pandas/pandas-1.2.1.ebuild
index 2bfbf0f7609a..5a54eac96e6e 100644
--- a/dev-python/pandas/pandas-1.2.1.ebuild
+++ b/dev-python/pandas/pandas-1.2.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.2.3.ebuild b/dev-python/pandas/pandas-1.2.3.ebuild
new file mode 100644
index 000000000000..2bfbf0f7609a
--- /dev/null
+++ b/dev-python/pandas/pandas-1.2.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature 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/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}]
+	>=dev-python/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.21[${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}]
+		dev-python/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-5.1[${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 '/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 deselect=(
+		# broken on practically any hardware/CFLAGS but the one
+		# the patch author was using
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# weird issue, doesn't seem very important
+		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
+	)
+
+	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 -vv --skip-slow --skip-network \
+		${deselect[@]/#/--deselect } \
+		-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 "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" dev-python/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/parameterized/Manifest b/dev-python/parameterized/Manifest
index bd9c60bce4ff..6358cfcd03a0 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,7 +1,3 @@
-DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
-DIST parameterized-0.7.5.tar.gz 21830 BLAKE2B 9ec717797f0aed058200ec3359a20d83f3c21f36b112c9395a6d7d20e5a28eb00c683e7829ab3e8ac161cf80d31b820d14edd0567fa569f29aafaabcef008dc0 SHA512 d7d3665f0ffe5449eacce2b0dbb01a0b8a83c0afea8a62320d49e3ed71996d5cb3a8ce51de58c17d41edace18c3491587d012c65d1d8990edf3b6e2553afd3c0
 DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
-EBUILD parameterized-0.7.4.ebuild 528 BLAKE2B bf4db038458729e803347981ebede57e97b88f983ce982ec1a9399e14ffd64eb5da94fdc028da7ca8dd2ee395c4c5f39f37baefa3e4c93a4033f7921f2fd8e48 SHA512 6a59fe6d6095cd8cca25e884c515c01cbbafde2dade209649d83b4c2da1b256f33fd53ac4571a4c19984a571018ade4f2bb6e5b8e7a4e55df7e8c9b53b377141
-EBUILD parameterized-0.7.5.ebuild 533 BLAKE2B a2c3744f4e240786fb90a060beb976cb4377754cb9423428cdc96803496c2cf512b796727ce7ece72529e81a0c48b8efe01d0f8774943972be3dd850d3230f4f SHA512 2cfe903912bf44c2cc4f23a8b228f2af60480e4a89657fa09d6f88f4c289237e402fb157c0098a9b7508aa76d2580d1f3d51e4d6d289041678f8725a42729c84
-EBUILD parameterized-0.8.1.ebuild 540 BLAKE2B daeffd97e5e30ce952106baaa82af28e09e20c9c1bcdc1bed6428ef464d62c75e4579c7485513a882353ab342c853defb75474c1fb836b397e5f2231dc255034 SHA512 0157b4b00295debb3d68e2fd33f9cee225150394ef90fa131be4f15f3ec74bebdbc292555664a817a0dc0e4d13a9058684903dcdb10a06fb14b249b68630a887
-MISC metadata.xml 293 BLAKE2B c517b622aca43d34db85ca377dad646f979c601e5adcf20f51ef84f10b92bc3e07ed42eaa4eabad883bf720fb000aa744ca38b2d418370435d5207f3d2f33aa7 SHA512 efd47a3325bd1ea4c343cf4bfb0ee0dbcef1d38939449eb5b4257c6d97eedb9a60e3d2c2930dcbf503c569588ee38317aa82e0e27bcdfe6b39a805b640470548
+EBUILD parameterized-0.8.1.ebuild 537 BLAKE2B 038c4bd58d7826ea18b504f4fa6a6a76c591b6f52193d9431edbc6ea4b28b2ae7e443d1733544a44c38b84c298a1853c1828be438f9348d3bd7e25292f16b05a SHA512 66511b83377de883405f5ddba6becb6ca02d661cf19a40b3d929ab246f59bedf77a73f747c01dfc94c2bc23054d6312b9bcfc06b63fa66d199663115bd2c8d2c
+MISC metadata.xml 317 BLAKE2B b1ce95ec42418491f1b046e126bc795d39ce0d09fd321f1f3f4e43a4c23620e7fe11f53f6801e8961e40c693492d0ad92d590d7ea370ef99baebb6af26fd81a5 SHA512 ba150667e4629927575df71e855e12cff065e061fb28f757f452d306f26afee7436c2bc2491bf73e096ed37d755a5b791050aa8c201b388aeab1254ea54d70bd
diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml
index d0639ce03a36..234ef1f3e9cd 100644
--- a/dev-python/parameterized/metadata.xml
+++ b/dev-python/parameterized/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">parameterized</remote-id>
 	</upstream>
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
deleted file mode 100644
index b1993de5f13a..000000000000
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/parameterized/parameterized-0.7.5.ebuild b/dev-python/parameterized/parameterized-0.7.5.ebuild
deleted file mode 100644
index bee3fa060131..000000000000
--- a/dev-python/parameterized/parameterized-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/parameterized/parameterized-0.8.1.ebuild b/dev-python/parameterized/parameterized-0.8.1.ebuild
index 7d4c5eeb252a..f2b02af469fc 100644
--- a/dev-python/parameterized/parameterized-0.8.1.ebuild
+++ b/dev-python/parameterized/parameterized-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 06b6fc9d6be0..483b4cec082b 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,9 +1,7 @@
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
-DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
 DIST parso-0.8.1.tar.gz 393403 BLAKE2B d8d2a025dfb6664d8deeabfc621f4dcf0c6f6e0769dc3a7081888436cce39685f7749ee4ed33c501e3690bec0c8b21d18195d585a8baf5fa8c1b1ae1bfad5680 SHA512 10cc36a4f288d06b8d06bf3995eafe8c6b5d46d0ab01ce6db4557c82f8c64c6792b438a5b7dea570a9690bad586ab4216161268be9c1979b91b3af50e1c8801c
 EBUILD parso-0.7.0-r1.ebuild 735 BLAKE2B f4a528e4639cb6eb70f830b234bd8391281571e9c7a3f21c02cc20b2361de21888be0549b356f4a9643e692fa2ae17471ff9a7a87a6edf3826afc73349441ee1 SHA512 adb6667165cee33cb3d46d737473e8d5c01b7313c88d2af8161a9933f6ac6c6ab70ea098574cf1d0f161cd5a02ca16ad2b5abb99c23ac7932a2501f8aec6a3c9
 EBUILD parso-0.7.1-r1.ebuild 548 BLAKE2B f9a02b8e9e90ee69923dc4402a9155eed1b57401e4bafafc8efd0e7b87ef648b00a9c351dfb476964fdd934d7b7ba2c78856b71a96fc2aedcbc39b5a5565f0bf SHA512 ed49af1c6e490bdc2e05bc90eb8681f748bbfb2c5d2cd0a9e68b4851c9bf6402b4e62031c4ab45cef3c4d1a7d8f18840bf8aff6924a4b6ee640684676d6c3aa8
-EBUILD parso-0.8.0.ebuild 548 BLAKE2B f9a02b8e9e90ee69923dc4402a9155eed1b57401e4bafafc8efd0e7b87ef648b00a9c351dfb476964fdd934d7b7ba2c78856b71a96fc2aedcbc39b5a5565f0bf SHA512 ed49af1c6e490bdc2e05bc90eb8681f748bbfb2c5d2cd0a9e68b4851c9bf6402b4e62031c4ab45cef3c4d1a7d8f18840bf8aff6924a4b6ee640684676d6c3aa8
-EBUILD parso-0.8.1.ebuild 552 BLAKE2B 948d7e892321a8f78f1df8916ce23cce3f1090c1e75a1e997b4fca08293f77979df3b78b926fb8d801dcf995ea289d450f1ed30236d1f60dfd54765187c0ad1e SHA512 0a520f5e337642716667087c9923fc8350283bb1ede51ee0fea54ee5f86b35d84762480d7d9a1d6f998a847cf1c6b0b63afa070bd0065c0fe6c10ccb6945f42a
+EBUILD parso-0.8.1.ebuild 548 BLAKE2B d93d0c0fd592d1ab4c33ff87eda0981976a08e8325d941ede29c595e60925c10104362b5c6d8dcbc6ded79b6f430f89219cc427834e47d766fa4d46cc6d6c7c5 SHA512 8a6234f3f288fbad5b9f09492dec63ef9c1022b87d11a8f197cd608f0899ce68e616f27729e74f6ccc02c185bdf56061e9161b7e2dae6466b1f5f3c700530da4
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.8.0.ebuild b/dev-python/parso/parso-0.8.0.ebuild
deleted file mode 100644
index 18fc937494c9..000000000000
--- a/dev-python/parso/parso-0.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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.1.ebuild b/dev-python/parso/parso-0.8.1.ebuild
index 4acbe09c0717..73f291036990 100644
--- a/dev-python/parso/parso-0.8.1.ebuild
+++ b/dev-python/parso/parso-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/passlib/Manifest b/dev-python/passlib/Manifest
index 6cf51ac6a731..31ea991c2cd2 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
-EBUILD passlib-1.7.4.ebuild 947 BLAKE2B d698979595f449feaf328ee17fa86892653ba2ca015b8736eefea32554a0f5f97cdb69b36239434762d2f6848e59239d03123f4ace4aca9a3f90bc1b65584778 SHA512 36d963821646ef0ff5c9ab15ea13b6ed230e31ad4137d4287df69923cb1fa590389555ade438741672cd07b7b8b7ae04fab88ec49712f566f306371197d4ed54
+EBUILD passlib-1.7.4.ebuild 953 BLAKE2B 293f15f381f15443c233bb7502717ef807cfb4f27bd7ce7426b7ec17b26c404b3423d64015f2ef99e0dbbf083a6eb251d48b849f34636dec7009195d6fe9cd7e SHA512 7d4cacbedcf4a3bc306ab5ac1dafdf983b2218b1595a898c59b6aecbe413b3fe524b378f3414aa17a78a1b8004dd6683269ea85cc8d30cd5d68d9d47212bb8d7
 MISC metadata.xml 759 BLAKE2B d38105517b388dad196bf6012214c4bdc4157896b8e6c5fd63441486dfaed1d8e9874fa892ad4376bb753ab82ac739500629e889bea5d9795db922616e6781e6 SHA512 6fa983f68d9d8a67352567dc5e7f20a42761ea144988e7a1dba8117e19f164fbee9229f14308cbd53ddd4dc26a52774ecfd52090a1f75188ea542ca184a0256f
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index 54a6f5e8bbc6..2baf3de19206 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -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 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index 49bca81ad402..eda2ab001da6 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
 DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
-EBUILD pastel-0.2.1.ebuild 453 BLAKE2B 6dc1ec0a10931c80ef5e4f7e4a4499a9360bb8d3c82b71fcb52933fa8af674cbf745258f1f01fc6610485c9ff1abd6c86bdf59385d77bcfd9d119b21467b322c SHA512 02b9458f42bf6259f5ed4f3bd6edb5de1a1aaa9e2e65d89610279d47028d33bd7cb95c48511682b04b52221704075baae197c983e8243cf34ea7ec55b953d2b7
-MISC metadata.xml 511 BLAKE2B 682644ff41bdbd8e94235ea9543edc06ab335e6a910b0121c1bd31e44d6511e924cfe45f97d9879fcc89a65ef8060261e459c42b4aecb3b5e87e6f6672d2d07f SHA512 a53766208c3a3d23607301f5098a2347a603973d68360b2209e34db0e2211cad4881fb39218575efd97039c5cc15c11247e1ccb3a552b7d5d29f19985adb776e
+EBUILD pastel-0.2.1.ebuild 452 BLAKE2B 950b31500751b346130dfc0dd42d1dcb9376c3718e3bc3b0b13050ebf2755b00c5ec85847166b9d22894bc03f684dbfab1c9fc1fee6baf2d2d9bdbda57b6fb6f SHA512 ba55488c57bfb59a05b79e68a06b6a81855d9833629c149d73625dbd521692a01d82bea3b98670a6337cd3881db0e78aed1fd5c7018e9b9c8ad1d581053286c1
+MISC metadata.xml 536 BLAKE2B 819da0904b2ec3f82cb2987ce164877d252cf84126d2a87fece657268380db9b27d47462e5e167d8143b7afb003808bd6e548ee5637ade4ea1c6f99ec0de8bff SHA512 ffdadc491018b89a11f0d64c323c1d3521b0a5c151253bb2d650b151a432436e3c0eccb3675b08385d349c4a61f8c889c54291ca557c367f9513290107427109
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index fdbca71a6d7f..3cd8e1fa015e 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/pastel</remote-id>
     <remote-id type="pypi">pastel</remote-id>
diff --git a/dev-python/pastel/pastel-0.2.1.ebuild b/dev-python/pastel/pastel-0.2.1.ebuild
index 9a1bcc9ea9d7..3d6cd02c9816 100644
--- a/dev-python/pastel/pastel-0.2.1.ebuild
+++ b/dev-python/pastel/pastel-0.2.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/pastel/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 9c7d83c96b50..1fec53c3d69d 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,7 +1,5 @@
-DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
-DIST path-15.0.1.tar.gz 47662 BLAKE2B ec50e75cd1b24cd017189cb8632340a5e4ebed8517d607a9f26e43c7c75b2b7d62e9a70b6b93ea6db79feb3d100ca535aba7926cfd7317bef1ac290697ea8f90 SHA512 d8ea2a98cf5caad15bc99a740188d6947cb1cdacc1ac7b6164f29f8d78ca8e73258120ff36f100957e3c4c2ca0ed6eaf27c98c4765ededde41b58d98de24f672
 DIST path-15.1.0.tar.gz 48271 BLAKE2B 3f71d7686bae65f0b605d8fb2077395e5f5f36ec6f29c41f18e2380c6f775e5bd5bc8c2d3589fe507ad49c7383f1cab84b59176e1d5952d02cec68037bf3e4b0 SHA512 31c40fc57d6c6c57fece4fec720b344191cc3d395efe9e5f071c98a7392727535150c6952a4f8174b037141d5cb1b026c2fa44da8921a8354ee1627daf8f6977
-EBUILD path-py-15.0.0.ebuild 1231 BLAKE2B 1a423645813b8de3e661f9c8cd19d975e71328a5e55af7220892242f8aae183057e4a338bfd654bb490bdee3893a88f60b8008482fea9e380f32005a8e69998d SHA512 3501b31c17286e698e66413687f1cd0f0fc88731c79ebfabe72401d01db47efb40e303dba7f7ca9fe347c80e5006eb4af3e3addc4f286d941085dac442d74c79
-EBUILD path-py-15.0.1.ebuild 1239 BLAKE2B f198743390b32d6f5a4c3b0493c3eb422a2732523beba7783ae925a800e1d90308f0fc6a41db6fcf1e9c963e25bff3e2741ec96dbb8b1197feac8cd82bed3ead SHA512 49b8a8c52dec64c0d4643faf45f1f869219e32d3b6427990fcdfcc164bb41e45719dd52aced3383a5e6d4519c4f9b01e47a5df9e8a435c42b3f96fdb17c3c063
-EBUILD path-py-15.1.0.ebuild 1021 BLAKE2B 52af4ec6690a5b09a31bb57cffd3ae029cc2e2d004734cccb915f47ab8439f8400b99a5216aea39bc02888d95873cdce7b43499c8cfb421e270eb1734f9ce2f6 SHA512 12bbbd28e178db67a761eaea622179ebd19067d97d03882b369e852e6568d2469b3a2fe871e1fafc15f067b5eb06c0909177222e0518fd9050528726e4946b4f
+DIST path-15.1.2.tar.gz 48280 BLAKE2B 6dd6be743939d4ac1edd5caab18658473d7318eaf255140198db34cfb28c95322ed8ae05284683b18a0146f412ff8a2c14dae60d018740f8bb9cfda861b8ea20 SHA512 76f2a04800154ee8c7b7b9783bf7c63c544da74bb2f92424aeb437448a04dcdec008deab262d3b40d515404e6144bbad44e618d824974654ef10676878415ba4
+EBUILD path-py-15.1.0.ebuild 1012 BLAKE2B a9c00450d98ec9092513b35f25b3cf32ad5faef103a4d47ab235aea731ee515f6342fd9e85df2e5e7d017e5a6e150cbf946c80ff2df2148c1dd4ebe1e5bfcda4 SHA512 eafaaf62ccbac71b774f1b46e20d8f400e801d4acd270763ab0bfdf30da414e22ad46954106222d603a54acf60b6f242c941995658684745d701d240c0ca1724
+EBUILD path-py-15.1.2.ebuild 1021 BLAKE2B 52af4ec6690a5b09a31bb57cffd3ae029cc2e2d004734cccb915f47ab8439f8400b99a5216aea39bc02888d95873cdce7b43499c8cfb421e270eb1734f9ce2f6 SHA512 12bbbd28e178db67a761eaea622179ebd19067d97d03882b369e852e6568d2469b3a2fe871e1fafc15f067b5eb06c0909177222e0518fd9050528726e4946b4f
 MISC metadata.xml 382 BLAKE2B f4e983fc27f8e9a578a8469a0b432adf91f622d9993bcdf9a0f25f2786680eb26a67d53d1c97deebc8bbbf7d62ac5b37b2d5a44b39c81f3862e0ffe2cbe2e577 SHA512 61909559eb0ad81e607bdd7b9b147f3e9c71e53721ddd99b1cc2afbe8e33ca7de2b9849ff3ff7468183c5f82f108b958ae0ce3042998972dac8eab6338040151
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
deleted file mode 100644
index 0c8e92698552..000000000000
--- a/dev-python/path-py/path-py-15.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=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-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/path-py/path-py-15.1.0.ebuild b/dev-python/path-py/path-py-15.1.0.ebuild
index ec0d713f9c9a..84e71862c2f7 100644
--- a/dev-python/path-py/path-py-15.1.0.ebuild
+++ b/dev-python/path-py/path-py-15.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/path-py/path-py-15.0.1.ebuild b/dev-python/path-py/path-py-15.1.2.ebuild
index 0ca9be981d71..ec0d713f9c9a 100644
--- a/dev-python/path-py/path-py-15.0.1.ebuild
+++ b/dev-python/path-py/path-py-15.1.2.ebuild
@@ -7,11 +7,10 @@ PYTHON_COMPAT=( python3_{7..9} pypy3 )
 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}"
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
@@ -22,28 +21,19 @@ RDEPEND="
 	!<dev-python/pytest-shutil-1.7.0-r1
 	!<dev-python/pytest-virtualenv-1.7.0-r1"
 BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
 	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
+	local deselect=(
+		# unreliable, not really meaningful for end users
+		test_path.py::TestPerformance
+	)
+
+	PYTHONPATH=. pytest -vv ${deselect[@]/#/--deselect } || die
 }
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index 5e37d53d4d3e..c33639e39d7d 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,4 +1,6 @@
+AUX pdfrw-fix-import-collections-warning.patch 1450 BLAKE2B 143b5365d1d79cae346ed7c383a3d961bbf370422540c3e051e0e9ceb4c5e44a3fe7ee949f5f4254ae295ba3aa34987ec5f2f30b50918880aa9b272b2728af53 SHA512 dece6967a707e81520a5dfd58e77b0b1a5fccc2f38e20f09be5ca2a209d0472fc7f0c79b47ff2fea2252a62126c76bda508f8bc4088dbec62a57ea1e95bd21ca
+AUX pdfrw-static-fix-import-collections-warning.patch 527 BLAKE2B e7ccd07d60e5afd7c98b81c1f6209ef539a6b0bed3ae4a96e6179d86bd73bdb6e4f673242730aea2e3535fd2a35b560f2d2bd8a84d0599f52e0525b7310088f6 SHA512 6d626d216c3201145825faf7d042b516a18bbeb570b098c46abccdfe85fe5613d166c8256a6b240a35aeb527a4c2b555fe2059a0fcbc0310ce9432ee26cdd11c
 DIST pdfrw-0.4-1.tar.gz 143615 BLAKE2B 281dc94c762dcc776e2c9c84609b59ca32387510bcfbec39271a6073533f9ad5d416cf4250b3dcd8564973d197ce090719c5561f58b972c89d463b90723ac8e6 SHA512 f2ef6a966cb1b947425679e6c16e658b5d1dbc13d62fb2e1edc278508b03f6c6847b3c83dab8bcd7df3438e587df066bc16b653461ae402bb8688ddb05f4e886
 DIST pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz 25243391 BLAKE2B 5c491d56c9731352907787bbe10b8b3ac362f0c7892ddcd15a1299d3b2b4bb604662f6231aa22478290992a345e769af2e2c2459a25a16c370ea05fa68101f80 SHA512 9bf1d5ddc8f55b40b50041e745579406bb0036fb7795ac40064aad7cdf592869051ba84a5ab080042e237690bb2f1811b86b2a4424535aa4c367f6e29a0c34eb
-EBUILD pdfrw-0.4_p1.ebuild 1600 BLAKE2B 35cc2d51d2a6699ff4525159312c335d5049c70eb5755edd40b0d994df4482e2fba794b42b71db2fb8804ca0742db2d87368a01fbed3f3f72f1a43efe6b1aa27 SHA512 b1c697810aa14830b468ffe5c3840cd3df0309f88db73172d3fb352bde967e520c7492e6f8252efa8e0e6091eb7d6692e19eedae7f5e5ce3980a734321ad6ea7
-MISC metadata.xml 385 BLAKE2B b0005d90a18dd6fc946a8d578b876cc0b18d3f8ccd5208bc99c9e514d5a13e5e8991bdaebe5983edafa18c5e8388da6db54f2669d9e1aa6b9205ac7280b38992 SHA512 92a6a0b16cea383eb074ec90baacdd17daffd2644f8a2574db3d1843e06b9ca5fbd6bfd8d2ff6452c2b10519f0ae6967df4dbf9a5d0265b5ad951166b7a6d226
+EBUILD pdfrw-0.4_p1.ebuild 1598 BLAKE2B 9b86fe593207fc8bcd7344945b30e50f3a78111c7f22582a887d28a554ca06e7b61ac26096690f9b7cc6c6549aee3b45e0ec5c805d3d008df181053cf75e1a50 SHA512 c17afb9e835abf2b241809771c63eab2a03efcd79d890b787de95d0d2d9b07d5acff1cb565c9b30a4c47799071690f84a2f677027d4f962ba17f8f50fc87fe7a
+MISC metadata.xml 391 BLAKE2B a926eab8ff8ea510f4c418fa13b3adc8ce9a3498eaf16880a2a2ed944312b6eaf162809236f5499dec6ab310ace105c9ca8ee13c046ca030f5013545f4af20e1 SHA512 c0518288da1389feb27e291b69254fe7fce0f4b6f28eb75fbeedaa343900d0808171ab4018a275b6e1aad3c48c9fa4b1056e8bec80a02a7b02cd4879d82bcb97
diff --git a/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch b/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch
new file mode 100644
index 000000000000..fe5971264d86
--- /dev/null
+++ b/dev-python/pdfrw/files/pdfrw-fix-import-collections-warning.patch
@@ -0,0 +1,48 @@
+diff --git a/pdfrw/pdfreader.py b/pdfrw/pdfreader.py
+index 2c9c3a2..feb025b 100644
+--- a/pdfrw/pdfreader.py
++++ b/pdfrw/pdfreader.py
+@@ -12,9 +12,10 @@ of the object.
+ '''
+ import gc
+ import binascii
+-import collections
+ import itertools
+ 
++from collections import defaultdict
++
+ from .errors import PdfParseError, log
+ from .tokens import PdfTokens
+ from .objects import PdfDict, PdfArray, PdfName, PdfObject, PdfIndirect
+@@ -340,7 +341,7 @@ class PdfReader(PdfDict):
+ 
+     def parse_xref_stream(self, source, int=int, range=range,
+                           enumerate=enumerate, islice=itertools.islice,
+-                          defaultdict=collections.defaultdict,
++                          defaultdict=defaultdict,
+                           hexlify=binascii.hexlify):
+         ''' Parse (one of) the cross-reference file section(s)
+         '''
+diff --git a/tests/expected.py b/tests/expected.py
+index d153fc3..62c29aa 100644
+--- a/tests/expected.py
++++ b/tests/expected.py
+@@ -12,8 +12,8 @@
+ '''
+ 
+ import os
+-import collections
+ from pdfrw.py23_diffs import convert_load
++from collections import defaultdict
+ 
+ root_dir = os.path.dirname(__file__)
+ result_dir = 'tmp_results'
+@@ -28,7 +28,7 @@ for sourcef in ('mytests.txt', 'expected.txt'):
+ 
+ 
+ def results():
+-    results = collections.defaultdict(set)
++    results = defaultdict(set)
+     with open(expectedf, 'rb') as f:
+         for line in f:
+             line = convert_load(line)
diff --git a/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch b/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch
new file mode 100644
index 000000000000..95d20358a4b6
--- /dev/null
+++ b/dev-python/pdfrw/files/pdfrw-static-fix-import-collections-warning.patch
@@ -0,0 +1,26 @@
+diff --git a/__main__.py b/__main__.py
+index 55c6e3a..fa9dd47 100644
+--- a/tests/static_pdfs/__main__.py
++++ b/tests/static_pdfs/__main__.py
+@@ -14,10 +14,11 @@ Part of github.com/pmaupin/static_pdfs.
+ 
+ import sys
+ import os
+-import collections
+ import hashlib
+ import static_pdfs
+ 
++from collections import defaultdict
++
+ params = sys.argv[1:]
+ 
+ destroy = params == ['destroy']
+@@ -35,7 +36,7 @@ md5.
+ ''')
+ 
+ 
+-found = collections.defaultdict(list)
++found = defaultdict(list)
+ 
+ sys.stdout.write('\n\nReading PDFs:\n\n')
+ 
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index fe2a825dbce0..d9e05d70094d 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index 701e68557c1d..43e32b1d00f4 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit distutils-r1
 
 PDFS_COMMIT=d646009a0e3e71daf13a52ab1029e2230920ebf4
 DESCRIPTION="PDF file reader/writer library"
-HOMEPAGE="https://github.com/pmaupin/pdfrw"
+HOMEPAGE="https://github.com/sarnold/pdfrw"
 
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/sarnold/hexdump.git"
+	EGIT_REPO_URI="https://github.com/sarnold/pdfrw.git"
 	EGIT_BRANCH="main"
 	inherit git-r3
 else
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 58168996cc26..8edd18b7a520 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,5 +1,3 @@
-DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
 DIST Pebble-4.6.0.tar.gz 23910 BLAKE2B 3a2f1b4cdad898274d53cdfc07b5c933162aef375ae548a39138b50d50376e7f06642dfbff038b431d77715a14414f90fbd77db1c373e988df6afe65cfb5a632 SHA512 445f65cf5a18c864478326ca1198ae49bf5aae3c53e67f68ffdcbdabe3cf16c59468b3d340568986414f45f13684c11da0e3a9fd31f510c391a7fd44cf3dc6e2
-EBUILD pebble-4.5.3.ebuild 505 BLAKE2B 24ee52d936f13d286f93ced13bb6c4b5d070447b11e7da1f7deff3a97e26e6faa9813ced95a7082215c564cdf0d72fc24d85429e729d49bc8d8527976ab7a6e7 SHA512 5bc83234a48e28ebab6edc8e543b4d6395f398309d67fc693f2ee9ba46b645a27d331588ff766efe14572e9516c64ee448c8e5b4c9691b40f6cafd65842eb2a0
-EBUILD pebble-4.6.0.ebuild 507 BLAKE2B d3dcdcb91fb144a1ba6be67891b722030ee13646e9fc4c6823ff0ee362e41e2c127d4ad390b5d5be47a30ecc49d1ead8bfba056457e2bf2a16c898c424e80cc7 SHA512 749fce50eac218e7593dc1fb8d58de7997f0ef64e92356f99da3a878e015f218e491173325a331ed33053cb74c05c3422ab8756029bfbb723a326a1a281a7f81
-MISC metadata.xml 342 BLAKE2B 451d73b322064b55aec3ae0369daeaa2081d126ea090c0b9a808932cd32ef1b5f92846d15f5cf11d399c9f822bc11b484107543c0c33434c2ec63b97ee8e865a SHA512 68bc288f46ab7ebfb8676d7ae40452500e39d72f9ccecc69d9e6ccb26d1465d8845333a0430611332eff2d4749a4c6bc476d645105191989120d14e338846f28
+EBUILD pebble-4.6.0.ebuild 510 BLAKE2B cb9c2017f85d06beb9df63c901351ee73bad131dc63dab9853d173e8b9c5a9128040b5c5a2cb84367a9ebbeec24541360e251fad269d754b79b1e92d3dcfb7f4 SHA512 199f6e506ce12107db7d0ceeccd9aaba661437c7ba208f693afd4304e3159ae3bc5985a45bf5da491e458aca1befaf40599ec63c89a387dc58e7bb1b7b02f12c
+MISC metadata.xml 366 BLAKE2B 65d8f6a8f317f3d4dc671ecaf51954d904265d61c261e5e52dbb09f2fe963875a325bca94ae6028690ace79fbf03e9277353511e736a8fcf05e446f9736ce0bf SHA512 bc3e0a767e97e35202912e6d52a4104daaaa9ecedc8f42b35651f94d76bb3b187ed0d2a74c9c024f84904b0d12384d6772550d7d206ce4788775fb1497319e88
diff --git a/dev-python/pebble/metadata.xml b/dev-python/pebble/metadata.xml
index a85b840f9d1d..6854ff29ab93 100644
--- a/dev-python/pebble/metadata.xml
+++ b/dev-python/pebble/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Pebble</remote-id>
 		<remote-id type="github">noxdafox/pebble</remote-id>
diff --git a/dev-python/pebble/pebble-4.5.3.ebuild b/dev-python/pebble/pebble-4.5.3.ebuild
deleted file mode 100644
index 7fb2519166dc..000000000000
--- a/dev-python/pebble/pebble-4.5.3.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_{7..9} )
-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 ~arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.6.0.ebuild b/dev-python/pebble/pebble-4.6.0.ebuild
index 4d6a2a8d901f..79f0c9548119 100644
--- a/dev-python/pebble/pebble-4.6.0.ebuild
+++ b/dev-python/pebble/pebble-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/pecan/Manifest b/dev-python/pecan/Manifest
index 09c847adc661..925c46260928 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,3 +1,5 @@
 DIST pecan-1.3.3.tar.gz 120595 BLAKE2B d1169b6af4fe822259a6bad75068475324cd9c7811a8e62ae6f9c2b9bbfe69b7688a03de9c4a1a4b27666f22c34fdac95ebddbb50feba6ccda60fd2a7f190d38 SHA512 ffa171d4847e549f959dd5ed71f32b3d689ef7e2548302adfadd007f5217c4e1a16088612c27005ac6ae38bb5a99aa532e84be71ae4abf6b06dfdb26ff5cac89
+DIST pecan-1.4.0.tar.gz 124233 BLAKE2B 42ac41d9e4aba2ad40b89d2ec742ae82a3d9f599c79d0ac5cce199b8ee50ba5e0765f02dc8812defd3e7276176d0e4dadf06b56256e9808771805df64811e9d4 SHA512 102ac8549fcb8c1f29aaf6facf1fba3dd06c454ed6262c3b0e9a009063033defbf0011b4117d854da1f4770368d3dbce1e3930daabfb0c7ee069eb2522bac7e1
 EBUILD pecan-1.3.3-r2.ebuild 677 BLAKE2B 2d1be535fea047ccea9673ff949e77f9bc32975ede07e1360009dd742ec94bdf0111951e27755f46f3d137060827522423e83e4dad7a6f529551207672c86afd SHA512 2f028d96076610f11f0d74fbf5c478a9096c59af453314945964efb6e30f54954d902eeccd81c4b988f4b9d249af448657be58247713876eeb2c5614352a6432
+EBUILD pecan-1.4.0.ebuild 744 BLAKE2B 27823d1a5472f0f0491e80fade1a0833ffb48a3aa8c8c0b160cce76fbb9b63a6472fd5c307b3f7ed5f96fcabaaec2fe82b87266f73b4d4aeb7545f27a0f4c026 SHA512 677cf8123f495e67d05312b9574158dd43c203d864a402a02dc8c546a89833003fcbf1f0aab152c093eb9412f0189fb4617841fe191f5441ff74b867f87bfe21
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.4.0.ebuild b/dev-python/pecan/pecan-1.4.0.ebuild
new file mode 100644
index 000000000000..0582e6a2ec9b
--- /dev/null
+++ b/dev-python/pecan/pecan-1.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.org/project/pecan/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index d44e33c742d8..66ba6da3eb26 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,7 +1,5 @@
-DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
 DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
 DIST peewee-3.14.1.tar.gz 879443 BLAKE2B f7a1967006e517c56a4a2b10bd9c097e87dca4135038676b096431e6927fa6f0a7e2ad13c036a1a7499a9b3a140a4d4796399f9c1e727e7e8a0770ef3483a3ce SHA512 f8b8bddd1e32e05d75a2f1cc5fcc8b9d98397107e4e4d3b19b444f20f4b8243d740643c858d20fd0ceb8b30de859fe17079fc611ac21cf289c417e1f857f1f0f
-EBUILD peewee-3.13.2.ebuild 757 BLAKE2B f51418ba6858185f999eb3c5471067f4374221e3c9a4ab755b9105b22bfe3a46b5a62cda25effc4fbe7cbd1cdbe3ae63e664ae185d80a9defb30deda9ec3daee SHA512 080700b90b67b1d216684b127c3528d6e51ef3215e0e328def53113a46edd97d563b19505409357da73ef49906e986ec875c00ee33e708a60d422148824968ba
-EBUILD peewee-3.14.0.ebuild 755 BLAKE2B fc9bff9efc66b112967efb05c34aa77133476556c91fa79ffbaab808ab0decd71b9324035bd85708b2232c87cb1817ea2d8f3601a47a9793f8c792f42c48bb2a SHA512 02f998daa5191a7fd4e016f389cebf0e6d2c901a0faf33859652bf969a49bca0740067eb7abadf3eba56258fa8647792f1a42d3f6b36d11f071d9fa7717d9a4f
+EBUILD peewee-3.14.0.ebuild 753 BLAKE2B 3bbf8da2196374f36d4947a258e8b09e078d1618f7f2d6ab91bd47b3e0dfe09b04df345a24a8bcad55e758f857838c1c21425ccc775818057f8905234178ac61 SHA512 e8327280be86e1c60a3cc6fd8ab0894b235f3c8388d95b453dd63e61a3bfd6cec32a0cd718e6746c8b43267bbab7d8c008ef5f742d72738e53129855391173b3
 EBUILD peewee-3.14.1.ebuild 755 BLAKE2B dc9d43fe216113450d0a211fb0d74723a24fc3f895fb33353a840d2a0eb8bed5692a04cead776e5f22107c5306e27e30e1b0d05a07698ea53f9e9004b4186559 SHA512 e607644cfc8305bb00bef66436afa638577fab33ecf54857ad5bd06a72837beb357f6ea794061a876379b8910c877951697d6e222b5a1b2283d534ac337e10b6
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.13.2.ebuild b/dev-python/peewee/peewee-3.13.2.ebuild
deleted file mode 100644
index 95c1d782bf6d..000000000000
--- a/dev-python/peewee/peewee-3.13.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_{7..9} )
-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="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.14.0.ebuild b/dev-python/peewee/peewee-3.14.0.ebuild
index 207e54dab13d..eed96cffbc6f 100644
--- a/dev-python/peewee/peewee-3.14.0.ebuild
+++ b/dev-python/peewee/peewee-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 0a3e6298fbfa..54af95d7e35d 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
-EBUILD pelican-minify-0.9.ebuild 611 BLAKE2B 03ded2911d92f76f47760b7bb831d776467860443d0337bf3c1031457eda7fe364b61999ea0f3e2ab95a5e2be69be5091305b6c3ddb8085f01546d6d90ac35d9 SHA512 8afa7025602bab32e48c6b2cc079abab7d600dc222625f54d54235adb6b7e226e698bfd2cd631fcd1648e2781bbf21abdabf8086cda65bbadd9d7ad6beb96dbd
-MISC metadata.xml 410 BLAKE2B de101727b82f76cf71588da4a543aa7853e8acb156f3a6baebcba62b5c9ef029611a7e30470ea929bc8f0cbbef0c852b80208b4b0682ff0aeb8878dbbf4c6889 SHA512 5fa4aa1fa8edf161002bf379cd12f55a78034d6e42d25da288f361234825cb4df23d4d221cdebee750ad49929ff08861e009e7d4a879bf22f2b6407183603dfb
+EBUILD pelican-minify-0.9.ebuild 550 BLAKE2B 8cb800b01a77f0bc1ad7eeaf00caffbcae815ad3c25b4ab03a5aeeaa56fa297e7ef488aff21125eb87911716b50e5473f4d729195ca31734bba4692747167c60 SHA512 8ae44509ad5d0470a1faed359b8976f26776137406ae7a0aa52a8b40ef29396e1fbb60431383deaea480f6348f44dc9d2ee8da4391305c2687a510889600dd6c
+MISC metadata.xml 456 BLAKE2B e64848b585a409718f407007eacf7c6cb6fa6275625542c881dc6c4cc105ee22360469c31a91619c08419a093862ff93074146a56f9e8fab92c35aa90a27d409 SHA512 277416d52195b999b6e4270c467ab352b80b308d6a72a62af9fe5f38c0e4708f378754b598369e838b648f87acd3474a595dea37d4fdd6d8dbcfbe408be06e74
diff --git a/dev-python/pelican-minify/metadata.xml b/dev-python/pelican-minify/metadata.xml
index a1db0cd41474..58d7482ac04e 100644
--- a/dev-python/pelican-minify/metadata.xml
+++ b/dev-python/pelican-minify/metadata.xml
@@ -3,11 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pelican-minify</remote-id>
 	</upstream>
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
index a1a18fb13262..0188745ee87e 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="An HTML minification plugin for Pelican, the static site generator."
@@ -13,10 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
 	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
 	>=app-text/htmlmin-0.1.5[${PYTHON_USEDEP}]
 	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 20c2e87c8043..9a8aacba86ab 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
 DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-EBUILD pendulum-2.1.2-r1.ebuild 1013 BLAKE2B 932790e068a9f39ccb7ecdffd381d15a85a414f6a27424f44bf6e14b5f6a1ace335b13f6c25cb6c9f98dc17d2fad69af63f8089150c252888e9636c58d881cbd SHA512 66e3b624a7210d74a8935d8c46929e546846f58dfe672fda3521165904dcdcca92f387eb55f8fd7ecbc9deb8f48bb838fb1082240ff4bdd11bed2aba04a6d771
-MISC metadata.xml 515 BLAKE2B 836e056a0ea2aa33fd1d3fb9bb6fda8539ebb1395038e3b264302e8b6b63397840f3413bccd4bd1fe24ecceec8075ed3313f8404cab60a386c1c9eed902bc6d2 SHA512 e61f93ccb5176ea9693f9d03bd6b583db8154b9673e63ab683841b4ab9f611ffc2072bcb9c19c199f93b7fdec1cdc87c82fdfb688733de449f1a59a7a25f70f4
+EBUILD pendulum-2.1.2-r1.ebuild 1012 BLAKE2B 3e955eea1323fa65eef885518e0773b2f0fe727e420c015c6cdafb95ae8e47b55caf3e21884d69ff3cf367004843ad3bfc584db22edeb2b0bf13ecdfcb5c9d23 SHA512 a980cf7abd15c607ec43ab5761c2c96909d4fb21204099cec3cafd8b3b0bbd91a80dca7d1439ece4eac1308397335c43d9a2f845b0909f58024122039ecd4d67
+MISC metadata.xml 540 BLAKE2B 8a5e21fb3d1e62ab29a72a1a6fbd32be6428f9c33c1a4a9245b3a0c83da045eddcf41c723df1e71ce15c1c52f86a2e8d9a9a2c0c02cbec4f89a6b26f893b9b2e SHA512 c20802488e42236eb7e4192c9c3f8123952aeed089c5c15693d2037d878283ccab4ac79dc80825e0167a115f8cf0defb48cd39228df3f30e1424b8d86c5d12a7
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 2f00533e580f..2f9cf790dab4 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/pendulum</remote-id>
     <remote-id type="pypi">pendulum</remote-id>
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
index 87d8f8fe5c55..d02f38eea836 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pendulum/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 # Requires timezone information which is not installed by default
 # with dev-python/pytzdata, and otherwise approx. 50 out of 1600
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 813f91948cf7..e83f3128fc5e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,9 +1,7 @@
-DIST phonenumbers-8.12.15.tar.gz 2256651 BLAKE2B b3a583cb64ea1e4fc278f40cb78c7ad9aa66f1655e4483219f8d1e3384628b9b5cd672c584953c0233743d436fbc6723484d63724e466badf0b3fecf57791b87 SHA512 56c52ab736ce807609c79d5cc3d4e97cb3c5a3e59689cf3112c21ee672c04f095f1727fc37f4e3b1573dbcd4c9ccb00b3a5773c2c383264996e1761f46acfd0c
-DIST phonenumbers-8.12.16.tar.gz 2257000 BLAKE2B 33e513840f1147af9169ae4b01527b07597cd8fd3be2e299c77e79eed75b84c7e8bbe036e5961ddd93efcf4a8bab6e6a5da348800becac66d078947a2c98accb SHA512 4e2162a6fa02170241887f4876ee811d431b0bccb03d9be305478ae48f21f27643da1be238d68f52b50eb72e87f8de4961769500f026cd4bfb2ac291534d1e74
 DIST phonenumbers-8.12.17.tar.gz 2257177 BLAKE2B fb47b020d78c1f91973c5a316b1c08dafaa7847650c19ac012304f855701fbe6ef5068c26c125a52c69bcb02c68e7465e376f5f521c06f25c92402d60416eb6b SHA512 59999dd64c78d69cfe39c3fff7ac41e57739e7363073fd871c7ede6088e0b32085d92e560954cdd3db1c986cb2f17f884fc2ce04b23cd7d10eab1ea4b8b5c4be
 DIST phonenumbers-8.12.18.tar.gz 2257229 BLAKE2B dbfea2209ffa671eb619fffd8e10da793718b36dd193eedc5ea02ffc69bc967a5ed7f6ee2cf6dd2b85621d3b9dad33c552b839abe7597155d702f59a3a8dd140 SHA512 01efb25e5f47b314cde706c8d064fa6c3e6b3ceb76be775fba456720036bd69d95fb03b775a4c510dc6d7cad662a30208839f93fdf6274f82488e06ef35ce508
-EBUILD phonenumbers-8.12.15.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
-EBUILD phonenumbers-8.12.16.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
-EBUILD phonenumbers-8.12.17.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+DIST phonenumbers-8.12.19.tar.gz 2257568 BLAKE2B 6e464e1d86485518b6d891a0c57ff86f3d7ecfa3f67316e85bd3352b4b7d86883631a625c9634e79a82228960aed4fe4b0d250e23aa90f48327f617ed27766f8 SHA512 4807db073ae05dedab6e2d8c9a46c6a318cad78d12d192f63171e59c48e40fdbbeae7192106b2279dc2a2360f929138b6f49df0d42492e740174e83d11d81253
+EBUILD phonenumbers-8.12.17.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
 EBUILD phonenumbers-8.12.18.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+EBUILD phonenumbers-8.12.19.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
deleted file mode 100644
index e1586dbb97b8..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 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 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.17.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild
index 8f5b4d0422ab..e1586dbb97b8 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.19.ebuild
index e1586dbb97b8..8f5b4d0422ab 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phply/Manifest b/dev-python/phply/Manifest
index 6675e28bf319..76b20991e72e 100644
--- a/dev-python/phply/Manifest
+++ b/dev-python/phply/Manifest
@@ -1,3 +1,3 @@
 DIST phply-1.2.5.gh.tar.gz 35624 BLAKE2B 99fe9704cef570ad3055fa6c5aaaaed866d3c41c1479efbd29bb3224ae666d2ba13ccca61e6d67a8a0da4542dec79b5fdd201254e1ad638de81fa762049f4d13 SHA512 f0e4d0a6d2dfad5163fb68660602482b6de58c0dbd60d8db2f1df0622a9da3cc24e5fd309299a4a9ccf7abde081644a9a91fac8a2800520859199060f4080dc4
-EBUILD phply-1.2.5.ebuild 795 BLAKE2B 93611bc17899023ebf42dc13f42ba66cf6d591efaaed81e39d6b7d54cad569459f74854547165c0d03c50f2acb93fcca40a049d236517bd7434ae2236561d6d2 SHA512 dd1eb4cc81c309305f7a4eb0d8358341852e124b6067cf5afd0dadc8fd9ffef167cd74d6c55e5acf6cee6f599c579b041be0cd20bb82387be7c47aa7c5810098
+EBUILD phply-1.2.5.ebuild 802 BLAKE2B 8d20f5b84baad742ec99271d219e74ec8794950abd000150a39ffbfecb7c2f35bb52803d307faf99ef6011fa6e9b905068a084e7cf01a1ddd3d6a220e59c1c16 SHA512 635a363785a5fba51a399fe5b5f336d69513e8fa40bd74581f9d840068845fbd657634e3e61d1496dc3df68962f0cb9ff425545846f4f156f1e127240411ca48
 MISC metadata.xml 364 BLAKE2B 32f89060e0ce7bed45287e0d206ba333b07888c7b32c6e76f916c7a153cab420440f4cc9a0b16e9747949339155ac013696f65ce4e4d7dbda69aede6fb8531f2 SHA512 67ec43a111b7cbdd46954b82baa2d528d2cd86d25f579500bc556069b67aa5055abf78dfc3c51afd095e282a240c295f5503ff5a1c0292a996d3f2315fbe27f5
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
index eddb961c4385..15413f1e50a0 100644
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ b/dev-python/phply/phply-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index d0715c8bb6f4..8a146482a06c 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,9 @@
 DIST pikepdf-2.5.2.tar.gz 2368463 BLAKE2B dcf7e2c6f8a2a9d41073f2528fa6a13d5d79c0915d4dba810fb13a989039beafebbbfe0c8211f0a769ade9889af0c99ce1ca5052c74d0d88d817447dfdb3a7d5 SHA512 52e13805d4712f623af6c91eb287009abb6179d28451ab0a32b3472c4b8e484cc5700c3a32bb98cd7a188d4249128b2a2ef7fb19e8bc5aee4488627df161c38d
+DIST pikepdf-2.6.0.tar.gz 2368553 BLAKE2B 9bffcb7ed046f0337392fc27bcdaf8bc7ddd451d6c238fc5cf7ef952658f154e6cd0ae553f84fe10c4df946756fb8011a449e90b7f886db11b2330fe452f75d7 SHA512 0a57df99156dfe34d129231cd9ee703cb4d00f44d65e767aa71d7094e1e0896afda1d8f770f4efa33e156ac083ede9741ac7765a415a101bf38f1eab8da04bf1
+DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437ef41e49ad922a2f29c46f74cba9570aa1e3f9dffeacfe2bf31f6abee27bc393200620ebf23184f80ce3b40a93c3 SHA512 d3291e15461ebf9cb20d6ed145d6327e25595375a0b9e4ca9f6ee26a4b698d094f8f938cf766ee530cdd565b0f10bec78f228f70479e2777907376d24ea3b34f
+DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435
 EBUILD pikepdf-2.5.2.ebuild 1482 BLAKE2B ed869023041dfd2868624ad0e1e1c54bb93c2f19575ab2747d9f917911e0f9828b1a26b3e48749f8b14b5415ba9aed3ba168eb1eb6e8ef38f2bfa7d3e78ac596 SHA512 56732bc004bf3aa895df1ab72912e7941084a196a075be91357dc30eb19f87177318b2fd39ef7edb264fa7ec3e6f41598d84b749bb8a09af7efe2bd249c47a7b
+EBUILD pikepdf-2.6.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
+EBUILD pikepdf-2.7.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
+EBUILD pikepdf-2.8.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.6.0.ebuild b/dev-python/pikepdf/pikepdf-2.6.0.ebuild
new file mode 100644
index 000000000000..597751526446
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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 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 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pikepdf/pikepdf-2.7.0.ebuild b/dev-python/pikepdf/pikepdf-2.7.0.ebuild
new file mode 100644
index 000000000000..597751526446
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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 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 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pikepdf/pikepdf-2.8.0.ebuild b/dev-python/pikepdf/pikepdf-2.8.0.ebuild
new file mode 100644
index 000000000000..597751526446
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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 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 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3045e673ba76..571797ba631f 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,3 @@
-DIST pillow-8.1.0.tar.gz 44929704 BLAKE2B 6b8100f26a746c625851521d7aa3696c4de30b05d2debc07cfcc038c1bc1e73ab1136676d22fccdf17b8d0ecfeb21479168580e5f5a93488c50cbaf1c6533d79 SHA512 1014271d29e98c465e6882ed3f2f915f8955f5ada2a762c671a1f79389b25576ead2d144c6eaf42b4777f14438d15979d78d34dc32d984fd7defb53f0d209957
-EBUILD pillow-8.1.0.ebuild 2621 BLAKE2B a0df80c884d2ae46c5f02126e220dbb10330c35e25ccc8a24ba4ce451efe93aac0ce1f2ce753cccc286626a3841a46a683ef4c15435175e0caa6a46f7ee86e6a SHA512 3337dd0acc4a11306870d428a64e7af65f381d57ada6fe44ebdbd748eeef28b69d7081c6485fe93b38e93f33da734d7d398a91fd4b8e9e273624d4a687464fb7
+DIST pillow-8.1.1.tar.gz 44976395 BLAKE2B 208534f3e24d9416360efaab8f802b4d482208fe81d1b39bf8339ddd1fe992b281a59faaadeb5ad5364ff062b1b7b19c3dadc11f9a453d5bd14bbf5170521396 SHA512 d04300442ac33e946bea186d6293516b615059b0f4b1b6ac7a48ce3a2e4e22bce5bc403331be697c022a4c81cb30f943cc33bfda649873c734af7db23afd6b69
+EBUILD pillow-8.1.1.ebuild 2621 BLAKE2B a0df80c884d2ae46c5f02126e220dbb10330c35e25ccc8a24ba4ce451efe93aac0ce1f2ce753cccc286626a3841a46a683ef4c15435175e0caa6a46f7ee86e6a SHA512 3337dd0acc4a11306870d428a64e7af65f381d57ada6fe44ebdbd748eeef28b69d7081c6485fe93b38e93f33da734d7d398a91fd4b8e9e273624d4a687464fb7
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.1.0.ebuild b/dev-python/pillow/pillow-8.1.1.ebuild
index cea581c6c538..cea581c6c538 100644
--- a/dev-python/pillow/pillow-8.1.0.ebuild
+++ b/dev-python/pillow/pillow-8.1.1.ebuild
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 0143b43e48be..e8495bb45e6d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,15 +1,8 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
 AUX pip-21.0-no-coverage.patch 2082 BLAKE2B ad2efd846eabc81f159cb9c45773258fa3e242ae619428c264bff738456d3957a229807812fd945744163b0d70bea70da36e659d68530c33f810e96d311de9f5 SHA512 4f8e2242897092e41e156b01a35ca2a0c1ddcaa1e4e5347b6fef0f9ae171a8d7283c346c0e0c4b013e62df29eb053095d6d8caf754d162fce89937270f0bf1ae
-DIST pip-20.3.3.tar.gz 8757085 BLAKE2B dce60cd59669929957715d6be70da4924c3a89bb4129f0972516bde8ccca751b4f327dd2f44a06cd0b48d092f8d520d1ec236ee812f768282004b34f1fabb798 SHA512 362d20e5d2665fa6211cf3836ca02a0340fb34ecde1d5902eecae744eb655d7dcfed0bd464e9db186b87b63a7aaf275e43645cf6321bdddd44b62787de84d87b
 DIST pip-21.0.1.tar.gz 8772082 BLAKE2B 2fdd78e2db8ceda2bd21fdeb4d29c0c2eda412827b87cc97ec1996a5b71b9c6e5938c0a6ef696163780bbbc55d81b8b3b1b6e2e79b05fbe9ce4bdd52e3ebdf13 SHA512 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664
-DIST pip-21.0.tar.gz 8770962 BLAKE2B 5a246e40a8b2ea5ceda27bec27e9bb6390613e28c301ed79fd95886c850a29ee1c0261f2dd69f1c2485dd72ec3010f61c4e783ed707a40630534790eba748c4b SHA512 ac77a7204423f1fdc3a4d328dab1860258efccde0123cff3217f357637c4ce3d85772ab81a230122ff813be2cfa40f2862e5d499390289efe1dcde3a31a42264
-DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST setuptools-51.3.3-py3-none-any.whl 786243 BLAKE2B cc8a98cdfd5cb78a342a3d50049c0ebd0965451e9bd4050b7a133346f505a17842a498531ade9bf932064a6cac81277ecf60d94ef94faa39b78740de87f9fd86 SHA512 1d4f29e392371b7f0e427d0570fddbdd1204f6c98e48a0a289db23b20f7c048551584ac946e30b90d720cce4f508b3c39208e9a70f87067d66734432963d141c
-DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-20.3.3.ebuild 4312 BLAKE2B 852a0951b03f2083c3ce3748ec790c6b5da4e86ba16574c9e26ce8ddd4a96a34b9c5fae5ba8f619cd31a3fe134037a3700fecf104fd1a028331f647b8e8bb476 SHA512 c422579be536b602203905ccf81a0c49887fe9b0f2458a984f32fd5d20240a8208f0c4fff80fc4c60e9deb82a68e2680124e02ebaa3581c5be7706d5d71446eb
-EBUILD pip-21.0.1.ebuild 3778 BLAKE2B d79c3301b2a44c52eb797396de52694db516fa098a1538a26887e055ca7753573744da31a7162c905595943cea7055ef358752b98ce9b37daf7ef6230fdf809d SHA512 687193ed63f011a4b5c5d280c1a30f2659a298bca75135a47b05669a080a0931aa43ff56afb188f012cff36932e60f4546b801df1bb03c4659638e4e8e8ac3ec
-EBUILD pip-21.0.ebuild 3850 BLAKE2B debfeb584693f0f599574d46a27502d7c197e7ab562a8e3089177351591b6bbcac9199acb1a278910cfd6236664a727d4bf70ffbb4a62e5f0708908c2cf3ea06 SHA512 69f446ce6463e692b3b718bc3c902c5d84030ae09481e640f83dec06de4c86ca092564e4d6c5b4ce9413d3290801e3923ad260945a4dbf674665451598db1616
+EBUILD pip-21.0.1.ebuild 3770 BLAKE2B 809223baec949e59ee589a954440349091c03b81c4f3d25e405169c0a678aee6e71ea59e1b84a11b6befc27e69d24600f89b17369c0d03e2b5c5f11715354c8b SHA512 b9283e24bccae8a5c8e1ea6a2cd525079d12b85b1e772434726a74d861686a4411c39a5a81201ad28c64e74d997098bb3e52443bedf827268d4d6b2f80dd11f6
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-20.2-no-coverage.patch b/dev-python/pip/files/pip-20.2-no-coverage.patch
deleted file mode 100644
index 55be5b8c9712..000000000000
--- a/dev-python/pip/files/pip-20.2-no-coverage.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-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/pip-20.3.3.ebuild b/dev-python/pip/pip-20.3.3.ebuild
deleted file mode 100644
index 8fc9e727b994..000000000000
--- a/dev-python/pip/pip-20.3.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 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 )
-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/en/stable/
-	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 ~riscv sparc x86 ~x64-macos"
-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_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
-		# these fail with new setuptools + distutils_install_for_testing
-		double_install_fail
-		multiple_exclude_and_normalization
-	)
-
-	distutils_install_for_testing --via-root
-
-	# 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-21.0.1.ebuild b/dev-python/pip/pip-21.0.1.ebuild
index c5d9fc3fcec4..902858799358 100644
--- a/dev-python/pip/pip-21.0.1.ebuild
+++ b/dev-python/pip/pip-21.0.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test -vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.0.ebuild b/dev-python/pip/pip-21.0.ebuild
deleted file mode 100644
index ca2635d6f3eb..000000000000
--- a/dev-python/pip/pip-21.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-51.3.3-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	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/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-SLOT="0"
-IUSE="test -vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${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_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${PN}-21.0-no-coverage.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_WHL},${WHEEL_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 deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv ${deselect[@]/#/--deselect } -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/pipenv/Manifest b/dev-python/pipenv/Manifest
index 3d529ceb24f4..6de579fc95c3 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,5 @@
 DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2020.11.4.tar.gz 11574683 BLAKE2B cb2ac4ba6b07377a3a5540b23756afac38a02691e495ba93031815417d001701b919221fd83d0f9e6b94d4f28c1fa754c2c31e289830305a8c8ac75d847209c4 SHA512 c9015eb9a449fa517f31619d1fec5d99882da915a50e189ba6ab9c7c147862f9734f0df200330d666380afe5d2cf52d18015c539635ca6459042ab50d3ccd059
-EBUILD pipenv-2020.11.15.ebuild 1433 BLAKE2B e8401b866443ebd69f8b486ee095ee4a8c5083d946ff8dce48b1bb4fc283e746e6775bdfbc732288c807dc3ef52dbcec2b8e443f2fb6cbc73881a9f010c5aad4 SHA512 72e456dd97d11d0e16abd49c0f8de445519d542563791a8fef59b84b35f8b0530275da967703ce38fa0757c64e1a62d394878f284019a5f9241623a5205cf983
-EBUILD pipenv-2020.11.4.ebuild 1436 BLAKE2B d56794b0968c42bed6fbdf2fb266b35c6cd99a565e8d440ff37ecba8aacf8086a4c05d2832d739ba2c0fd43fe91bb5751cea04765be53e5efc249e40b9c04b51 SHA512 265545ddbe990f93d970ab537c7bc5d625e2456ffa36caf248ba64962864e85c6018a485901ebf25206536124e78ce716684e4f1cadefc4616a5df5b8a59ad32
+EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
+EBUILD pipenv-2020.11.4.ebuild 1432 BLAKE2B 00d2dd047f89341579febf843f12432ecd0e867f81068c230d39de68eb0b3e2f6c8816f37e573930cb582f27987c9656306efb4e66942b7c58f3a4a96d100d81 SHA512 cb76b0fb86259e84fec328352a02001bd8c5f1f519ac5bbaa429316e6a8c6b3da0d90c838864224a02c51dd289958308bb30ef88f1031499ebebeaa43f79b157
 MISC metadata.xml 612 BLAKE2B 98320e022ea9f2425e3a499f769490e2ff0372fbe5c1fc2f77f0b3bc89a9ab10816c7b45571a6526645cbc437f067cb170df28535722d324e1c7e88b4200e7c8 SHA512 c3c4c875d80c3aaf0ec9ea42ffe04641e60f0c54c9b9dae661cd19d488cfa230c8d8bd98cbbcc4e91f53428f66cc44302b0891ffcf6fd6e1501fcb7d258eac65
diff --git a/dev-python/pipenv/pipenv-2020.11.15.ebuild b/dev-python/pipenv/pipenv-2020.11.15.ebuild
index e20e61223c3f..9028b19d5c26 100644
--- a/dev-python/pipenv/pipenv-2020.11.15.ebuild
+++ b/dev-python/pipenv/pipenv-2020.11.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -26,8 +26,7 @@ RDEPEND="
 	dev-python/pip[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	"
-
+"
 BDEPEND="
 	${RDEPEND}
 	test? (
@@ -35,7 +34,8 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 src_prepare() {
 	# remove vendored version of PyYAML that is backported to Python2
diff --git a/dev-python/pipenv/pipenv-2020.11.4.ebuild b/dev-python/pipenv/pipenv-2020.11.4.ebuild
index f9e44ff1d377..8f561656bd1f 100644
--- a/dev-python/pipenv/pipenv-2020.11.4.ebuild
+++ b/dev-python/pipenv/pipenv-2020.11.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/pip[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	"
+"
 
 BDEPEND="
 	${RDEPEND}
@@ -35,7 +35,8 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		<dev-python/pytest-5[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 src_prepare() {
 	# remove vendored version of PyYAML that is backported to Python2
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index b1f223c93e26..5ab6cbcad317 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,5 @@
 DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
+DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
 EBUILD pkgconfig-1.5.1.ebuild 571 BLAKE2B b515916610f90df9752c25cc60bc7b7ca9d5f8a0b70b91a7b9b89e8f8fcb26a32878c18d9b1b07e672c9381158730a84fc8da8915040c5cb4a8d8079995d2129 SHA512 1bf33347b892f21c5955ed57e33c26cc1cead03a75018d36530098a24bae3b902c0af448d4145c412ea05cf83d7f6b516d41f34546603002142b5870de7ad522
+EBUILD pkgconfig-1.5.2.ebuild 575 BLAKE2B 89bb594f4704348bfa5641efe9490197803f29cbfcce68bd43d92edf1003f084f8a0d0ba6df83c75096534400b31db71e66c16e07d9a74009a9ea9fd393ad63a SHA512 455d1f080ff35d9bab3c5d9a468ac35720de18db4526ac5f2e49835803c7acf5832a8dc52d9f07e394b4ec7801d1dd5065a41b630b7bfe23b46648cb5c5226ab
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
new file mode 100644
index 000000000000..df5e38603816
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Interface Python with pkg-config"
+HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
+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"
+
+RDEPEND="virtual/pkgconfig"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index a45ac021fd8c..462fbdc664d7 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,7 +1,3 @@
-DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-DIST pkginfo-1.6.1.tar.gz 37124 BLAKE2B 852a37825840fc5d20fe73effa39e1c01e5fd1f1c7b1a0663d0d43d7ac1ae1ec3ae62e0442fb436731a985dbb936ac4651bc4003f14d55e4b51f200b4cf4ccd6 SHA512 51ead9d2d16464eff1e46ccf99b7bcb40897d2526e8f5a0aaf10cb1305271134a1bc0b4524b4559cf0a8ddbb450ba4a9b123a41676f5b6bc2cbe721c7cec52c9
 DIST pkginfo-1.7.0.tar.gz 37209 BLAKE2B 70e2c7d69d4b9b5544017c0b0c388e375060f063a35a3467a420d8819d77eb0e9772735db78c0ad03560aa9e35dd0485945517f305056bd52d435e2462a3878b SHA512 0e41899fac552e6a3c401c7dab3e3cd57f31cc5f052e07537f15b699c85113800edac27d232571ecab4852fab1d73374eca381d1ab70c9a7461bb422ff03de3b
-EBUILD pkginfo-1.5.0.1-r1.ebuild 715 BLAKE2B 9b9f69886b2453390642ae25757ea519f4f67163e23690850b7a40e36fe08f10273bd58ee81765314751c7f2db53985c3725d482066f44bf1e6a565ff06d01c4 SHA512 157b7c952bfc038c724e3bb9773a4889a0a30fdeaf018e69c83882215d7a911c48cc93e4dc6e8afb96fb4f9b25095df6cbb6ad9ff401bfa034d022ea5604f365
-EBUILD pkginfo-1.6.1.ebuild 723 BLAKE2B 90c04850b2fa08280726d07865db999fc0e61e8c0937b5983ce5b6d9343c03850fff7839c2517e9be3edcff1159e81ea91a06657e9c4d85f63bf27eb3e531581 SHA512 e6724597b88d63e29583403d1bf8d8d60513df4b88a4114ef8e2a1f60bf5e23734913f454ad0cf1a3cbb17ed0dbdd3017e270dfcff99ee72aa4a9797513073f3
-EBUILD pkginfo-1.7.0.ebuild 711 BLAKE2B 3286bede96228f81fd1f607bdd39b41a6da0900ed81f45c8df7a593c7f5b55e71dca7cfb7040253311605fd1e9510bc0fe7abba4c4bcff2c87f0e22642b97819 SHA512 e26629192a2954f99ae6c42392989ab95b6a77e60886f3913c1ec7823daaec4f557f5806ef8987789be883faa6b67e0b7f6b7cad73022692a80e7190651f3a6a
+EBUILD pkginfo-1.7.0.ebuild 703 BLAKE2B b326a31628b69b61a165802f73df89338825a3412b0609e9dda64fc6bb5e1b05491951597af74a57962ca4b8fccc33a897d06dc2095ddb8d249e96d32456e750 SHA512 67c3e470a23d0d713e35cd98e6ae218aa5b7b194685aa7fb95b02d98902de3370818541b4a7905dc18e5c49b170b65a425c4354f9f4bd58d8afe19e1fe561040
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
deleted file mode 100644
index e76e4ee8171b..000000000000
--- a/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# TODO
-	sed -i -e 's:test_ctor_w_package_no_PKG_INFO:_&:' \
-		pkginfo/tests/test_installed.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pkginfo/pkginfo-1.6.1.ebuild b/dev-python/pkginfo/pkginfo-1.6.1.ebuild
deleted file mode 100644
index dbaf6a9eac0e..000000000000
--- a/dev-python/pkginfo/pkginfo-1.6.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# TODO
-	sed -i -e 's:test_ctor_w_package_no_PKG_INFO:_&:' \
-		pkginfo/tests/test_installed.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pkginfo/pkginfo-1.7.0.ebuild b/dev-python/pkginfo/pkginfo-1.7.0.ebuild
index a1a0c45ada8b..1fd681f736a4 100644
--- a/dev-python/pkginfo/pkginfo-1.7.0.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.7.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 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 distutils_enable_tests nose
 distutils_enable_sphinx docs
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
index c4d6fb43f1b4..38495276402a 100644
--- a/dev-python/poyo/Manifest
+++ b/dev-python/poyo/Manifest
@@ -1,3 +1,3 @@
 DIST poyo-0.5.0.tar.gz 15276 BLAKE2B 515e04ee365036c96646e1d7aeae273d541298d4d817713e04c4b8be5d7dd12938099a5ed8ab1dfd137d3ff0108a0e86163b99135ea2aa739eaae67ef74484c2 SHA512 aad4334a2aaf63cafab0ecdbdd6f94e9e3d412e6476d7ac13a4399b4af0f43b1eb910e6a3cc7438e84262bc39413fadbe91674534e1e66f446d738c1328b9905
-EBUILD poyo-0.5.0.ebuild 392 BLAKE2B 9940f4ea222099b4dbaac9265cd94c549625439e1200bcb60fb1aa1feb87290216ff24a4cb340636aff7df85e6dcdb489b1813339ef9819896a75c5284850213 SHA512 c69728f8b111e5b5c16dff4ec06a8d31c43ac04dc2999783aeb60349b333ca100dc7625c37635a4e9b0b8ec505df81fae9ab07bb03aa86cd93c0faf55264c534
-MISC metadata.xml 361 BLAKE2B e2dcab94df2b6bc836d19fa5a7789279ef28dfa42ba1ca36f7c88fcfa461cefb2de49245fd9d94789b06f5560ec8d6b0b0d6a737cacdc4e1034cc211a468c3e5 SHA512 b40df5a8d22697185ef353c30f046ebab34896e43ec3e6aac1eb3c31396b051c026a6e76b00799855953a0f4393103bc2ab95e24fb358b0eff8897293d6762d4
+EBUILD poyo-0.5.0.ebuild 394 BLAKE2B 937fcf96d9e9185a0e45742a77594a4b5dd70a4a7a4986c9c68666764e26b07d8bcd04e2aa2795aae49f0823ad93601aba700d97ca1346fbc91da7a248e95299 SHA512 1f64e9930669a23668e0a4687a3e39720a719a6f3323ddf7ccdee35f24e8c9ec43e39212fbdb729a8672a315dbcbc364f7542e307850a003524a1e595c7633fe
+MISC metadata.xml 385 BLAKE2B 5e25f24f46871d150495aa515ebe44ba4ff6ead7a1ff5f7b5baedd568ce4394cab99226f5d09df25870ff87d5bcc078c7a82ca69f2fe43e3b1f0e84822d073be SHA512 3ab05157c11862a04fc20a868d57c19766781017900758cbb6d3dcc01bd5b6e36a23992e11c478a71dd2f3a26a4d2eb952a097b9327384ab6b629311ae596af5
diff --git a/dev-python/poyo/metadata.xml b/dev-python/poyo/metadata.xml
index 4d1c77ac98ee..cd7b09373ce7 100644
--- a/dev-python/poyo/metadata.xml
+++ b/dev-python/poyo/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">hackebrot/poyo</remote-id>
 		<remote-id type="pypi">poyo</remote-id>
diff --git a/dev-python/poyo/poyo-0.5.0.ebuild b/dev-python/poyo/poyo-0.5.0.ebuild
index 4c2d64f55a15..c593fc2968c3 100644
--- a/dev-python/poyo/poyo-0.5.0.ebuild
+++ b/dev-python/poyo/poyo-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="A lightweight YAML Parser for Python"
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 8208cd1269ca..bf0403bd4e7c 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST precis_i18n-1.0.2.tar.gz 65375 BLAKE2B 0ba2a23838306502448c4bc4bba5fec5228e4b819e7223cb5319ca3428cd558b5fdbd389327af7a8e718a5b8369b3d13de0f739456df9bae026acbbaba62e8dc SHA512 bef972f44e068954297429a22452d08c0e3fca983eb38dd22e3f90b3265bba1096343d34f7c9a226b24f92a823fdabf09af8eafba6bfbfdc8ddda8f0f4a28bdf
-EBUILD precis-i18n-1.0.2.ebuild 622 BLAKE2B faa56b156187aea174ab3e366ffa543c2a98012a515209d1d669e90d1ecfdf640f4d161540248d716037bb24c5ad8cce36602656c8018016899a5b084a00c26d SHA512 ef396434e9f9a231f43a6fa88bfcf8e4b60706e3215f86fe8507c6bc06348a9eba9d55c7cf8aa281985811c365c6f48ca6035dadf77799274127503571d79d1d
+DIST precis_i18n-1.0.3.tar.gz 64037 BLAKE2B 99486f8791785ecad7f3a246a0a13f26ec52aa91bc40ac904e92409f2cdbb28a5458c153da593ca8dd626462f0216e8c72447fdc81f8133ed61240717d08cbf7 SHA512 afb987fe4d0fb2732c62585e70361ad5ffc14d1eb9b8e767fe314fa9a3dee8dcd14f2531f5638d3a72fa7ac4fbeed94ed8907976816570257b405468cdb6702a
+EBUILD precis-i18n-1.0.2.ebuild 639 BLAKE2B fe7173d4b338c37cec48f6dff8714e239195b46bcc2b992de2dd67aedea3daaba9be970a5de9340188d79d846bd64034d8706532611247b60052e4ba72a65e22 SHA512 5a9cf566f8fca1ea7e2fb314430b3cb8d5e80f40217287fa4ce328da711ac916f4e0e9b8143804120d77745c73b4c63d18284464b58267b0748c434c77d77586
+EBUILD precis-i18n-1.0.3.ebuild 499 BLAKE2B 1d0e7577a9f8c783f139bbd023ec11f371f10379e730402477f2e5b3d73de116f4142edf74c838084ba53c2076c7cce8c35b25d12b492833e2ce7d21bf405fa1 SHA512 8f525e612af884e5dd0e8903d583da3f9edaa28bdb926428b64403898d240050cd4d1a001ef754a6458d801e897fcfdba19bd6207fdcbb08314b40d9daa88386
 MISC metadata.xml 918 BLAKE2B d23b58dbec4b4a3ac224ddb0413c70ae2ce1985c4a516ebb87ce9ed960c570f7dfaf7ac535c20b6fca401f49c81a1a3ae6df5df101593bbd65070ab50356edae SHA512 a04fd3004462cb9619f284ca076be314757dccadf916ade53eb5f2989fd5b4eacbea0817391a2380eed7358d096e2a5a253188f441be53086bb0d4c4716d5c6f
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
index 52049af743a1..40896484ed9b 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
new file mode 100644
index 000000000000..61f322b6d231
--- /dev/null
+++ b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Internationalized Usernames and Passwords"
+HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 837ad4259a31..c6ecebc120ca 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,7 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.0.0.tar.gz 43072 BLAKE2B 2293d0377f0bbef925014812cf0cd3702ef4f651927302012df44e829dd9ea249d03ddaee32f9313f3d001900e92df9a3be8812c8fc573624d308fa5c40a858a SHA512 b7c47df7d85a91e9518dea8dafcb27037e5cde81f59dd2b9e9468ae44b18431dd7d943fed487d5713e2c5aa25df76a8eb6587d045f73b8f25f53715a8a2085fc
+DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
 EBUILD prettytable-0.7.2-r1.ebuild 599 BLAKE2B 81279c0a0b31c8d20b3320531e78a9503d493c7432b758873826823c35e9db0e8e1069d1cc551c06ef5a223732a74bc4585247ba4a1973c03a5738e7cb6ebe3e SHA512 c05622c9ff27784044c47dd092a34545e464daf0ab17fc0b0e6e2eaa957a49e1b0612dd4fb87b907a4ccea023a8b0c383f65a8c1f98fc466cb55deefe66c4700
 EBUILD prettytable-2.0.0.ebuild 834 BLAKE2B 67567c319ede6e5e5cac3f5165405948d9501af776b164e480c2ff60ab63c946fc0282f2d35d17b6e388aa54c7e97773c048a9b06a7a98646b46d75ed65ad7c5 SHA512 553da775662dd6c1a2029545384bddde6add78dff92d30823dcd8215f1a0ff6245de26f44b65f1f9e9489d38ee159efa26958711040ce25b7d71b46407ca5036
+EBUILD prettytable-2.1.0.ebuild 716 BLAKE2B 2d5d3c5a66fb4eb184bb39749569a77a96b60905b6f5fc58a31d691cff516d4f1ad80622007d42f66f2a99f0948c545607a0bfe4635a7cbde49fd8c26312c7b3 SHA512 50c1067d1b2f8c228afae4710887d9cd2444a4beeaae74f18ce0d2e7679c2f2bb08924a29f91040ab6c27eb84504850274d81f0b7e270ddd74709079c42157eb
 MISC metadata.xml 582 BLAKE2B 2abcef37a8ef89f66a30fa5c96406bc7ae799f16cbeba3ab5105d5412da65ecdc691d410b0d4147d089290ef49a0fd8c4af42c1676c7161d82b12b31f7a2d5a1 SHA512 e4665346eda726a3041e5eceff3e7925bea95dc2a2df761c7f807d9da0f333d5a46a68ffb1413e6118e40c459fd08af9e9d73e6a45e9c84d41628d80e86fca60
diff --git a/dev-python/prettytable/prettytable-2.1.0.ebuild b/dev-python/prettytable/prettytable-2.1.0.ebuild
new file mode 100644
index 000000000000..f5e4ead55000
--- /dev/null
+++ b/dev-python/prettytable/prettytable-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 8b1dc73ed79a..c15680e866d6 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,19 +1,7 @@
-DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
 DIST prompt_toolkit-3.0.10.tar.gz 3020391 BLAKE2B 397ab28e5a362c84df7286be27be11acd4c6666bf77d63a1042cd76e6a4ee0b8002bad6166d858dfa6f07f8da41c6513c13fe2500b55da1dbc6562038ed974ef SHA512 71cdbe28064f28a2d88f369ee4550cc02b2609841b51d8fa7e8028304e77f34c6feed5d4549d62a3cbce27f95a4ebca1066a6fd869fbffa1799a3dedef2df6f4
-DIST prompt_toolkit-3.0.11.tar.gz 3024453 BLAKE2B 3e4b278797b1d55c35566d35ea08b3421df16942023952acfc1126bcdc2c4b2105d7e061951fc0fb995045437ea1168a0f3855f4b1450675da87d53a1e6e68af SHA512 d8f17aace8b54df0bcac101d062e207ed05ad305b1876bf1c0b926dd09ecec07f557dcab16f22f24fd9bc82902f4f85dc86ad797b542efa95b377b5d8f473423
-DIST prompt_toolkit-3.0.13.tar.gz 3024804 BLAKE2B 9e2db8742bd2bf64a662dbf2bf859b475a2b55213bb90dbee334deecde19a26d325713b9515b53b6e4e946020a7bd8263a391bcad738a3742d02e38bda4f2188 SHA512 d71671d3608e9d7600c5c846d215da829919dfec5fe2bb69615b2e6aaab2226c5c7fbb444eb31019d208b1f590f7ac29b5705d422b164eed0cb61802b90beb12
 DIST prompt_toolkit-3.0.14.tar.gz 385647 BLAKE2B 08e4483846ba0e6cc69828840a0791e1b85a7db91718042e9a357741164183c0ccd241130c83b980b88884ba32bcb60714c7f920731aa6ca91186ed6f256bafe SHA512 7767861d9f6e5cf88b398420187e4b0a075aaa4645cd8c346db104101f89bbe7c0da2a6518c82066da5efa7376db5144451416ec7b12e92360972f8d4e25d018
-DIST prompt_toolkit-3.0.15.tar.gz 3027170 BLAKE2B c00c44310784ccb652f8130fb236605bb2fa7cec4c396ff842038e6e07667fb185cfb0b2b6df676c1a4472f35a14542252080429662c959712c2ec566bbfefa2 SHA512 a8e2078f01a5e4b5f50fbdd16a4aa98e34322460da64be416a127234736074ae851d2be62a19bc98064376f49afc24aef40e4d568c43e92a16d55e31e7551c71
 DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
-DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
-DIST prompt_toolkit-3.0.9.tar.gz 3019859 BLAKE2B ebde3bd1ecf0f24b98e4f3e173c0a885c47af4a30bc19ce50bdc01636cd095cb7b09f9aacf37fd5f33f92ad2e5adec7f94cc85d5a48264c186a3a7460ef04b7d SHA512 8e9777215b73e1076f82e9733963151bbc4248581298b0f996cc1700db2aa28eaef3fb1a07470706e7569021f5e47ad9bc3a9a93c976fa36b6979552afc522b7
-EBUILD prompt_toolkit-2.0.10-r1.ebuild 593 BLAKE2B b8c29c5b702487cc7d422b9912447497e3cab98b1e99cf630baaaf3846420f61bb197489311af12c63e3a3d8329fd36535996baa0ae0af69ceb28759ae5401ce SHA512 5dc1f17e5a68d2c69623c676b0ae35669151f00c0e829ef6e99e5abff610eee22a24c9bf73e84e2bbb2b99f662b9169cc1d29a4e4330fcfbe49572a1cf59f027
 EBUILD prompt_toolkit-3.0.10.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.11.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.13.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.14.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.15.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
+EBUILD prompt_toolkit-3.0.14.ebuild 597 BLAKE2B fb5db05ae055ba17a8e0dd2f3db0a1e84053785b28db2a0ccbe37270cc96994a2ee74fe2764d168f079d46f22415125ce4ba6b427cfc21a7546b3b22d865e0c9 SHA512 bb1da9ff1bb8834d1fbc815395c4d0c50d3e551cabe8fc603dd9fb11bec0c466fd8f5fca2b3dd02a8aa8784e1d1b0f27994b9655110130455f873c9b60e101de
 EBUILD prompt_toolkit-3.0.16.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
-EBUILD prompt_toolkit-3.0.7.ebuild 594 BLAKE2B 0075664c5d482ab720be50bfc31ec4c0cf08a7f7ae9f7dcb9fa258e5b25bc56fc0218a1411be5b55ce28f9b50e77203a6c01f20919a6f897c438a28ed53fb9cc SHA512 586761782d59f87d4890ed2f38c654e12e3aef086cbadaeffb164b0b2e2522f51a5eedcf6c00316f8e539144e012439f94a001328c07eeaf1557dd95b693e668
-EBUILD prompt_toolkit-3.0.9.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
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
deleted file mode 100644
index f36f66f96974..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-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_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.13.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.13.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.14.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
index fe628251486f..8f045fd79e7b 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
deleted file mode 100644
index 9c7616cb8e91..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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.9.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 6185f1ecebf3..d85b2afe4137 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,3 @@
-DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
 DIST ptyprocess-0.7.0.tar.gz 70762 BLAKE2B 6c72cda3eae7dbf4335af11b6ffe1d46040d01fc5c2599948abf0a4fbd53ea45e9d2833843465dbb868da7b4058a014ed08754bb49888795de221bd54ae092a5 SHA512 791d8f2e79900627215ce80ce67ee9c79173dbc08297c6219d5058f9b80c5e323b93049e6836a70c4073f43548d22e3cf310f2e9948ef12f96bcaa15b0ddb2f3
-EBUILD ptyprocess-0.6.0-r1.ebuild 537 BLAKE2B 0cff32f84d7c138575b9207a3ee402f1a9a5cf325b2f7d578f69a7401d74c40ff0e9952ee57bcf8fa64b0b98c8cfc327068cc003d3cae9b1e8f515662e7772c4 SHA512 f7777b8b22e26847928acc6423e5a67497392ac9d535c081d6b0e04769b0cc163a095b3cd255505853e76f953545a463e0e126cbcca92409ba6543a5ef1bdf76
-EBUILD ptyprocess-0.7.0.ebuild 545 BLAKE2B ff5360c63efb99057c1b1fe05c6fa5c07f14ef1e420d751d745138b99318eef366b51d15025ab9e3bb9aa86f7da5c83aba20604af054153bb2dc27243e64cf21 SHA512 107f2f2ae7e9d89e889cd30dccb3418c73a8b433b81ca2d7d031fa24a4e6e142b4c3292c9bc68e34fa4d5e8c2277f5b3a6f12438f9fcb227cff85c2fd80cdd50
-MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
+EBUILD ptyprocess-0.7.0.ebuild 537 BLAKE2B 22910d1f4a98fad6d2adc275a6801cb1540124334c384b40a87d21a444ede56bd2eb03da1474f1943f22e6e61e5a8dc69f043e65936529632470ed50445e59e1 SHA512 5ef76cf495387c8204e5d925b13d06cb29bb8c5ce07b1d1b99676ae5f140b7f927278708fbf7cb47c8bc2613fd7f76af92b6f51e9d34d1ff2fac816029aff435
+MISC metadata.xml 408 BLAKE2B 2a7f4ec9617409508fac98416a26b1961a40fc565f886286c2b1a7e60e650bbec61450dca4065227b6e59d119745df771bd204b8a4ce2653316b23d833b824b1 SHA512 12be0553097645b279afa1c0453c61c2b8d29e03feb8e21260d780324cf98a4a50eb25fb903c3271e90502b91179c1cfb889501e13021958a5231bb10d8f0eb7
diff --git a/dev-python/ptyprocess/metadata.xml b/dev-python/ptyprocess/metadata.xml
index bfc26e6d3ec1..5bff1034cefe 100644
--- a/dev-python/ptyprocess/metadata.xml
+++ b/dev-python/ptyprocess/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ptyprocess</remote-id>
     <remote-id type="github">pexpect/ptyprocess</remote-id>
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
deleted file mode 100644
index d642c0281dc9..000000000000
--- a/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Run a subprocess in a pseudo terminal"
-HOMEPAGE="https://github.com/pexpect/ptyprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
index ab1e1b73904e..8164a9b8619f 100644
--- a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
index c4d6def37efe..8ec913d5cfac 100644
--- a/dev-python/publicsuffix/Manifest
+++ b/dev-python/publicsuffix/Manifest
@@ -1,3 +1,3 @@
 DIST publicsuffix2-2.20191221.tar.gz 99592 BLAKE2B 3e96f2b1d23a70827758eb4440892719deabdb9a67a2144fefd2d4b23e26dec0d19f6d9fd4de504d5d52c0250719ef85e929b4a2b92b7ba8896ed4055480d0d8 SHA512 d863f0937b340958ef7c8bd07d62054aead993ba31b0c2753631f2e75e48f7cea412c6501d8a94d98bf6a97a13eb0716c24a89e336787d5570e9af0386c58320
-EBUILD publicsuffix-2.20191221.ebuild 581 BLAKE2B 4bf38b49000817997573279641cc8b79dda2ea773eb1e6ea475ab04de1325684624f8aa1eee74e82d1f935c64e8794bd3829abbd430e0cdc8f32d04ee4b618da SHA512 dac7b4914dfa00137d50a27713a843f0562637251afb0fb3008054ddf93ecc1b6336264c633e711bde01e2bbaf4e03ae5d8317d1e7fbfa1475ad515935aecb24
+EBUILD publicsuffix-2.20191221.ebuild 585 BLAKE2B a2ab68bf83c321475d65f6825a0079bb3367300960f9b9caf30aacb6e864dc4bc7ed7a264fe707f43c957a8dfed597a194f172a491df502597927b09cf001309 SHA512 889c28d7fc8fc5075a3fcda04860671d006b66658085fea07ff68da09c27f77732cfb72488b69a93435643ee0cc762c0c566b1771ce8ca609fe8cc54fe92f117
 MISC metadata.xml 583 BLAKE2B 3519893d41ad0f0d9c52f9ec48cf1e7e03e6975dd941e8f1e6c17c55383c42dafda8653c53879d006295996c6cd9fc9b2147c7e2273b52e851bf60e6cccb7e59 SHA512 0947e97be911b2dc15a80d09b950a77057430e5041d7489d80bf4e02fed669abd23ad8b0a3eef18d3ec844473f22e67a6e4d5f5d496e61605334748d175cc48b
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
index eca5b2ff79d7..70e340f60a4a 100644
--- a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
+++ b/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 6330e940c367..28a92557768a 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,3 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r2.ebuild 768 BLAKE2B 13f17cec9d325d7641d812dc86526eef2dbecb78c9d3ab53821ab8d03df702036d5359d381043f8c804c4a0e701c301adc7643dda0f48abdf9a8b2c5c7500809 SHA512 5ee3dc250706594340e96e87014a6a3b82b972a1281d8bf3ac2cb7f07cf8a7ea636244f4c9498e2e4a90a234c6776a904e1dc05af5665a6c47e457eefe239b92
+EBUILD pyaes-1.6.1-r2.ebuild 774 BLAKE2B 2be931fad2d043dd42ff03376b78714d0973f5da17eb2a1b302806931fd7f086ff7696b1d503116284258f59e8838ee0143478575ede177dca3651aab1fee716 SHA512 2ae472cf31f08883ef6a97275c63dddb0dbb2523f8bf3380b12ab6d9b0e9343807d55661c6fbd88f6e4f26d1a0688ed3e68f4b9873f1269c8f694f53a63b3afc
 MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 860bc575f894..bd68548f3e16 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 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/pybind11/Manifest b/dev-python/pybind11/Manifest
index 1e6f2a13e44b..5b7f63eaaf5e 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,9 +1,5 @@
-DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
-DIST pybind11-2.6.0.tar.gz 631925 BLAKE2B 6b7872182f52e035f2a86f0f2ad70b084e62fc20d5aae4903c13ff824f80f3815845f3206d740d17ae471fd979eca117d9d4ee011f9f96c319ca808e6304b07f SHA512 6a3f407c136d827243c0043c794c654ca267a1a4e3b7e0e45cc7629e29193156b0744d85e45222fab284a9af82cf7fa2008fbd977d2b5a7b947c8a6581456caf
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
-EBUILD pybind11-2.5.0.ebuild 1291 BLAKE2B 251e15c7aa172f1dd8ee33a762e72b1653eb5533bb1d1e61760a95ce8382525f552e420cb2559c5320a111bf51c9b9475a67eb69afb484162e76be9aeeba8239 SHA512 b9f17b21673a69ab521ac079aae7638b34fbd56964a03231bb1775a3210eedc25ccb6e25b7c23bbc38fda56394ebd1a6b69c26900619f7761a281851eb36b374
-EBUILD pybind11-2.6.0.ebuild 1271 BLAKE2B 907a503d96ad11e76f4a2e7259d792f7bef0f8eb86fb7fe462c385a44eebbd337ad51face36457ad7c3fad428242ddcea372c8c4746cac69ef0ee86d5daf84ef SHA512 60efe8a32e1f08f355147ecf659c9ff3887706ac64863ea50a9d897edf4ece9befddd6f7a1e9975426f7161c71904ff1beede2c2b8d1d35556cebda29efbd11d
-EBUILD pybind11-2.6.1.ebuild 1272 BLAKE2B 3f67c0cf7343203b0d190577512bedb497457d776340cdcaf7f7cb2319b08f3c1c60415387a638324cd55d5600881a57026bb2fedf5ae283e77dc0b63560b859 SHA512 a2663ec04758c11b3afd257f31f3d64f5bf54002a9f2ebf89c71fc03d584371e469a5a452d174e1431c077f8efd8f9ac5748a9d876793842c146e2c01a398190
-EBUILD pybind11-2.6.2.ebuild 1187 BLAKE2B c1e3acc32b38999e7356fa26ea9c2c33f3abb069a9fdebdfbdc52fa3ac67f3830b9474f65e9397b76fcc17b556c9cb54da370a04babbde75c065b516f7698d8e SHA512 e910cf0329a1ab550595d1cd91289f4399a7313708840e60de98a1c12b4dcc9870731d12ee4f7abe6cabfaa29ec4a883a1ba6fd6d8dd0b4c0c1287b2910444b3
+EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
+EBUILD pybind11-2.6.2.ebuild 1079 BLAKE2B 5ac522fae270d505255da6e92fdfb140043084e943db0f966cd61a7414de8c0d5896d4e4780a3b7d0419c069cdb7cdd6f2f9c19767f201013a975c2b918882f3 SHA512 7c1e6f411feeb6a8299dbac6aa26874a92c058f368625d40c9c151854522da175e5313357aac9e1a274680ac0e4433fc3fa8c525c88b26dde72d1078bf7d76c6
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
deleted file mode 100644
index 01814f6a79fc..000000000000
--- a/dev-python/pybind11/pybind11-2.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-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"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-
-distutils_enable_sphinx docs \
-	'<dev-python/sphinx-3' \
-	dev-python/breathe \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-DOCS=( README.md CONTRIBUTING.md ISSUE_TEMPLATE.md )
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-
-	# broken with scipy-1.4.1
-	sed -i -e 's:test_sparse:_&:' tests/test_eigen.py || die
-
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.6.0.ebuild b/dev-python/pybind11/pybind11-2.6.0.ebuild
deleted file mode 100644
index a05d779b717e..000000000000
--- a/dev-python/pybind11/pybind11-2.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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 cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-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"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-
-distutils_enable_sphinx docs \
-	'<dev-python/sphinx-3' \
-	dev-python/breathe \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-
-	# broken with scipy-1.4.1
-	sed -i -e 's:test_sparse:_&:' tests/test_eigen.py || die
-
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybind11/pybind11-2.6.1.ebuild b/dev-python/pybind11/pybind11-2.6.1.ebuild
index 9078a14c5381..2503acee1b36 100644
--- a/dev-python/pybind11/pybind11-2.6.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.1.ebuild
@@ -14,16 +14,12 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
 "
 
-distutils_enable_sphinx docs \
-	'<dev-python/sphinx-3' \
-	dev-python/breathe \
-	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/pybind11/pybind11-2.6.2.ebuild b/dev-python/pybind11/pybind11-2.6.2.ebuild
index 69c5bc2c5387..55f034efb1f1 100644
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -20,10 +20,6 @@ RDEPEND="
 	dev-cpp/eigen:3
 "
 
-distutils_enable_sphinx docs \
-	'<dev-python/sphinx-3' \
-	dev-python/breathe \
-	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 83104a7fdcda..36cef3abc885 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,3 @@
-DIST PyChromecast-4.1.0.tar.gz 44463 BLAKE2B 3ee92cfe57134665621c347dda9b21a06fa1d000f840d25b49f843edef86e35e22b82c9d4f80b8e0ae6f5fabcc4662d7c619363686a37903e27d84e0f85c8fca SHA512 688014a115f3189fed5535e70622a7323e4a29fd65678aa14a302047c5246dbc6a932a8f4eabb58f9fcecc0f4bdbe627d1496a4b6d28e680ad4fac6dd902c825
-EBUILD pychromecast-4.1.0.ebuild 707 BLAKE2B e5cb62c087685da471ff73f3320c6abe592ba4524b4426c3076c4da3089595ecf575793f4391ea65e61fe538afb58fa3af1bc2fcab55f613d046033f82ce9790 SHA512 00b8bba4cc56d5828a14e4879d22b27ea0ad8ad3aca3de3c929d6a8463346d2e18684847013c4167315667baca644e19805111226932dce55b86a2c00835b8bd
-MISC metadata.xml 329 BLAKE2B 11a3bc359a7381215f3f41f52520d1ff51e71579bcf7419c6ad092e85dc3c5820c92e8da8d741ad2cb5c4ac0492a1be7ddddeb8a59898049a9cf830010166ab5 SHA512 56015362baab8549c6dcda45b3951925ff72aac085938e51490ba032347227aaab2fa362f68096f86d703d37fac6d12293878506f6cc10fe276c01de4b4e3569
+DIST PyChromecast-8.1.0.tar.gz 50867 BLAKE2B c5d3e07f1644d0a83ba25826e27ee62f36b80f594f6851714c2d17ab6e8bb9e982bfa72731715bba15b6b587967461bb5def3cc49569d43b5186ceebc4a360c0 SHA512 882ab5987a7ddbf61a177ff867986461bc21bb5560a7de1bafb3a873173981139897ca36336e5b21b0e013f0100d437d1077038f35676998d3eccf353d684f9b
+EBUILD pychromecast-8.1.0.ebuild 595 BLAKE2B 49afa36e52f9d0820e46a7ef8fb5f6fe6c02a783394b1a429d25ad8cfc1f6bdf880a4899ea606c2e1f5cbb70dc14bc1885f563b44e04b86e60fbc65679af870d SHA512 d3afbf7c524d0fae0919fdae98ff0f71242cae41a943dacf00c379aea4fb963ab3a9347e52b3b625c57d374ab03ee463c715cff582e0dd9182f90c3afd06a907
+MISC metadata.xml 353 BLAKE2B 6810bad286e48bece29c89e66c28a88647527bd6d5d5e29967408567e9c4ea246062950b0393248e43c3af78bbb6036715e27385038ad4e58129f1779bd1a149 SHA512 0827d936aed04afdaf910a0eaebbb4590350d2723cda185065a22e3ce6a2d52385b0f84bab843f764e064d338cd11927d4f096881f9c17ae6c85e4c193d4872f
diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
index a59cfbf773ee..0d5b4e09c4e3 100644
--- a/dev-python/pychromecast/metadata.xml
+++ b/dev-python/pychromecast/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyChromecast</remote-id>
 	</upstream>
diff --git a/dev-python/pychromecast/pychromecast-4.1.0.ebuild b/dev-python/pychromecast/pychromecast-8.1.0.ebuild
index 70e3cf61b9da..e46cde8ad015 100644
--- a/dev-python/pychromecast/pychromecast-4.1.0.ebuild
+++ b/dev-python/pychromecast/pychromecast-8.1.0.ebuild
@@ -1,25 +1,21 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python module to talk to Google Chromecast"
 HOMEPAGE="https://github.com/home-assistant-libs/pychromecast"
-SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
 S="${WORKDIR}/PyChromecast-${PV}"
+SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17.7[${PYTHON_USEDEP}]
-	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]"
-BDEPEND=""
+	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 19334cc19565..0d6cce55b08c 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
 EBUILD pyclipper-1.2.0.ebuild 784 BLAKE2B cfb581cdb79b46647a28a71bda3c0867963a630f48c0610bff9988f3c0743012c2babba84546a54944d521dbf481a887962586fc0c891d74caae05f2fb6d9f5b SHA512 f98399301a4e015aac64be5a603961199c30d92589e0f0e6d92a9c3794872e5f6f673174c259d148f3bc30a92b0c65b87dc83f12d51e30f15795dd3297968762
-EBUILD pyclipper-1.2.1.ebuild 787 BLAKE2B e59f50433f6caf9fe8d602d99027c32aba68416a599a187952d31dde8634c01516d737fe9f6d3c83cf8aa1014e4646d735a3bacf442b1168dc78b1c8eed7efc3 SHA512 bec317849bf97548fe94835f0a072d5b8c4982004f69164166ed76c4fb3b01369bfea1de5a9768de440a078f9c06662670e291ffc0e698c02b0dea999b6564c9
+EBUILD pyclipper-1.2.1.ebuild 785 BLAKE2B d578ce800f96163ef4911150716e4c470f673d448fa7a08bfd4fb155bb9c1488922556227ca8db2649194ade339a296bd36db72aab0e20a557571382d848e6c2 SHA512 33201396f9d2740a5b3d1a4b691f1c3549ff5102649594f58abc15e4e0c548aab5271b14e056c49d775a39a97d04e90fcef27c429f4be5d639d472002116b5bc
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
index 4448844760f0..6b883c5d2dbe 100644
--- a/dev-python/pyclipper/pyclipper-1.2.1.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 04e087b5704c..c7283d80410b 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -4,6 +4,6 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
 AUX pycryptodome-3.9.9-system-libtomcrypt.patch 1538 BLAKE2B 7928e5a3c2edee7f58d7b7f5876416d3b397e29cfb63e063f904f7a1deb46300113d165aaeddc57e5e0e0b4b1f0ab548fb9151e1d43f16483491948c2d722d2f SHA512 74b0ec6e521e0d51c3e777a8cb6f374e2e3853e163cbe66e50a16b9eb72b004386cb6296a0f3950ccac9a3fece26221c0363e4b05df4608a6c5e7cf408fce6c8
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
-EBUILD pycryptodome-3.10.1.ebuild 1427 BLAKE2B 16c7bcbfebe68bde9a7763132e8ea7ac770e3675d7b80f135620b02ae90adb99494e99b2db6850eb16ac6bc02048cb72a02d95174036a109dab6b844f62a57a4 SHA512 02a0cb06bd6e1596029ea0673b4a4902369e2e9fe838aede9cb9f70254ba5eaeb14a09c30dcbb7639f56c9dd77864e5c77a130e0019da9138fc2d2a26f113b9a
+EBUILD pycryptodome-3.10.1.ebuild 1439 BLAKE2B 42a04f5fe53fb122475905510fd8addec91ee89fb50743d740714c0bd66d5ceb2ff3c739ac125b634d4fd645e3f5dcb03d088e3c793e7e526652b25954ae6822 SHA512 ca5608c0620f56ea9d97d90971f0a2429438bf9be0b8b000546673f6aa053542b920200faa98ed9af11b00cd86ef19c7344b0d4a0d44777a46e29f3bf9f3d188
 EBUILD pycryptodome-3.9.9-r1.ebuild 1418 BLAKE2B c5600edbcee40731b005b54b3a87325b7b1f9cc52a0ed1a1c2437f47904e42a2d8054e708737a4b579b520ffa3b51647010cb9d1a48ffaf2a32f744865864b94 SHA512 83d98d4e857553f45082bd28c2d80ad0921910097892c7aa34d8b4536db007684c5714820b7fc7458bf387b949646526aa9528a81b6849e9392999b72857bae0
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index 2e000e816eea..81175a13b9c5 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index ac6297036974..9b0b0c5c52ef 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,3 @@
 DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
-EBUILD pycson-0.8.ebuild 480 BLAKE2B c3bc50ee52cf920a30f56944de6650d7035c376111fc52dfe4697def2585071a3222c9591a1448be970c83484ad8808db9077c111c7d8cccdc3230ebcf79d7ab SHA512 8a06ef42638b191ab84d49055cb181f40ccb6bfff5c7304469b567d8c47ed9b3f118847034e9d6d63eb8eceb8b02dbc8c5cbbd8e15038c6498ea9f6fb7d41ab6
+EBUILD pycson-0.8.ebuild 485 BLAKE2B d3c81964bf86b8f902dca174be63ae823c2b4c54f76fa4258bf2817d28c19c57d7d7b8f1d60f4e047ebde5dd5c3d8bce0506280c4b83953fa28896f6650c1394 SHA512 fbe9f6e091cc57e554a6bbd140c3a4efa2c7089aefe1790e00065d3d10edca6a988c25fd8baeceab4d6f61f759e18c9371732ac87baaa3b30da684a71cbc627b
 MISC metadata.xml 403 BLAKE2B e97a1a22dc755326c7d234aceea3d28fc560de8813aa1560477ea3fb4d2a985d43853e3628812c56111d89483ceba23466c79e00fb86a843870d9e03146c2681 SHA512 37a294a6e853785ffc0f49c99a84639057fe6ef783fc304888bb45207cccfe04279e0883a7c7c302ab7764a66711b609f87f2763e8726df49afc68645e06dd7a
diff --git a/dev-python/pycson/pycson-0.8.ebuild b/dev-python/pycson/pycson-0.8.ebuild
index 8d7eb949f00e..6380c86b010a 100644
--- a/dev-python/pycson/pycson-0.8.ebuild
+++ b/dev-python/pycson/pycson-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
@@ -8,6 +8,6 @@ HOMEPAGE="https://github.com/avakar/pycson/"
 SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/speg"
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index bff4d9fd723c..cc8f8d660fd5 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,7 +1,3 @@
-DIST pydata-sphinx-theme-0.4.1.tar.gz 3279361 BLAKE2B d3538dea9444272f1cb314d8b2bd8656b5114b916f31c4cca078867b02a24c60fc91e5ac367d09335b3ce4b9c9fb44405f61ed70b19ae9fed5d8919fc68f1566 SHA512 dbca1f7bde25c20a5ffb5b37ac808d84c938e6cadb6e0a6bc2d72101993889f4f7be3bdc50488bed1945779d30ca0f131bf74b16be2df00b5fa093f8491fad39
-DIST pydata-sphinx-theme-0.4.2.tar.gz 3279200 BLAKE2B d1229e0af813fd5f69aa1b4d2f6e1b882f9e469cfd296e16a35e7d9aba4336faf245f0b52053b606be9839e490f690d24624ecc8fe4a3b40a6057081224889dc SHA512 9d786937d5b05e86af779893f28f553b13220e8e208c87235ba311cf830aaf718aafa2142c400b77728c407d6cff4ce66e0c0b9bec91efb61be8f75473c6a1d0
 DIST pydata-sphinx-theme-0.4.3.tar.gz 3279359 BLAKE2B c2a57fc7dd70f8d57a0b56bb45907615658b1dbb705f177fd40e04995754180dd637256618b36b0a6ee59e865558eb013d191f2a5f461365f07cf647427056e9 SHA512 9f4f0b1fab88e92302211957df798a7e1bbae034e9935260f94959bba50bc3384ef818ff0cdcd04c3a4b4d09a5285c3d165e35fa3114d6dbb15452cc6895703f
-EBUILD pydata-sphinx-theme-0.4.1.ebuild 965 BLAKE2B 3e50013bda7f7e70997be801b05348acccc1aeeb21d2917b577032a4e47ed878e4a8a98044032c28e4fddd4f9129b1d337f650ee978a15541e974f71cd176f60 SHA512 942c6d3002e18a431cf8f65bb618fb25158c17ea36d5f386f9e2332ae2a4bd0f2a6a5d7df9a5c388d887da6660f05070a2349bb3752ff0ecff677d46565d95be
-EBUILD pydata-sphinx-theme-0.4.2.ebuild 980 BLAKE2B 74565d9ada8a36bba429c28b3c0ee18352343b4c5cab90cec3b65ecf183453ff6f0101d71befa5cecb042fa0a4c2f242e526270e004e6a77524157ff6a4b24bb SHA512 b9485827fbaed46a3e541b9340c4d4dc7d8fbe374046604803c9faab8385133263312be74df82c6eb7710a94e789f9b8bcc02b982bd0d597fe542817916e838a
-EBUILD pydata-sphinx-theme-0.4.3.ebuild 980 BLAKE2B 74565d9ada8a36bba429c28b3c0ee18352343b4c5cab90cec3b65ecf183453ff6f0101d71befa5cecb042fa0a4c2f242e526270e004e6a77524157ff6a4b24bb SHA512 b9485827fbaed46a3e541b9340c4d4dc7d8fbe374046604803c9faab8385133263312be74df82c6eb7710a94e789f9b8bcc02b982bd0d597fe542817916e838a
+EBUILD pydata-sphinx-theme-0.4.3.ebuild 978 BLAKE2B c1195609b74e8a79b596d12ca3546ec6e2a338c4bac68bb5aee54d206a8954038fc4d2b88380703f7db0a516d33eadae8557fced9194b07a9589723536aab1c2 SHA512 8bfd6a630fce8520733d012c22b3496786dc35d3f5a252f5e5b23a05e58b5a971db4feac105ea69682ceeafc2a07f83d0e4dedabc38cfd93a21ba4e43da6b895
 MISC metadata.xml 582 BLAKE2B b4438cce7d7df99e76b61279181bfe6b249df6fad33895afeec44bfc25f44589804b51c6542bc7f75866d7b30a10d9b083bbf57de27808e55db15f0517c096a9 SHA512 3f2984b687c60d565bf1a2b8890b6c044c138484003fd67589035f5a1217c866f0157e0ef9956ccf5c35adf337be822ca34dd3c70394855c7c4916bca15deb17
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
deleted file mode 100644
index 909149b01fba..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.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=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
-SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/pytest-regressions[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
-#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
-distutils_enable_tests pytest
-
-python_test() {
-	PYTHONPATH="${S}"
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.2.ebuild
deleted file mode 100644
index 5c75e3b66e5f..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
-SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
-#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH="${S}"
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild
index 5c75e3b66e5f..8093d405f6a5 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 8f3c8bbc4e91..22cbb9269d64 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3.ebuild 973 BLAKE2B 8571cfc7ec737508164de25bd126f9fb218abdfd9e089eb6656d99352876c968a3dc5c1fd450ba165e59ff7f1d769896e9023868d9d08292084a0139364bec7c SHA512 74d89dd2c83adcacde10c65847df95a01b4d36a1e4f04df0baaa6d17cef7592d003248e14da8a90d9c440373ca99fa31fd6839da82dd96e064b81da36e8bdb27
-EBUILD pydecomp-9999.ebuild 1246 BLAKE2B 6d0cde9fb40a3c7519bf1312ad227a1bd939b86ab12f5b48afd7bf531ef2cf1a0b055e718e6c3b100269c71dcfb2202a728cc712ddcb7d547164df3644fdf8a9 SHA512 c75719720583cd847a3df5bd64f72bebe5ca8eeb6ee24e13aa49172027c1ea11fdb60ddcb170d902a9c5d67fd2a9e445cfda5d8a1d26c6447cdb5705271b4eec
+EBUILD pydecomp-0.3-r1.ebuild 975 BLAKE2B df40aafddb440153833d0868b9c8152d11c074017f38593ee2bb16bf63f30acad90ddb34449d6b681e516296a8f276a8959d4972b376bf6659a1f85bd10359e6 SHA512 d756e24d35ef8c50cc14bff53644eedb03c55b1053dafae0d45fbb33f48f661b8534842bd7c3f84110325df90d3bc3609b61299238d5a83a1aa8086b84bb4e33
+EBUILD pydecomp-9999.ebuild 1248 BLAKE2B 1276da970f91fda44d4d0f24d40e05fe2a033aea758df1454b9b7ac4d4ab584aac2264b039db9e162f61d85d7acd6fd226808c09307acbf302d7d30573d67785 SHA512 0a15d5e34e87d110a2dd322c7df097fbfa1efa2ed13c6d664b8554e6d258ec5a97281d6472c6b55e0d25cf045a5ccaf4170596e5ce23f20e51ec1dee9ee98129
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
index ec2b52d0d2fc..ad1e3693d2ce 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 python-r1
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 48f747ea4f09..a041520dd8a0 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 python-r1
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index edffd7f8c4a5..f061efadf8fc 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,5 +1,3 @@
-DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
 DIST pyelftools-0.27.tar.gz 3328795 BLAKE2B 74e6e17c68b197d0ecdddedba81a96601003c41a9c095bc72dff7630511705d36d1bc2732005a87ad1420c99497d729c5b771eca7bf5409c0da77d7b348d9c1b SHA512 bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a
-EBUILD pyelftools-0.26.ebuild 935 BLAKE2B ac778d423459d1daf6e3cb1d9433601179d41e2c9908c88ca222a17e149955b1271149136cb7b442d54eb01c3757f8fdc91f12789c08b59963ee5598d0af1483 SHA512 43f37d179f1eb123e82a35edb93790a59ed1b987c8ef4b68fe32d5a00e93d77cf24e48f28578fd0e75305b92880eb8e4766a9d34ca148869bd7c118cee77d76b
-EBUILD pyelftools-0.27.ebuild 944 BLAKE2B 5ed95d5a28b9fba1c7580082af3ca4c215704aac9222f57cf8ac9af0d7a8b45e0eb1640b8aa3dd2b38d22b5dfed37ed8c561808a462443703a737f708308b4d0 SHA512 06058c2ba5961c1e83545e75d478259530c4f5944e27e3d6ee136e779f19a30998f930ea2c82b3eba5d4a9236d215944cbc3ef1dc9252b7b94efbe3769170be3
+EBUILD pyelftools-0.27.ebuild 935 BLAKE2B 146501abe82061c6e89a2df2ba47cd222d811dc420fee0a891c34c9eb072a1ccc63e92f940ebcb3620e0de3260dc3e795a1054a71cef45077d4164700e4a6c62 SHA512 88d42382c22f8ec0045d2041431c989df92c585384bd6dfb76e3b59b54a7067a4692d33a85f3f0b6dcc1e9b5d6a82a39f3cff1dca79568005c9894d33cca9cca
 MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/pyelftools-0.26.ebuild b/dev-python/pyelftools/pyelftools-0.26.ebuild
deleted file mode 100644
index b61e9aad6f72..000000000000
--- a/dev-python/pyelftools/pyelftools-0.26.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_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-# PyPI tarball lacks some test files
-SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
index 0d1bfc498446..7106d8ff4099 100644
--- a/dev-python/pyelftools/pyelftools-0.27.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 59086bf091fb..1829a614a933 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,5 @@
 DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
+DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
 EBUILD pyfakefs-4.3.3.ebuild 701 BLAKE2B 3528959cb23a99ee562e13c183d2942f20ae88f24ca39540d501100c24c462edcb28f8a5d1200c6cb6dd82ce6169ddbf84b080d20d0bec8fa9055fbf7082ec99 SHA512 8c3cad1ce77afe4689336bdaa894a640c7ae0a7e151008da6c64f3c0620a0d483c5eeea659e33e76c8872de77d147109e42238ffa434c2834f55e6387db76f8b
+EBUILD pyfakefs-4.4.0.ebuild 709 BLAKE2B 8a37d618917663370857fe363213344e6887080fe382c29ed9bdd6d952d3732a635556c20331ca070fd40f52b3611ba734590123826f3c0a3a79304b27d3a0f9 SHA512 b59b99540b8bc6e946c16f7c01f56345aadb97942ddae5e2037695980ca9d083a6e376ad6ac30751acf262b5f53da40ec03c43520ac0e627349e6a4634e5050c
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
new file mode 100644
index 000000000000..1d0bb7aebad8
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index e331b943f9e6..470625ed787c 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,9 +3,9 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60ca609be444b04f547cb2372090da91d2670307ce7068b964458e6ac1284402439bb7809c9735135d5e93a71d78 SHA512 1535a872c43e5f75acdfa7d325fcfa0f0f826e18602b28b228cfdbe068a382678c21568d80873f7af4f0b318e693adb38afa4d632f8294f716a47188abe5245a
-EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B d48455bc0025db2919b3dcdf2c1a977db27cfe1fc5b1f6a2d90f9fa3f56ace8e7192ca814f5721d4542e2b56f17ea855fe69f25f08165cde1f4c105f8d1b6a48 SHA512 092a061819dbe4c07dff211f441639af33e3c3df2b98173b757658e277a1369ceb192a4a5640eea80aa4afbe2d8f821efb06d2f17562df54d4f054da7d47189d
+EBUILD pygame-1.9.6-r1.ebuild 2292 BLAKE2B 7216c2990d0f80f6b76056b5e7da097e0888a946087e81bb5263cd65c10602be95d572332c467ddbfb28609903536ce88e95821b8beba735ba296dc12c18659e SHA512 d5d852abf051adfa719b3c3bd4fd6c9f6ed27ea8c7383eac133c859747042c1ff7718cebe6abede245b13daa522b25f5d7fd718a51ecd8e74a6e41db17641bf8
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
-EBUILD pygame-2.0.1.ebuild 2041 BLAKE2B 35efffaf0ca4c394d7006326c67047e644c8b6537bb359fa5753565544f86e192b00b6937ddcf9b6ecf65dbcd3d8f827c7024bd623a6b66aaf0e9cf6a2cc6bc6 SHA512 f8121e1cf9eb78cfdd1f3ec5a2523931a6c740f17a2d80f0b9425d5fb682475cd3f4c6e06a3972fba5122b0718b47c7599de7f41fa466679bcfbe0c977daf0db
+EBUILD pygame-2.0.1.ebuild 2040 BLAKE2B eb35b62f6a140de7c6cd79a5716d71ea0ed5901b069a0a9ca506607d2083a054fa94790acaf3776b7a5bd1924d9d27113a2dd956b6fef70247a74432acbdd307 SHA512 d410823c290477ed7930c620b1a55e94138906ae8801eae0a4beca682505834979c16f58d8a0345687f39bf45e57750e74983b63602779803d817e6699cf5cef
 EBUILD pygame-9999.ebuild 1737 BLAKE2B 54a56dda9bda27773deb654df0f280b239993068497be42aefeada5e7d78eecc5e325b5d7cbdec7f4abe9c9c8618263f6d5e1d0f26fc364f8321c82246472f26 SHA512 bcd9a20d10734b3ce5ecd3ea8a9e36d9474d92598ab8825eb13aabf80357c8a89fc8c91808ddec07620b4f3cc29e176535ff8098b9c3a99c2531dcbe74d46b08
 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 411f770c76ba..61a94fda0e1a 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="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 )"
 
diff --git a/dev-python/pygame/pygame-2.0.1.ebuild b/dev-python/pygame/pygame-2.0.1.ebuild
index 54e876a05ab1..984200871ea6 100644
--- a/dev-python/pygame/pygame-2.0.1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 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 )"
 
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 868c65d59564..fba690eb6f98 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,3 +1,3 @@
-DIST pyghmi-1.5.5.tar.gz 195830 BLAKE2B de7acc04e4b33f9a623cbe1afcd0caf869dea3e635df5e7ee1c609ac223cd6bf203735da54b6fe0e9f9a98e2371077f6e2d29dea60112014d58477195e798118 SHA512 9f1e1e0f0cf88c0ff794a29e4116b20dcf5eae141c1eefb6c5b8e3fae948fe6f928cd98dc4b95248c5cddab1cea3b841818e3255ec85c11d5c039dcc2c315cbb
-EBUILD pyghmi-1.5.5.ebuild 1136 BLAKE2B 248f4993a0b81c81bc7a30f80b297a86400a3759a5a3d53ce3e91c98bb80c41e7a97bef4d13f6476bb93c7d5b170b47433ef2ca6943ee8c27b93d9a755ca3997 SHA512 25efa17e4a85f64eec7f6c357bfa5517ea0948936856b3f59ddd77ea405a181723539bf9a5ed206a30b9a9dccf78aab9a350851d419e0f14a45c068b168deae8
-MISC metadata.xml 343 BLAKE2B 107a20dca0846a5e4dc8d61825da4193cc7525abad94e161022371ccba00523822c69cf0cae23d13b6f650ec11b98ef4640b5cf18437d60a9a5a6bf37867e9e8 SHA512 cb4c5f58339d6c5f181bb0e9a1aacb4e3c30c5690744e0ee6649e82eece03678246cfe3b13c219e177de8812c6916fe1b6b49443c2dc0a00ed1d024c8858b5c9
+DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
+EBUILD pyghmi-1.5.22.ebuild 1116 BLAKE2B 0d96964ae13baa9be846aaf23d1dddc9f8364edc68a56aa57d3ae71588eed61712ac0af7800bae9109e448ecc9ec773abf1716b7be4dafb7ce3a238f2b87ad7e SHA512 959e0352c804d14a947009c1cbecdf76e306aad9b1d4f6c7b162147cb4e44475dc067ba11adc50d69ff5f794f2bf9dd97533b6ba19ac091f9b33f6484d837a98
+MISC metadata.xml 393 BLAKE2B ca47af51c6bd0b9939279323f0cb79895320f250a7f1e7e12aff2455cc84fd2c2a91de417976b49be4d93e7719e44d480f9adabc49612978f00d1cf640a8544c SHA512 e768bbf1b720b644329379f9949ac7e1eb582f14a90cc57daa7e1b6aa727183f16577762688693dea7e3238f8cc0e47456b3898b1be1b1885eb4f7c414dd8088
diff --git a/dev-python/pyghmi/metadata.xml b/dev-python/pyghmi/metadata.xml
index 9ae992913b2b..d196ca4f8f8e 100644
--- a/dev-python/pyghmi/metadata.xml
+++ b/dev-python/pyghmi/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyghmi</remote-id>
 		<remote-id type="github">openstack/pyghmi</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyghmi/pyghmi-1.5.5.ebuild b/dev-python/pyghmi/pyghmi-1.5.22.ebuild
index f0bfab277280..4a81c80c555a 100644
--- a/dev-python/pyghmi/pyghmi-1.5.5.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.22.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="A pure python implementation of IPMI protocol"
 HOMEPAGE="https://github.com/openstack/pyghmi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -22,7 +21,7 @@ RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index f3e2d6c2d891..30634f3e9571 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-1.4.0.tar.gz 244586 BLAKE2B aa4c04ff22df31270a03107498abe095e99e196711a1939fe6f15d4cae18e94d72f1964850437c5e82d897ca74e951a5b877fb41154f3790c9fb6c926c6cfe0b SHA512 b6b9d5028fd63593e6ecd869735132edeeb55c1fd97664be5d0d5dac0c25f844ce0d981782fad7f47e54555ab1f7fa5e87d1ad8a76340d81e1f908ad4ea1e35a
 DIST pygit2-1.5.0.tar.gz 255958 BLAKE2B 696a4c39920e7f66962b69d2a838c55bfb6f96e7e5ee56a39aaa732926accc3bb6331042382fd22f377959cbc129be0320d94765d13db95fdb7c7f87a14f7608 SHA512 3f915c855ad08641391565906023d231550a38d4e7f8938fad4634a30e2ee1c81e2a0d3289052426e21d2c14814300a0f789eaaa9f3e62c3ece73cf53803bb80
-EBUILD pygit2-1.4.0.ebuild 922 BLAKE2B 549c49da06a1fa74c6998a03c34cc99966ae8c7b254e9958a41e3fb0bd9024efa4ba94b708d1e01d4ba2b0beb81f5036a085da239406c762bc46d07834164ebc SHA512 792a461594c031b86890c39d172a071278fb404bd45d9400b1dbe827cc1a5949acaa3f2ccb2918e6b829f7828394cb4ce4bbc03909710ba8136b2098cb237e04
-EBUILD pygit2-1.5.0.ebuild 924 BLAKE2B 93a09110d9fa216f73f72be397c0503e9eedcfbe45f8acfb98176ef764b4fea25678be7b0f4022ca342d4f7df2ffea061124f820df3ccec2965bb0df84b0e2d5 SHA512 08228b42c0826d69d686f4ed19a77cd581ed248e68ca073d5cf2bf22bcd2bda06d419c12ac17e5f15d83b1d9627cf54af31cd88b49ede8fb43d7a3379a443836
+EBUILD pygit2-1.5.0.ebuild 922 BLAKE2B 1194e0c9d03c3fa228c6a42d7bc17ec367d412648ae81b6d25e018d159905ffe90e52ef8f517aba36a71d22291e3b346a92e6867eabb9ef4aa4345277dae2a9c SHA512 03cdfa2c18acfe175da8ed168bbc3202a20141fb3d2094261296b2ce172ac72bd94016f209ff9e4f72f9fba662339e35128c04e8389695269204f294bb616b5b
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.4.0.ebuild b/dev-python/pygit2/pygit2-1.4.0.ebuild
deleted file mode 100644
index 39ad7a4b395f..000000000000
--- a/dev-python/pygit2/pygit2-1.4.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_{7..9} )
-
-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"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.5.0.ebuild b/dev-python/pygit2/pygit2-1.5.0.ebuild
index 15da3c0f8d4c..3e10d2d8997c 100644
--- a/dev-python/pygit2/pygit2-1.5.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
new file mode 100644
index 000000000000..14e797402b0c
--- /dev/null
+++ b/dev-python/pyhcl/Manifest
@@ -0,0 +1,3 @@
+DIST pyhcl-0.4.4.tar.gz 58400 BLAKE2B 89ce8ba1eff577d9b4c7a86931e305f94ad7633b83c27f44352658ec2a12e48fd0cb05619e4afd97e4f2d78a9f4dba5c082a0d5703060b629880a3d193d9b4ee SHA512 7c5e2b611d1198a0e6c667b8fda868231bdd25da822d634a34c076fea655a7ea2999fc827de8484992efcf52b6b843871713a83e3be7787003c90f05e3e7ddf6
+EBUILD pyhcl-0.4.4.ebuild 806 BLAKE2B 0be078a5df5857c1e7425f9bda2db0a2234bde032a3ee103aaa5563aa949ebaffdfa0e08d0b35b07f2e17ca456267cc1b761d7f2d67499b886926f92c50d5e61 SHA512 a36b63dfcb1f91bdbfc4b7d44d60e2477faf06054c03cb2443ac1aaccd01ea217b661acaef2ab9d61245963561d1ffc78a9162515011879879c0fd0ac65373d7
+MISC metadata.xml 504 BLAKE2B 829a8f8466ea2164836482d43073fdbcf8eee25aa17999b1f5ddd36971dff10fc9e42cc7c1b4a5c6be72bb6307f46c40bb657afa8760659e9fbad0b38142fb33 SHA512 7ca7aac67d55ac7594e805cbb493285d69bd751a30bb127713f736f0c1b2f1d5b795fa48001b3544c920512e3b791b3bb2303647ce62d94781bfa279afe4dd26
diff --git a/dev-python/pyhcl/metadata.xml b/dev-python/pyhcl/metadata.xml
new file mode 100644
index 000000000000..294c6ef72555
--- /dev/null
+++ b/dev-python/pyhcl/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">virtuald/pyhcl</remote-id>
+		<remote-id type="pypi">pyhcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyhcl/pyhcl-0.4.4.ebuild b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
new file mode 100644
index 000000000000..f3342b15ce58
--- /dev/null
+++ b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# This value is obtained by running the following on the checked out
+# tag:
+# git describe --tags --long
+LONG_VERSION=0.4.4-0-g314cd32
+PYTHON_COMPAT=( python3_8 python3_9 )
+inherit distutils-r1
+
+DESCRIPTION="HCL configuration parser for python"
+HOMEPAGE="https://github.com/virtuald/pyhcl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/virtuald/pyhcl.git"
+else
+	SRC_URI="https://github.com/virtuald/pyhcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MPL-2.0"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	printf '__version__ = "%s"\n' "${LONG_VERSION}" > src/hcl/version.py || die
+}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 7d6e81251e5f..3e98591fd995 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,8 +1,4 @@
 AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
-DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST pyilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
-EBUILD pyilmbase-2.5.2-r1.ebuild 1482 BLAKE2B b7145c71881dc1a9dd07428adead308ab5e11797bf6c73e54e0fd85f047e30467c3d9aa15eed78372043de9328b29366b38d954f6a5a1ea83546f3c53d787e29 SHA512 ec730c7d8fae912b524a07000e09a9b54ec101b964d379c252ba08d1c01973c9efdbe39152459e167847b60a7dc663c9b6f2073e7a1842a8e8c90b991afbe78f
-EBUILD pyilmbase-2.5.4.ebuild 1529 BLAKE2B 3f5b87fc5883a5af729d930a03a217bea0ffcdc9c41bdff9a0d5de017dd3937de4c7f34ff2fcff7deb3bd5c3e4daa645ff0d94b8210e8e96b13aca64b38f191e SHA512 26c197da6cb9ddf0404454bf929499cc328989ec4c0722e2f52ecbe81f6d8c0be5c515602c917115db5a6021d49ca70b130068738c1c18d14b25a3bcc1b43506
-EBUILD pyilmbase-2.5.5.ebuild 1529 BLAKE2B 3f5b87fc5883a5af729d930a03a217bea0ffcdc9c41bdff9a0d5de017dd3937de4c7f34ff2fcff7deb3bd5c3e4daa645ff0d94b8210e8e96b13aca64b38f191e SHA512 26c197da6cb9ddf0404454bf929499cc328989ec4c0722e2f52ecbe81f6d8c0be5c515602c917115db5a6021d49ca70b130068738c1c18d14b25a3bcc1b43506
+EBUILD pyilmbase-2.5.5.ebuild 1528 BLAKE2B 53c15d9d6f57246d04bc1ce5e846973fcbdaef51af9f2fd1610c2a4e8a993b01459650d4c732c3f83b585ae654c2d41ffc33e1412cc048047ac5e887dae14ac3 SHA512 9f956a1b3e8224ab95e6e364b8b8f80eb4b68a52f4c3b5b9dea85cff7320a9f9dcb66170ce45dea5ae1bf48dadbd1592430fdbc8b2b9a897aa1c328adf286698
 MISC metadata.xml 660 BLAKE2B e1a4d9bf411ee4d67651d4783313d813652953abaae6b04b2e1fb11bea190f2d8611778fba87623ba859b6792225759686fcdce3f7b7690f569e64bac733f2a9 SHA512 740e753bc83c71ffd08c20d33a34a3fce7537d87b168d5ccec51f0810c1253e237fa6a97dba18651f17a8d9fa4a730d3d916ee46731efaae817651282e37c219
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
deleted file mode 100644
index 7e434570df04..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.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
-
-# boost is lacking py39 support as of 20200605
-PYTHON_COMPAT=( python3_{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/pyilmbase/pyilmbase-2.5.4.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.4.ebuild
deleted file mode 100644
index 223f1a8e4a37..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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="
-	app-admin/chrpath
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-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
-		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-	fi
-}
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
index 223f1a8e4a37..d254903b155f 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exceptions +numpy test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
new file mode 100644
index 000000000000..21de43cace4f
--- /dev/null
+++ b/dev-python/pyjsparser/Manifest
@@ -0,0 +1,3 @@
+DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 744 BLAKE2B 34cdfb147af916180e0ed06aa43fe7eb6e5d9b877b107f747edf763ae43b3bfe3959cfc85e01cc69c15a697f9156b8292f1ea2fd42bf4d9b3e1a9c2ffde4dc7a SHA512 71b4fb433125d1da59d9c2ed931144358a09a6c637034eaecaf590ad57432f8edfc1c0c918241649299e161dcfd97bea1ed9a51d54ea0ddef383a1cfb96ea1ac
+MISC metadata.xml 556 BLAKE2B 698d63c671dc2fcbfb7503bf7e545c58e8b3f9e64da013738cbfd6a8dea478fac113beb18f009dc1777caa6df4f01e765f7ea3d853d92d05b23ae1574eb0d37e SHA512 997062facc34f870037e9a9d67ef3eed1fd7430d2463d8d340228e2eb822b5fe7ec254d9911f8b5c0b1e5c699ed0f953ae91e58d66f744ae707e385ff5f1e90f
diff --git a/dev-python/pyjsparser/metadata.xml b/dev-python/pyjsparser/metadata.xml
new file mode 100644
index 000000000000..5ce6ed5ca087
--- /dev/null
+++ b/dev-python/pyjsparser/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">PiotrDabkowski/pyjsparser</remote-id>
+        <remote-id type="pypi">pyjsparser</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
new file mode 100644
index 000000000000..d0d1cdfd469d
--- /dev/null
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="5465d037b30e334cb0997f2315ec1e451b8ad4c1"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast javascript parser based on esprima.js"
+HOMEPAGE="
+	https://github.com/PiotrDabkowski/pyjsparser/
+	https://pypi.org/project/pyjsparser/
+"
+SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	test? (
+		dev-python/js2py
+		dev-python/pytest
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+python_test() {
+	"${EPYTHON}" ./test_runner.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index aedd1c5895d3..8276bebef983 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -2,5 +2,5 @@ AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c970
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d6539083241cde7ef27da155cff0808211eddd56b9455e812bae4c739f83fed1c6fd84abcc85208203d86e5834d5952b SHA512 a59b975fb465b44e4d84e3ef0380ed5107438e202e073238700bd700e8871098b9c59a849d157ade7888eef32609078571e2b8af09dca0752d7a18c370c2a0a5
 EBUILD pyjwt-1.7.1-r1.ebuild 1407 BLAKE2B 0e075df7723cd6a589b5b37f80657a2d10085cc8186e325305e2403d24548156f43d019d4d846c7a38d018a7eeebfdeff9377489cdfee0ac0c7800140a4e9291 SHA512 a9674c55ff01d8a26a17d9e1e08247e2dee00f3d64c9a1324e001df71af7fa7eb912c7e10f901e0f642bf48431319905c4f5a62445aacf30b55c5032166fb4ba
-EBUILD pyjwt-2.0.1.ebuild 751 BLAKE2B cd42fd04c1117a04e917bd1f4119729a8a1d340d47430d62b427542f53127218434dfb96e50026b1494b8d0f037a45bfa7d8487a326cafef92c35c357dd704b4 SHA512 e674e84fddf2114b4b8eb54a6a9b8a115ffe39402bbbfae461031925ffc825ea9174d1620b3019995b9ae2b18b1e7c6e2a1844d4b77fd665a53dacfe4d504659
+EBUILD pyjwt-2.0.1.ebuild 746 BLAKE2B 0a306ebaa6c3ba4665032509b429fac4efdb05e367b2a39178971ad5ad8eb4ac37dc09d6c4a2d08843611e64fe7c9bd015e9ae5b0364702332c5f80ab147eacc SHA512 9a324b8cbe672c10a6c7758b41acf27f55184aa87b76264e4ea960616cd6f05f5241167b0dd95b29b7eaa3a7c283900fb271e9005ba65d761a7a1d6b3a85ad02
 MISC metadata.xml 449 BLAKE2B 72bc65496c7061fe2e9033a92e89fd44efc69ad8055559891279f8ed2fc60fbfa5cfc06c536a6904408f8da6db3537d70337590fc9af3543d35bf9f6d0f482d7 SHA512 1712608360e4eef320fccc8408374c966d9ca611f9170cfbf7043c3782eae002f2d85e56787474c4e7f119b694019495faba3d4e004db18865337db87d290b55
diff --git a/dev-python/pyjwt/pyjwt-2.0.1.ebuild b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
index d6e6d2d94d3e..8de92e6852aa 100644
--- a/dev-python/pyjwt/pyjwt-2.0.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="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"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 78793fadd219..ab882ca0c9a6 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,5 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
 EBUILD pykerberos-1.3.0-r1.ebuild 1308 BLAKE2B ec9bf5757fedf8c7953f4e1be765c68bce5134d9eb1b4da4988734aef8f5395e989ccc607cd48a76eb8a6643d7414f671723fa1b3bb3455197010f195468bb4f SHA512 0cb3031e9b410ea0767390ed7fc0980aa6b7377affbf53b3f9899ed962cea2e70ad90ea3c400de3d0a60eb66b5f5dc8b61f6d28fff4ae376e22df9cdcd3086ff
-EBUILD pykerberos-1.3.1.ebuild 1278 BLAKE2B 27193304fb6e9693a270e78242aa3a0630acf75cffda3e6fb61afddc01d17c435aa7fa7f8d54fa3859946efe6ae67240e63b68553c34eda0855ab827cd04be6f SHA512 2c325e6d25c32b8c99729eb44a368bce20e417030b0b1cf7ebf1e0bbf82d8e5bd3fd918e730de0984d4cf9b264546d40ca7b573873c0004158c02c6544d119fb
+EBUILD pykerberos-1.3.1.ebuild 1276 BLAKE2B aa03d8f0fa10518d3a3c77d04682af40db4d8e325afd08def94eb658558ff81a2903a77945841d91c08d096b40c2d3b937df48d084cb86a1afeac0ecd5d87926 SHA512 86283625526a31af2a06316e07640e847c334ef20b37cf0e96afcd8fa249f89e395d6fde066431a84d62a15118b3e75bce2a9eec76f613a14ce25eb5da61bcd5
 MISC metadata.xml 371 BLAKE2B cc0afa6647f1f23014d9c89b3efc9f16916f6d703b2866ceaaba5fb3ad3899f18823e7eff64fb55bc265b3159b31b0fe40c302e92f9ebacedaad597a77686230 SHA512 77d94cdf0eeac0b8cf610e916a59d4b364c0196622515fee47bfae41a226f8acbade3d2dbb760b53696cc71f4b1639ad7de670e633172f6142a48c96969e8f33
diff --git a/dev-python/pykerberos/pykerberos-1.3.1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
index 2d7b0e00b64d..2ff767672c2e 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
@@ -18,7 +18,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 b305cb807cea..d1b35778fded 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,7 +1,4 @@
 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
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
-EBUILD pykwalify-1.7.0.ebuild 801 BLAKE2B 8bff67eb0ece0d7723c9a0169a9bab217f0157537fa98fed7101e4c8c517f56d317b79de3df7e6a2b03c02b781f4da9df75eacc01fb58f6f31a3778a1aede0c5 SHA512 6a80b4624534b6ebc0b67a9366c53c7149b6a1c15c38ef092390b8e509fcade7ad315ec31649a485cf9bc0ac34aa31c7f6a73f3fa5efdfd95e9050cd4dbcf9de
-EBUILD pykwalify-1.8.0.ebuild 779 BLAKE2B 660f7274bd84c0e91bae611be2f349d2ee21465854dee7e7c1c880078c0a7101d15883d223c80fca06c8dd1cad9071c95ac2cee8582e5db483993efeb03499fe SHA512 6b7f651714622224478bbd2bf9c28206e549be60dcca23d29337fc3620b3a1952b058893259a43a19e64ca309547aef28e9aaed1305c38627a9c4c5cd434c2f7
-MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
+EBUILD pykwalify-1.8.0.ebuild 782 BLAKE2B 85920ffd2e4840b4fa25a37681e5995b83ef783e7d75db189d6636f323a983af0cbc89f98332752267c971e6c073db24d012cbfa3d36f9f7725d9370dad812a1 SHA512 77b1a65348c77bc271eb96c5b62d3aa0c6874b66e76b9f1e87e1c11a806a7912a8c3682493fcc3dbacc9db29691903bfead3343b774dda70502cc52690c2c90a
+MISC metadata.xml 393 BLAKE2B 16007b48a409e741604ff8a1ccf4a23a2ef7c2cabe43213b833c7d3d88bddfae2e7f506c11df480ee3e746c80ed69766a15931977d64c0adb6cae49c20316f3a SHA512 0044cc9f44d2bac090b214e323de8e1e81fd0e22e94f939e4821f5786a33c400b1f7c94593587c458fd533dc321a64226bac5a220bcd116e41e300a897bd725c
diff --git a/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch b/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
deleted file mode 100644
index a41653abae1b..000000000000
--- a/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 744816a146e567a4c1efd30e874ff76134754fe2 Mon Sep 17 00:00:00 2001
-From: Grokzen <Grokzen@gmail.com>
-Date: Wed, 9 Oct 2019 23:25:59 +0200
-Subject: [PATCH] Fix broken test where errors data was wrong and duplicated
-
----
- tests/files/fail/test_type_float.yaml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/files/fail/test_type_float.yaml b/tests/files/fail/test_type_float.yaml
-index bef14b8..972167d 100644
---- a/tests/files/fail/test_type_float.yaml
-+++ b/tests/files/fail/test_type_float.yaml
-@@ -16,8 +16,6 @@ schema:
-   type: seq
-   seq:
-     - type: float
--errors:
--  - "Value 'foo' is not of type 'float'. Path: '/0'"
- errors:
-   - "Value 'True' is not of type 'float'. Path: '/1'"
-   - "Value 'foo' is not of type 'float'. Path: '/0'"
-
-From 49052dd010637e1403c8b2b1c3710926acd2b1a0 Mon Sep 17 00:00:00 2001
-From: Grokzen <Grokzen@gmail.com>
-Date: Wed, 9 Oct 2019 23:21:09 +0200
-Subject: [PATCH] Fixed bug in test_multi_file_support where pytest would raise
- issue with a option that is no longer supported
-
----
- tests/test_core.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_core.py b/tests/test_core.py
-index 6fcd81e..bd974df 100644
---- a/tests/test_core.py
-+++ b/tests/test_core.py
-@@ -336,7 +336,9 @@ def test_multi_file_support(self):
-             compare(c.root_rule.schema_str, passing_test[2], prefix="Parsed rules is not correct, something have changed...")
- 
-         for failing_test in failing_tests:
--            with pytest.raises(failing_test[2], message="Test files: {0} : {1}".format(", ".join(failing_test[0]), failing_test[1])):
-+            print("Test files: {0} : {1}".format(", ".join(failing_test[0]), failing_test[1]))
-+
-+            with pytest.raises(failing_test[2]):
-                 c = Core(schema_files=failing_test[0], source_file=failing_test[1])
-                 c.validate()
- 
diff --git a/dev-python/pykwalify/metadata.xml b/dev-python/pykwalify/metadata.xml
index 7d4bcd18d048..484bd68627b0 100644
--- a/dev-python/pykwalify/metadata.xml
+++ b/dev-python/pykwalify/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Grokzen/pykwalify</remote-id>
 		<remote-id type="pypi">pykwalify</remote-id>
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
deleted file mode 100644
index fba6ffb64823..000000000000
--- a/dev-python/pykwalify/pykwalify-1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-S.patch
-	"${FILESDIR}"/${P}-test.patch
-)
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
index 1ea74ea82429..c86530f3f72b 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm 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 47762a2b1844..b7a495553150 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,3 @@
-DIST pylast-4.0.0.tar.gz 40044 BLAKE2B 89402027494d608bffc4738857d8a7728175cf29a68af259aec1d6ab3755c5e02268bbacac2ff9bd8d8c6490b86ae200aeed59f34c764a4c2f90ea59cb732070 SHA512 093845c718269ed5a0b5223182e60192a71e2fed9270fec453b96b0b2a5488a0c5a8f6386edb42ed183b97cb7ea00397b4491ff72cbf72f9e7d42dc90fae66e7
 DIST pylast-4.1.0.tar.gz 39592 BLAKE2B ff1f9f025701ebf741e53d96c2ba0c34d7a165d1c248973874484ed0c2e5e24693631f31de516fb4a58ea14014cb38c60fe04b9d116128a6a259346f16085dc2 SHA512 90be1cafb9252c2c19db9b179350269dc8eec82545487394d671d411e4fc2ca10fcd85259874f72c39674474c75274446cd8c64cd5f2274ef98ebf5ba7fbb351
-EBUILD pylast-4.0.0.ebuild 800 BLAKE2B 9c615769c20c12fbe4113f99a4365c3add0ca22e040267d216085583b6e0db753738058ae5f1f7d6cb156ba402e29a0288e009f3b051348c6f2286ed25bb3024 SHA512 2913ca565d9a38a8ae0c37aeb7718e9f163804076882f946160502f11756b32a6067c334fe7eefb25f4da0407549150673823f75a5562b893e8b32fc5a5fb8ad
-EBUILD pylast-4.1.0.ebuild 806 BLAKE2B 31ae1b8163e80af5f94acf9e8ac47326d6be61f14154a5d4b2a967be583523fab6c9863643345b22c8d1266ec4df6511961c5943475ac6d2dbe2cf571b4b12d2 SHA512 383dde122c944db93454a457bc390cabb5cdf437016c6d43ce595c9b000dee9f42ea7340ad82508c4cdb33ad9619946db42876dc65869522e905cbd5b8301aa1
+EBUILD pylast-4.1.0.ebuild 800 BLAKE2B 9c615769c20c12fbe4113f99a4365c3add0ca22e040267d216085583b6e0db753738058ae5f1f7d6cb156ba402e29a0288e009f3b051348c6f2286ed25bb3024 SHA512 2913ca565d9a38a8ae0c37aeb7718e9f163804076882f946160502f11756b32a6067c334fe7eefb25f4da0407549150673823f75a5562b893e8b32fc5a5fb8ad
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
deleted file mode 100644
index ddf99d5506a8..000000000000
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 arm ~hppa ~ia64 ppc ppc64 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/pylast/pylast-4.1.0.ebuild b/dev-python/pylast/pylast-4.1.0.ebuild
index 030d123b5f4a..ddf99d5506a8 100644
--- a/dev-python/pylast/pylast-4.1.0.ebuild
+++ b/dev-python/pylast/pylast-4.1.0.ebuild
@@ -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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 5da2f7a8436b..f6102d71787d 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,3 @@
 DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
-EBUILD pylev-1.2.0.ebuild 417 BLAKE2B 0f210f66ca15b028f5cc77f07ca02b895d542edf5b9a250d3c84e8d83e48c76c2313436e75feb5d5996ff4a0f835919b3cb4ee2b44ec8a4ce1f8829edcd51a6d SHA512 8042ac1989df45bbef01807c6361cd3c30484280736cf4159459a9f02dc679a8068b4409c5aefbf29f3ddd592d0daae1a20b31d1eb5f51ffd8d768f45342b1a6
-MISC metadata.xml 511 BLAKE2B 2a6e66dad341afe9386031a90d395cfc9518526e4c4441cab70c98c700c0d64b706dc7680f71e282f549239ad0e5af386772e3f1aa0848a4cbac9b37627134a2 SHA512 632108658c5730efe8bc9132d1b1023c0b3daa54b95f2ce6477ead3f0723d98ee24fad95df150892b4b3c6ce7783b26200a4e4d3ff55b6c36960d882a648aacc
+EBUILD pylev-1.2.0.ebuild 416 BLAKE2B 263689cb5f823718569112bdd193ea6f222281c37d399f76c6cb31a42f901645044673ddb2c54a76ac875a045379bfd0024e45177ee00b9b825f545fcc2223f4 SHA512 6457c40d491df46b0f7535d99bf642cbd9345fe460944571ffb2294fbf601c2d6630cb0c49a04a5683f851a7f075a31f9d2301a24a1407d748c640f2df9681a0
+MISC metadata.xml 536 BLAKE2B c6dae1bb2b1c4cab0e21338b8a15c921ff1902fe8a529106cd607f66547eac618fcca86685a6da17d70750a308d5b9e674dca21c0d1df743cb39d8408d8754ff SHA512 f6f55b11b0aa71af41f9da612f1a780cbd81a3a1149492d0893176be97d541dd6634a924e77347bd3ab08a2d83671bb9a8ecaec1c8fa7c84835e9a3705be86b2
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index 1023f11f98d0..eabc276bcd67 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">toastdriven/pylev</remote-id>
     <remote-id type="pypi">pylev</remote-id>
diff --git a/dev-python/pylev/pylev-1.2.0.ebuild b/dev-python/pylev/pylev-1.2.0.ebuild
index f046eff3c311..179e299303d9 100644
--- a/dev-python/pylev/pylev-1.2.0.ebuild
+++ b/dev-python/pylev/pylev-1.2.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index efe8ed9a2515..686c30b36604 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,7 +3,11 @@ AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf70
 DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
 DIST pylint-2.6.1.tar.gz 694232 BLAKE2B c169939a49a9a8f3225e120cf56df12fabd8d1940504231d0e1c3783dd8b87beb24e7095e15b332189043d5790b69bd2a41b0baf56cffccb4ef5d7cfe2be9cf8 SHA512 6a6bda57ed22df8378aea3de3fe3b97deb7c0742abeb08463d3d2e0f0cbf6bd2166861456b3fa7cd2d7cf148b052fc4913479c3f632b8e92ebf8d26189a122b1
 DIST pylint-2.6.2.tar.gz 680364 BLAKE2B 59bd18d5458f86a7279a7fc895f1564fc575c27e7ad7b4a668456d6005cc2a4d920e2221c2ec3f447c1c63376e1b35f1e1c5177c355f52872d3c556aa63ae462 SHA512 75e88aea23e4e68714451d22b0a6a2106a4821c05cdd7d077e12ea7f6198959ebdace6824b1e2fb42a632051e049a2c84eb93990a7b6af23c7fee7e2f56bf6ec
+DIST pylint-2.7.1.tar.gz 708916 BLAKE2B 606637ff25daccba741ae5bcdecb6a2be50bc17393009193a29312b4a218622d23287a0f0c5a81e79e77cc54dfe529483ad01fa39445103f240addaa3ad58bf7 SHA512 eebf1d3da5ca072cb912ecffebf183c79f2f8b2c2b14044751aad202d75d06d1c06abb561d4581990b92fe54c06b570a1de39b792b0d729cf300c01c82c4e3c0
+DIST pylint-2.7.2.tar.gz 709177 BLAKE2B 5e4daeb19b6b18d570f4d78b01cc5023d5d245840160fdbddb194ab7036118742ffe3075ee27c37bd7a700d11d9006dc9abaaba9cf9596ae1b63941f139da7ac SHA512 800b210fbe5665db390d5c885d103856dc474b4e43d2f752bdcfcea36121132c26eecdcb67620c4a90456823f11a33568de4d37d59eea692dcd1751d931420f7
 EBUILD pylint-2.6.0.ebuild 1595 BLAKE2B 883e2c8a47ad5bda161ced7eb0e0c5b233d841a5190544b6201f2abe76b4f9d3893c6dc56e1fc5e526234fe29bd053cf59f12dd1b3b486335ac210e9ae3d1564 SHA512 b8e0432af850450909cdf68962e5ac82409b462350fedf158badc8b651d43d9ea599f4c57ff5c609287ad0020bb89984f701c7af28402114d30b25148a354199
 EBUILD pylint-2.6.1.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
 EBUILD pylint-2.6.2.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
+EBUILD pylint-2.7.1.ebuild 1727 BLAKE2B e07d6f741c58a76124132176c4f6332c9d3f9bb103befb18f76814c5cad9bd6c79e3e90f7e694ef972b19fdd3379c15bb32925b5da8cfff07e5e2504b664a4c5 SHA512 cd3b03bc30673c727d2e8af8fab9e09e87535b613e4e43a66cb3ecf40d7859f14a264cafdeb06af4f8be5bc531076448c15676e462fe017bb6fa01df99b465b0
+EBUILD pylint-2.7.2.ebuild 1773 BLAKE2B 68e534aafd63231a8c0e6ace09da37f9fc56980dcf86ed284e906915d0aa26cd0e028788da442fb0faf95d52ad24513fedf9ce28441bed36e5a3af9814214804 SHA512 4eec70ae69c69be749f335f555753ce067b05ea9873a8b7c49e549369a67757768632429c52f085271a338bb4925af0d9e4a9f23bfb9c63aaf6622e8fa96a073
 MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
diff --git a/dev-python/pylint/pylint-2.7.1.ebuild b/dev-python/pylint/pylint-2.7.1.ebuild
new file mode 100644
index 000000000000..48b79b75f0cf
--- /dev/null
+++ b/dev-python/pylint/pylint-2.7.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+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"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	~dev-python/astroid-2.5[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# Fails when PYTHONPATH ends with a colon
+		# https://github.com/PyCQA/pylint/issues/3636
+		tests/test_self.py::TestRunTC::test_do_not_import_files_from_local_directory
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	pytest -vv tests ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	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/pylint/pylint-2.7.2.ebuild b/dev-python/pylint/pylint-2.7.2.ebuild
new file mode 100644
index 000000000000..e6b283ca3cff
--- /dev/null
+++ b/dev-python/pylint/pylint-2.7.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+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"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	<dev-python/astroid-2.6[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# Fails when PYTHONPATH ends with a colon
+		# https://github.com/PyCQA/pylint/issues/3636
+		tests/test_self.py::TestRunTC::test_do_not_import_files_from_local_directory
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	pytest -vv tests ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	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/pymssql/Manifest b/dev-python/pymssql/Manifest
index e3088cceedc9..e751e89d5918 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,5 +1,7 @@
 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
+DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab
 EBUILD pymssql-2.1.3.ebuild 1075 BLAKE2B 3cb7d762753963a6b66903e36fe11e5d89ae2a61ef294390ec35b281290f0f505bb2159c6262cc9c82dbaa0b09a19fb3a39a0a044c728042515936a1c302f34a SHA512 4aa9677d5e99150e340038b960456a87e897f9ce0f00de235c95540724af58062edc9a0feb77220cb8bcef9ef4d32787d91ec63cf450aacac5963368c7398e16
+EBUILD pymssql-2.1.5.ebuild 840 BLAKE2B 293cb1e599ea56e9d8ad58ddc3d2b2f29aaee701ddc062f2440d58af8e465a3e2f139992be5939586630003010e7636f509fe5f38c9f34b3d427784f0848b788 SHA512 a81171ab86accc58beda2d0ee4c53a197bd3c415875015c87553360239827a775ad181929dc68853be8ba8009fc8ad4590065bbe85ac8575b0cd7255f00015a4
 MISC metadata.xml 362 BLAKE2B 34809feb3df73137c8fdd77f5fcc54520593c3d8f82316981c34971ff0df5774a32e1544fe4dc89acfbbacd7b360881a89f8e18000c91648be1fc471c5ae05f2 SHA512 6d33889c3389c738a35383c7924768ce3439bbd951015cc7799f2153585d4ae44065e91e8ec23194be680e20f1caf82e27b4d5650680334baba109f8a19128e8
diff --git a/dev-python/pymssql/pymssql-2.1.5.ebuild b/dev-python/pymssql/pymssql-2.1.5.ebuild
new file mode 100644
index 000000000000..309b34a4b20a
--- /dev/null
+++ b/dev-python/pymssql/pymssql-2.1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Simple MSSQL python extension module"
+HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+IUSE="test"
+
+# tests need a running instance of freetds
+RESTRICT="test"
+
+RDEPEND=">=dev-db/freetds-0.63[mssql]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 5730a06a9038..80f2e7539ca1 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,10 +1,3 @@
-AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36
-DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
-DIST pymysql-1.0.0.tar.gz 85033 BLAKE2B 792b472c2a230e823cca9deed5adc03a004e34b09594d998c1df332769b93dde3f0b84a11f1b1ac83b6be34fe661194d3c780d6a5bb0facf193d2f46a807a7b8 SHA512 52c4ad45f31725bcbb313d4d1bea52bb52c82ad9573a58dd8cca14e844ff9d7e3831debb3bd08d00a07cc32625b15692138947ccd9ad3bed7f869a7bd69357b3
-DIST pymysql-1.0.1.tar.gz 84902 BLAKE2B b6a84f288c016849897d05ce97b87e3d58dc7b08acc8f66df16142d645f70a990c8a0acae9f57ff9f00f5cb58ff77e72c7f2d7ccf76af1c12e694d54b0daa080 SHA512 0c8ca8e3ee3fd1515621875117884120d33e18b36c90b71a6923aa01f482423a47c55ea333169c77e3cceaa2577805f2ebe387acf7f80dc525f605f3b4328906
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-0.10.1.ebuild 3575 BLAKE2B c684de808de2dca09235e4551390b798c43a0c7c03d5cd019941ac3ae59d4c68fbcc169a5c107f7efb19d14534fa9b4c2832cc38a7ff1e0c28814a49483b69be SHA512 c1939f1bd259cc2ba8c5797fdc65a346983b293cc40205c743a1ea5b130b5cfd4354bad546283699491436ac028780b70a590d95d0ab1f67c32f3ce57910326d
-EBUILD pymysql-1.0.0.ebuild 3835 BLAKE2B 4ab8768cc3fd61836d9167a719a54410d309090c2397b9af21f445bcfc1c0ffc61ac0ab4bce584ec5d6e923ac13f273da685ede8442775415616054c8d03dc47 SHA512 130904df4d13e4c1df55769a7594c35e195ad126f72ac4b6f9a8bc1b9fab6b31f277c99ab2342b03418c2de0fe492deb265f04022da3f48eb383461ff4e5851d
-EBUILD pymysql-1.0.1.ebuild 3799 BLAKE2B 23e3203c7f29d7573263252c45fa4b238bef0b2bbad425af5741fe3282f876fb948ca7941a942326b8447a6f5311f093d300699dd0e4d6491c5816740b17535a SHA512 7f3e558a3f0ee7694bb6bb569112d69dadc77cf788df1c91009dcb657d08a9204032cc2c76b54435c6e13a2a1737c59938a54928b742d737c67913fafc777842
-EBUILD pymysql-1.0.2.ebuild 3799 BLAKE2B 23e3203c7f29d7573263252c45fa4b238bef0b2bbad425af5741fe3282f876fb948ca7941a942326b8447a6f5311f093d300699dd0e4d6491c5816740b17535a SHA512 7f3e558a3f0ee7694bb6bb569112d69dadc77cf788df1c91009dcb657d08a9204032cc2c76b54435c6e13a2a1737c59938a54928b742d737c67913fafc777842
+EBUILD pymysql-1.0.2.ebuild 3797 BLAKE2B 9c57667606aee1eebba23f07b8ba84f0da467e3eca4cc7729cd4792bcfab5193a96d4fea95f48eca1650ba5c31dc0d9660825e308fe02a804184d69705dcc01a SHA512 be2a0dc58e51598b9f7acdcab0ee0b2d1db473a572e90df9bd772bb4c645bb1717009f35819624fd4e70b671c4e054427bdebc5f97a4443f37486d53b0e05a4f
 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
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
deleted file mode 100644
index aa9bc53b0358..000000000000
--- a/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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.1.ebuild b/dev-python/pymysql/pymysql-0.10.1.ebuild
deleted file mode 100644
index 16fe5df53ccf..000000000000
--- a/dev-python/pymysql/pymysql-0.10.1.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=( python3_{7..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
-)
-
-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/pymysql/pymysql-1.0.0.ebuild b/dev-python/pymysql/pymysql-1.0.0.ebuild
deleted file mode 100644
index eaf0ceedb45c..000000000000
--- a/dev-python/pymysql/pymysql-1.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? (
-		dev-db/mariadb[server]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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 "Configuring 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",
-			"password": "",
-			"database": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"password": "",
-			"database": "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
-}
-
-python_test() {
-	local excludes=(
-		# requires some dialog plugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
-	)
-
-	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymysql/pymysql-1.0.1.ebuild b/dev-python/pymysql/pymysql-1.0.1.ebuild
deleted file mode 100644
index fb5e6f2df416..000000000000
--- a/dev-python/pymysql/pymysql-1.0.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? (
-		dev-db/mariadb[server]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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 "Configuring 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",
-			"password": "",
-			"database": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"password": "",
-			"database": "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
-}
-
-python_test() {
-	local excludes=(
-		# requires some dialog plugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
-		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
-	)
-
-	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index fb5e6f2df416..dbbedb942643 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 71186a0d82a7..051194abdfbd 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,3 +1,5 @@
 DIST pynvim-0.4.2.tar.gz 52809 BLAKE2B 0bc2c3b509b602d7c46df9c54e867d1833bcadc792d5e1b27e45d99a57c33ff531e85841d8cbccdcb104892a994fcd71ac1c6ba2e86b4785cf890b1f8445d577 SHA512 d24d18fd158b318396cbd4e4ca3a0a304cb12b6790b84fc5f78bbb4aaa4b325d0fea6e281ff3cb27efbec0130d193d4871806750f6d1b792ef8a3558b5c37501
+DIST pynvim-0.4.3.tar.gz 52807 BLAKE2B 2ac8894af71a28f8008dca1f9e34a0cda6a68aa108ddfe122e4e9cac4c7669262483729aafb238d0e8eb0022ddea9bb222ec7b718e9a9c59fbb349821b6b8dbe SHA512 5d8fc7623a5bc2e069991b901dbd4dcc6005ddab31e2f0a70ee50c2d6febf3b5c29a61fc4dce454aa494779d7a869a1e92a2a97cb66212ed858c3d3fd77c0f55
 EBUILD pynvim-0.4.2.ebuild 667 BLAKE2B d02f89c41da6f6dc5e81b6fb57d43732d864a5947ae6bfb0cbbd2c87bc0f3cc31758e8c70e8ec7e83612e11593d6716487d86bbb19cd1419263140eb2fe1615d SHA512 440137929faf80bd888f52d039fe21618c8cf6a217d5fd0b6eadcde3ebfe96a9c5032a79c60fd8810c58f02dd06a7097a4a53526fabd1aadac43747f66c9d029
-MISC metadata.xml 395 BLAKE2B b13f075786aee42360ea1a5bcea9fc1341e36faf2c53738630040860db48ea70a35cbd9879db9d0300ea5ead161b3f1fdaa183278a64cb4642a6bd29184a8f37 SHA512 597821983f5e1a07fc771e071fb0e97bcbd3aa075e6e9d63158ac51cffc8e8f19d4f7a92c09fd099c559320acf65aa89936a6f79cbc9546f4914f6dc5536c20f
+EBUILD pynvim-0.4.3.ebuild 668 BLAKE2B cdfe8f47f14c0ec8c506d64122e5dcab3fce9d5191218d63c87e4a97b75b4462fad9d6d2023b145ed83ac3b9a68e4c44674e5d69a696e2d39a90d6d087535f60 SHA512 8318fe309df6bd58f1a9f06187c3a6966f3884fed989d17a3e649cd8cde141a1aa3290a17cdf0c178022ba2ffd9acbc147ded3c8a7ff2999146a32899daa96f5
+MISC metadata.xml 496 BLAKE2B 95410e3d48c746cafc37f65ecd6c869262b5506bd9487f812d8fcd6f4afb133f00743df05f56d043858a2bab51c576707ef562de86135b47ef302636ce919f91 SHA512 e291511a8d8fef665e070b71a20309937bc981ab9a9dffced19c56d44870ed86b4318bce548eabfce5c6518046889d8898da4e29334393be5fb08ccd7e2565d8
diff --git a/dev-python/pynvim/metadata.xml b/dev-python/pynvim/metadata.xml
index b6149ba8600f..0d1652e860e9 100644
--- a/dev-python/pynvim/metadata.xml
+++ b/dev-python/pynvim/metadata.xml
@@ -5,6 +5,10 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">neovim/pynvim</remote-id>
diff --git a/dev-python/pynvim/pynvim-0.4.3.ebuild b/dev-python/pynvim/pynvim-0.4.3.ebuild
new file mode 100644
index 000000000000..c761d8d7cf7c
--- /dev/null
+++ b/dev-python/pynvim/pynvim-0.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/pynvim"
+SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	test? ( app-editors/neovim )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 2df40c3a6b76..e667abe77e24 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,3 @@
-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-r1.ebuild 801 BLAKE2B 36e73bf0eb44c4422e40a6a2ecd1ce0ceeb917cac440d9575d5817779a396e29a15d52932259b1c346bfde084b0fa002d7949c30f988b14efca57131fda07aa9 SHA512 05114048c6190de4b0b8c8513d0c324edbd21d56a5686cc1ec850b00d07686c81c7c0b486321d2cfb65e26c23c7a2b6002cb914c0b26d12008d4203154fcab33
-EBUILD pyopengl-3.1.5.ebuild 1223 BLAKE2B 7fa246b69ec46548493e44db66c0f1c0f50bcdf119970aa4f9cf8e04cf11adff217aee65f306b09b33e84c8a782f001c7b035d53cff91efb430110b3d1e10649 SHA512 1b2122348a20560765e8fa291ade1970e626454cdbcc2d655ae0a44293a4ed774c1a97250dc6b9674bcdd89240b80cccc066b314dd607bb467fb57dfcbd5d810
+EBUILD pyopengl-3.1.5.ebuild 1221 BLAKE2B efdd2cbcca74f94c54f624b58739db2bde57b137b6b5526803edc8317c748d821dab17cf975f2978b24e2435afe61415f897b9ad15b4fbeccaebbdec20f81b26 SHA512 33d83f09185ecaf70cd42b9f96329db8347c1b88d7dceed946f779104849d83ea1cc0df151b5b49160c9d7b54c2ea38bf324bd529e4baeaadc3a9ea471aee7c7
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
deleted file mode 100644
index 75ec32590a6c..000000000000
--- a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PN="PyOpenGL"
-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"
-#	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="tk"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 5783f86ef910..aef96f75fb09 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index d97276ba5306..f0bcba4e3c6b 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,4 +1,6 @@
 AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
+DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
 EBUILD pyperclip-1.7.0.ebuild 1224 BLAKE2B 9a9c14f66381071ea284bea31e98aaf7c215b9e5b2e27549246fcd16eb89f649e8a54a2952b458c8e4e3d4c3c0d12eb934fb770f8c63b06b10c7d85165878dcb SHA512 cf10f385fac732e85a8a846305cf00ef95ba652398c13ff0303e4f682743ac3dee55cc860d930887d81dfa9885726540f8ed366d058864a3c4f1881ac75be5bd
+EBUILD pyperclip-1.8.2.ebuild 1180 BLAKE2B b2e30adad634560de79cac5dcebd984d87bdb62315760dbce3469e02a4e91ca64823a70c738a43b2d925bfc25f1678a489ada60b9336a079dfa3e656a377b001 SHA512 860e8d07bdfac263f35a7d132d3f785bb3be36704cb5a910f6a81fa387c884ad0c8dc41307486c443b873f5e232734a5e220785a93c3d4e00e361754b965b76a
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
new file mode 100644
index 000000000000..43129c28df83
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		(
+			x11-misc/xsel
+			sys-apps/which
+		)
+		(
+			x11-misc/xclip
+			sys-apps/which
+		)
+		(
+			kde-plasma/plasma-workspace
+			sys-apps/which
+		)
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP}]
+	)
+"
+# test at least one backend
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	# stupid windows
+	find -type f -exec sed -i -e 's:\r$::' {} + || die
+	# klipper is hard to get working, and once we make it work,
+	# it breaks most of the other backends
+	sed -e 's:_executable_exists("klipper"):False:' \
+		-i tests/test_pyperclip.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_pyperclip.py -vv ||
+		die "Tests fail on ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 43c6b5e1afec..8af032d40d9f 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,4 +1,4 @@
 AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
 DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
-EBUILD pyroute2-0.5.14.ebuild 844 BLAKE2B 926289183ef8d05955f6ccb978e2d8215742fa3d10e4a266933865e38a5831803c61fb078fb717cd15cc14c0f07b3476f6048e4878ea46aaca941d39369a958b SHA512 3a0a710d54af7bbc8b420210d5df8f8a8723062d8e535a50fbcd5be227c4871a3e2a767b9e2eec3c4a838d2ec8fe8cebb75812a600aea620839ac490b0062069
+EBUILD pyroute2-0.5.14.ebuild 846 BLAKE2B deaabf76d040698801d05a6d478841e35a2fadc929472630a07218f8a9dda33d6872cd1d289c6e05dcf7ee1ccd0259568108f269a0ef02de25a54b97cd31922e SHA512 47de46387fdade3116627d99956309227d71e736349b629bcfa8e2faf23c9192be3396e6464e60d621fd2fc467a4ae479da58916fbf0eb0c669251037e6c6822
 MISC metadata.xml 512 BLAKE2B 61e3d65342e943b09580b0672fab33e6192a6a114675fc1e774f995cbdd3855ecb8dabdea91362ce60c815bd2c946ef5c1d96ae8e52c4397c041ae753316cc50 SHA512 a27de7a2ca6cd8614f3fafd08fe5d8a51b36f9a6569bd593ef7ab32fddf813fe9fedaff39bef39668518e9d0393718293b33688da63bf50a1cb90124f98e82ec
diff --git a/dev-python/pyroute2/pyroute2-0.5.14.ebuild b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
index f507fc5937e3..f7df3323e74f 100644
--- a/dev-python/pyroute2/pyroute2-0.5.14.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 3da3707fd71f..342b6fa291bb 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,3 +1,3 @@
-DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
-EBUILD pyrqlite-2.0.ebuild 637 BLAKE2B 5f1e36a003c9b94f864b4e698ba18956b4ed84a16d112cb0e414d4f2811124a09b82c1c144a93651a383cfdce7ecfe077b146672c17742bb0cc69177bb52ddb2 SHA512 8727f07ed53fb3b6ebb042896a48ba9cd411c5535b44dd24324dc6c933681e2576dd9951207c009904f46a65c6ebf1bc4d492b9b1b801f15df902f0d8bb51a60
+DIST pyrqlite-2.1.tar.gz 19069 BLAKE2B f5ce9c1201632e81ba6f7f41e3ef54bd5fff354c869e73879e8b324ad12aea6476eb197119a22ba15d58c9ab3503435b0110ce9bfe2c21d16fe10b44afbe486a SHA512 6a63860378021b29ec0e8d81cf2c3534c97cec2c65d60e8ac2ec9b0a7900efb9a9a63546da44d8be89570eae2fd47eca4004167d11438b2dd9eb6bc68e646bad
+EBUILD pyrqlite-2.1.ebuild 617 BLAKE2B ba86110b3847c6897d49b1fdaa48d14d4d22ccb544d0a9e58f28de009bac0eff4f44a9068182bf42e6b1652e318894577bc0aab93f9cdbd9816611501ef11d83 SHA512 38c5a41d77d6c6842240540bd3000b77601e275999fe810ed51d8992438173a7d9d8b56dd7dc86c2fc15ee5271d5a784becbd6fdfbec023d24569976b456444c
 MISC metadata.xml 306 BLAKE2B 6848a797588465344547135639af1cdae67a9db23851e940a5f5aed347ad4c6e8114c2fc88159370356bb4360c926d4b44e1f4474c98a7577e3dd64403100d72 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
index e2ecbfbf9f88..c1ae5f7ad52d 100644
--- a/dev-python/pyrqlite/pyrqlite-2.0.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 
 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"
-SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+BDEPEND="test? ( dev-db/rqlite )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index f5a4129966d7..c7ab08f4904a 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,3 @@
-DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
 DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
-EBUILD pyscard-1.9.9.ebuild 762 BLAKE2B ff250eb3edf7a9f4fef316070356fb2bb7ba17fba5ea1abb58ada34188a4365be39d6227863e5753ec6fb93690540fb1843a8fd392ed0bca83fb04e3da246160 SHA512 de658fa13ad7f4c71fb168924cae942b0ce08a78e229e452229d5274153cbe7adca93494b3312e1f1347b770846ad8d1cf545a45543d1c3d83a6ba1af3cd98d7
-EBUILD pyscard-2.0.0.ebuild 693 BLAKE2B 3371986814742a46aa438d0b5523f025df7ad4c4af8173558d74237ad06e8657721e8d6cb391796738d30f2051c7c9424dd862ef4076eb94f7d6f30dacc34dd4 SHA512 5328e4592991d46e317cd0eb778614e5bf0a50b983a8a08957dfecf1dd6d217ca53f6c1673810dfd0a5206b073a1e60447bfe009a57e0d4bbb4f261945ba91ec
+EBUILD pyscard-2.0.0.ebuild 691 BLAKE2B b118e9e40effe0fee81fdc1e9a6e1b7da153249172e756d61264c90b512f01458bcb615867f691cfff162f887dafa6f759b308638750af1444a969565421d5fb SHA512 f44c4829a938755b5207afaa75c604844f1ae3952b82c09b72eb2bc94939726721d068894457cd35f4d47581073187d587e89134951daaeb87565ae13fa0b3d3
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
deleted file mode 100644
index 6964fbdc2609..000000000000
--- a/dev-python/pyscard/pyscard-1.9.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Smart cards support in python"
-HOMEPAGE="https://pyscard.sourceforge.io/
-	https://github.com/LudovicRousseau/pyscard
-	https://pypi.org/project/pyscard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="${PYTHON_DEP}
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${PYTHON_DEP}
-	dev-lang/swig"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Gui support" dev-python/wxpython
-	optfeature "Support of remote readers with Pyro" dev-python/pyro
-}
diff --git a/dev-python/pyscard/pyscard-2.0.0.ebuild b/dev-python/pyscard/pyscard-2.0.0.ebuild
index 4117f2fd3991..0461c47d0851 100644
--- a/dev-python/pyscard/pyscard-2.0.0.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 78be2d21ea5b..2587a0eb280b 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD pyside2-tools-5.15.1-r1.ebuild 1660 BLAKE2B 1bd29899ad9003c31499ffe81b4ba66892c842065d36d90b19917fe1178b28f7a948a509cc41d35388aa8bc7a15c27f7854cbbf7735a5f2cd63b8687957b1554 SHA512 00b1e96af2aceb69f9f4c16a93e6c35725274a3705be60507badc3714628a6db03df1584a3d2476ba11c5590c62707e1510f837eec0de206e1a4f5f3c113c015
+EBUILD pyside2-tools-5.15.1-r1.ebuild 1667 BLAKE2B 720d28927bd13aa0de40c7c41709f64bbc369000e9e85cbe2217ea12b8c3fe87dd5b703948bd9df52c7a269873c2ed121ce2e36ab99abd92c40d0ed05979dcc1 SHA512 22a25c027d34d188a095598678e3dd6d1916792946ba8373b98feb054a4bb42bb8ffae9263ea6a7dc3b312a6639c7150bf223c979577b07f5cedc9ef6806e36d
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
index a26529044804..186e304ebacb 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index e517470aab71..03417e97a175 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD pyside2-5.15.1.ebuild 8502 BLAKE2B ec49c70ae06430b502a6c19e42cb43e9c7c6615d6a41085a7ee39291dc3e0a5f6899af42a4d8ea0ea7d9fd828a71084dfd44cf26899ef322e8b87538ed9f7be2 SHA512 dbd8e77ee6a8349170993a3977221d02c45ddce5d3430b2e0d3d2ce2aa58891b25e2186561df3b626b5c1726e655dd190305640cf1f7e345d7cf885b32d2a788
+EBUILD pyside2-5.15.1.ebuild 8509 BLAKE2B 677c5f6fe8ba542d396ee5fc0eba5f9cc9de25c5e6ab1158ec83c59f0e9e061ed299b2b6e0f376f67e9e9ba10f3c2bae59877a6d6898a8aef8231fe2a61dcf25 SHA512 a9c5e2a6a94a39c50f93ce72bcdd983961083369160942ea789882a40f8e0685600b1c94d13db2b98f834ad93366ed905195f29d328c7533ec0582b433d95dee
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild
index d338dc4e02d6..0fa8713a733e 100644
--- a/dev-python/pyside2/pyside2-5.15.1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 8c8ae8c4a2be..586958e4c087 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1,3 @@
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
-EBUILD pysmi-0.3.4.ebuild 425 BLAKE2B 231f9ced0b626eb3f136aa6d7ff77241f561b33629f4a57e60cbc971743906ee5b2bf9ba35533cbd5e9ca2bbe87eae4a9e24bc466015fadc495c81cc42a480a6 SHA512 3b99ed4b515b163111680d66b3e86d70baea52009a7fe4fb4eee9e9b1293b870385f741fc923f007c52ffd2f74727f5d73cb3375daeed8b765d63771e1654b86
-MISC metadata.xml 414 BLAKE2B 6b43ab72d3bbd00cba2f58ee65d9f567f4a1012e2d691074f5b4fc436ca2a51e24bf4088027fe0b439a6e0391b0e05f3fc20902634b86d1b72a682fca7b7461f SHA512 6fbc62e3f60b75e2bd6ad20e5c66d790d03764154bcface954d9a38486e0914ccf19922c0f7bc75c37cbebc48480750e6024f15062f23fc2b253e287475befaa
+EBUILD pysmi-0.3.4.ebuild 495 BLAKE2B 763e018cd1e7c9bc407b110380f1e1de531fbd1d84c1e10e1cce58531bcf0760790a617e03beb691a7c9b698bd9e9cee2418539096d3d95a79f4568e4af8c343 SHA512 ba9a6fff7dc8b13487db0807b6abdb8a8973b5f0882442f7ce9c43bf601606b97342680763fa94dff71d1c9cbfbbe00ff851f5b5bd116294cbb98a9a2eaabf56
+MISC metadata.xml 438 BLAKE2B 3ac74ce8f327d154727a24a60523b2eda0c0b8398c872d676cf4a934d1243eda303c240a9f2d6c9f017d3dcdc4e5c3a38b6ea2f80056abd91642a2d85c7dc960 SHA512 78238201b20bd896e945967f8d1e65117ccfc1126554828a67865ef676f223b346d40cce66c6b4a1e15107690449856c3680870152b62dc2e79811442a3cd9a5
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index 6a5f21bdfe8d..701159a49f16 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pysmi</remote-id>
 	</upstream>
diff --git a/dev-python/pysmi/pysmi-0.3.4.ebuild b/dev-python/pysmi/pysmi-0.3.4.ebuild
index a25f52054908..65ae6d0c5a5b 100644
--- a/dev-python/pysmi/pysmi-0.3.4.ebuild
+++ b/dev-python/pysmi/pysmi-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex & Yacc"
@@ -15,4 +15,6 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/pysnmp[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index 7b73ec6eab73..64627628252d 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 473 BLAKE2B daabe0bc6052fceb4e28502a6796099b6558068029649215dd3c1d954cc618aebecae5ff62b61ba81c957804886bf9d2070d8b4e3ff26a6bd4672ea5f2719ebf SHA512 b1c9756e5281437bcce3aefe0d2fc6484d5936ee2f500c2c97b3ac6469abe82f33daa1bfd12aad415e84d86cf80bd5a23e4c697404d3f755bada1053b98db0e4
-MISC metadata.xml 1582 BLAKE2B 9e7ce993fdcf3a7debc835255d92d0ee1b2bf8397612c95b3855b1c4b58888832af8df81abf01aea2169fe60216bc64747cf093fe66708ff6660274488b69cb1 SHA512 a0225700601accc978584b302d42b9456af8c96fa4ee4f07b4e7b820dea3afab500cc48130315a390a6a3411f0b30e97dce0f23757c0c3806e014ec22f9cb44f
+EBUILD pysnmp-mibs-0.1.6.ebuild 418 BLAKE2B e6d680c3ce25aa3208c10d6719be0193f8cf98dd2cf01cb75c5075480bf6bcc26b71125ac0432b539a0e55783ab191c1e598fcd2a7b04df36aaf6f093ddcce67 SHA512 14d9b5cde4572c99b4fb0c6b019a34b9ed86aa2d8c4edebbf72f159e06cc0f943490657bfb14943854646ac87eebbf8d26f3342043f2db90df9682cdd45d529e
+MISC metadata.xml 1606 BLAKE2B 286eee5216b4aa8ce553bec22f402984ffc7d2790b543cbe8e1d3ceb2966777b8d8bd0eff894ce72f8fc0ad291ed4cfa8baf1d85dc52d5bf49d4e05829f2fe3e SHA512 339cc9509307da6ec2e2ad4e30821e5f43fd9edb2fddd0541ff2a56f8c6945c509755cb225fee85912b107d7afea3ac97610cf70f0114568737a9e4cc2ba3fc6
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
index 11950035509e..9385d8db2095 100644
--- a/dev-python/pysnmp-mibs/metadata.xml
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -9,6 +9,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		This is a Python implementation of SNMP v.1/v.2c engine. Its general
 		functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index 86ccda7086b5..cca89c2e7910 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
@@ -14,6 +14,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=dev-python/pysnmp-4.2.3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pysnmp-4.2.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 25d43354797e..3388abfc02fe 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,4 +1,4 @@
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
-EBUILD pysnmp-4.4.12-r1.ebuild 1125 BLAKE2B bbdad24464fa511d6a55acbf527df05a495560777862dd4ccd6537fde99c16412bdf0dd2204f758a04d4134553b71c250bda708a76611b994b4cb3aa8a7e8b6c SHA512 0927e077a9e9c50ed8b3072c43ae21dffc019ff8c9c25c477f48878075f02a8e1ad9d760ce9b6a5728ed539c0ae7848336a2fcd59a68e0dab03d8293f1089dc8
-EBUILD pysnmp-999999.ebuild 1087 BLAKE2B 229abbf8f3cfbced006c77c1c8a16945c9f9f65e24c30950b99d4894f37490de0718ff50a3f8f272a54ec8efe87fc8de4cba32e95efe11746da37f331054da90 SHA512 5d9f324ff0776af617efe92c02adf734a067446c776e85969364ae06fe5dba14ef367309af7a8f82481ad104c882a4bbae092b090a0f00f21f485f384fd912a9
-MISC metadata.xml 1623 BLAKE2B 60158881e97c5b16db0beb92ea3708fce622925f19f3cf55366c0cd33a7c1d307e78b610c8282ee5d7e761ad2da36574eb48d71b7ddc036fb61a7e81999632e5 SHA512 9767b366ec9dc7f7fba97b37017d98bf5cd34a4d300ca1c3b94804b1ffb625059de8488723e5747984a38cc10eb6146e0d395573a27c6ee870bdbfe4f3737871
+EBUILD pysnmp-4.4.12-r1.ebuild 1134 BLAKE2B e97ee0897cf78af8057c2f8d40ce62cf88244ef12c07a090a074ab71fda230d62a178e5c3e9f001b160da3278895d32ad86f20f65a1d8749c4fd6b1cf9273cda SHA512 c3bb122c84a5d289264c36081d8a15d77cace1115c52262b5dc6939e7dc172de2f0d617835c14e3efec51a604cd8e9c85f6e24c51f9ca6c77d14fadd252a4b30
+EBUILD pysnmp-999999.ebuild 1096 BLAKE2B 6ddcfe749863d6de27ac6779fbe47c78158ba8362db9ca5acae315bd41b470a71ed3d46e12066efc8de5f204ed855cfbf5e1267d93faf02fe51e68a8be233907 SHA512 fb7161f433b047f9569948c9468a9789455a8d67e995ddd051d009625ecfeffe7916b3735c4505356ee9ab4b7e26dddbad8ea35f01cd943faf0e2ff6e92c35b9
+MISC metadata.xml 1647 BLAKE2B 4258f129b71fcace052fca297e7cfdfbb4566ca10692733e616ee1f25ebba0878e567056247e9fcaa63ad769a249fe2b3c56afc28808de4fbf5259990df4a250 SHA512 3d0298f321987be70ea5e1087f410aebd4b4534ee4d2c80252116fedd18409881efbcc6aead31f54bb845f1362a1f473c4174a46a52faac6ae8c87f907c5e2e9
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index 4a0c1e1eca9c..2ea5385dab4a 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -9,6 +9,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		This is a Python implementation of SNMP v.1/v.2c engine. Its general
 		functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
index ae484aeb7d46..ddbf9d265f40 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
@@ -17,9 +17,8 @@ IUSE="doc examples"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pysmi[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
+	dev-python/pycryptodome[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs/source
 
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index e4cf3513e746..10dccaf53f2d 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
@@ -16,9 +16,8 @@ IUSE="doc examples"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pysmi[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
+	dev-python/pycryptodome[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs/source
 
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 25ceae12fe40..e60bf455c6b2 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
-DIST pytest-cov-2.11.0.tar.gz 59018 BLAKE2B f2ecaff439e701c3b7d029e4c51cb019d5222a083815ae5771341b0fa0f1b658f921a6eab75c0b568b630cc7ca75887f25ae7fb6fcaa9c2e8dc419397c4c799a SHA512 001f4975d7ad1a573354074366f983887ec9035bcc29afe9bd1ae2654fab520b8f479c5037936e6131749e5205077e937304e73d366cb43460db1f24a58b02be
 DIST pytest-cov-2.11.1.tar.gz 59143 BLAKE2B 21aeffbc9ccbe6a7c69a08fe3f0013204eb039c6dc9ddbb364a74ad10764e16ce7be0154e27beaab2c8f9b2a972131c4c2421c4aa4557efc18318556056a421b SHA512 19c465f5972ee0ee3b9a2f1a656fdf5457622cb449f73a6f707d377a617807dadda997a6875f0c081bc4c4f7039559c6e7ce820b818db42dfd053c016e1c3b4e
-EBUILD pytest-cov-2.10.1.ebuild 1388 BLAKE2B 1de8f9b3cc7235e4db2c56d1e679285483bc2564a1c4bf9c6f6c0bed681bb8a938a9e3bde5b9981c1b7ccb2bb06997aae2a528f285b69ea2c2e7428c21bf3678 SHA512 6374cec526c1de49f920a996c952458fff8caec3d4e5e946d658877085d145de4d32213459aa574e92901167e8d01284b01825b56bc8be47ddeb6d3e1836fd74
-EBUILD pytest-cov-2.11.0.ebuild 1285 BLAKE2B 49e15b8d30865c76ef41d328bd2049c915ee17551d89e844491aecd3d8f1fccf218f7645c3e75f3f10ca19bd353594cea15561e855faa590e3de05e450a8a1bb SHA512 8dae610239503d4c7f711572889808a07cfffb3e7f66027d38b0c07864a398953082561f564ed0f62d1840eaf6dd3b468a86eb1a31b0ccc26e9b4a8d26b1a068
-EBUILD pytest-cov-2.11.1.ebuild 1285 BLAKE2B 49e15b8d30865c76ef41d328bd2049c915ee17551d89e844491aecd3d8f1fccf218f7645c3e75f3f10ca19bd353594cea15561e855faa590e3de05e450a8a1bb SHA512 8dae610239503d4c7f711572889808a07cfffb3e7f66027d38b0c07864a398953082561f564ed0f62d1840eaf6dd3b468a86eb1a31b0ccc26e9b4a8d26b1a068
+EBUILD pytest-cov-2.11.1.ebuild 1277 BLAKE2B d8892d96b8a9ae16dd41bf74df52548a5557f3e4fef998cfd1671f874137e0babf7b9182a55b2e8255f2518c06bc51de6c0e21b72b4f8e7479cba0483bb39867 SHA512 2d79947d40938296502321155b5ff66f70c5eda0e1d4b631f3baaf960bd31670bb9b958ff4653e997f5e313e24b7969b026c636834fabf85b1f23fbc2b4a2d5d
 MISC metadata.xml 411 BLAKE2B 5ecf37fefd3ba802d31a3f7e10a58fb7391d213164cca73117a5723b174b66e29574ef694960af9346df13667e6c203c309e8372086ddd481eca1eda7f843926 SHA512 ffb291dfaa0724a05a65152d6e1d1fcffed59bf260e07e216fb8e097fef0c3aeec320fd75a7c45ffefdd39c1c0e6a50e196a4cea99654fc3e5d768fd3a81dd99
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
deleted file mode 100644
index fc5c14c4dd9e..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-#PATCHES=(
-#	# Bug 597708
-#	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
-#	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
-#	# https://github.com/pytest-dev/pytest-cov/issues/365
-#	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
-#)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
deleted file mode 100644
index ae807ac41f7d..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-# TODO: figure out how to make tests work without pytest-cov installed
-# first
-BDEPEND="
-	test? (
-		~dev-python/pytest-cov-${PV}[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	local deselect=(
-		# attempts to install packages via pip (network)
-		tests/test_pytest_cov.py::test_dist_missing_data
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
index ae807ac41f7d..60cf89a6e397 100644
--- a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.11.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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index acd874edc4ff..8c431b1d1d14 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4da03f0f5c4ea1e8601b16ed1a211c33150bcc0eaac5b47786040f571ceb266300bcb5142e2a8d977aeb69f89bd0ecefec4c3 SHA512 23146b1c0965e66ac201cae82192f3833daad2563f2177d916050df14b532a3eb78f2dd3b888cec3d28121b334ee86c9b762c5aadb8fb624c9a4288fbad693a5
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
-EBUILD pytest-faulthandler-1.6.0.ebuild 748 BLAKE2B 1ed59d2a536e18a3daaecf25eabbd2cc6b4817f61111a16056058d3a88a4cb70cc13e2c4e740c71645729e6d254e27a3727f592c27953b4f6d6277122b9e19f4 SHA512 b94849df122b91a2aaa1560fc5526eb753a6d6f575aa18cced216031016e4ce244240b547aea79c3eeda3e85cdc9724cd1787cde0963b1b34a6da71eded956ca
-EBUILD pytest-faulthandler-2.0.1.ebuild 507 BLAKE2B 033f2e659b969ec735326ebf98da66c7081a504f5f029ddcdf2e360904f80f083a0c48dbb1235e2ca3e1e44905ce269f48115113f0348aa3929a12e84e85d4ca SHA512 6a0598dd9aa90c279136dcc5d3b0a22bfc401a0045a772bbbfe59ee66ef9e932f2235ad9c44caf5dd9abf666a0cdb31ddd4f7b8f6417e856c9722c0a87dcc3dd
+EBUILD pytest-faulthandler-1.6.0.ebuild 747 BLAKE2B 4b1c07cabfc292ba543dbfb3fd0ac154dcf82a15e4019a4c2ffbc951dad94ab82e9b742d7cfc6e53cc2d7e984ee926322de62080db9cef01ba995c3c51df5837 SHA512 83cb68adad83c92089f7d9b400de93c5f5d46f38435aa8ff63fe51c6476f159c3bf846ded527f7fecac30d149fc792fcef69e9d85c4851c668d4bd005e1f2203
+EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B 9e7e5f4c37aebb033b7a093fdee08a18e786dbd838182b93bd5d6ba848f307bf63bff147f644d1bd62c92b5c58686099b448b73e201e1c0388df961382b49f50 SHA512 46ab18e1c5102feca7ffe08243a18386acb6bc5cd73030109e0a90acb1fe0ffcf5a83e76577a309ea7de935fa264e00ee8f90ac2793a60dd53673e41b9428720
 MISC metadata.xml 457 BLAKE2B b60877a1c09f68aa69b75c8386ce1b8a338f91bcf54e875cfd45fabbcb4b254d1702c58fee5d2144d424bf890e57a2c9814c517670dd6bb430f3ace6ffde3ca5 SHA512 dfdf0734d59cf307da8c45c92b13831b5375569bca715c7021af1e932aa37a1c21810827184f3e78c93e5bcfa7a2c10639ea96219f595a7e7f5b68243f52aed8
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
index c2ef1ebeba08..01da741b3e65 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
index 952c64b46b07..6c18a00e8b96 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index f47c15df413f..e23f496e941d 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-flake8-0.9.1.tar.gz 7959 BLAKE2B d0ef55385dbbf47968abdfc14e69a0420cd52bdf65c0f74ec72abeb1ab28ad27806593dd592f448f3c01dcdf29af4042c1e1c8affde46a1405ba7b4155c174a4 SHA512 eeb4f66022e367d92dee94544ae8fa99b79c1de0579a80e91c22e6f050752010cb7ad6c24094736d23ae753615b186a957b8b0f94c09754005183a971a1e4aa1
+DIST pytest-flake8-1.0.7.tar.gz 9560 BLAKE2B 056066a6693fa6988448662e52856eeed49688e834b344e5f60f31f1c3b3ef89043dba06bddbf958b042ab9e702fec056784b252e96c8b4b46fe350a801535cf SHA512 16e7b437ff9fc9afd3520f6b81d9eafeda840c7cd7925f5287ce0e0d5b20a0fa758183cea7ade369e3fec8606eee976e84c5b3142923e4586f559232012bf3a3
 EBUILD pytest-flake8-0.9.1.ebuild 671 BLAKE2B 602e62bf93e44016f378e1a9e41f232d50d86a9d0589c8f3476ed0b70cca0c85601da4903516bc560e7d6a26eb179743749e1ab89d1866ee0947082c2da63d92 SHA512 d8374b5671a7eacc980b8c98e8dd4979d74387d40dbd62f4a3fefa20a253f2a383c5011bed3ae6cdef8ef0a5ff45d1c04f344541fbd1d8cddba72f3ebfad922d
-MISC metadata.xml 507 BLAKE2B 75290d0db230e858a4b5b706a2636963a998c882631cd2599bfca3a1961a2f6304dd67b1fa2dbf5a278a86dda00a4c50247f400ff8573845552d3f11b2704595 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa
+EBUILD pytest-flake8-1.0.7.ebuild 570 BLAKE2B d1b24de3f9e48f8988e1a11b0c6f91ce130ca7178119556382473a7ac3259135b62c6f7429a022bfbd002dc1d4406e17e35646fe5fb0d97732474ed594485505 SHA512 b3683925b92bfe44485ef717cf8613a74b80f21fe83418d270b63e792ab11342f0730a27b5aaa57f74a8c636dda84a4b6e0663ffd2e0bfa7e398cd4179c5a413
+MISC metadata.xml 532 BLAKE2B b9c44db2f3d1692ea5d6b7751df933ca36b8d22a6dd9f234be7b7ad388bb382d76fbe0d2222ac1824e8d0c82d07eeb3b0c538566bb40cc4b6cfdfb25927db513 SHA512 007b524192378cb468c161fdd1a3e847f6e0e1388e3d928348732ba02a0fec4894fb5b1f1b744087d3d49ed83d98c2cbf499474f4289331696ce621abd9fe4ef
diff --git a/dev-python/pytest-flake8/metadata.xml b/dev-python/pytest-flake8/metadata.xml
index 2ef8e4f36f30..45bf72c72be7 100644
--- a/dev-python/pytest-flake8/metadata.xml
+++ b/dev-python/pytest-flake8/metadata.xml
@@ -9,6 +9,7 @@
     <email>titanofold@gentoo.org</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-flake8</remote-id>
     <remote-id type="github">tholo/pytest-flake8</remote-id>
diff --git a/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
new file mode 100644
index 000000000000..84c861885f25
--- /dev/null
+++ b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for flake8"
+HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-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 ~x86"
+
+RDEPEND="
+	>=dev-python/flake8-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.5[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index d0fc0ef18952..d86945b6a498 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 614 BLAKE2B 31c1d29d74797d44c930a19751af360d00b050ec2c10cfb5079f20873c327640bd2d0f4a9035ad6b67cf71996fb1760298709c6a10e4fa923faae0af7e2925ba SHA512 6bfdf96adc414d76f37247793fdd8bec447f9d1ffd6eaaed04e92e251af7c56b11d23fe2437ca2cbcf5a3e07970bf2c3816b70d59bfe9a4253240948cacd580a
-MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
+DIST pytest-flakes-4.0.2.tar.gz 7225 BLAKE2B 3a5ec59e3df90b6bf90daf5cf4abdf2946852a8e62a98ed08e5ba93c2e3f9e93699b2a4b571df45edac83e4c1791a5828b0bcca2a26a37b71f01d81bf3f0342f SHA512 bb1fc432e2494367849acedecba80495ede34c18dcf3ada09ef3dec8567d55f8dd6ba427bc3d9e47cfe3c0bb2aba80576612282d5a71858ccb45bce458f8656c
+EBUILD pytest-flakes-4.0.2-r1.ebuild 499 BLAKE2B ceda8546a975b08ddbc9331ddbac86861c752ef76c8d5adb08e906df134787603383dd65fa345b4c8aed1d3c5d3192172f4e1a5577ab2cef0d1ff1cca7687b59 SHA512 2a3cf5d26d07985651cb3e86db33a1c1bcacaa5fd232b5a3a6c885a17e5c1f3b545f3cadb041b0bfed928e3d48a29544ace10b2390aa018b7fa3d761405d4b05
+MISC metadata.xml 345 BLAKE2B 30c89e99999ee7a34a424f1a71511353cd7ba4a73c05f50313d3c4afa7c191b64af1942651d88216c8577b2302a25ac9ab7f10fa4f2c145fe569ea5227ccf136 SHA512 ea5807438cc727c462bd09213cf4f1de85ac98c31edf750cf9292feb320e9d40f6d2e1c79af57c2e1d74e328fcd0eb751577ed4810397bfc5344e1b4e0b9aa28
diff --git a/dev-python/pytest-flakes/metadata.xml b/dev-python/pytest-flakes/metadata.xml
index 9d43655030c4..8dad66ec297e 100644
--- a/dev-python/pytest-flakes/metadata.xml
+++ b/dev-python/pytest-flakes/metadata.xml
@@ -5,7 +5,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-flakes</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
deleted file mode 100644
index a52d77a892a1..000000000000
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/pytest-flakes/"
-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-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_test() {
-	"${PYTHON}" ./test_flakes.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-utils/python-utils-2.5.2.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.2-r1.ebuild
index b83efbe8075e..ec121802c206 100644
--- a/dev-python/python-utils/python-utils-2.5.2.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.2-r1.ebuild
@@ -2,23 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3)
 
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
+HOMEPAGE="https://pypi.org/project/pytest-flakes/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
new file mode 100644
index 000000000000..87cc3d38ada2
--- /dev/null
+++ b/dev-python/pytest-httpx/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-httpx-0.10.1.tar.gz 21117 BLAKE2B 372ecc8a132f28bf7016ed466c4f6974f51c3c2ab9decd68fd8e3c7a810030db9f169f5ab28662cfed006297ea200d3a157ba220f2156b44be03fbf49edc5415 SHA512 f306e57408924b653d3ab4dd28f266b066f202b98440b31769940bdab0be98d5c48817e22d68e2dcdf82426e26334242591d0ae630aa71812f81dd7866b81e0f
+DIST pytest-httpx-0.11.0.tar.gz 21178 BLAKE2B c58c303868fd1b1926a58db28eeda3c5d74cd38f68aad3543cb0296f4dcac59d9fb983287b432219f70bd2003c2a0e32d85ed343b1c279d576ef100b129c7f25 SHA512 eb798d31c710ab50d3176c569aba8ae2131a17f415fe87830fc71aa941d638bdbda4296032a07fce98d9a43a57f250cea380f8c409660eb1f13862094b6fcbb6
+EBUILD pytest-httpx-0.10.1.ebuild 652 BLAKE2B 46e3a52a92fa0a41113b83ab484f788ffefab9b78b1131d4ac93a10cf66a434353a18f2190f654232c6dac93448c56fdb94497f61b45f06f0e1ff6fccf06ed9d SHA512 deb414435242646088536df2966488bc188596d953d8c53c6957cd92b2ac2250b7840747c6198fa1068ae05821a1495aa966ed1e564247d0a1a1530ff5c53fc9
+EBUILD pytest-httpx-0.11.0.ebuild 652 BLAKE2B 874b81051af4bbb2aaae6f0b45db7b5ea0deca1c63b32eb903591598268ae3776fce86a0211bbb5307d5f904741c240d0c23ddfa9ebdad0427693b007d34fa28 SHA512 eb0530d3b446928dd6e6bde6a9a79c49307184f4bf3ca5b033db2f5bb37862867a72d48f16d33a2204fdcafb84ef9ff334739c7002d3c5497688eaf63b991360
+MISC metadata.xml 467 BLAKE2B d13bfcccc41321e84d9e912be5e6106c376d7dd5a8bc596e69e570713fb2d0dee3627e29dc9c35c6638322c7edd328a6f60e6af8dc967fad302508dcfded32be SHA512 a6b6cc298ccbbc4b11c0e91a4402f634ee0f69e5ee53e09648f842771b8d6f3fdebe5114b3f55623b75e6539a794b6b94956a6eaf4e7f91e28eb6d4bcbb5f770
diff --git a/dev-python/pytest-httpx/metadata.xml b/dev-python/pytest-httpx/metadata.xml
new file mode 100644
index 000000000000..fd29bd901502
--- /dev/null
+++ b/dev-python/pytest-httpx/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-httpx</remote-id>
+		<remote-id type="github">Colin-b/pytest_httpx</remote-id>
+		<bugs-to>https://github.com/Colin-b/pytest_httpx/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.10.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.10.1.ebuild
new file mode 100644
index 000000000000..b2f04c25ff37
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.16*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild
new file mode 100644
index 000000000000..6b38ce967264
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.17*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 7d760fcabef1..087cf63faf76 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-mock-3.4.0.tar.gz 28115 BLAKE2B 0a7f9098955d57f7121c04f7ab706dd67eb52d8ec0b2254552460eb90b2e3fef3cd3b925cf46619532ffe7bede2f208bf822e465647f3ac4504566c18ff58a75 SHA512 5456b60bdd06a63859232b28aeb79be643e8298e69ae103cb6e194891987e01b17771ad895dfead97fa45531959689fb202bb1ebc9ba44491098760c10d1ef43
 DIST pytest-mock-3.5.1.tar.gz 29135 BLAKE2B f9eb37bff0965772919c359ad56a0cdd0cac24fa763685c42ffaa2dfaea183a9c0be480269cbfc80990baaf406021c541b6dccc09602e98c8f731bbd530e928a SHA512 28ab2f239d3dfee134dd4e4fd467109cf3c76cb60aeb537dbc0c21b9a7619d068d54737e33d98c585e9341588fdafba4737ea5f428af37796f55e61ec30373a7
-EBUILD pytest-mock-3.4.0.ebuild 953 BLAKE2B af318c499a1dbbdc22f44d9349b63869558eb92d035dca81c9599bfca4d5a43365242f63e57e0b81a21496982fd125e44d09d0e0cc4d80ab4cae48b4022a6dc4 SHA512 197716c13d3b10d3ba5db4b432a5a522649adfdf2badbe93f916afd9bd14d3b31427a94a8f213aaf22f96da49e69668598553b46bc28fe01ddfdf22dabed01df
-EBUILD pytest-mock-3.5.1.ebuild 961 BLAKE2B b9141a1cb20bedd2aa0dbdca793d5cd33acc09ff15526ff9e60c2cbab6c546c93bb0f70df1e2c95b8c1927c206e399c7178e7d9d9d120e59a7f7f4b8aa3d3a0a SHA512 f13eff6316dd71a0a33bc4b86fb411aeffc4416ea6ed2573ae32af9927a951cc99ea82166d1a00b9348159bc5a5cb8bdaf88437b2912653451d1263b3bd72d14
+EBUILD pytest-mock-3.5.1.ebuild 953 BLAKE2B af318c499a1dbbdc22f44d9349b63869558eb92d035dca81c9599bfca4d5a43365242f63e57e0b81a21496982fd125e44d09d0e0cc4d80ab4cae48b4022a6dc4 SHA512 197716c13d3b10d3ba5db4b432a5a522649adfdf2badbe93f916afd9bd14d3b31427a94a8f213aaf22f96da49e69668598553b46bc28fe01ddfdf22dabed01df
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
deleted file mode 100644
index 17ca5abbe94f..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~riscv sparc x86 ~x64-macos"
-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.5.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
index fc5daaeaf104..17ca5abbe94f 100644
--- a/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.5.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 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index d8a0436a2dda..3c805d834501 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-regressions-2.1.1.tar.gz 97596 BLAKE2B a0c62ec1a0c1f66d0539780008a99bcf7fb0f9bd6d73198154c9a1ebe9830679d4fb57f989a2ac03c19cce7ac617db26c07857581d2bf753fbe18358a9edcecc SHA512 488bf42502ad18995c1f1e7f32677c500d14869cc0e2655400610bf18b73f48538025c08fc23758737ebb92deba61b130a1f6f82a75f71d93f03181ccd74a9c4
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-EBUILD pytest-regressions-2.1.1.ebuild 1058 BLAKE2B 1716a67041a5d634defff5a2e16fcc4e21026ede4d6f91937f2a9c48ccb2c643f46455ed40a8660a443a82fe74ad3d494769da9750b85c4d66794af71b0ea0c8 SHA512 99ff85f74ee2009006e09a7a97a3e5de655682b7944bc0d1a9f5fa18c87a74bd515575884950533b91138f99f388f660aee4a6a590b55997ce8f3441198cf143
-EBUILD pytest-regressions-2.2.0.ebuild 1068 BLAKE2B b1e8d0cc1a8a8d12c55e1e926daa455b4cf7f823f2222efe15af8ad89d4c683274ee082972372388a609b8cd051184809018d4686758750f0e386bf3049148ce SHA512 26db84b0e897ff9dff56aad6a0e72fc040fe5b7151d11cb70e4d64ca86dbcaa48bd29d944bfbb45139d7b4eee04c1a55331bd75713ed4f49127f123712824381
+EBUILD pytest-regressions-2.2.0.ebuild 1066 BLAKE2B 18e7110806bd68e26943690c24fb757a96f5a9c04a27a87fc0ee9aedfff1f5c9be83e256e308943d9f96d652e9b2a355fc9743c9bc3eb59bc09f0b680fe8b263 SHA512 f6949629a4bcb9c286365dea82674a8fa37940829adf7e11541d1cb282f290059c1be370eaef3060ae70f5204f45088f6d288eebe2f28ff77293ca7f0a0d00f7
 MISC metadata.xml 581 BLAKE2B 0c89ac086ea6a4df82876ebef5710c1e5f83a198c7f6554d25d2f4a79b9ed4522477233fecc66f8212b9d67c4d051e6845a4ee5a82320e95c8e5d1b3b9fbaf3c SHA512 2332331595aadb30675a3c78a19a5fc072b780ea17526f97450c16510b697711ce879289aee329801d0b16c6d058a375d21a718e386eba662c22a8d8f7739748
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
deleted file mode 100644
index 079a26b29eef..000000000000
--- a/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 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="Easy to use fixtures to write regression tests"
-HOMEPAGE="https://github.com/ESSS/pytest-regressions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-datadir[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# Does not work with the panda's version in ::gentoo
-	sed -i -e 's:test_non_numeric_data:_&:' \
-		-e 's:test_non_pandas_dataframe:_&:' \
-		tests/test_dataframe_regression.py || die
-
-distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 3e11d5accfdf..07c233bce68c 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.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"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 21b6647a877e..95b8ecefb50c 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,4 @@
-AUX pytest-salt-factories-0.92.0-setup.patch 507 BLAKE2B 6bc3f42686618d3a450d7e6be327cb8ed91c42dc18965cc4ea7a70cd8695f47ac97a517dcf7e36336512ad76d817194f940472a1c0a87838519bf17a71a428d8 SHA512 c7cadb4239ee5bf9fae9594e6612bf36878a910184ca6d98f58241707163ffe2a830b567b06ba4d7c4f218a88d5b72c3dde4387d224cb250308a1fcfc0c4ee37
-DIST pytest-salt-factories-0.94.4.tar.gz 117281 BLAKE2B 9b42dbf4329fe2afd875de55e96604896c6f46d3c3736b644466dd5db6091cf5b9b1d2188c0e0a22b4b15a227dfacc7692ea6499aa7f58ce6adb9b802f00b1f7 SHA512 5c670aa7dd64441b1bd3a188335a35be00d7406bc8d76f9a1213cc3414061c3dfc51a9319008c29c83fb5abec1d7b677aec76ac4b9c00adcd878ef6da599041a
-EBUILD pytest-salt-factories-0.94.4.ebuild 903 BLAKE2B cd6e9994cb4d100eb6def23b2e8d229474aa37c82c22ff237953ce1456d62e026df669a61ba5af6b24b7fe61cf5308d319483b378e7c22dc2645a8f60c94a5a2 SHA512 726156e3981e40d9a258ff7b0e29727cd3c2bd26a9bbb45512b72e1a0bf08f44ef172cdb456110ef39e618295368964304225e2419b94b40751a6c7fb234c2d8
-MISC metadata.xml 333 BLAKE2B fd8789d4c8303669a8770b3b825c7dc3429f703c1d0e0622ae7b4d57e9fc5b73703aa79ec2819af6b60c1df4b6b58ec19e6971867c01486d48c6e7aaa3e3e7a7 SHA512 ffdf1308d023306664b012d94fcf678534595e7a4efed20dd214a0b1d3e39ca827bf61450ec20967a838606adb3a4f67055a12fde227d080c5f426d9321cc7fc
+AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
+DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
+EBUILD pytest-salt-factories-0.121.1.ebuild 1734 BLAKE2B ae6c0a3bee5b429b9825c5a802aab4e57c08ff965c5c8310f6954144e11bc84e8db95addb96fc6fe3dde5c376ce9505201a4321ab41c07c7cba479e06d1b1b86 SHA512 825446d4931684f4b8ea8ceff89724c72587dca69230b7bc14d953d1d77d9f63d137bf1b1be1e1c68216a18dc0951ad415def713bc124dde476be987c5d9523b
+MISC metadata.xml 357 BLAKE2B b94cb0c96e720905214dd706d61a7280f2209def7f2eaedf553d83204ee49fdb4c6f668531bbc39f9bc0ea32a728293d1c7892b6c1eb8f2babb185cd32b5d709 SHA512 ed4155a008f387aad4cbff6a314c5240484901f0bef50a3225b16ae1068ee4e01288b4c3692a9a075785c98140a20d51d17b44504eb77da3436ddefb3c0ce017
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
new file mode 100644
index 000000000000..3e85580c9158
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
@@ -0,0 +1,294 @@
+diff --git a/saltfactories/plugin.py b/saltfactories/plugin.py
+index b29a115..9d68c34 100644
+--- a/saltfactories/plugin.py
++++ b/saltfactories/plugin.py
+@@ -21,7 +21,7 @@ def pytest_tempdir_temproot():
+         tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
+     else:
+         tempdir = "/tmp"
+-    return os.path.abspath(os.path.realpath(tempdir))
++    return os.path.abspath(tempdir)
+ 
+ 
+ def pytest_tempdir_basename():
+diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
+index 8b57368..d58f0a1 100644
+--- a/tests/functional/markers/test_requires_network.py
++++ b/tests/functional/markers/test_requires_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ from saltfactories.utils import ports
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_local_network(testdir):
+     testdir.makepyfile(
+         """
+diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
+index 17fce6c..7bd2789 100644
+--- a/tests/integration/factories/cli/test_salt.py
++++ b/tests/integration/factories/cli/test_salt.py
+@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*")
+     assert ret.exitcode == 0, ret
+@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.json[salt_minion_2.id] is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
+     assert ret.exitcode == 0, ret
+diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
+index 78b8bb7..e20f28c 100644
+--- a/tests/integration/factories/daemons/api/test_api.py
++++ b/tests/integration/factories/daemons/api/test_api.py
+@@ -23,5 +23,6 @@ def salt_api(master):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_api(salt_api):
+     assert salt_api.is_running()
+diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
+index a6c5472..dd15c17 100644
+--- a/tests/integration/factories/daemons/api/test_restarts.py
++++ b/tests/integration/factories/daemons/api/test_restarts.py
+@@ -16,6 +16,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_api_daemon()
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
+index 2676dfa..cbf598e 100644
+--- a/tests/integration/factories/daemons/master/test_master.py
++++ b/tests/integration/factories/daemons/master/test_master.py
+@@ -46,10 +46,12 @@ def salt_key(master):
+     return master.get_salt_key_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_master(master):
+     assert master.is_running()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_run(master, salt_run):
+     max_open_files_config_value = master.config["max_open_files"]
+     ret = salt_run.run("config.get", "max_open_files")
+@@ -57,6 +59,7 @@ def test_salt_run(master, salt_run):
+     assert ret.json == max_open_files_config_value
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp(master, minion, salt_cp, tempfiles):
+     """
+     Test copying a file from the master to the minion
+@@ -98,6 +101,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+     assert master.is_running()
+     assert minion.is_running()
+@@ -119,6 +123,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ @pytest.mark.skip_on_salt_system_install
+ def test_salt_key(master, minion, minion_3, salt_key):
+     ret = salt_key.run("--list-all")
+diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
+index 6a6852d..70415d0 100644
+--- a/tests/integration/factories/daemons/master/test_restarts.py
++++ b/tests/integration/factories/daemons/master/test_restarts.py
+@@ -11,6 +11,7 @@ def master(salt_factories):
+     return factory
+ 
+ 
++@pytest.mark.skip("not compatible with network")
+ def test_multiple_start_stops(master):
+     assert master.is_running() is False
+     pid = None
+diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+index d63e640..653693e 100644
+--- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
++++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+@@ -28,6 +28,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_event_listener_engine(minion, salt_call_cli, event_listener):
+     """
+     There are some events which the minion fires internally that never reach the master.
+diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
+index 64a3df6..ab82e55 100644
+--- a/tests/integration/factories/daemons/minion/test_minion.py
++++ b/tests/integration/factories/daemons/minion/test_minion.py
+@@ -27,6 +27,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=minion.id)
+@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="minion-2")
+@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
+@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion_salt_call(minion, salt_call_cli):
+     assert minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
+     ret = salt_call_cli.run(
+         "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
+diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
+index a7d9ae0..8f0401b 100644
+--- a/tests/integration/factories/daemons/minion/test_restarts.py
++++ b/tests/integration/factories/daemons/minion/test_restarts.py
+@@ -10,6 +10,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_minion_daemon(random_string("minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+index 3bbca21..2e2fb8b 100644
+--- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
++++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
+     return proxy_minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
+@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
+@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(proxy_minion, salt_cli):
+     if platform.is_darwin() and sys.version_info[:2] == (3, 7):
+         pytest.skip(
+@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert proxy_minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
+index 3101204..28652ff 100644
+--- a/tests/integration/factories/daemons/proxy/test_restarts.py
++++ b/tests/integration/factories/daemons/proxy/test_restarts.py
+@@ -17,6 +17,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_proxy_minion_daemon(random_string("proxy-minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+index f58eac4..c3df3de 100644
+--- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
++++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_ssh(salt_ssh_cli):
+     ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
+     assert ret.exitcode == 0
+diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
+index 3b425fc..3e03636 100644
+--- a/tests/integration/factories/daemons/sshd/test_sshd.py
++++ b/tests/integration/factories/daemons/sshd/test_sshd.py
+@@ -5,6 +5,7 @@ import pytest
+ 
+ @pytest.fixture(scope="module")
+ @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def sshd(salt_factories):
+     # Set StrictModes to no because our config directory lives in /tmp and those permissions
+     # are not acceptable by sshd strict paranoia.
+@@ -15,12 +16,14 @@ def sshd(salt_factories):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_sshd(sshd):
+     assert sshd.is_running()
+ 
+ 
+ @pytest.mark.skip_on_windows
+ @pytest.mark.skip_if_binaries_missing("ssh")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_connect(sshd):
+     cmd = subprocess.run(
+         [
+diff --git a/tests/unit/utils/markers/test_skip_if_no_remote_network.py b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+index 1aa72dc..c4d079e 100644
+--- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
++++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ import saltfactories.utils.markers as markers
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_remote_network():
+     assert markers.skip_if_no_remote_network() is None
+ 
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
deleted file mode 100644
index d8d1a915a789..000000000000
--- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.92.0-setup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d7cab46..1321f06 100644
---- a/setup.py
-+++ b/setup.py
-@@ -51,7 +51,7 @@ setup(
-     url="https://github.com/saltstack/pytest-salt-factories",
-     description="Pytest Salt Plugin",
-     long_description=read("README.rst"),
--    packages=find_packages(),
-+    packages=find_packages(exclude=['tests', 'tests.*']),
-     cmdclass=versioneer.get_cmdclass(),
-     install_requires=parse_requirements(),
-     extras_require={"docker": ["docker"], "salt": ["salt>=3000.1"]},
diff --git a/dev-python/pytest-salt-factories/metadata.xml b/dev-python/pytest-salt-factories/metadata.xml
index b8b1eaa537d2..66f5d56588c5 100644
--- a/dev-python/pytest-salt-factories/metadata.xml
+++ b/dev-python/pytest-salt-factories/metadata.xml
@@ -5,6 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-salt-factories</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
new file mode 100644
index 000000000000..480bd6832c7a
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-6.1.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? ( >=app-admin/salt-3001.0[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-0.121.1-tests.patch"
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:[tool.setuptools_scm]:[tool.disabled]:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local tempdir
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	addwrite "${tempdir}"
+	ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+	distutils_install_for_testing --via-root
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			pytest -vv || die "Tests failed with ${EPYTHON}"
+	)
+}
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.94.4.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.94.4.ebuild
deleted file mode 100644
index df0cc88cf7e3..000000000000
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.94.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-inherit distutils-r1
-
-DESCRIPTION="The new generation of the pytest-salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
-SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pytest-6.1.1[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? ( >=app-admin/salt-3000.0[${PYTHON_USEDEP}] )
-"
-
-# pytest just bombs
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/pytest-salt-factories-0.92.0-setup.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index b5363dd5fb27..a609541c3934 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-subtesthack-0.1.1.tar.gz 2410 BLAKE2B 3d41950ad46bb07da145db7f88eba7eb34a2bbb99273f47d2443cae5ab0e11737f1c2fe81bf473180178b2ad9e55b252c7717846f1b010cc58fb1bf61380d003 SHA512 0bf6425b535e65dc7f06f74493d10fbb6451e78a817174638661d7525f39f092f67db8da010228cbd54b400485e71e443118f91ebef660b9c00d2b354062a55f
+DIST pytest-subtesthack-0.1.2.tar.gz 2669 BLAKE2B f1f5a052f9418732de4a97ff438d280d177860439e667e29ff0d0503740e009c88046b5ba859884e5fa9e958ea1be7388d7fc6838c19e44075ab0ef757ee41c7 SHA512 ddb7b0c27f912bec31e58ddc54930e229755df8980d146c861f7f1c766ae742b4f1552117d89638bdbd443f22890262320a56565954ebc6deeae6184f459a5a8
 EBUILD pytest-subtesthack-0.1.1.ebuild 833 BLAKE2B 55220d71cf86b50c3a9801123dd06233fe9ff01f47babba633aea1de94194c6f27735ea196cad4a23fdd91ec0556c50d4d2d741f45e642ffd98b1b21f792d117 SHA512 187d4357c022af5a81f846007317a7b387871f7c8b75415e14ddd5e46d64a773fafc4639cc10ee92e9f5d165689f65a9645a99fb32d2577e622b9e949742b20d
+EBUILD pytest-subtesthack-0.1.2.ebuild 649 BLAKE2B b694de73008954d2820921174c8fcf279177fcfdbc00aef23a4bc8accb0d3ce7c0f88ab33ee53cfe0c9022c3ab6b9e9c9edc654b62493640ab4712b8c6701750 SHA512 62dda8959d4fb47ee251f98f35852ea1254ca34826c8492eb881f9d2b6b261fe49bca0bcd56f86c392a8ffb4f7cfd29c580803d1dad1813e777444e9c3542377
 MISC metadata.xml 389 BLAKE2B c1a64baf73ac4190b139a5e39f1b01eb379aa6bde70466ea4a71d97bf92624decbdc0a41a78ae5f1e2e9d95a2ff59c98bbb80a91bb30e0f6be0a11797268747f SHA512 e8be63576ae72a296ac1d11ddebc32611bfddd1ce398d6a5f224dcd627e157fff96536d7bd32e2ed9b5cd872834ef4c85c9b84e10578526a4e6a8b51196eb99e
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild
new file mode 100644
index 000000000000..ecf80737e6ff
--- /dev/null
+++ b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
+HOMEPAGE="https://github.com/untitaker/pytest-subtesthack/"
+# pypi tarball misses tests
+SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-testmon/Manifest b/dev-python/pytest-testmon/Manifest
index 2147f08ada2e..fc3c3d00e51d 100644
--- a/dev-python/pytest-testmon/Manifest
+++ b/dev-python/pytest-testmon/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-testmon-0.9.15.tar.gz 32468 BLAKE2B 72678f4a5ed9bbc1ee6a4ec611da105554856454dcd3a3f199084645977d7ce461697218c460f9ae3b5a56bd90843822e5e88c54fb43f55a12f2c31d4ea53658 SHA512 fb414c492188f59e34a5f940e9f378cc841dd9de311738a0238980318261f51b869c30e1218e3219dabf8c438f28bcb9b10f751c07240b533ead537f4b6d8d4e
-EBUILD pytest-testmon-0.9.15.ebuild 655 BLAKE2B 7c344926899f7bcd2c172de05bbb41d0a04272872c7e77d76678227fb100da05d81702cf82d9dc06ee7a68e00faa01ef0bfae91c437346ac8a6da647e63fe911 SHA512 2bcf2232c0d33da4ecea4bb717ec85ddaa1303ccd5dc9c90c3c88a41e46fec09451de7f6d1392917c6c962a7c056ca83ef692864907f64a1f780e2447a23fcf2
-MISC metadata.xml 325 BLAKE2B e9c9201fc83275c985d83c4a534f9c4b04b27376bd5678dc9bb59a30b33f1462e5096b0dad4d9bfcc7ba9d8ef443479f332aa1dc691e17f146f8227d9cd9207c SHA512 e8f8919dd90a8848a92a80c8ad84441ed550650dcf53b4456a934953c15502beb788a609ece7b5d1c0fc5a006d19a5a7b2e534fe1877e1ea39450ca0c2e47da5
+DIST pytest-testmon-1.0.3.tar.gz 44160 BLAKE2B a5b623afca30b8c03902a37c8ea56680691cf6a66979e3e3ecb00977f467e5b497ec58f2ddffa8d6993aa69d5c8614a342c7b52929193f0e7694b87671a94fd3 SHA512 1107836272517a390a3cc30d550ac3ebd2cf589430059d03b5c85a1db86276ce73044663c3bfc000e7d5805fc26d716bb26e17081ac2a46b799117fdc14a4df9
+EBUILD pytest-testmon-1.0.3.ebuild 669 BLAKE2B 55b90e77e19b75b58e49a32f3abb9af1834bd04fb7a65dc4d4948214daefb3aebe897442fb14a43aa574a1f9b62694d408360a990f3d6552612cc4397319034d SHA512 032c697b93e2f64efdc7b6aa32ba78eca695c74c470b41b0bd8570c7b8992fc7b1f297a562f71cc8b640e68e0097ae8c25ea60dd06d1e29cb85a92458b6d24b2
+MISC metadata.xml 349 BLAKE2B 9d17c57b35c19c2c8bd85b26c80d1e286c27a3670ec5a5451d634b529f12b65e32b2d1b556957be131a736918aac87674c768900008ca853dc3956808c62bc43 SHA512 f3117adc85ae38488b2e28d7916996210efb3f97d1a7fdf9623b2710ad9ec3f713c2a1f07ae6e2b136434ffed054534327bc5dde1a08b269711ed678de9314ab
diff --git a/dev-python/pytest-testmon/metadata.xml b/dev-python/pytest-testmon/metadata.xml
index d04e61e25d72..fcec7c1b8e6f 100644
--- a/dev-python/pytest-testmon/metadata.xml
+++ b/dev-python/pytest-testmon/metadata.xml
@@ -5,6 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-testmon</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild b/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
deleted file mode 100644
index fd85c34746b0..000000000000
--- a/dev-python/pytest-testmon/pytest-testmon-0.9.15.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_7 )
-inherit distutils-r1
-
-DESCRIPTION="take TDD to a new level with py.test and testmon"
-HOMEPAGE="https://github.com/tarpas/pytest-testmon"
-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/pytest[${PYTHON_USEDEP}]
-dev-python/coverage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild b/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild
new file mode 100644
index 000000000000..18df13a7d277
--- /dev/null
+++ b/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Take TDD to a new level with py.test and testmon"
+HOMEPAGE="https://github.com/tarpas/pytest-testmon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests are broken for version 1.0.3
+# https://github.com/tarpas/pytest-testmon/issues/158
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/unittest-mixins[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index ccd06d235332..6bd742b7d386 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xprocess-0.17.0.tar.gz 19186 BLAKE2B 071063267d88d8ddd56c3b8ab7b2e6bebae321ac741e63336721cd13045688cef56909737c73b5cec27805b4f7dd93cdd7f467071966b3d864d0a1f270e821d0 SHA512 c85bb7bd8373b5b5119083fca46b8f173efe3b6f6cde5db8365e567e717f47f6f9230d2cf5ecfddb014aedd628aee75023f4da3077fa3ffb26b3c7bfc61d57c9
+DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
 EBUILD pytest-xprocess-0.17.0.ebuild 628 BLAKE2B e55249312bb8b5036823030e4a23bbb047968324359e9a0c108211360be503d8d52dfac107fa2b70f01b9a6af4936cdbee5f5c2b53c895307dec04e36f03ef49 SHA512 f102e5370b18ebdbebf0343409d1825b23c2efa4d6d8d3ae1d483516d20f43fb2f3e50192fe498b5bd30777406bf1431245cb05087549e9464712b83066cb61f
+EBUILD pytest-xprocess-0.17.1.ebuild 636 BLAKE2B e082b98b55222970f8cfdcaf3ab0b2cc81a7b1d58c80834a43a5185b17a810e3b2e64a2378a29805a83b8ed47aff66b4a6e905ee1464d2c746f4532d7fde97a4 SHA512 83a7c9300f159af5ea65e8d63efe045204aaefdb7f901c19a36427a05048b1b1d3f1ce165cfa3cfc281ccb0b90bce885fe121e8f94a9c6ba7e9d0d980d170e5a
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
new file mode 100644
index 000000000000..598a80e97ddf
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 40748eaaad30..83f8c065b581 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,11 +3,9 @@ AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19e
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.1.tar.gz 1102958 BLAKE2B 336757fe911e2bfa1041d7d9c1f83ce66418c55bbe0a1accdac45a36ed5ace972f124bc5f68d2847e3d310bcb2e68a8ced04c74e818ff6f1d43c3ba8b915332d SHA512 abd130212411e0a26265aec922958053e41d05d09d14942b75c1ba81d0ad7c5115d851110a257b32f0b05a2d515961ad068a1fd65f7e275cfe65d16150d008a6
 DIST pytest-6.2.2.tar.gz 1116980 BLAKE2B 7e74050f01fdc4b1ba8a6d703915b0d707305e6e8299917fff8e0cedb873f998c9a904728b77e7234718016ccdac15d491d10411c582d1bfa60d2450a8a2fa7b SHA512 a81def83759c550c169b3db8ed43b4df40433a88acb663e2e9422ef562149ed52041724b7f3cc5d0d6b532f2243a8d9a9614ffbcd87ed571f7fdde7f036c2297
 EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f2a3bfe54cd0bc11ab6c4d7c26fca121a0bdaeaa1621964aa24d8b03580f0a00663a1b77a6a62195d031deb1bc712 SHA512 4533c66af3f820c63437504655af8607923ff0b0d386a38073dd32eaacf0f47043d3b31e6cca1aff353aeef7b82ea747737270db1e8cebbcb2fe69750fe24898
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
-EBUILD pytest-6.2.1.ebuild 1684 BLAKE2B 4d7cb64825d774351cdd2521b79b717da88269c5fbb40aa38dae0eef299194bc9396a1785f53e0bcb0899c4e291d79a3161649fc7277aa77d7101ba725ab3f99 SHA512 0312b5bc56806bbdeee55d2056f24e6fbc0ea4b5decd8f44f394ba874ab8fe793750eea7fec1f8f4b177c1715619e9e3a28f5b4619710fe6a9d542b2b043cdee
-EBUILD pytest-6.2.2.ebuild 1688 BLAKE2B c7d476bb8cc28f561ea882b33c1419a2a45b1a4af53ee110b989c288b25bdd94045c89a3ebddc0119861561af0821abf2d734b9e08a75461fa06692e9eb8f0b7 SHA512 c1b3e8076cd67003aa44163fe0e6df80780715b584305cd8661b0c51b556ee7931098d782b0bc30a51420d00aa8cca778671089e9652ff55de3e41e4175fdbbe
+EBUILD pytest-6.2.2.ebuild 1680 BLAKE2B e415039d858be4f81b542b7c82d1781c61cad61c52575b145d9781057af6d12490c45a85d583add9dcf1555b0932a1db30beea6ecee45f9b7bcfcfcc2b62875b SHA512 0e4d8dfe3eed27af6c5ba337928ee417776b64dbaeb0dc8e8f163f6c7b3c62ddd0906f4a94250b21651bcaa088f865a7a485907123fe45a2a39b98b018e5c3af
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.1.ebuild b/dev-python/pytest/pytest-6.2.1.ebuild
deleted file mode 100644
index 6435b7e7e8df..000000000000
--- a/dev-python/pytest/pytest-6.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.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-3.4[${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 --via-root
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.2.ebuild b/dev-python/pytest/pytest-6.2.2.ebuild
index 173f3694ca7a..68c99e5b183b 100644
--- a/dev-python/pytest/pytest-6.2.2.ebuild
+++ b/dev-python/pytest/pytest-6.2.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index 2206b2e5104d..86fb94f95d63 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,5 +1,3 @@
-DIST backoff-1.10.0.tar.gz 13652 BLAKE2B 15b9381fc83cce4559c3402cb214d8cf41651a1a72f7231a61a576e9a48ca7a4367b7823043c6540bd15d3d2b8c185be3ec3533bbc61d5f2dcebefaab013945b SHA512 87f64612ec1d6f80d2f173846af196bd347f1fcc6c6f93275dd1cb3b5486789f3c6e98e1080ed6f3b13e28c1b056fb1baa6da73639d4b9b460fedf68bb012422
-DIST backoff-1.6.0.tar.gz 10474 BLAKE2B 64e4b4a9cb8a1ac5a888aae78f50111400bb57f46bb0c123ecfeb4d660393a9786945d83b838599479e70244f2aa9b667428be2f0d57958b084ed8a045d0ea7d SHA512 a9bb5477d8a84397df61bd3904ad0914c5b214e46da9b55a2286ca8a81508184483e99a6703551dfcd1147e3e656396171ab7133f9e0cf2bff1bc17e6da49444
-EBUILD python-backoff-1.10.0.ebuild 567 BLAKE2B 6bcfd6b0ace8d4e42a3eb9568becab8a736f02e1fc955fbf44127cbf8fb5b25f4849672b306ca9be9a43abb486c04f9d7c70e823452c9389ca007eb6a6b09598 SHA512 bb8ce711c1b4d74cca8adf197195b04201eae8d4e3f95eecf624318ef75e599d20aeaf255097ed001373c74fe67e5e667cfbe1d5ece041ff2a39b0827659e95b
-EBUILD python-backoff-1.6.0.ebuild 564 BLAKE2B fe3a403b0a998a3515978492eb91d05855c2d1ad3fbf05c71d61d83a775ded8954e1ade69c69397bc7a866c80e582d2faa300fb1a47fe858cb73352c82c063bc SHA512 8331f1dd6bb5a01ceb26a5f124f69e26f5cd8bc4580ba27edcb77b877c3003919a6132b200cf3a637bad51fec4e432f0a72811abe15ab85e25cc58e8dbd203b8
-MISC metadata.xml 289 BLAKE2B 05f8c0d55061a70998b9685ccbec22edac5bb7d5567ead2e5dde57ad87fdc581aa1b3fd75642117c9ecec899256f542386437d04f6c439a2225c5644cbe260ed SHA512 3e252bdf24d43bd9529d7062551bf939fbfe94fd17c3286c7816b24564f3615af3de250aae50d670bf5c6e8b2a1f49e203a7c4139a315a463a8cd4b0bad2e163
+DIST python-backoff-1.10.0.gh.tar.gz 15546 BLAKE2B 4e2ff1f63a4659c9dbf3135f32da44d4c127909178ffe0fe6935cef43558d61087498d0cd31260396da0ccdff360ee1025db2c0347fb865468abffed2f4adf49 SHA512 9a874a12462c56e8559d2d3d85508f546c397c9d419d1d9ab81d9a046d27b338068f6baeb768fa78b43eccd299de71ec7d1471c4fb153f8c02e6f7292f56b285
+EBUILD python-backoff-1.10.0.ebuild 650 BLAKE2B 35dc9679fe73c508d9195200938545769084c06a61e08c2f52d3640743da205f0a3ab4730fb3137334388ea01c873a3a6ac1adf90326bf281fc015ec65e8d870 SHA512 523df6c47ad667885884ff686175244f555a7804eb073ea00ec0955030fa7a05ca9b9f4eb00ec1c3eee88826a5659d27f805e4d749911d122f960d6995c1dd32
+MISC metadata.xml 386 BLAKE2B ad575b5fbec1d1816f4405f05e092307346a49ea9d70f38ac2429823efd2dd5538a5b5c039014e948bc1e1bc4b7695c62dc90345a232389c185645f11120bdad SHA512 83267ec512b870806fd0cd9d0c8bec3d9a42c8e54b0121b6345f1188626812efff0978cdc727f955bc2b02901741e69a9b20e9370454ecd7a6d8ef562b94a520
diff --git a/dev-python/python-backoff/metadata.xml b/dev-python/python-backoff/metadata.xml
index b07fc479ab40..35eef87e5b77 100644
--- a/dev-python/python-backoff/metadata.xml
+++ b/dev-python/python-backoff/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">litl/backoff</remote-id>
 		<remote-id type="pypi">backoff</remote-id>
diff --git a/dev-python/python-backoff/python-backoff-1.10.0.ebuild b/dev-python/python-backoff/python-backoff-1.10.0.ebuild
index 48d4a2f8dcef..9b51a57eed0b 100644
--- a/dev-python/python-backoff/python-backoff-1.10.0.ebuild
+++ b/dev-python/python-backoff/python-backoff-1.10.0.ebuild
@@ -4,23 +4,22 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
 MY_PN=${PN#python-}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Function decoration for backoff and retry"
 HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
+KEYWORDS="amd64 ~x86"
 
 DOCS=( README.rst )
 
-python_test() {
-	emake test
-}
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
deleted file mode 100644
index 49223f5e319c..000000000000
--- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_PN=${PN#python-}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( README.rst )
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 1c0a68e2f611..4a461c9d6022 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST python-daemon-2.2.4.tar.gz 80775 BLAKE2B 3f260993a2207e6467db03c456d9f8621d1f3252236b6d49432ff14c1039416db901feb5d405620106d02ae2ea186fd0b10183156f31d17f9f4fa62964fbd333 SHA512 9a7a4e23e126f05e4c1c503f15401cddd758c5f9195c370997060ca1bbfe71cc51d82d3ae16bcf0023c28fa50b0b8d6cd406e515b27725ffa9fec10fde3ed64a
+DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
 EBUILD python-daemon-2.2.4.ebuild 802 BLAKE2B b2778a40b40c5c93727913d949cc31a1d0e66af86a034823b2a92c51936a314ea6da05c3060beb810cd3984305ba7551c9055d59d18ad64e59f75f69e094826d SHA512 4532d4f8e9b20424c82627924310edf806818959365bfa1d27c166879304b0fccc3dccffdd634caaeef1ea979f1b4e28b69f684324f6f015881e2b3be54cea71
+EBUILD python-daemon-2.3.0.ebuild 706 BLAKE2B d2239a9de8344a6fcdabed305605b0d0b35fa556825a6c0b9701489959e7928fe6a61294cf29bb31fcbf1306a92bf4c5bca0966d09ab3a5ee5c1814a01c7dec8 SHA512 63e9d3af69fd4cbbda430aa9a0fbbd9b7fabc06ac351f83cc334e07834a7dffd584f305d2bc0e4e49156ffb82350c123031507046f59cf7e75b719be10abf310
 MISC metadata.xml 340 BLAKE2B 8b44be0af694459080c54e9611780e3c5b1802a54702f38d52264bd39a896a094340da2b35e5c37a1dcc694f442b398f36290f2d933c1f2b28a4d18ebf5c5f97 SHA512 3733cf321d280bfb265e32b5ed480898a86361b5fd2220a03a1d4ba7e10f5fdc041155444d43b0c67a4e2f51d28652b3d487e3895b7310dc5b4900bcb93411ea
diff --git a/dev-python/python-daemon/python-daemon-2.3.0.ebuild b/dev-python/python-daemon/python-daemon-2.3.0.ebuild
new file mode 100644
index 000000000000..89993f129963
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 70a9bea8f280..b0f34ceee5a7 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,15 +1,15 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778 SHA512 da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
+DIST python-3.6.13-docs-html.tar.bz2 6016532 BLAKE2B b1aa4fea09f84615146a160ebfc7f2a40481397f25549f8935ea83b5dd5d6db83c0e8ecec94efa9941712186f93b8564fbda7a579550919bfe3ce47adc6c0a84 SHA512 7bdc77767211a652dbbe654cf9675e325a959d1d90eb751fa2f86abd04ddc41301d1035c8cf1a4968a8f23c97f95cf87b06763fd97f7844ac13c365b39dfcd8b
+DIST python-3.7.10-docs-html.tar.bz2 6289108 BLAKE2B ff751e3b847602f766389a4dc249bbb55776d91c7263a7b51b4699b3c65ab02a055e67c483d28a284c18b686086c21b2689a1b62373209a64dc102418d6fe26c SHA512 c303561ce3b758df1ee017ab8dad862adad116eedf1f2d0ed1180529e0af06526c9293810fe086f8223ec97b2c935cb08ca7e74bc20b9be93dc4e97909f5f561
 DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
-DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc SHA512 be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
 DIST python-3.8.7-docs-html.tar.bz2 6583700 BLAKE2B 7509e4bb530f272653f0efcc6582628f80e60ddf143085cc8fb9492a686d8de2be599be3e0a38ae0271526704c04e7bbe0bc064dbbf6712d03b8f4166f6e8cda SHA512 317217948168d870dee57f2b1633c5d3dbd1a54963f5595dda4cccdf902ea48bbc70369f98e2c03958047a76966aabf9842b87adade21bb1fc5ec01c3db694f1
-DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B 301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e SHA512 d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
 DIST python-3.9.1-docs-html.tar.bz2 6806786 BLAKE2B 0101e59fd25bd57e8abbb9f289b2b48a7db8e4ad9a74e51e3c8977f85a0d5d731624fe61fdc376048166e1ffaadd69c8e97acc677024a9bb711ba958a5c43cef SHA512 aa87b27b895894281b923031af651d26627526f85e61fe09c88be081ff6471ae367364cea176b1e522e065c6ec98372504f769aa1d40382716004f90c3761d97
 EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
 EBUILD python-docs-3.6.12.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
+EBUILD python-docs-3.6.13.ebuild 635 BLAKE2B 04ab113013750709e3f88d5a720af1cda135d8c81a2651fe18c94cc6d0567b55db20fda110a05d407dc4e29b572afe97375e06853ed7f716253427a6ddd9bfb9 SHA512 06c2fd52a0f284bd05746c5422f6b5a1bf372c84c8f0a1d6713397887cb0dcebe881995f9c2284698f4ba709962aff86066cb114819d5ce07559e81de5886451
+EBUILD python-docs-3.7.10.ebuild 635 BLAKE2B 04ab113013750709e3f88d5a720af1cda135d8c81a2651fe18c94cc6d0567b55db20fda110a05d407dc4e29b572afe97375e06853ed7f716253427a6ddd9bfb9 SHA512 06c2fd52a0f284bd05746c5422f6b5a1bf372c84c8f0a1d6713397887cb0dcebe881995f9c2284698f4ba709962aff86066cb114819d5ce07559e81de5886451
 EBUILD python-docs-3.7.9.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
-EBUILD python-docs-3.8.6.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
-EBUILD python-docs-3.8.7.ebuild 635 BLAKE2B 04ab113013750709e3f88d5a720af1cda135d8c81a2651fe18c94cc6d0567b55db20fda110a05d407dc4e29b572afe97375e06853ed7f716253427a6ddd9bfb9 SHA512 06c2fd52a0f284bd05746c5422f6b5a1bf372c84c8f0a1d6713397887cb0dcebe881995f9c2284698f4ba709962aff86066cb114819d5ce07559e81de5886451
-EBUILD python-docs-3.9.0.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
-EBUILD python-docs-3.9.1.ebuild 635 BLAKE2B 04ab113013750709e3f88d5a720af1cda135d8c81a2651fe18c94cc6d0567b55db20fda110a05d407dc4e29b572afe97375e06853ed7f716253427a6ddd9bfb9 SHA512 06c2fd52a0f284bd05746c5422f6b5a1bf372c84c8f0a1d6713397887cb0dcebe881995f9c2284698f4ba709962aff86066cb114819d5ce07559e81de5886451
+EBUILD python-docs-3.8.7.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
+EBUILD python-docs-3.9.1.ebuild 626 BLAKE2B 941e1c001b627a91249fa91620645f9a04a7669904808582c23f34bcd0a13ed45f925b75be4a3ed6574f41655a0263bc4c938ba7465bb296359aece3828faafe SHA512 a321e0337907b8e20f16326681671e7ca13a9daeb321166cf84480ed387c770bfba995260ce9abf3a5d0beedfb61ffde58fce056b7a533f8ec5373800ebcf9a3
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild b/dev-python/python-docs/python-docs-3.6.13.ebuild
index 69b83c700c31..bfc00bc95def 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.13.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.0.ebuild b/dev-python/python-docs/python-docs-3.7.10.ebuild
index 69b83c700c31..bfc00bc95def 100644
--- a/dev-python/python-docs/python-docs-3.9.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.10.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.7.ebuild b/dev-python/python-docs/python-docs-3.8.7.ebuild
index bfc00bc95def..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.8.7.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.7.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.1.ebuild b/dev-python/python-docs/python-docs-3.9.1.ebuild
index bfc00bc95def..69b83c700c31 100644
--- a/dev-python/python-docs/python-docs-3.9.1.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index a82a79813bce..ca761d015df8 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,5 +1,3 @@
-DIST python-evdev-1.3.0.tar.gz 85018 BLAKE2B ba5c391631ecf8cc0a46f21830209c59b1217940ff25e051e027bc8896d71965a394f222f4e3d629ba2a2f8056ccbdc0dfaf43a37684d7157c7456d61f2d8314 SHA512 392fb4fabed344e6db4e257d4cfc7043393efda15d940be80b013e4c4e350334148a7b04aa0a7239f824ad2c7e0bb057c5cff1c0f320d30b25b0c9aab65a6891
 DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
-EBUILD python-evdev-1.3.0.ebuild 777 BLAKE2B 02970f083c747bf0634a5889c395a6260a659a483faa1ec8c86f6593e0bc0d3254a8e82c091e511022c3fe658e926b8c51a7c629e948a943e6e8d1045531409e SHA512 720456903b292d16b6e9647da0df2e1ae930824107c1319b2cb07ba7e4efc01e87f429762c2b28bc85b3a9550c64753547902ce9395cede220f46419f76ec7ae
-EBUILD python-evdev-1.4.0.ebuild 760 BLAKE2B 278d4372c27ac7530300d4c9ada2e196820c215f3e22364b1d2f533d753e406157c2f68bd4b063ab44a23918fa0aad2600a9f7ff3d85ac8352dc45e113af740e SHA512 a11b74b830084fae7b1b6e20111995914095b6eff5fa697327fc899733aaf5657bea59d3aa6afdcc899d9ea426300f4f73f9eea832a9b0e4d9c5bb2e2f679818
+EBUILD python-evdev-1.4.0.ebuild 759 BLAKE2B 31ceb49f75f235930bf1e95db3fa25c6f70e7fea944f7cd299d4e622aa9c376f75bca0fc61eb2c5d06c0169edf70e315926f99344df422144d664a58b1c53059 SHA512 f1c54f7d600cf5957b0806f45a5dc52ca0cab693c1d52fc158ad2d5c0d7238f6f33c303fe469354d5dd6ca2da969350aeebdb745aa5c16e6776fea5d59c66fcb
 MISC metadata.xml 427 BLAKE2B 7c797c3e574c9f3fed201cbf35d42d6a259d4fbbd69dbba280e184a6c8b2ddd82f008be20d80cb74aead9b1389e53d82b38cdb438713e6ae8e7dcfb3e4a41bef SHA512 e73122f3c3a0b515d6929c78df917bb62a80722e409e2bed91969dd28b8e7e36ea7eab954739c2cbc575e627e42d526cf35b71a1977ae6e6308b029222235c2f
diff --git a/dev-python/python-evdev/python-evdev-1.3.0.ebuild b/dev-python/python-evdev/python-evdev-1.3.0.ebuild
deleted file mode 100644
index 0e8b02b2a474..000000000000
--- a/dev-python/python-evdev/python-evdev-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.io/"
-SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile build_ecodes \
-		--evdev-headers \
-		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
-}
-
-python_test() {
-	pytest -vv tests/test_ecodes.py || die "ecodes test failed for ${EPYTHON}"
-	pytest -vv tests/test_events.py || die "events test failed for ${EPYTHON}"
-}
diff --git a/dev-python/python-evdev/python-evdev-1.4.0.ebuild b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
index ba10259d1388..4203b1499531 100644
--- a/dev-python/python-evdev/python-evdev-1.4.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index c2394a3526bf..37df15f48cbf 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 845 BLAKE2B 65a149ce9148fd6b4e6782d1e23befbe0c1b48cd4f2c7f2382678819c195beb2abf9bc23fb897b194b833a56e07f7c51806a3e8ca3556c1da22b3ebad4f9fc71 SHA512 43cd5166e146ef7d890f806ec5d49c46a469d0e22cc05a27f89c600ca6ab68e66606bbab7ce875517987e856187ae5fde2784c7c861155d991019acbfb4c6c00
+EBUILD python-gflags-3.1.2-r1.ebuild 822 BLAKE2B 5e039b367693a82bf5fe191dbb35adbf125a58637934d84507e91563c0601fdfc9bd060562b270cea1cd85a73298702d99c9951f4420ae0da4bc47823ec8ca6c SHA512 2ee39eabc9b12ab0725e486bfcf33e142d773767ad0ddab0e97d4bee51aa932dca82fee4ac7237a23c958fe39d40f09ca956c2015cfc54141a901161f12facb2
 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 22c0041b2e4f..90fe031744e0 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Google's Python argument parsing library"
@@ -16,19 +15,13 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-script-install.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-3.1.1-script-install.patch )
 
 python_test() {
 	# note: each test needs to be run separately, otherwise they fail
-	"${PYTHON}" -m gflags._helpers_test -v || die
-	"${PYTHON}" -m gflags.flags_formatting_test -v || die
-	"${PYTHON}" -m gflags.flags_unicode_literals_test -v || die
+	"${EPYTHON}" -m gflags._helpers_test -v || die
+	"${EPYTHON}" -m gflags.flags_formatting_test -v || die
+	"${EPYTHON}" -m gflags.flags_unicode_literals_test -v || die
 }
diff --git a/dev-python/python-jwt/Manifest b/dev-python/python-jwt/Manifest
new file mode 100644
index 000000000000..78497e5528ed
--- /dev/null
+++ b/dev-python/python-jwt/Manifest
@@ -0,0 +1,3 @@
+DIST python-jwt-1.2.0.tar.gz 22578 BLAKE2B e8ed53c87f55f829e134955d03efd4c4a8e34e1eaa03f20a644db71d7b79d21564344a856206ad72aa5e0fa8cb8fa799d710a9669850c50c7aa588bfa59d7962 SHA512 c663e3fbb6476ae60b485e497f898aed2db84aa10c677ef2fc46160b355ea51af31ed259117fe20937809068e6c586e4f48b4e217722a47231f19be59f25295c
+EBUILD python-jwt-1.2.0.ebuild 772 BLAKE2B 684362915c56c162280399ab5459f920b5dcbc8a6330806a39c69ae83d718592cc52bba26934dc6a1d0d2e8dc5d0662466fab93f4bd20ecf8634152e68acca8d SHA512 fbe2d4983a23ce79a846c7b3ffef0aa8be2d972e250b9b5991ab73b9b32f7b8010f3cb1e458f5ca4f5ad50dc81ba41f0e9c157bb85f3bd74a1344b12938799b9
+MISC metadata.xml 508 BLAKE2B d1d762e5fb0ec41936b78c51f9ff539479968a2e135f42255e48da380e7fc0c35d1fe47d5b4ed7029131983d703cda31d751eee317c9a943dd2cb269dcfbaf46 SHA512 782efa147b5a52ef92d0a6c1d61ae2352f7f5008dc04dda5db5faaa8e112062daf546444799b4101fdfa201819ba08a46ef79ce7c5494003d27df6e95e3c538e
diff --git a/dev-python/python-jwt/metadata.xml b/dev-python/python-jwt/metadata.xml
new file mode 100644
index 000000000000..fb6d10e660c9
--- /dev/null
+++ b/dev-python/python-jwt/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">GehirnInc/python-jwt</remote-id>
+		<remote-id type="pypi">jwt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-jwt/python-jwt-1.2.0.ebuild b/dev-python/python-jwt/python-jwt-1.2.0.ebuild
new file mode 100644
index 000000000000..e10f83af9f6e
--- /dev/null
+++ b/dev-python/python-jwt/python-jwt-1.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 python3_9 )
+inherit distutils-r1
+
+DESCRIPTION="JSON Web Token library for python 3"
+HOMEPAGE="https://github.com/GehirnInc/python-jwt"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/GehirnInc/python-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e 's/^addopts =.*/addopts = jwt/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-lhafile/Manifest b/dev-python/python-lhafile/Manifest
index 3485e0e80bb7..0ea824b9c7a1 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/python-lhafile/Manifest
@@ -1,3 +1,5 @@
 DIST python-lhafile-0.2.2.tar.gz 266494 BLAKE2B 03f4f8e58e261b74c32d65c9ea4507d088c5463424c4c279a320553689607e8f4ff13bab0c2e6fc4c252f923a50cae12ce8e4b8c14cb5d8eec2fd8129fa41a97 SHA512 304de9a000b76fae243f0a175040e16515524ccec051cffefd20dcf6995a37e3d4d2e13016794166a661b235700f540f8cc0be60979ed13ad6308056a95f1b2f
+DIST python-lhafile-0.3.0.tar.gz 267965 BLAKE2B 1331f21059f84f5e517339ac26546d73bc9dc125578840bf24483c274b651d8f0e2494b1b7e140bede07412b5c44e499269ea23dd1180bb955b1044b06d82ee8 SHA512 bb4db2767a702d30f2e713e5f7890d619de312d609761ade2ff8f4e99ffede8e35a72cd116abf3b8ea29b0885ebe2c993dc37f44722c8e5fe346be93dfdbbf81
 EBUILD python-lhafile-0.2.2.ebuild 473 BLAKE2B cecb678df236edba6d33efee3ae8144b9a32e8428856d2740ae6777e3b31894f1734a0b84f600c3c8eb1079de6680bfbfcc1c0f4bf1e5adf423d0b26c8bb68a6 SHA512 762cb68f11d129904392927b121d817aede8cb425da96c44e421bd1fd6253a12a098c730076a04a0afd3b13d4dbf90c08275678727a407103b15f265fd3b035d
+EBUILD python-lhafile-0.3.0.ebuild 480 BLAKE2B 355ff1a5b27211cdac771f4c7422a0bcb05787b5dce52b0d81a7db53d31b733fa0384573247e514a9017feba3296500edf0ca9c6c8765ed385c99b46555e6022 SHA512 7089408c1a886f3ab6b8cace815ae5681ce6b9e8126432859c39479b2bd15cd4feb278039a3d0990b10d90c2cb058afee48beea43267bf787962d13acf8622e2
 MISC metadata.xml 384 BLAKE2B 75a9c852faaf98efd379481d1ca0e4d9d819da1b1f276caffcd9d8ebf24fcd2e471c001f68a6f834a4c26a447a68df8f59fc5a2e500891ee763e60859dec5010 SHA512 d1f6874eefd9bc35327b7b0286a7e3637c451bad9a1fdc135cc5ee9d7cc90e1a994b32624eda59ef6632bad1950cfaa538af1a950324dea0a03f7d409a925143
diff --git a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
new file mode 100644
index 000000000000..532279f61ebd
--- /dev/null
+++ b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="LHA archive support for Python"
+HOMEPAGE="https://fengestad.no/python-lhafile/"
+SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NOTE: The tests don't work, they're probably outdated.
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index d123152ef983..0181f67676fb 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,5 +1,5 @@
 DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
 DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
 EBUILD python-libevdev-0.8.ebuild 585 BLAKE2B 6485769ca5dfbb0f85909092a323fb07fe18bb68abd0730d8a2775faa95b18ef6f90a11897563fceaeb002a188da186d27a8b9bce613e06bbda5548c5b1b1d10 SHA512 2feb9888b86d4281f149e648acc69a0935bc031f8f7b88e1d0c5761b32fec66f36a8cf827618267b7e6bcd56366e31f952ec55803dd16931d535fa2f78d4ad38
-EBUILD python-libevdev-0.9.ebuild 627 BLAKE2B b33eddd444ab9b4605a81216b337a5e377726caa1ad62d68d1d98a68824560ccb7f8055decce306b4997672eb3edbcc2cef4bd5274425e95b21a460df551372d SHA512 ce84c748fbfc81a5fc7703064b776ddf8bf75e4b8a303274e3a1dfa3272f923af7590e933b86ffcab6bffb87827497d42d260ed475b57efb090706cfd90528c2
+EBUILD python-libevdev-0.9.ebuild 628 BLAKE2B ec419e399b103fcce3d3270bbc20f2df12f55c417cf2f6f72ff1b914ec69978a41c0be5533376d9184da98f53dceecb016821d266ce497594058c7f8a7ffe99e SHA512 7e05657063e442f8b92d330855f9848d44245a13c06bace7ab871e1891cfc397b9e71f683418a44202eb84c69db1145ee40bf5d296df12a06a50dd9024267277
 MISC metadata.xml 305 BLAKE2B dfcc352aa29bf0497e41b9ce993e525211a1d673fd3c7ce75712ba1441faae1841a57885fffa358674dd03cb67b0e2c423a90b047c3517524a76f97ca1e9ab0f SHA512 e4f77ae903c4df549c7f730b37110adcab750d694a9d66d4d1c8c02fe327da783836e65edfc91fb131901154cd69c19fa250c9a000103ab631897e358fab0ba5
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index 1b49c5bbfdac..d49c4b5ed215 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 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 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 786648dc5395..2174b59d8ee1 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,7 +1,5 @@
-DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
-DIST python-magic-0.4.19.gh.tar.gz 863519 BLAKE2B 2e777612d55256ba955e199fc6734f6e68b8cf996222820192cf9730b2c274b2f6be2d5fe58c92cce741047d77b79b0447c5961a056e1788d924d34cedba1d40 SHA512 1d78077fe02b4ab8c8aa1720064f2b5d19f304310ca88c1fada2dbafa5118820b6d7e3f031e3d7df5394ad480872d8bcd33489fec1ce2e6e0d9d84a7325040f1
 DIST python-magic-0.4.20.gh.tar.gz 863539 BLAKE2B 27f345b138068a44670456209b9f87e9715c475787bcfff396c711cb0f768ee83599b9e6ebbc4c0c73c6867c3653518938b51116d28e3d77a758a6d1b860c7b9 SHA512 3927958a6957177d1a6e8bcbbb3723f489018f9037b619bbf7478ab68ba2ddd52d9a0caf18e6a73671e8e5e1cb8a9efb957756ba9547a7dd66ab6ba293f37826
-EBUILD python-magic-0.4.18.ebuild 748 BLAKE2B 4a1859f1762a592df273747eb3075cb81dab10600e1fb31bcb1d21f1986cd4b23e68b3440394324db618762c6780ad65e778d573eef9d54a390e12e81606e081 SHA512 9d72ed768e899fd6972a4681cc697282b2de9aaf7fd4fbc0723094b72d4f69e302dc830732d552f06cddae9fa784a8b6db65318fd6ef451d6164b47a722a3454
-EBUILD python-magic-0.4.19.ebuild 715 BLAKE2B 6530656d55d45961173dda8965a352b6470164cedfc438f33b6438d525454c9212dd3a783632251e0e6a48a77aa58214fdc596a529f60aae2dc0d7eb0b0b1b7e SHA512 a930230722089a77f4423c64c0a541c9434c78471d57c7f7962c84f2808c10925ba9c0990ea7b036bb4f6ebd0eaac38e167a680c653108cdc13e597a2e749c3e
-EBUILD python-magic-0.4.20.ebuild 715 BLAKE2B 6530656d55d45961173dda8965a352b6470164cedfc438f33b6438d525454c9212dd3a783632251e0e6a48a77aa58214fdc596a529f60aae2dc0d7eb0b0b1b7e SHA512 a930230722089a77f4423c64c0a541c9434c78471d57c7f7962c84f2808c10925ba9c0990ea7b036bb4f6ebd0eaac38e167a680c653108cdc13e597a2e749c3e
+DIST python-magic-0.4.22.gh.tar.gz 863567 BLAKE2B 6994869e4cc5ba5ff7ae1a6ac6117f5b1553a11079fb5faaa23b48ee241b2615e2514270f66c55b417b4051d6a5aedd7c289f139c23842979e4af0cdb7a34e3a SHA512 7f16c090a713be4ecc25727f0195bddfadfa9f54507899e35f48bd268ea1d78637ca024ecf02e331a8988a931e430f7346bb5f4b46e58ddc1ff03ec678640e6d
+EBUILD python-magic-0.4.20.ebuild 709 BLAKE2B ecc3dde2600cf2dedadc46c3ac0ca26e5408d150be3d8365ac0b561b43247b44b5fe10cf8a511e07fc773d2094a8c9b4bc3231cbec1c988132b9035fa105ee1d SHA512 f8da0055d19ff8f706b3df8301d4109ad0e7bcbcbde2f40b69b840bab972764d78e9fdd827fc0447265a732d703acc5cb48f20c4713890f74d69079c5abe5571
+EBUILD python-magic-0.4.22.ebuild 715 BLAKE2B 6530656d55d45961173dda8965a352b6470164cedfc438f33b6438d525454c9212dd3a783632251e0e6a48a77aa58214fdc596a529f60aae2dc0d7eb0b0b1b7e SHA512 a930230722089a77f4423c64c0a541c9434c78471d57c7f7962c84f2808c10925ba9c0990ea7b036bb4f6ebd0eaac38e167a680c653108cdc13e597a2e749c3e
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
deleted file mode 100644
index b1cbf183b699..000000000000
--- a/dev-python/python-magic/python-magic-0.4.18.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_{7..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 )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.20.ebuild b/dev-python/python-magic/python-magic-0.4.20.ebuild
index a4807619f588..e16d4c872717 100644
--- a/dev-python/python-magic/python-magic-0.4.20.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 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-magic/python-magic-0.4.19.ebuild b/dev-python/python-magic/python-magic-0.4.22.ebuild
index a4807619f588..a4807619f588 100644
--- a/dev-python/python-magic/python-magic-0.4.19.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.22.ebuild
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index d64eb69c843c..9b28b9668118 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1,5 @@
 DIST python-nbxmpp-1.0.2.tar.bz2 112977 BLAKE2B 950d0046e0c01b3e501ca36fbe6e50e383e807d866e83b64d011c4f398d89e6feb2adbee52122a43b307b6c231693d1e9cd2dad36c580ec40c26c1301886a83a SHA512 a20f5e3f55ec6afe2f8846467c45740a3acff2c9f7e3c94ca000113a6f95486abcbb73e78a12901039d019179afb0611e83c245357614474f42286d8f95803d6
+DIST python-nbxmpp-nbxmpp-2.0.2.tar.bz2 121999 BLAKE2B 70116ab89fc99ed5a8bff7cf350f578673c54ee5c38a4cf58cdfa63645e142ad2d1163846989ad8eabd6ce6e9738b84f9e95f42dcce7703202c659c2c9ec29b6 SHA512 31fac81d856a993a7ca014519305c74c342c89e049d779386292e9dc73cde70d924d3fe2903cdb14231b60a583d92406a7830f61a29d2a9cf159a247b8e88509
 EBUILD python-nbxmpp-1.0.2.ebuild 542 BLAKE2B bac8374faf5067da704262d570ff8b59f24b4d7819471696a0b042f33744a25adb0e6a80dcc1ea2793154f8f84609d018ea7d1ce5b041085ce6dc1dabcfff843 SHA512 9c00f702ec8c9e9faca967bedd3577f8f5b0063ae00a8324a9bd777c0bb13e1998fd4951d25401cff9f4058997c0edb33443bf26998643f49ae3302385188fab
+EBUILD python-nbxmpp-2.0.2-r1.ebuild 739 BLAKE2B 63f5010bfba2e45307c3861c00a8c5880761fb857f2f5b111e94608629aa71e668993599fc448529e087174617a3c4119efc0e2e5cc1f76934b8a1e401bd3e2c SHA512 a3f32de8bf21e7c089d3209dbedbbe9f557fbb18e555465f1644c1612348ed944921638e389120e43c84237783371497d1793d50b9b46c70fabda47e6ddcc23a
 MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..360daedd51c4
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=python-nbxmpp-nbxmpp-${PV}
+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}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 04b7a290aae2..69ab4e275ab3 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-neutronclient-6.12.1.tar.gz 290511 BLAKE2B 046de903c30539183c5650e3f666ba1f24c311d0a9848cbc7c79d64f0d35a0c380917453bf7c8251a1099fc13a15da2ecd5facacde26ec46d859510ba4203dff SHA512 cae17fbffb4f0e78aeff07e90a1d08e5f2aaa3221192be8bf66ad8ed108ee01b0307f7a9a862c685061c77ceb831a7eac4c8343a8b5a71d1380277cdddd90b07
 DIST python-neutronclient-7.2.1.tar.gz 294034 BLAKE2B 46ddd29327a9c8c8cfa28b90585a6cddffd80a3892a97df53d6e3624570277525eee0e74aac4e9c70389d2abaa5fed4276e64a37df517c3903b649150cd0060f SHA512 7b05ed090e0c88e203b38ad536e303c5ee892938e9013750cb6c0bc1d5e14b50feb3ea3a6dd9534c99182b613d225d99b8aa432be3623617dae6a364bff7adfb
-EBUILD python-neutronclient-6.12.1.ebuild 3076 BLAKE2B 54dfa3c532f3c455120adf910a6e1f1ade8a57900e0ec742aedaea6457dd34ec0646bef17125ca6920332020b9d7ec0b6198d4f76e8db20440cd623e3f2fb21e SHA512 e673e5008c154d1bcd75256b475a2ce3c23baaa062a649f3ab669f558f7c2e93ce36b8f0c82b334852f584fa8c01ecd7496d8882c5e244b81278424512672a90
 EBUILD python-neutronclient-7.2.1.ebuild 1764 BLAKE2B 19bb35a07cc1d957a8745cabb19757eeb439220dffba48c5fec7f2997319f2afb37d1725f72232c10f4b8f67dbb4c3a4eec8cc06518870cb6f3a1b14d6e8b132 SHA512 bac032d155a7e5cbb0ba7802e7d934e00eb6afaa32219ee061c4cc00f67cb677e0e355d7538ed0d357cba8e183ef7ad4eec4de277df7ab415dd37a3e4a05f610
 MISC metadata.xml 537 BLAKE2B d69ac25df6ed6f88e1e2a062c291bb79c39cf33a23ca0e86427ea63222b531f3ba0c0ddc4e50c033adbee9efc74559f1148d4584a7da5fcebc949ffa50478072 SHA512 68e8106f4c550ce5d983e50617ec897866894d550a14df9f27aa0c26034b9eac1187dc02fe537c6199d751ada49eeb7c9379183e7abcf13fef491e42b64b8afa
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
deleted file mode 100644
index eb39a1d8ee4c..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^flake8-import-order/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 3b834f35e862..6bae8ce42a8f 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,5 +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-r1.ebuild 1116 BLAKE2B 07525835731560ce5e9a0a279da61a78542b1405115f229beb8537d66794fc3d03d29782c30fc746a778c9cb7057eeda65cde94c6484c017f46d54cb7b5a8a3e SHA512 064012118af772a241eb53d55bae054fcc927d31b3b004b8359d9dd55e3a38da893728947cdba982b39b5e6b7717c705eb89cdb4f61a8858383787488948269e
-EBUILD python-slip-0.6.5.ebuild 1219 BLAKE2B 717994a011b6f496749131fb8cab3af553de7f33b61ad9ba85588b2d093aa16dd090d668a0250d10a55c839ebb5af4c7268e755a59d6cb45c02e37b47454b1a5 SHA512 8a74e30721166034494235462ead53b82788f7975c3cc8cc7d87002f85babd5de31480877a40459d672f92b6066cf1f15a203985649d84d9723f6cd64045d598
+EBUILD python-slip-0.6.5-r1.ebuild 1118 BLAKE2B ba7aa73bb7207e248558738441f7a4cd0afabeedc9d3c5a9dd6ddeaa75dd08f2d81b0311ee1cdcbd2a6d6971f7df61f72e9dad8bd1bc6766061d231a2602b92f SHA512 31d2b87b86f6c26a86a983d8f52966f76a7ccccab7bc9359a22d38605575a84431ce2c852ce8134329b750031932277e40f4058b2ef038efa89f03ae0a595211
 MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
index d1ccb54c86e0..14ed51a46c86 100644
--- a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
@@ -15,7 +15,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 ~arm arm64 ~ppc64 x86"
 IUSE="dbus selinux"
 
 RDEPEND="
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
deleted file mode 100644
index 5c28912e855e..000000000000
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python"
-HOMEPAGE="https://github.com/nphilipp/python-slip"
-SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="dbus selinux"
-
-RDEPEND="
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		sys-auth/polkit )
-"
-DEPEND=""
-
-python_prepare_all() {
-	use selinux || epatch "${FILESDIR}"/${PN}-0.6.5-no-selinux.patch
-
-	# hard-disable slip.gtk since it did not get ported to gtk3+ and the only user
-	# of slip (firewalld) does not use it (upstream disables it for py3 already)
-	sed \
-		-e 's|sys.version_info.major == 2|False|' \
-		-e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die "sed failed"
-
-	if ! use dbus; then
-		sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n    \1/' \
-			-i setup.py || die "sed 2 failed"
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index d84c25b98be1..c87f7b24d06b 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -2,4 +2,4 @@ DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 55ace80e2b6c0f3b22ef75356bdd0d0d885edfa30fbb2022fb0839fe42ec968cd4331a08d081fb81ca39c10b4a506c052893addda6963ba576e3e99eae6092f9 SHA512 0b6479877191bfb5513a86fe807fcd119970f88528a138c5cb0574008cc59e0f9265df5c873061023b1b8ecd1000b95aa338c3a13dbbe6ecbdcf34dfd2119933
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
-MISC metadata.xml 582 BLAKE2B aec9e0c331eb3b395607d2de104195cf7c6bbd88f3546420844ddd30407fa78ecfb6eb207ea208d910ec280441aac8c578b94a5cff71adede454e04f55ae60b3 SHA512 95eaa04f1332aa04a3f20e6e6d0ab4f8f86a8532d35c3e8059732febac20c8157c017d66abd1fc70b75e1f069b9ac90aa6ce64851923bd8db9efb1c219ebcb1d
+MISC metadata.xml 606 BLAKE2B 26da67fc21b653f901da03a5d1da280cc8739b9adc99cc16f5bb8c01f01c1d89b36fad28ebea33ee6c28e1ebd28bc948c0bc6385923589ebb64812c7d1e2d4a0 SHA512 14889db534b873cc79d1f060c5c82615c975623d8ee4e540cbace144efb68fcc7ebaef73952908a509849ca1bef3eda9010f620b8e5cabb92953c06b75c53f68
diff --git a/dev-python/python-slugify/metadata.xml b/dev-python/python-slugify/metadata.xml
index 25f373941294..6ae542e5f505 100644
--- a/dev-python/python-slugify/metadata.xml
+++ b/dev-python/python-slugify/metadata.xml
@@ -12,6 +12,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-slugify</remote-id>
 		<remote-id type="github">un33k/python-slugify</remote-id>
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index b42c7aeb427b..6833a97d65b2 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,7 +1,7 @@
-DIST python-socks-1.1.2.gh.tar.gz 29948 BLAKE2B c110cd8d5d055aa30a63cdade10e7e67b0d6f0b1b17e76ff40bfb85563c90e026f0169a7e943d1391d75e20d7dd715ab070a6adf9e1e247eccf906d63c324e66 SHA512 c62259e86e7afeba7ee3ef5cdca104846352137e5d5bfa6f475e2ac38b21fe1766aee6a1fcb6b9f725576613ce3d92663fab3682516b96caa3948a05d89333a7
 DIST python-socks-1.2.0.gh.tar.gz 31969 BLAKE2B f967d8100513455533132e7bb276a8f15a8486656c04493cb803640951d2cedaa0b9229386322846ff8992cfd13cf04470b017a615f33392880a4285c9ecd041 SHA512 c5db92b22ef1edef3a22b7ce79975e66f379da2bd8e9a629a15dc2995dfaef3d99d93eaf768ef593b6a7571ad580397290274e319707f36a883a9bcad20434b1
 DIST python-socks-1.2.1.gh.tar.gz 32038 BLAKE2B 56f3c885095090f4b3441294977b4af142ace8d2814f5f9b965a68e129baf90a6385dbc7e78463aac2249f97c6d60f03c9ae8b1159e30fcdaaeba00c19831e7b SHA512 8ecc35c51096b1c0312895dcc1169b7f475709f5bdd81572257257cb6bdca00ebcbe9e6b211c66b26ec2dec4dd86051077b7b30279174585428dca0fa7098403
-EBUILD python-socks-1.1.2.ebuild 839 BLAKE2B 19b849cb60492be44f34c4129cf3b04c290ef8d953985de1c37a19d482b57f4576631877498bc498487be7b825ad4708ff960823094b26a950e774e1d8ace9ce SHA512 17ddef9d8a9ee4b989aa6b891edf4ff2049141577fe1b91fd67eac7091db7c53f6ce00108731c625b36b958c4f68f1e982b8928c06c524b007130ca5e89d33d7
-EBUILD python-socks-1.2.0.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
+DIST python-socks-1.2.2.gh.tar.gz 32141 BLAKE2B 51e7c4a2319c4b9680f4568c2dba7f9b64bfb3ec8404dfbb6b30531b9ebeef5cefc95997df7663209909f38583040f3e58c7a9472a75276decef605f5af7c4ba SHA512 27af2da348396e0bd5f6120de7bbb9b89533d3481bb1cbb72668aa28afaa84026fefbd4601b8fd0129d8f5add95b8e00d840d1298eb96b151091f2f64d92dd2f
+EBUILD python-socks-1.2.0.ebuild 839 BLAKE2B 19b849cb60492be44f34c4129cf3b04c290ef8d953985de1c37a19d482b57f4576631877498bc498487be7b825ad4708ff960823094b26a950e774e1d8ace9ce SHA512 17ddef9d8a9ee4b989aa6b891edf4ff2049141577fe1b91fd67eac7091db7c53f6ce00108731c625b36b958c4f68f1e982b8928c06c524b007130ca5e89d33d7
 EBUILD python-socks-1.2.1.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
+EBUILD python-socks-1.2.2.ebuild 862 BLAKE2B 65ecbcf01da37563cfef0812693080a42f3d80cdcdc8cfea6b157707dd82dd19fcbabe95198604dbd5ba1a82065fd71bd2bda0c1b3675de7d8eb1170643c809d SHA512 8f42b37497ecd1ab8fbe8a800d5df7a19e63853e411ae357d1470f64463b4be70aed9469413d2032f5ea3c533d51e9529744c54bfc739abe222bd62ad113128d
 MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/python-socks-1.2.0.ebuild b/dev-python/python-socks/python-socks-1.2.0.ebuild
index e4a5b571d8c0..a3b6e13f50c0 100644
--- a/dev-python/python-socks/python-socks-1.2.0.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # tests rely on connecting to Internet
 RESTRICT="test"
 
diff --git a/dev-python/python-socks/python-socks-1.1.2.ebuild b/dev-python/python-socks/python-socks-1.2.2.ebuild
index a3b6e13f50c0..29375e51cbff 100644
--- a/dev-python/python-socks/python-socks-1.1.2.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.2.ebuild
@@ -16,17 +16,17 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
-# tests rely on connecting to Internet
-RESTRICT="test"
+KEYWORDS="~amd64 ~x86"
 
 # trio, curio are not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
 RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
-#BDEPEND="
-#	test? (
-#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-#		dev-python/yarl[${PYTHON_USEDEP}]
-#	)"
+BDEPEND="
+	test? (
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
 
-#distutils_enable_tests pytest
+distutils_enable_tests pytest
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index c51cf66198a1..f49e00732831 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,9 +1,5 @@
-DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
-DIST python-sshpubkeys-3.2.1.tar.gz 57872 BLAKE2B b3a5a3aa719d3fac4608e6f43fcee4d3377baad73d0acc451fb4fc6c8a3895f5288607b68a2b3b3b65d86210d28a22e0c83cb8b3758eeaf88969ae803568efcf SHA512 10e593f5250e14e91b6212e29831c8575cf1d335e9db5c8241a3d3614793aacd2ddc609b07c4bd4bed99900fffb5c40562daff24c6a0715927ef1f75a484273e
 DIST python-sshpubkeys-3.3.0.tar.gz 57904 BLAKE2B b716f91f99539a27574842687ca71b9eef4f715a667931576a94094687a6dd9bbb2ad50826fe2a4d7f21d546c4dd1e33daa815128e62e2446ade30218c3b42a2 SHA512 41314001e6f32a6286927833e64622c45bc5c55729722351dbb2305919a5b44fe74e528988a3fad672595eb2e8da7db225ad7ea6395aa14dc5abdc38187a600c
 DIST python-sshpubkeys-3.3.1.tar.gz 57896 BLAKE2B 3212ea0c38377255258a831cc942f71c0b0efb040ba8ca3283200b638dcae7a31ad5763ae0de4f51a7ae0c3f0a1b83ca6db96f00384ecd1e1e3a369028e4ed41 SHA512 8a59e73eddd795a71b64fc7433292ca03a9f447a13c8ef40d68fc599776c37f5e4a1fdbbf2f2ab00b0091a513e2412f213f6a21474ae0784af2df9a7107a2ed6
-EBUILD python-sshpubkeys-3.1.0.ebuild 567 BLAKE2B cd9bf9ab4f6a55d10bf84b50aeb1285f5f020b816a6f167b5315f5a424b123aac9d7f6d5e7288b3d1dab2fbde85c6fbd4866fc7ef6dc038af11e22c5fa27d4e4 SHA512 ff8e4168c9756f0d837e7c68a8394748956d504daf2642aedf40395427922686d58834bf4f5ed543b71ad7adf603649b9866766ac42eaa85f673a5752314fd09
-EBUILD python-sshpubkeys-3.2.1.ebuild 578 BLAKE2B d1a0ae006d31ed6880cfc55a774b2a17b86b47427f13f5d9e52aba1135e320ea16902e5462c34fadb92e76e7456825a9f641417286299cae36ef0c03a34af558 SHA512 56bf86ca3fd9fb8e39b9470dd062dec0f087a89b5553d84ed9e1b9e198fcacc9ba63c1a6aa40e47b042085fce3feb774758e896b93f5e80dd497261b9e8bfca1
-EBUILD python-sshpubkeys-3.3.0.ebuild 578 BLAKE2B d1a0ae006d31ed6880cfc55a774b2a17b86b47427f13f5d9e52aba1135e320ea16902e5462c34fadb92e76e7456825a9f641417286299cae36ef0c03a34af558 SHA512 56bf86ca3fd9fb8e39b9470dd062dec0f087a89b5553d84ed9e1b9e198fcacc9ba63c1a6aa40e47b042085fce3feb774758e896b93f5e80dd497261b9e8bfca1
+EBUILD python-sshpubkeys-3.3.0.ebuild 576 BLAKE2B dc0a882dad0e9d646c7b242996360ba00aca2917dc2dfa8487669ea4283e81712c74d9941c3ff6d693a8a45a70564bd57468580bf07bea1b170e89e358c0b3ab SHA512 1e1caf7f070901f3a89cddcb4a5ff83297e404f8d22dc580684df6fb33280cf5be8d6cc8d60b96169fa9e8ba40389c68cb5f868250d1d47d2d170bb7026b06a1
 EBUILD python-sshpubkeys-3.3.1.ebuild 578 BLAKE2B d1a0ae006d31ed6880cfc55a774b2a17b86b47427f13f5d9e52aba1135e320ea16902e5462c34fadb92e76e7456825a9f641417286299cae36ef0c03a34af558 SHA512 56bf86ca3fd9fb8e39b9470dd062dec0f087a89b5553d84ed9e1b9e198fcacc9ba63c1a6aa40e47b042085fce3feb774758e896b93f5e80dd497261b9e8bfca1
-MISC metadata.xml 487 BLAKE2B 35d2684cb25f52fbb86138cb987cc5ad3cfb258ea121a729de1532ee37593af14011051159c5170cffe7472bf48c21cd1bf5a96564489becfb8ee03c40d20d04 SHA512 d2c9aed541d681d71df93b4c97073c3127f0cc90ad3989a259850a666ea64c8a71a1c0504248b933b88424194ce33e1dac769adb620a2096e592a7b6d3282fec
+MISC metadata.xml 511 BLAKE2B 1c456477ba1082685b12f78dec6f05e32b217923e608d2c62e0bdceb3ec1f695852e6d584657888d53c313f6a2ca444bf25709fe28a246acf28f076972a8e6fd SHA512 4180c2dd2bdd77c3df2ac08863e75b5e459738e71fe8c98f0dd44d267ea255a391796a95b52e9d53a0c0ec792927fa31bbfcb225577471da44805c117766c5c9
diff --git a/dev-python/python-sshpubkeys/metadata.xml b/dev-python/python-sshpubkeys/metadata.xml
index c773e85856d7..f19fc76eae25 100644
--- a/dev-python/python-sshpubkeys/metadata.xml
+++ b/dev-python/python-sshpubkeys/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sshpubkeys</remote-id>
 		<remote-id type="github">ojarva/python-sshpubkeys</remote-id>
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
deleted file mode 100644
index 9670582c990d..000000000000
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.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_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="OpenSSH public key parser for Python"
-HOMEPAGE="https://pypi.org/project/sshpubkeys/ https://github.com/ojarva/python-sshpubkeys"
-SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.2.1.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.2.1.ebuild
deleted file mode 100644
index c2a98bb36685..000000000000
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="OpenSSH public key parser for Python"
-HOMEPAGE="
-	https://pypi.org/project/sshpubkeys/
-	https://github.com/ojarva/python-sshpubkeys"
-SRC_URI="
-	https://github.com/ojarva/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild
index c2a98bb36685..0d5b72ec5ae1 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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 96cd32428348..56fbdbcb4b47 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -2,6 +2,6 @@ DIST python-stdnum-1.14.tar.gz 953637 BLAKE2B 5772fd2284dc9c255b544c6f0d1f4d1ebb
 DIST python-stdnum-1.15.tar.gz 1037630 BLAKE2B 7d4bc086a5c0e272b7c55ed5bead9561375b6410b286c6d1d78e49dfc1473a9021646fbd363cfa532bc3eb1a54284b253f46ab28f60d2d411efa0992772a02a0 SHA512 e6f1d921e8ce64a11f9c5572e7eabc27bd7c71c34017fb795c45fa585701fcc78ff81c15b1a9bd48b8d9975e1fbc354b3923942c6f81e8fe4dfb8f611e3ab9cc
 DIST python-stdnum-1.16.tar.gz 1039599 BLAKE2B 98197fca412371757b7e7ec242d30d5fc43352b9eba7677aeb3a475dbe7a379c4f88797192b8e5de97493186562d1d21347703643be7798316e22f28c6a144bf SHA512 29ad92a8d1d3267c56e3d128700611cbfe3bc7a27a1420bfe62851f110f3f23b1d8927771588ef043aba366913bf7a5b0eb72896ee50343f3adf72cdb071415b
 EBUILD python-stdnum-1.14.ebuild 518 BLAKE2B ea2ed5e0eb19624cb40e7623c9ae17fde5e56e82025924db33302ef22ea3e3f0e9f9268bd3cd9efc92f16dd53907f6aab399c7c15d126d64e0a2a7cb1e2e0c17 SHA512 0d6db9a8da39cbd5299156a4348441b8b08ea2e0e9ab7abe92f20b1d862f64d16bd045d8e20613e499001fcf3cf11ef7ce1f51ef6aa5a82c95b7ec0ddbafc1ad
-EBUILD python-stdnum-1.15.ebuild 569 BLAKE2B 896173e47c27b84233f0c4392aa595f9e4828e78eb6cb8d30cc001038b7b3a85760269eb6bb6e4f4527ce2708d281864566831661c1b3e0f6dcb526e2be88723 SHA512 c900226ffe46fb59a117843f3b5b435b7fe53e8f11e6e826f64fa8fb6e61f5fcffc14a8f75ce620a9a88da4e9372824603027519699c1e1a9ec20bd516bcc1e5
+EBUILD python-stdnum-1.15.ebuild 567 BLAKE2B 46fcc7014aa6fe5b8086e6cb4259de1af50f731cce5cf12c030d24214f424c763ae57a7321bee61e27c85c859404a61c0740af248828001d21f75627b8cc6a7b SHA512 9b2035fcaa3d1d4b72fa1cfca5ee1f2513f054c201dbc4aa221403cf6513670fe46fcddfddad89aaf557be9bbf2f679bb0b7f5180c4d1e06759379e0c1df95aa
 EBUILD python-stdnum-1.16.ebuild 569 BLAKE2B 896173e47c27b84233f0c4392aa595f9e4828e78eb6cb8d30cc001038b7b3a85760269eb6bb6e4f4527ce2708d281864566831661c1b3e0f6dcb526e2be88723 SHA512 c900226ffe46fb59a117843f3b5b435b7fe53e8f11e6e826f64fa8fb6e61f5fcffc14a8f75ce620a9a88da4e9372824603027519699c1e1a9ec20bd516bcc1e5
 MISC metadata.xml 499 BLAKE2B e444fa5be3b1988a7d386f191372618c345589b3dbfd7828ceb7513b9b4f6b39a78c210d3cd8c7f9af0fb4f9b51ca433cffd7165cad812edaab1bcdf55de5607 SHA512 da9ccb3df8edaf54fbc964d1f32419242b1f2f9d3da928e85253a6041072c3a9a0f25e29e4c466d3179658e47ca65a88cf148db44b052fb14570dd8143a70354
diff --git a/dev-python/python-stdnum/python-stdnum-1.15.ebuild b/dev-python/python-stdnum/python-stdnum-1.15.ebuild
index 7ee9a4124ff7..bfb61e91ad09 100644
--- a/dev-python/python-stdnum/python-stdnum-1.15.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vies"
 
 RDEPEND="
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index b038477a9d8a..8250d88df1ea 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,16 +1,5 @@
-AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
-DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
-DIST python-utils-2.4.0.tar.gz 22230 BLAKE2B 1c144f62a009a2470ec43341283048842cba61f1b677e8b1d197d3ef39dd1d890b364e63ed8da0b30ad5560d335ab0eb2dfc329ff6dfea86c0f64e909de730b9 SHA512 bfad0ef30383df634b89bb2206a00e45434eff9fee9ba0eeab99361bacfb56f3fb420019608b639713a7e8777870de75becb1d7b48aa09c582df27f9ebe8c512
-DIST python-utils-2.5.1.tar.gz 115307 BLAKE2B 2938b9f188c92d407baf09147338ea2c54b9c70c5a8746f14cd4d4b5026e6bd7bab418c9cde6c99ae4c4072da6967033bf59ed32acb0e21bfb5aacff8640620e SHA512 886ed6c1c7027012c1e5a59dfe3f81ac2b07974cc5869b5cb8f5fc91f8ca733acf0ee03dbb559be69a389228974d713666ced950ec766117075aa5ea781216fb
-DIST python-utils-2.5.2.tar.gz 14034 BLAKE2B 1d9ec9ba84ee1ebff2c4ef915bb0e57c34185c0577252f8b4cc9678f2e5b6e5a815f7c049c2f512d2f79aa8be855870ff21ec2291b1305bf8a369614220bc582 SHA512 5bcf4f33eac88b83e0cccf6b50162a5c913d9e72c4395b2265017cda566c91fa36c24eb5c3d23269b71330df65ac14226834d7b339b5b767afad3177734b9934
 DIST python-utils-2.5.3.tar.gz 49110 BLAKE2B 13b6a20278c73acc1e52c12dff3833b1dc6ebe6c1373ab5b972300d778bb4f110af79333dddc805b29a7d34265973ebf0136a607b82880b5c43c4c4d0c9f391c SHA512 7e0a584a80ce5eca654eca5335080b98b21bed11bcef7d238639d07e386f58d44a00765133b487dc5492cb35a221bc9e8042513099ee3b49177c77334129c8bd
-DIST python-utils-2.5.5.tar.gz 14069 BLAKE2B 44874a8d8089f18ff79eccf94f0b436c234dfc7d691e5b9e8e1d41e4cd3cc1005bfca44822f0b3558496ff80dc12443dcd2f29ece6c65956e17ace09c1c5663e SHA512 448ff86a7f05b764f260398496fc722c2bde335aec6402c686e8fc063faa8999088f5a6b7a960b415fb9a3b4d35bc9f26aa74fe4dfe02c61926c6cfd31a3876c
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
-EBUILD python-utils-2.3.0.ebuild 798 BLAKE2B 77fed23c0740531dbf64b1a5ce0e6244a17458fbd04a8b19e7758af4aff9f908125626507bf101682677cf0aa6332b33c952ec5a709d2fe6dded4d417a768648 SHA512 1167303ccf0b72b27d6e65c7b409902f8568c46f0d895b532e07457c6b8b47a9f10bcdd42064120f8aa96edc68b23c06eb9f7ede2578f1f79fba45c87ab4fb32
-EBUILD python-utils-2.4.0.ebuild 794 BLAKE2B fe0d2c20db950e3e96b8f8d3864f0c04c54d3109a5677903d2ea5fbb107e3b3d4f5d45b870001cdb9546d7a5e207f1f37016bd838c38f2bb7ad47170d71f1d38 SHA512 a5d635eaad61de411452f26b5c13cc5bd372c054b91c093ef1c295f5d058978b54bca37f31f83b8ad41d1d18d9969960c4a715d5f59f2343355bc83b345451f0
-EBUILD python-utils-2.5.1.ebuild 719 BLAKE2B f9a62680de3d1c829929733006e43539702937a2cf1f46cd0f34dfe83a556bf66970978001fb3b9b5a62ef5090c9a82a55dc85f840f342b6b8812c3a509b65ff SHA512 3da3e1f1c51e1522c17aca5ba125eb9e2f88fb040c82fa6524cc1b9b8bfb49a1efc3970dd1c66b8d83fff40d5ab59297e1acf98d4229c41b0a320828041d2322
-EBUILD python-utils-2.5.2.ebuild 569 BLAKE2B be00a0f01485d3f953d68b13910328286128c4c96301e2841d5abf1c638e047db2a69e631cad59f75d49fe4b080758405d6c13989bb015d40a4563e2798efedd SHA512 ef998f76341d9d433d68cb892b41accfabff93f11966bf654f5bec8fea1b535e6dd74cf3573b1c68bb89e3d4bbd206d4e41c248ff48775f8bb06ae8cbafeb7a0
-EBUILD python-utils-2.5.3.ebuild 569 BLAKE2B be00a0f01485d3f953d68b13910328286128c4c96301e2841d5abf1c638e047db2a69e631cad59f75d49fe4b080758405d6c13989bb015d40a4563e2798efedd SHA512 ef998f76341d9d433d68cb892b41accfabff93f11966bf654f5bec8fea1b535e6dd74cf3573b1c68bb89e3d4bbd206d4e41c248ff48775f8bb06ae8cbafeb7a0
-EBUILD python-utils-2.5.5.ebuild 569 BLAKE2B be00a0f01485d3f953d68b13910328286128c4c96301e2841d5abf1c638e047db2a69e631cad59f75d49fe4b080758405d6c13989bb015d40a4563e2798efedd SHA512 ef998f76341d9d433d68cb892b41accfabff93f11966bf654f5bec8fea1b535e6dd74cf3573b1c68bb89e3d4bbd206d4e41c248ff48775f8bb06ae8cbafeb7a0
+EBUILD python-utils-2.5.3.ebuild 568 BLAKE2B 2e80158c8a0a01dc2b3a0db07eccc38d576ba0cc5576da4eb76524ca453bc3300268499cc75c6bc61eb3d57996f8357360d14a92477c004c6409b283f2f7214e SHA512 d05fad7705f80815800fc2ffefddd711ede411e91e7d7224118cb1ebd6c13fd3dfd159051e3b83a606a307de96ce1a8cb39daadccb334cf63e896679602a7c5f
 EBUILD python-utils-2.5.6.ebuild 569 BLAKE2B be00a0f01485d3f953d68b13910328286128c4c96301e2841d5abf1c638e047db2a69e631cad59f75d49fe4b080758405d6c13989bb015d40a4563e2798efedd SHA512 ef998f76341d9d433d68cb892b41accfabff93f11966bf654f5bec8fea1b535e6dd74cf3573b1c68bb89e3d4bbd206d4e41c248ff48775f8bb06ae8cbafeb7a0
 MISC metadata.xml 445 BLAKE2B a847943e498e81c625bd90908ea97d42ce4054cbb4f9a2bf525a214b261cd6baea9795b04ca88443c906c937647b50db5d3731f2a6b6740f3301de6f6e45d8cd SHA512 bd6c83e0495c326af8e74d6cece2faa6914508f6fc0edce4003ca116880e9730f9414028918a389300b494d77ef6e01a3652e7e2620221e1606d39da3901df18
diff --git a/dev-python/python-utils/files/python-utils-2.3.0-pytest-runner.patch b/dev-python/python-utils/files/python-utils-2.3.0-pytest-runner.patch
deleted file mode 100644
index 277c283cad4e..000000000000
--- a/dev-python/python-utils/files/python-utils-2.3.0-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr python-utils-2.3.0.ORIG/setup.py python-utils-2.3.0/setup.py
---- python-utils-2.3.0.ORIG/setup.py	2019-02-01 15:09:06.863038597 +0000
-+++ python-utils-2.3.0/setup.py	2019-02-01 15:09:22.636039253 +0000
-@@ -27,7 +27,6 @@
-         long_description=long_description,
-         install_requires=['six'],
-         tests_require=['pytest'],
--        setup_requires=['pytest-runner'],
-         classifiers=['License :: OSI Approved :: BSD License'],
-     )
- 
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
deleted file mode 100644
index e8551dc1e07d..000000000000
--- a/dev-python/python-utils/python-utils-2.3.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_{7..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaning *.pyc failed"
-	sed -i -e '/--cov/d' -e '/--pep8/d' -e '/--flakes/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-2.4.0.ebuild b/dev-python/python-utils/python-utils-2.4.0.ebuild
deleted file mode 100644
index 704e8a54bf7f..000000000000
--- a/dev-python/python-utils/python-utils-2.4.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_{7..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaning *.pyc failed"
-	sed -i -e '/--cov/d' -e '/--pep8/d' -e '/--flakes/d' pytest.ini || die
-	sed -i -e 's/+ pytest-runner//' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-2.5.1.ebuild b/dev-python/python-utils/python-utils-2.5.1.ebuild
deleted file mode 100644
index 2b1813f1cecb..000000000000
--- a/dev-python/python-utils/python-utils-2.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -r {} + || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -delete || die "Cleaning *.pyc failed"
-	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-2.5.3.ebuild b/dev-python/python-utils/python-utils-2.5.3.ebuild
index b83efbe8075e..3fddaf420a56 100644
--- a/dev-python/python-utils/python-utils-2.5.3.ebuild
+++ b/dev-python/python-utils/python-utils-2.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-utils/python-utils-2.5.5.ebuild b/dev-python/python-utils/python-utils-2.5.5.ebuild
deleted file mode 100644
index b83efbe8075e..000000000000
--- a/dev-python/python-utils/python-utils-2.5.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index f253d3f7fdac..f8695eaa7964 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,4 @@
-DIST pytools-2020.4.4.tar.gz 61208 BLAKE2B e124ae0f2c6be9c760ac178f2043e2d63af7e1eaa79e343b52dc183724bac7e869185d14d43a79efb91cfc55f39c81747581c61badbcb8cbd3d02d6e9a9a79a0 SHA512 32dc47a5a6c39c806c0bc4ffc34a41a1bb51ada537dbba36cfefad7f4370793879b3cb143b37d6fd3542aad0d64ac663cca4c8f7a05db36a9522e9919a1ef3d1
 DIST pytools-2021.1.tar.gz 62003 BLAKE2B 2938359365082d9475cfb51586c78d3dce264cf0e8b1cf3fea0c7c688570c6e25c9a558b78977c35331ee89afd23ab7eb44a8702b3908eea160b07747646cc53 SHA512 c365cbb65b756869407f7f053112cb9732aeb138493172f2b90563a4f45e6d993557e54de2165a463931b8e2bd29c3ccd32c059702f21fb59e3dee74c19efd8f
-EBUILD pytools-2020.4.4.ebuild 631 BLAKE2B c6331d7fc2c4ea29ecda248e305e01624dc8dbcba35546ac1a255ccfbf47b395a043aac44a3b7ff8a8e1f26fd0d31d881c2ea54325b82fbaabed36d3b785140d SHA512 1a2b7167f3f9d1959d77d21df99ffcbb22a8f0a0287512fac9b60ef14f264579230a971af8656e3135419694cf61a1f99eb226be0fbef05e25e11c9c6ac1babd
-EBUILD pytools-2021.1.ebuild 632 BLAKE2B 435feb6c54a3ec7c848185818fd354e0bcc5338e8aa3671c369baefcacbfc011eb82b3eb9030eb1752e12f1d0fb45f7dc1312021570079644bfa7af2b4034742 SHA512 5829639f5b19f01739dc1b9de25787905237a771ce051c4c98b3a303fc6959354e1b05b06d04739e285dbc7fea3d7b60fd25e8c353e3d37995bf2091190aea2c
+EBUILD pytools-2021.1.ebuild 631 BLAKE2B c6331d7fc2c4ea29ecda248e305e01624dc8dbcba35546ac1a255ccfbf47b395a043aac44a3b7ff8a8e1f26fd0d31d881c2ea54325b82fbaabed36d3b785140d SHA512 1a2b7167f3f9d1959d77d21df99ffcbb22a8f0a0287512fac9b60ef14f264579230a971af8656e3135419694cf61a1f99eb226be0fbef05e25e11c9c6ac1babd
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
-MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
+MISC metadata.xml 394 BLAKE2B c92c0da3fd787c1b70b8b6518448050c13a1b68b27a813506d513f54db1b47853d4d2c633b70f5bb1e604935dbdf8e1f4fc3394cadb29ba30ead7a2b718c03f5 SHA512 70139b5703a5bda95cf48fa30cc97702a149a3555da20a2e8143fad5d9174557b3508a251526af797a93811aa3964ed5b0f8e89fc2a6b3da965a72062649ec37
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
index 5ca4bd67b414..d0d7223e5811 100644
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytools</remote-id>
 		<remote-id type="github">inducer/pytools</remote-id>
diff --git a/dev-python/pytools/pytools-2020.4.4.ebuild b/dev-python/pytools/pytools-2020.4.4.ebuild
deleted file mode 100644
index 0638cd697a4a..000000000000
--- a/dev-python/pytools/pytools-2020.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2021.1.ebuild b/dev-python/pytools/pytools-2021.1.ebuild
index 21d7abc4ad97..0638cd697a4a 100644
--- a/dev-python/pytools/pytools-2021.1.ebuild
+++ b/dev-python/pytools/pytools-2021.1.ebuild
@@ -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}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 128dfade755a..bf36365f7134 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,10 +1,6 @@
-AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
-AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
-DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
 DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e
 DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b
-EBUILD pytz-2020.4.ebuild 943 BLAKE2B c1c12746f6aaed0003008f62f84b9f830da2a1d3183abdb9693ff92a19466a0767d0f3525830eaac3742da2a1fa3c2fd0d865004cba672b821c6ebb8a79886c5 SHA512 adcdab012c09cab47c26947e92a3382c3f286117e4f5c5e290e467e26b92fc5ab2125c946d51ac85f691a8c13e51af1d97646614696723ceccd61a1c310ed21e
-EBUILD pytz-2020.5.ebuild 872 BLAKE2B 01365958859d412d7452646a193a3e444fb0c1e26f743dce42112456269245e0bb222a903ef5f6cc6e61661ba5d6c73a5bee74be869b79b5295464349283f0e7 SHA512 5a91957e6b45577b049a50b9a049c7417ef951854c75cb8458a7b243ae3f6160532fb3050382f76467faa11b32806b35805493b41c6f82618077b9416fc983bf
+EBUILD pytz-2020.5.ebuild 863 BLAKE2B df7c17e9cbcea04312351809c17a3384e86363e415b0ed7f5da654421a41c722bd6ce33e3b46f8b66b92f6a2ab8ccaf5faffca1d5bc4b407ef289a791cdc5cc3 SHA512 adf05dedb276703ce53ea1693e5f8ed3300db9a713a295f0bed1a740aef3e28c74d7fcd8a45e27de8f809151062e66f5b7f5d5ac7c7e1c20c625b7aea18df7a9
 EBUILD pytz-2021.1.ebuild 879 BLAKE2B 98fa7a0e1e92cfa0654b8a5b489b007fdf868c306fa07efea38d1e85388087f75ad5ad4efb9b5f2e5ef39aa4c238cbaea1beb3636df389750892bd09590335d4 SHA512 1e2d8bee9de12d26e6446aaaac9c3a3bab2a11388555d8efd1f2e603565e06923ff3aaad69c3474c0a02d8faa35e911e6c2c70151dd337931ac3eadba75e5192
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/files/2018.4-zoneinfo.patch b/dev-python/pytz/files/2018.4-zoneinfo.patch
deleted file mode 100644
index 2eeeab416d7f..000000000000
--- a/dev-python/pytz/files/2018.4-zoneinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -91,8 +91,7 @@
-     if zoneinfo_dir is not None:
-         filename = os.path.join(zoneinfo_dir, *name_parts)
-     else:
--        filename = os.path.join(os.path.dirname(__file__),
--                                'zoneinfo', *name_parts)
-+        filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-         if not os.path.exists(filename):
-             # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-             # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
deleted file mode 100644
index 9f8b93bf70a5..000000000000
--- a/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -15,15 +15,8 @@
- memail = 'stuart@stuartbishop.net'
- packages = ['pytz']
- resources = ['zone.tab', 'locales/pytz.pot']
--for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
--    # remove the 'pytz' part of the path
--    basepath = dirpath.split(os.path.sep, 1)[1]
--    resources.extend([os.path.join(basepath, filename)
--                     for filename in filenames])
- package_data = {'pytz': resources}
- 
--assert len(resources) > 10, 'zoneinfo files not found!'
--
- setup(
-     name='pytz',
-     version=pytz.VERSION,
diff --git a/dev-python/pytz/pytz-2020.4.ebuild b/dev-python/pytz/pytz-2020.4.ebuild
deleted file mode 100644
index ffa78dffaeb1..000000000000
--- a/dev-python/pytz/pytz-2020.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	|| ( >=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.5.ebuild b/dev-python/pytz/pytz-2020.5.ebuild
index b0b0610ed1d1..139d6cadf7c5 100644
--- a/dev-python/pytz/pytz-2020.5.ebuild
+++ b/dev-python/pytz/pytz-2020.5.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
index 6bb07f6d7892..d4601f0604b5 100644
--- a/dev-python/pytzdata/Manifest
+++ b/dev-python/pytzdata/Manifest
@@ -1,3 +1,3 @@
 DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
-EBUILD pytzdata-2020.1.ebuild 531 BLAKE2B 96729bc715f02f3efbdedf86950544c41ee8c7262851fc8974ddf59c40de414382ac6cf5080c6a933d954d3c0eff1cbef63a98c2cddb52631db923248ea14fca SHA512 3ef3a8816901ddd622d189562cbe0a785c90bed49307a00ae1ad46fb74f2af8eaf23f75cbada3cbbd7789f953d66fb90531f78f43fcdb135733150d094b2af86
-MISC metadata.xml 515 BLAKE2B 3514d09f0f24cb33bbe944fd19d916d46552b113daf2bfd8314dbb19b549e14f5676c69d67c59252c67a86240b24245cb062866c94190e0404329189462eb967 SHA512 406625b6aeab7f473b4b38e31046040af0bf170e806ffb475728f9124788339e9a0350cd586e2a6ef055e0cdb937289c602ee2935fc1d5c40576270a791a2313
+EBUILD pytzdata-2020.1.ebuild 530 BLAKE2B 52fb544863be2facebae577958106dd4a1b19d9e8fcb5b8f119e916cd39e79f44171f496255c8e4ef7c9ead580ee7336ba9f8d1016e54a00c13d67dce4c217c3 SHA512 8a58d6c01d01687b0ec1063a3cdd14b6831d32a41e79a98f1c17217c5690b0260a7e41ed0879bbfc42b69e5e0cbeb4f12e3eb704b59bd86277d0ef28db4422bd
+MISC metadata.xml 540 BLAKE2B 9d449ea1c6dfd3e908dcbcfbe93dc52c091ca5126e6cc41d5787618fc22d064d13a864a60053a7033db7ea14aa69c0bcfae491de9061e4268244d14527312432 SHA512 f3a9584fe0f05cb20abbf1ddbf0061edcce493da0d0b51b550ede073a732e2dc735e1c6d28e1ab37de089e44ff17e150a78e5ad77ee9fe60ec8386c7f9535fab
diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml
index c966784415f2..d3630d930517 100644
--- a/dev-python/pytzdata/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/pytzdata</remote-id>
     <remote-id type="pypi">pytzdata</remote-id>
diff --git a/dev-python/pytzdata/pytzdata-2020.1.ebuild b/dev-python/pytzdata/pytzdata-2020.1.ebuild
index 671a5ac195f8..8fee9bf0beb8 100644
--- a/dev-python/pytzdata/pytzdata-2020.1.ebuild
+++ b/dev-python/pytzdata/pytzdata-2020.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 3a15c30f06f1..17a365ea8961 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,3 +1,3 @@
 DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.22.0.ebuild 1261 BLAKE2B 03f9298f9245206fbebf8c2276e330ac531213e9bf16869a68c3c2fa3011ce973c1ae5cef5ee976b2d22398664646a7b46e59a92f8ae876f7de8fbb7b7cb38d6 SHA512 4ede34f1496546e9760c13eb5ab02dd5c80373302be8c7bd7802cbb0d09d8aca4b813174c5212ccef2a0e52e9268cc261ecedf1770138705eb8f3eee2e9e7901
+EBUILD pyudev-0.22.0.ebuild 1273 BLAKE2B a1085fed6c59aabce49239b1100187d7ea290305bceab6cfbae16bc0c2e549bc2214aa51b63691d464d978f9523f2ac07729d66abb549940cc256be665e2d94a SHA512 1a4d9454b41087dddedd3a2288270e5152df30839802ceef834eaf6ff09f4a497519d29a65cd2ba07b77cedff554ca999580065209e9c9e7a34d78a4f53dff84
 MISC metadata.xml 593 BLAKE2B bb5efdb90e8b189f55f12df33d7bc69233a448d010c62b512cdbea78c58a625d0e876b48cdac3342e3588e3bb1f3998d9400e927fecf7bb86ad01da113c97758 SHA512 dd6e479a44e54d4e3b2a4b7a3ceedf04fd45152d9667227b4f7bf0c585052e1adedda44084c6251749714ba91bfb8ae2969c158bb3412edf1230f5b8d1d1c768
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index f6bca3d67873..25193dc4699d 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index b7201a34af73..581094d483a3 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,5 +1,3 @@
-DIST pyusb-1.1.0.tar.gz 78752 BLAKE2B ee541afedca7d5dca345c6addee2702ccb7408bb9a2d8b23fe1eb47f067a93309599894e364c0bdcef3e5348bd13cc39f240257efd4664679017f61b87853217 SHA512 0769670e6ebd8b31f2494258eca5d6e470ad3cb17663cc14b8b3a8136ea24caa23f86d81c60c501b88a9bc94b0de6a45aac43c6c5f140e65fd03a589b4d18179
 DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287
-EBUILD pyusb-1.1.0.ebuild 683 BLAKE2B e3b19d4355dc4fb9b824198a34743aea91c7fdf39c719b6d29d311695d2b2ae7f2c8c2c3ea69899053287ac812bd2dc166ac9528558a6a3dfeabe76796e9b0d1 SHA512 5619c449b655b3d831fd0615386e8e0b602a8cab98d66804b5c36b935ad920d9445e919766240eb7812d62af480f1c0a11c34249656e10ee4547b2c8b48a0eb3
-EBUILD pyusb-1.1.1.ebuild 686 BLAKE2B 06b5a5a5e6457feec6d4c1077207ab26dfe641f2d877df9c87cf029b211f75eebe8d5e2a8ef2f11eca2727d9bba147959d8f34a20cefe212441f3ae97dfadfa6 SHA512 9771215a72b25a8031ecb1270fcd00ffda1498c2d101230acf93adfcd679482dca2b4f3cce941e262f21f14643cdbb8f1fd5a84d18eaa999c784a58fc9880873
+EBUILD pyusb-1.1.1.ebuild 684 BLAKE2B edeb2a5c8370e8eab98b54d03e9280cbaa3a310f833261a80e86bb1d9846f6c8b46035691b3b5fe9aa678fa3e0727d6d6a1f04610798be4fb4cd074ae8dc46f1 SHA512 d916936d150258b529292a1724153e4382631e865223746c45865fd7c296972df2a640bbdd5c5bec99a693d03bc3c80b524c1633f309b35923e72ab31831c838
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.1.0.ebuild b/dev-python/pyusb/pyusb-1.1.0.ebuild
deleted file mode 100644
index 508d193f7cca..000000000000
--- a/dev-python/pyusb/pyusb-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst docs/tutorial.rst )
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyusb/pyusb-1.1.1.ebuild b/dev-python/pyusb/pyusb-1.1.1.ebuild
index 33c5549aa1aa..3df409241c7c 100644
--- a/dev-python/pyusb/pyusb-1.1.1.ebuild
+++ b/dev-python/pyusb/pyusb-1.1.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
 DEPEND="virtual/libusb:="
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 07dfd59fde6e..91c0591dca44 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,3 +1,5 @@
+DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
 DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
 EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
+EBUILD pyvirtualdisplay-2.1.ebuild 950 BLAKE2B e351abd07253bea2a2a16421e96fc3d6e853e6f9a0851969da6d39bc23c1378b8cc9637ae4a8177afffc1b091e6c0ce9a06dfd699bb905d02f4b5e80eacf6d89 SHA512 68d0bb13e235b2515ecc30da4135ca5ea401c2aa9e7148e232b405204a02468f31727caaa6091788e362a9c47bc0adacfb3eb2093046d78d4a1246256d9fd1e9
 MISC metadata.xml 454 BLAKE2B 175cc198884a009e32e480e1d98a7fe9454be85ba6d5760d29e5f211eefadef768c419d04bff83ca7eb217b5ca2654526acd11437494da37df770c34159dc34d SHA512 40c644fd60022874585532c2e822aa7e12047c252415fc3a2b6092a3e359e23ea7a51a9ee371f89e2e5b505794dc3e935cd697ac2e85a66c68867eaaf5ecb3ec
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
new file mode 100644
index 000000000000..ecfde6a81f73
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+MY_P=PyVirtualDisplay-${PV}
+DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
+HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
+SRC_URI="
+	https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/backports-tempfile[${PYTHON_USEDEP}]
+		dev-python/entrypoint2[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyscreenshot[${PYTHON_USEDEP}]
+		~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
+		x11-apps/xmessage
+		x11-base/xorg-server[xvfb,xephyr]
+		x11-misc/x11vnc
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index abc0ca90aee7..1f4bd8ebdc94 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,5 +1,5 @@
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
 DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
 EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B bf563eaaa4ae394748c7be5f6fa54e306efa1435e73a6e6677e7dbc94a23a57ac073c31dcabcc00fad70dfaeb805b2b6b3ae015b815bbfd91083fab8feb66d5b SHA512 c41ae555d23866dca2ec2c9d7e1185aa3bf676641a3b0a24d882f8e9f83c827f6db4b7142834fd02afaa345b6245c9cac4c84fc3c6aba41e020d947eb9c8a7b9
-EBUILD pyxattr-0.7.2.ebuild 832 BLAKE2B b36ba8b45628fad3f7e85139910645cd01d9cb3bc6fef2316de842800c3a08f2a89a1fac4724664b7b7ed67cce6880ef227dba6006b17f8d68c5c6816bfa7385 SHA512 3212863990f515e542d4f1afabfa99d1eb6101125f6e1a337220c7647d15555ce7e0f2a49ea32538422f4b525e84d3e4d744f81ec59147829f7bf1751eb5a61c
+EBUILD pyxattr-0.7.2.ebuild 828 BLAKE2B 2659576cc675e1912959801247b842c43e607f9c349885dff803a6f96093e7a4acc2fd12d8bcc1e659a81675a1a6772ba2d0cb10e40243673a9e2cdac583549b SHA512 61f3fae8d21eb2ad014bbf121049e0cfb8a7e8ba14050e3195a04aa575a99f4d377761f4a3ec17c72c61fd47d407bb848d83c7d926762a32badc700acaf31451
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index c51f5eb58afa..ddf522acafa1 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 b0032946ce87..dafe2b44121c 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,6 +1,3 @@
-AUX pyxdg-0.26-python384.patch 1782 BLAKE2B 61eccc53300424879b2ff88d0f8e11654616dddf045d7edc3a67a8edf063b8517676276be6a9ee94de69243524cd46dd082846a13f2304b84d26a6f5bb31944f SHA512 e6d1af2b0fe52c85751e6e468576533bf0e718e58b74623fe7e84e2004f7a19353dc16591fe054cb78719318f1f5a70e96f4a009a292f1f8112592ea938eca5f
-DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
 DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
-EBUILD pyxdg-0.26-r2.ebuild 772 BLAKE2B d6a1c8211106340b4e44c8f97e4771b7f0152a541f587120366383d83e0cafb8957d1a3458e3a1012dd0ca3a8f4b8d38a73c555a7b74c1401b6abbd40669471d SHA512 62968a0c31b5b100f5f902feaa8ca5d57899ff46fadcad52da9b9f0f0f01155a8ab740fb4239649f6656b708a861acdb847472ab0f353d51e99d74d4c60aa3b0
-EBUILD pyxdg-0.27.ebuild 608 BLAKE2B 67f6e00541a4c7fe64343d388764b715d4d3b4b91469d1bad311163233a42c08becce68629ee9b2722927be7857a6f91fb3592e413c6a3ef47915a10c0d650b3 SHA512 24d29f963acf3376a31a44b32f04cd81d09039a6ea5fb565963b42b7ff91da5b85919a693ea6c1224c96f04c00cdc3e6d316cb9ba2c72074ce6b7fcab8c5a455
+EBUILD pyxdg-0.27.ebuild 601 BLAKE2B 457a53f6e5d5c14d8b20474453fde8c51fc76ed177f5e7464a332c6d665b96ca7753cd6e900c49508568839e20e65a1d3fd6d1c409ebc6ab2d3cdbbd31bca5e3 SHA512 4d8f7de9a00845b32b9b589395629fa62270619e1a95a2a4863edee55c87ed1ceb52f951f53adbdcd57e8b12ff4ec3d937ecd70f88b3c8fff435ff6e5aa37c2e
 MISC metadata.xml 512 BLAKE2B 134a7a97dc07dfa10dfc1f9684a0d9ef1cf059966ca3a569762dd277145d19dabf02987553ef6ec60083cf7ea5dd754ff64a735ac4cff8045415657c0a5b1f33 SHA512 c1f7bdaca58f1e63fa5906edd0d626413174742e68da597ab28350fc1f917d9c9c77d0fe7ec0aadd008525cdfc1fa71ff3558bb738f60d129be198844549a39f
diff --git a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch b/dev-python/pyxdg/files/pyxdg-0.26-python384.patch
deleted file mode 100644
index def4a835f036..000000000000
--- a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9b913229ace838958e51a16cabc41905a2460f7b Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Tue, 25 Aug 2020 00:24:53 +0200
-Subject: [PATCH] Fix compatibility with >=python-3.8.4
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- xdg/Menu.py | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/xdg/Menu.py b/xdg/Menu.py
-index 1d03cad..ee406bd 100644
---- a/xdg/Menu.py
-+++ b/xdg/Menu.py
-@@ -21,6 +21,7 @@ def print_menu(menu, tab=0):
- import locale
- import subprocess
- import ast
-+import sys
- try:
-     import xml.etree.cElementTree as etree
- except ImportError:
-@@ -35,6 +36,17 @@ def print_menu(menu, tab=0):
- import xdg.Config
- 
- 
-+def _ast_const(name):
-+    if sys.version_info >= (3, 4):
-+        name = ast.literal_eval(name)
-+        if sys.version_info >= (3, 8):
-+            return ast.Constant(name)
-+        else:
-+            return ast.NameConstant(name)
-+    else:
-+        return ast.Name(id=name, ctx=ast.Load())
-+
-+
- def _strxfrm(s):
-     """Wrapper around locale.strxfrm that accepts unicode strings on Python 2.
- 
-@@ -754,7 +766,7 @@ def parse_rule(self, node):
-         if expr:
-             tree.body = expr
-         else:
--            tree.body = ast.Name('False', ast.Load())
-+            tree.body = _ast_const('False')
-         ast.fix_missing_locations(tree)
-         return Rule(type, tree)
- 
-@@ -781,7 +793,7 @@ def parse_rule_node(self, node):
-             expr = self.parse_bool_op(node, ast.Or())
-             return ast.UnaryOp(ast.Not(), expr) if expr else None
-         elif tag == 'All':
--            return ast.Name('True', ast.Load())
-+            return _ast_const('True')
-         elif tag == 'Category':
-             category = node.text
-             return ast.Compare(
diff --git a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
deleted file mode 100644
index 0fb2dd272cca..000000000000
--- a/dev-python/pyxdg/pyxdg-0.26-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
-
-DISTUTILS_USE_SETUPTOOLS="no"
-MY_P="${PN}-rel-${PV}"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
-SRC_URI="https://github.com/takluyver/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( x11-themes/hicolor-icon-theme )"
-
-PATCHES=( "${FILESDIR}/${P}-python384.patch" )
-
-distutils_enable_tests nose
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
index 1b21277a80e8..1b1a33faa9e9 100644
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 72a644ef39d6..4751e99f5966 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,5 +1,5 @@
 DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
 EBUILD pyzmq-19.0.2.ebuild 2963 BLAKE2B cb100a32bac4365afa3e7d0432139aba431d413915864f881f68426dff3753970d27a039e5d985aad76267c4767fe4a5b87ff3bd33dbfe0e551860902569f265 SHA512 8ba857d924fd33e98edd7cfc0f2231dad44c32614b5d1479aa38870f77dff3e489a5ade041c5a51a0af700b223825785ad4d5ab94e1e90dcf8102c6a651619d6
-EBUILD pyzmq-20.0.0.ebuild 2664 BLAKE2B 8359a7686e20d0aab74d99ddb8868b60383a509fc92b1f1fc9d38fd9b48fefb8e050cbcf04399a7b4c3ce047f3f592d4f1f03b4508bfacbd061d1b538f3d827b SHA512 ae31fff77b32bf18233ce3cdaed2a4ed8ce70be758398ec83f77dd97ed32376202961c42d4d70b34484bd423f8a8e56238c6308bfa06ae8637f59a4846de39dc
+EBUILD pyzmq-20.0.0.ebuild 2661 BLAKE2B ccfe42c2159633441a81e4be9dddc68b2b62b802ba5a9056e3bff2a2894eb6f528c7aa77f96ce8670e8400c444928843b7a9a39e047838a1c0552331d3530bdd SHA512 836b3dbfab749414a9336aa89d27336f206ee269ac11886d9e211752a039facbdab9369a57141a3e225aa5d239f5597402fc3a11dbd556dbf5ddb2df5447114f
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 423bf52f33fd..6dbc55973f07 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index ed3b3e10fb04..d17a41355567 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,3 @@
-DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
-DIST qtconsole-5.0.1.tar.gz 424682 BLAKE2B 46f2cdea799786d7b2e9385a5b73ac397925eef9c2403f4d9ebd4ce89241cc1ca6ec494450759db4e017c16abc525505dacaa7452018379da5343c2b1cf24f86 SHA512 4fa7629c68ab7554c20bd8ef885bf4073d64d4c211a0d9035faaa7e4122bd5d182fb97773c8a41f215f9e299309ace591081a0673370b55c796b241211bb4ccc
 DIST qtconsole-5.0.2.tar.gz 428499 BLAKE2B 42d71e1a1909f8e07705fd5e7e64194d865b70cc67377ba631bb75fb8678faea4d8dddce90a2e84c0898fa074a88b655290bcf9ee1f9aebb39f91d2370908dbf SHA512 b74711c0444b74efc2fc31c631e6a87cfc05045d8ae9eb8253a9fcd1c82a1ecb688cbe50dc2f3dd4dc5d47c6e2b4fa027ac22e77b7ac37e1ed3fa0a9d2b677bb
-EBUILD qtconsole-4.7.6.ebuild 1251 BLAKE2B e9d90a46e866e1d7eca2102d084ea5c2e053bc84f14d087d66e4f6d1e90783cc63503f1a5577282f97e32c35ae4c39737484cfd4c75fb661b379d13c9c5847ec SHA512 92f8f6a41ad3baf41cbfb31446378c72f2108cc238c58393843ceb416808e20c2061446c22d290a18136f6611261675fc07bab77cd39fa2b399af38b3caccd02
-EBUILD qtconsole-5.0.1.ebuild 1270 BLAKE2B f5013655e9f312ed38b416a8080e68f3f831fe10f510487dd1d1659be74ae136019adc546647505a2128fe954ee9bbc334ce4e684bde5fe9ac0f271b21015e93 SHA512 bff26c72b85e756d23c4466cf463ead6383b4805c5d567c511efac7d31b190c5682d83df5a26fbc1fed71d7192fb38267914ab50236a9d1511fb412e2d8e5ed2
-EBUILD qtconsole-5.0.2.ebuild 1273 BLAKE2B a3e2959edcfa6efaa7774a8c9099efff7a9a28ec9c581a65bbaab87427906922a5f14fe89a9f2bb16f13954e93924a9d3eae5528f865cd8879bc31365bed6df4 SHA512 9b5da629c938ba2c67a0c7399bc8c4d31504c17eff0dc6704137c4ff0685144569731230e63e5509dcb33b5554bbdad794481a76f4ca0eb7feee82ad712060c5
+EBUILD qtconsole-5.0.2.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-4.7.6.ebuild b/dev-python/qtconsole/qtconsole-4.7.6.ebuild
deleted file mode 100644
index cee68e3cccd4..000000000000
--- a/dev-python/qtconsole/qtconsole-4.7.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=7
-
-PYTHON_COMPAT=( python3_{7..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/qtconsole/qtconsole-5.0.1.ebuild b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
deleted file mode 100644
index b629a8ca22d6..000000000000
--- a/dev-python/qtconsole/qtconsole-5.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=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-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 the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		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-5.0.2.ebuild b/dev-python/qtconsole/qtconsole-5.0.2.ebuild
index 9fea2d480c04..97125f3772aa 100644
--- a/dev-python/qtconsole/qtconsole-5.0.2.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.0.2.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"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 9d0bb2d8df16..35c618ed03b1 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,4 +1,5 @@
 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 1036 BLAKE2B 63271bc77a2b97af77519efc7a1ed4e57ddcf99b6709f00906b5601ead93f2e07183ea311b107d882973afe9e30744e43ff7ad90f605833859d69430ff6e7eab SHA512 016824daf78e077ad3cd4ac011e2b71e7c4bb58acc3ae8a50cc0049a2448919ed45b1f1c159ebae65473f5b17b39d1e6d48b21479c8731086c2c7843cfdd9f61
+EBUILD raet-0.6.8-r2.ebuild 985 BLAKE2B 467063491306e27e27c918262a728079517147ff808852b6a08bfa3c50ff57946c0dd7249dc455664f57462d23af1911d914f2d569a7c6b3d5a05c83085eaee2 SHA512 c4673a51f64745dc8a20de0679f0104face0e555d5de3977e18ce513a1088cc2bdb699cd4b17a95326a333f12fd16ae9e1dc4cdcd2ee5985acd18a31171bbd65
 MISC metadata.xml 474 BLAKE2B 8b186f4c18696c3df8e3d6b29f5d45d3c040156a473edb5066fa79f449642e4f1a3274974bbfc02733cf9ae3bc04b22c06cb8ef80b9962d14b4ee26dedc329d9 SHA512 33760bd0996fbe1d95e4f4ed658eb4a6c221b4c8911842db2e0f443d317c9c079ecb5a8e8f5cfea1c47531a944c6d79b4f4bd29775ddef6cb6c6008c4f359e15
diff --git a/dev-python/raet/raet-0.6.8-r2.ebuild b/dev-python/raet/raet-0.6.8-r2.ebuild
new file mode 100644
index 000000000000..ccf39de3c9f7
--- /dev/null
+++ b/dev-python/raet/raet-0.6.8-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{7..9})
+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 ~arm ~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-2.0[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/raet-0.6.8-msgpack-1.0.patch"
+)
+
+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/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 792c95bd5f14..bfe7f806cf34 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-28.0.tar.gz 27370 BLAKE2B 380e10941fbfdc17193a558b0a90b919b841153aa1ef4f26634202c5d500b57755858354374f785f0dedc5b119365281e50897bc9ec95943c8b08d69976e692d SHA512 2a5a00e404d2cc156e01433232fade64e13d2f95177b72c1d3903554144746317efc637c17c6333c501cd426f77628bf45300e9b219e30e26fa3963da690e06a
+DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
 EBUILD readme_renderer-28.0.ebuild 832 BLAKE2B d46435d8bd549cf919ad09e16d0822f35ee1d27f5a111fdb341228a170f572fd951a8a5220679eb7567bb738031e5a43e6e7a470cad7ef77bde891b1ad2c664e SHA512 732b850104c678f28358e0b11b6eef47bd88501fe6b7dd39dea34269427dc3f58340ccd57b38250c03173a3d56eaa4e54a33b71c5b578fbcac6c05974f88cc3b
+EBUILD readme_renderer-29.0.ebuild 840 BLAKE2B 4585fc10072a2358153849383a142efe98194c0af501ae02fc4cf93f33da0251c919501039d296494bd7a6379bf7ff1dda8aa477a86ab75296b1285a5eb5a901 SHA512 44bc060592b8747a6211e0f55145c128d2e2f7959cb96bae9630d694dc8ef5894c2987bd3632de3563831f3502eed9af504602f22f3e5c12d0705994fd8fa332
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-29.0.ebuild b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
new file mode 100644
index 000000000000..a6b665b4994f
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+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}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index c38afbde1c55..97723e1ec82a 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,7 +1,3 @@
-DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
-DIST readthedocs-sphinx-ext-2.1.2.tar.gz 11709 BLAKE2B 9386d9c849c4287a0f52ce054e33d22afed0426b5d775a03c90b7c18021f2a2a9429334dc0231ec8d28d3b4437dcf4e3faf57a0c1e46cfb4690893b96560fa3a SHA512 c1fa8a2c1b1d50aa5039c0592a0960b1162c31f58769754a7fdbe4d85557428f3e0a3a509012077210d30d79a28463ab0624855036ffb45d0977e9e0e666622a
 DIST readthedocs-sphinx-ext-2.1.3.tar.gz 12261 BLAKE2B 3121b75c2a157a61727f4bc5b15b7a5d0aa23a177593fd7208d558de4ea9d89c48c788a843af833ab9dc79b05baa32231086ca6e4ea4c69ba793fb5001becb12 SHA512 f9b03de7a5ef8e6707960cb05b1be8115a55292820fe3fd43efc6d7843b9e55c8c537a53653967e1879ff27c5856ca66f145fc6e8f98891fc1f2682e425e2faf
-EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 754 BLAKE2B 7e18c254f60fca4258fc6cf1350a81f428dcdc51b6bf3621179138d4d197561f5e9aa7ce065d6f32d364d33d7471c0448750749f55af1f2206e62718bf550ca3 SHA512 0bd0a4e0bbd9bb203739463d7954393508aeb1a93dbff035ac386cf3a0caf2c34447bfc9d2b271975348ee362e9c26ef1e3d719de3e42bf586fbb3d2f334c7f8
-EBUILD readthedocs-sphinx-ext-2.1.2.ebuild 767 BLAKE2B c6cd2200bb1863474f3fce40e7cd5515cce15c192574ea54e7b2272977b3a316e3528e754eacc6f918426630d89cc746d42ce8f5a18962e2f51df9e15e009c3f SHA512 d4d99ac6245126e2e014db03a4647321588c41655bc1e6fcdce39154558439b24cb866d863d9446b8abc954a98415a14acd42a4beb2117fbded207b07e1f455e
-EBUILD readthedocs-sphinx-ext-2.1.3.ebuild 767 BLAKE2B c6cd2200bb1863474f3fce40e7cd5515cce15c192574ea54e7b2272977b3a316e3528e754eacc6f918426630d89cc746d42ce8f5a18962e2f51df9e15e009c3f SHA512 d4d99ac6245126e2e014db03a4647321588c41655bc1e6fcdce39154558439b24cb866d863d9446b8abc954a98415a14acd42a4beb2117fbded207b07e1f455e
+EBUILD readthedocs-sphinx-ext-2.1.3.ebuild 759 BLAKE2B 42f961030ed3c1f4fcae1b95d7cc190a943bffd62af5b4b89a27ec11f3b8a375c0a9e752325763221d6955b24e99ed12b463fecd3e5859ce20945a26d21d96b9 SHA512 c24b914c987ec5ccd8d021200afa66d4d45e5a464f4f69a83076b9a0a57942d6fcb82a210e4d413aff0fe1dd0f9ba00b4a9d95dbadbcfe5f9fdd4e8153bdeaa9
 MISC metadata.xml 349 BLAKE2B d74b06bcf26cb258eb33f7b445a1486eb04880987c3227e891fe3fdbd39c2108dbe4a89b37e76a57c3d204d0388081306cbefcaa5a904de2c718b33f3832f0dc SHA512 ad5563a21425a463bb85e37b2f0d4ce12703999d89ba943f8bc879526b83b58462c8dfb1c5224862216b0f959ee0e44fbf99e940eea6159674a27071a669c99e
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
deleted file mode 100644
index fb8f88ae7edb..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.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_{7..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 hppa ~ia64 ppc ppc64 ~riscv ~s390 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.2.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.2.ebuild
deleted file mode 100644
index 68b9817de11a..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~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.3.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild
index 68b9817de11a..153d97190265 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index f0eb79d420cc..3f83cb24d336 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,13 +1,5 @@
 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.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010
-DIST reportlab-3.5.57.tar.gz 2901465 BLAKE2B ecb0459414d359b8feb048ad34cfd782a6913f2e254f6d8832dd076fe63fda82d24c4dda28da9c0cc6765c284d51a45d44459d225899574625212c33800116dc SHA512 d325e389ddd7d3c4d98e462956a3c4b7237c9219728577a1e0599a137d19a27205b223fd13c5c260e2968c435bc06b2e4745945ac056926543a47e52868e21db
-DIST reportlab-3.5.58.tar.gz 2903638 BLAKE2B ac19bda75e111266b35a939fc64ac44de4ad69dc7a7cbf9fdabc233e28f33589ba97dc5082cd38d5b8d11a2c7aaab0bac69a1453d8661fd26017f8e07299c2e8 SHA512 949b50f65ca305f79fbb06e7e7b1ebfb6546864892f764a3440eaed0a95ac001a71d3685e8702032573ed60893b9529bd2356b1d5419882058a3b9aab986cb64
-DIST reportlab-3.5.59.tar.gz 2904089 BLAKE2B ab9bdbc8decda8f858c49a7ffe5ed919a2ca971a20967be45bdb780d9480aa474462c76f886756b433cee3ccd4d78e245334dc6a600c8e19c28ad79befe14705 SHA512 c862acb10f4eaed877321afadb52615132dcda0976e648e1767c32cd0398fc2763048f274d31da6088cb824311e8a28fee048cd6e98411e70583cfb36d0050ca
 DIST reportlab-3.5.60.tar.gz 2905122 BLAKE2B 8863e910dac03d5fd1d53880bb9fe83d218641156e481c97b498e462cf9e1e5c6826f2f25fcef7c65cee3dbc7551401bfd1dba6a319532363b7c9cbc9c37e618 SHA512 395ad0c904215ba3ae16efa52140b7cc6f751efd04c70f687a8891806b346d78c75bb29df5aa0d6d49adb6f5638da58704e713ee1500df05424c9dddc38afad2
-EBUILD reportlab-3.5.56.ebuild 1428 BLAKE2B 742266a9bdadb95badc0d747717f0a4923daaf279be896750256a90c4f733e8d4c0436c94488e1490e278695db1315492c452bea44ad16240ce148f9c67a64bf SHA512 0a8fd8ca63f7df1ee83ea0f3c96771b2207c25117f7f1344418aab54a6560c7cd3b949381638f61f4c1c6a2f83d2cd1dee36f2f3d7a7bdd4e7dcd6439159e92f
-EBUILD reportlab-3.5.57.ebuild 1435 BLAKE2B f11cb70feb1fd44ecd11accc50fd7a101da1152b145026ee384ac45002c8140f4becf5b1cc139a3592f21146dcf2c68ead9a84db6f2027fbd7848e0cd3fb7316 SHA512 2bdd5448234dc594f2d4d4d851193b2bcfe3933816919b6837c5ac5eb1a8af9ea306f75e5af0eeebc5e809a2b631308ff33d8a42da328b2eec9e671730e092f6
-EBUILD reportlab-3.5.58.ebuild 1435 BLAKE2B 37207d872b8210f3b6f6e66f3da1f59ed8969f55d0e4c0ac7e3de4cf0cb37c938d395850c5f6004e05713f0b116c80ca4e873e00e5a48b249b6c6f745f771ed3 SHA512 84755a5e2f404dd87cb4b2bac8efee1c6d227c4d6f399857ae761e5a1a7b18df58864b4cc33b96f1ffdaf6e13d89d1781eea4ba76a2fa31d744b2ca089131ce8
-EBUILD reportlab-3.5.59.ebuild 1435 BLAKE2B 37207d872b8210f3b6f6e66f3da1f59ed8969f55d0e4c0ac7e3de4cf0cb37c938d395850c5f6004e05713f0b116c80ca4e873e00e5a48b249b6c6f745f771ed3 SHA512 84755a5e2f404dd87cb4b2bac8efee1c6d227c4d6f399857ae761e5a1a7b18df58864b4cc33b96f1ffdaf6e13d89d1781eea4ba76a2fa31d744b2ca089131ce8
-EBUILD reportlab-3.5.60.ebuild 1434 BLAKE2B 83c72ad1c3f4d40f3bef0d114f89bd2d51a3efc98d1f419154b52326bb734cc399fa7dc273d667a679f3429dcf886f78e55a85de8154d5f1bd134f88147c9288 SHA512 02bdc679f3701c687d3d71fbab5c8f784db6259005648813ef6bd73be2640b118cf817a94b45994bf0e7e5f892f65a337641624e681a9a1908f9500aabc49e00
+EBUILD reportlab-3.5.60.ebuild 1427 BLAKE2B e28248a50f14aa4b7c110fc965fbe3a2b723369f0ab9ceaf1afaf32b216ce224557cb3d08eef46ab510a96371840df2b4a162d881dbae65652a465a3166e7034 SHA512 9b5203054f7b4f52a4440ea2f6500928c9be0ba8dfdd3f392512d7d7caa3be2bb23f28e25d2fb9ea01e3af984990af454b15e398965c9d7da13ffd8aca59c907
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.56.ebuild b/dev-python/reportlab/reportlab-3.5.56.ebuild
deleted file mode 100644
index 97e7e60f515d..000000000000
--- a/dev-python/reportlab/reportlab-3.5.56.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="
-	app-arch/unzip
-	test? ( ${RDEPEND} )"
-
-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/reportlab/reportlab-3.5.57.ebuild b/dev-python/reportlab/reportlab-3.5.57.ebuild
deleted file mode 100644
index 9621138af46d..000000000000
--- a/dev-python/reportlab/reportlab-3.5.57.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_{7..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="
-	app-arch/unzip
-	test? ( ${RDEPEND} )"
-
-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/reportlab/reportlab-3.5.58.ebuild b/dev-python/reportlab/reportlab-3.5.58.ebuild
deleted file mode 100644
index f9cdc2cc372b..000000000000
--- a/dev-python/reportlab/reportlab-3.5.58.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="
-	app-arch/unzip
-	test? ( ${RDEPEND} )"
-
-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/reportlab/reportlab-3.5.59.ebuild b/dev-python/reportlab/reportlab-3.5.59.ebuild
deleted file mode 100644
index f9cdc2cc372b..000000000000
--- a/dev-python/reportlab/reportlab-3.5.59.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="
-	app-arch/unzip
-	test? ( ${RDEPEND} )"
-
-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/reportlab/reportlab-3.5.60.ebuild b/dev-python/reportlab/reportlab-3.5.60.ebuild
index 715b36b555d2..dcfc62e7a273 100644
--- a/dev-python/reportlab/reportlab-3.5.60.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.60.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 6b41a2767e81..44d3fc9af13e 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
-EBUILD requests-oauthlib-1.3.0.ebuild 870 BLAKE2B be7bce4098df43864f6c0f736686942c2610aa1085710429bc1ecfb7d051381a229f7bdbc8192acee56abda18f3291c324bc1956b71ebc74a29fab6c1c7a1e9d SHA512 96c9bd196667541f9ad30f2db3a676fa3622c6c50a588b1146042753138bf7917a91801f42bcd1d7d8026f331a197bf8915717fa8a856ec4515d3baeaab3ac66
+EBUILD requests-oauthlib-1.3.0.ebuild 872 BLAKE2B 08f496bb01558c8e4cfcd269ccf0efdd67fa288acf4ecfd3e89eca368ee2b60a39886c7dfc0a8b1e496d777e855c213a305c4285ba71cec857fa448b10a43d14 SHA512 af0d60d87f050f4e89533e1373e7782a7ff935d84a82eca60e24040b856ac0215caeae26c17dc982d2709dfbe2abe3cc0b8b1867a01aff8ceaecf67db19a4888
 MISC metadata.xml 386 BLAKE2B 2e2afd7ed7d90551f20f4917132d686b1c03f24cad9c55aa9f06587ec5988709c7e2cf602b5dc16f06ea345c5f1ca3cbbe7eab282e460658fd04a3aa99f4666b SHA512 ab2b57e2fc4308c5d6e27cd567a1a5cb45698b7795887c1cc3122617775c76ba6c7141cb3440a84c855fcd5cbcc567435c4ab1127483e01b1d5941b6c8ab2a09
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index 1e668c35d7d5..b3518a21213a 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index fe1d2dac2615..8b0105eeaf82 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
-EBUILD retry-decorator-1.1.1.ebuild 459 BLAKE2B e851eea1d64cc98498ca4dff89eb9a08f04ad28eefb64c4f8f205523fdf2aa57518715bb80b64ce1f9170c9ac758fdb96f058913ae9c9ffbd09275cc30899449 SHA512 8d869389132bb3c603db41903d1b1b878a169a2af8cfc096382855c380e4b81982bd1d7941c9f6028824db8804e8e248a6179582cd16452b78583b603074c847
+EBUILD retry-decorator-1.1.1.ebuild 460 BLAKE2B d0ee622c7fd528417fbdf7ee7f373dd98440399a0be7fcf7f4f8e7ef78048ac909f89a6f5686fd383ceb19b3dbe2cf498ef30b924f14205348a3b41659b64378 SHA512 f33acf9e98a799f56f2d9830b726840fa4fc0058244489600281eb0af4098d6d2efef8b554399689bf8a8e32ef9a0d0a76f87ed3678cd0ca1fe65b3aad4cd740
 MISC metadata.xml 404 BLAKE2B 1eaa65e01a0b62a084085fc066b33a6356d5c62043faf8937a6929d047e6ea08d6afabefd9093b28c7ec05b447746d8a58865afb1ca36e703bda72d10375c0d0 SHA512 0596346f0c4eed5f17cb2e346aab4c3f3a7e2d038e863eeed640aad7ade590c7649dee4cf0196c45521be0d3737d0d31c707cb2d61c83c5c9521a064aa1118ae
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 b00d1727c32f..ae3d1adf0544 100644
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
new file mode 100644
index 000000000000..f1e52ea08851
--- /dev/null
+++ b/dev-python/rich/Manifest
@@ -0,0 +1,3 @@
+DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c
+EBUILD rich-9.11.1.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
+MISC metadata.xml 392 BLAKE2B ddb87719a768fbfa9efb493e82b4bf7401fc60782e24a0387e0ed50eacbcd9069beb7f3f75fdff28a906bcbcd597312bc79a2b252fe44487d16289ba81520f6c SHA512 3676c47be47b729d8d794e0359cf1ba7dc8b5c9318520474c323e71962dfc9a013f7a56f69147b9bab9d0c8334c57384fef3ed2adb7177677b8cc9033ebc6418
diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml
new file mode 100644
index 000000000000..ee58016921d5
--- /dev/null
+++ b/dev-python/rich/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">rich</remote-id>
+		<remote-id type="github">willmcgugan/rich</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rich/rich-9.11.1.ebuild b/dev-python/rich/rich-9.11.1.ebuild
new file mode 100644
index 000000000000..a62e88778e09
--- /dev/null
+++ b/dev-python/rich/rich-9.11.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index ecb4ff2c051b..121f194e837c 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,5 +1,3 @@
-DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
 DIST rply-0.7.8.tar.gz 26697 BLAKE2B 95c4be3bbbd7aea7f278dbe0c37fd43d012df768169d0363d1a938f762c2f9ad69d596cbbaaafee3c93f3d615ea5cd1509e9b642188320f8acd09c12d6b7c780 SHA512 b43e6425f046561cfca616801d37d7151f015aeb2ea2365abc00f97fd6b41f1a01a17e330aed5a81537065e4b29d49cd0824b5a5cb8b2d11da2ff1f8de952fce
-EBUILD rply-0.7.7-r1.ebuild 569 BLAKE2B 143f795aa4ce0bd6a9bcc3a72d62c7752367afcfe5fd039125314940ebd2e18efbea3264a943bfb9e6e0829abef74797e1e6585d2f97cd0ef21c852c1dad08b8 SHA512 18223fede5e30f6efdc9df41355d3ca6eb57746e3ef4ca8ce09df05e598fcd170126fefefbeff761b69ce465dbfcd54dee910ab03c2e6df6e49596385c4a2689
-EBUILD rply-0.7.8.ebuild 571 BLAKE2B 21376282d00edb6914d9c89f4f9fde8b6b67b28bfd220598340925a019fb7f3abb22416eca388faf26bd1ed90f020df87292badd2dc838c0222d02f14b0560be SHA512 7bb6d039406411a315cf006d993b865b546a933f72085aef003c9aca26d2c79949c1f677431e3e14fa7c8236bc19b6376917a44a73fdda4a587b2c86386961fa
-MISC metadata.xml 356 BLAKE2B d47709ed8a660507a33ead01d41c7d93124b429f642f81659f55d6da019fbe32c7b0d48690319ecb0099635c950c8938f08fa4b3d8e1261b39bc9cea5f20556d SHA512 3bb601a253d74589a2cff142af8f37801027bb8515cca97b4f5839f32b56c314a2dfc7db5b7225ad79f2090f7fd1db84616f86f9ee7685a21700a506074237be
+EBUILD rply-0.7.8.ebuild 569 BLAKE2B ecdbd60485dc4b5753c8e05c161c0618a53f35154e8ec6ad7ea60ae100eaf0a296b6e53c48175011d0e8fbbebe1f1033dbcdd1988d887bfe385e5bda466fa815 SHA512 4469da5a4ee2d7557c7c391ea8c7484457bc5631cf8f3cbb443ba858252a019fc74cdb95ce3c35ae0a34a58b33cff8cd8ae719e4adad87e88a72690d7ded9d83
+MISC metadata.xml 380 BLAKE2B 0ac53d36f1b21e8a614df2da1e992880124a7bf62b82b1ef65744b90b650ba539eb6f5575998075dfbd4f5f4a00a5813b8d71a5680e778cac749a5bee9be8425 SHA512 6e6be00947ebe96792114acc566fb0b5cc2e1e65d49c343d9a107a97f1fcbe2a072059290fcdd6f0efd42784fc5d4e1b9586f3f17cef7f1f83a6d2f617c4c52b
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index 2abc747e45c3..1f1e70c9c679 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">alex/rply</remote-id>
 		<remote-id type="pypi">rply</remote-id>
diff --git a/dev-python/rply/rply-0.7.7-r1.ebuild b/dev-python/rply/rply-0.7.7-r1.ebuild
deleted file mode 100644
index fcf9a9272759..000000000000
--- a/dev-python/rply/rply-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python parser generator that also works with RPython"
-HOMEPAGE="https://github.com/alex/rply"
-SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rply/rply-0.7.8.ebuild b/dev-python/rply/rply-0.7.8.ebuild
index d42fc41fdfa8..0cdee74125ee 100644
--- a/dev-python/rply/rply-0.7.8.ebuild
+++ b/dev-python/rply/rply-0.7.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 249c6c5564e5..bd0c33476fbb 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,3 +1,5 @@
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
+DIST rpy2-3.4.2.tar.gz 186064 BLAKE2B 5c800f546240cc33e6341973adae813edcdaa88e90ea0274e97075bc4516ced20828ccc6010ae23aead0b227639158240dae9b678790e0d28f974f10e9ac0e5f SHA512 e754d082bf392de582829bc078b512a071d0c0aa79ce3ed3692ad88b3816863b520a4ef9bbeaccbb2a7284685e470f345ba103e3db78a1c95187c0b554565314
 EBUILD rpy-2.9.0.ebuild 1071 BLAKE2B ccc7499a20f427102ac273a1b497f1b971a3d98b3192b8a2a5a479f3639e57c6d820cd1d88c7e1558fd43e22f07cbd9449be23e273dd21a020fbca20d7384bf5 SHA512 aca2aa1cc7fc5d07239729fd5a8d32a467008908489345be73b0de81f10d3dc3d1fd920a62e90a339ce993ac20fc38a91adcad4d1324f817a38865e91413e4d4
+EBUILD rpy-3.4.2.ebuild 1077 BLAKE2B 828384c209e0107b649092377b057616d34ec4b58f41bd01d1185a604d120fee8ea2b6cde8c56934fabaabb7effeb7104d70577068c66506a7e8c821df618503 SHA512 7f66cf831e3515a3650c9a9d598fff989ed4e63f8790ce5a782cb751aa41e4a26e94d618e871d654ce0a58fa0f75745cb86d1a5a079c477849ea693f73def496
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-3.4.2.ebuild b/dev-python/rpy/rpy-3.4.2.ebuild
new file mode 100644
index 000000000000..e79da72ffd5c
--- /dev/null
+++ b/dev-python/rpy/rpy-3.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1 flag-o-matic virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="https://rpy.sourceforge.net/
+	https://pypi.org/project/rpy2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+
+# ggplot2 is a test dep but not in portage
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_compile() {
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests'
+}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 90c12c2af627..1e692e2b673d 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,5 +1,7 @@
 DIST python-rsa-version-4.7.1.gh.tar.gz 65085 BLAKE2B e63200a7861f13177d042ae92dbb9f8eb4ba3c30174e21b12cb4d84d9a39d3cbb59d6dacec5d4e3d2375ca100bf48c12dabff3f90011f3a3c795ece9e863893f SHA512 f06eee5d6e72c11cdf68ee756ffef7fd9d002ee93939158593ee6d0b5cf1abbfad31c50f6cfd4676d9f64247faee6019d8b214d22324706c82d07068f55ebd94
+DIST python-rsa-version-4.7.2.gh.tar.gz 65177 BLAKE2B 513d6f346813d6bc67de23ee419d70f310155303df40174d47343786f735e00446d8874f51fdea0d7dc890bc8986bb2861746328d7200e8704197adde99d68ad SHA512 4ab64868be00b74b64931453f684bc7f68cfea92cee651e957411e4dc5084e5f8e300fda01cf5187df2f3b455ea40d233488a2e777c9d669d457f67325b420f0
 DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
 EBUILD rsa-4.7.1.ebuild 780 BLAKE2B d9c370fb59e4964b639a33d60a4f28e47d3854e74ab202195c8dd1591604a08721e5171dc925cb6cbb3a2c440b08cbfae0a7ba4d5502fa798ac19e5dfe7fc11f SHA512 e0201c9e469df1024c5b4268e93e42e3d04496f0d57831a65810c03304819029114ded6a56310c7427aa6ae01627635002a373654ab2ca9bc7d79b613de5cab9
+EBUILD rsa-4.7.2.ebuild 780 BLAKE2B d9c370fb59e4964b639a33d60a4f28e47d3854e74ab202195c8dd1591604a08721e5171dc925cb6cbb3a2c440b08cbfae0a7ba4d5502fa798ac19e5dfe7fc11f SHA512 e0201c9e469df1024c5b4268e93e42e3d04496f0d57831a65810c03304819029114ded6a56310c7427aa6ae01627635002a373654ab2ca9bc7d79b613de5cab9
 EBUILD rsa-4.7.ebuild 774 BLAKE2B a80b2c99b3cd93077b792a7872e459bdef913cd10c2d94634b18a90f6b8ef2311c174fdd632a3e7d19cf62308999c71a3fb5e2c4774b28919e0d0fbeacc56951 SHA512 5942870ffbc0bd0b3c63135c7b1d98e8999bb93f0ba76b6be5eabce4a690494fb0f5535f1043e12a04e28a7f239defdd490335154bbcd5e8dbeb8048580516e0
 MISC metadata.xml 341 BLAKE2B 0175c0ce5e0939f8f3645c278fe6a8b5fc9f31c68e9b2aa312792a411005cbb23e5715c6806be3345731d37c438c5ad44472647616eaaac6ec53eb84aec9f66a SHA512 2100e90d14980a2b492c3e940e2cf2298e5933be99eb2bacae8980862c0a468a006749cd69fa7597c642ee90c091dabae9752b1cea0d46cb554f4e2c6251b91d
diff --git a/dev-python/rsa/rsa-4.7.2.ebuild b/dev-python/rsa/rsa-4.7.2.ebuild
new file mode 100644
index 000000000000..32aff8b85fb7
--- /dev/null
+++ b/dev-python/rsa/rsa-4.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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 ~ppc ~ppc64 ~sparc ~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/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 6d850f5613ea..bb731b822874 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,6 +1,4 @@
 AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
-DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
 DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
-EBUILD s3transfer-0.3.3.ebuild 719 BLAKE2B f6dfe4dfc926383bebba34a442c1920ef3d02cd3e50c4a46a885ef4cf9c77a7fc6cd0e49611f69bdda2fdd35467f2ccb666724ee9e16f809333a69664d2d97b2 SHA512 31dde2f118836752fa7ca885a9ce7d984514b4a1ee0ee7a2c657769188362f07eb96ee86ccef49fa9fe4b62530fe32a93c00463acafd44f26b9122cc0061018c
-EBUILD s3transfer-0.3.4.ebuild 733 BLAKE2B 828bdfff8d70b217f616e1fc6a963f422aa98609d3fdd5f1d7f7630476641d83b08d3ec72e674e49d228d4cb18d718d65fbda076b39cafa5cfe0ea61f726af33 SHA512 dde2ca873cea2606770a495d3cb8b587098a44f13e41d3e60fea02acd5e454a3d0b2e7cc886347792465f649360acf1925443631a92d1b075c9dd60ea75f870f
+EBUILD s3transfer-0.3.4.ebuild 731 BLAKE2B b81ae9a3411f6f4e5633da1fef1b34108e01c4c34dfaaf0d55bfc318984fcb670dc7414acde89b4789f37bd34c370f89832d3ae30a84d33a91a348b422860961 SHA512 19232c442fc89e2c7272255507cb9c21f23eb4cd3c04848798a799f9b089934b8dec296120ce6b211fd686ae1a9ae3c00f5573ec932c21d5828ab2312474c7bc
 MISC metadata.xml 502 BLAKE2B b996c37a4c744bcd72c760026bcc710ab8e70df0f9866167ac2628303edf5bc795943e686947de7c2c01a35c13a0769ce79f43efcb9d369cf0b1f2dc3a2b28a0 SHA512 8dc4c948f34912f6b4160afbffdfd9ed4f148871f4add56010943db1185fcd7d8af27e57e97a0ed293bafbb7c395636958218e023ba4507989aee2eca308ab24
diff --git a/dev-python/s3transfer/s3transfer-0.3.3.ebuild b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
deleted file mode 100644
index 7e4cb8bf0311..000000000000
--- a/dev-python/s3transfer/s3transfer-0.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py38.patch
-)
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.3.4.ebuild b/dev-python/s3transfer/s3transfer-0.3.4.ebuild
index a66f78aa7609..66e3530ca124 100644
--- a/dev-python/s3transfer/s3transfer-0.3.4.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.4.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 ~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/scipy/Manifest b/dev-python/scipy/Manifest
index cee98e41047a..d6db9343fdcb 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -16,10 +16,14 @@ DIST scipy-1.5.4.tar.gz 25237512 BLAKE2B 719cfecd6794b037dc636793ba38a3b39f5fd1a
 DIST scipy-1.6.0-html.zip 23941941 BLAKE2B 3222e9b1e1aeebfd1ab0f8d179d25c25d6ab26a54c3d6c7f12d5cb24dd59af216685cb1db1d11980ca32c8e14595a1753b69438d8c7504f7c4fc1b386e1c944d SHA512 42cd5595e1f260bcd14d5ce159d9acd0eaefbcb1401270b90efe48b0e743681361dba5ee410e5932533bca03c19daaacb6042ef8edea9b2cccd5dae21a612072
 DIST scipy-1.6.0-ref.pdf 34332184 BLAKE2B 948a03372797915e47d5e8ce44a32dcacb3448a20e06c5233d3362f0f04f228e8f7505aa918dbbd9a50ad64adb7a17181acab6a726ab251b8e8acf245a1550d6 SHA512 fe4c316f91cffb10d14207882ceb7a1d3711b03ad74857d771d0ec244caad60f878902f7279f6688c947fd415762abbb5a7082c810dd85c73385e8f58fbc056c
 DIST scipy-1.6.0.tar.gz 27275413 BLAKE2B f65fca81a21a3077ead119123fc3bb2ed96aaacfee6f291473ef6780c291f3e9fee88d86501d4cb966f1d601fb7f0656956134f0437eb8fefb8030e762c363a5 SHA512 995ffaf56b713cdd4bdb98d8525b892e9ad84a511878b43213cb71a67f34d87c111da36cf1e0b044c75c0d5af64bfde4ad0f3e9c5e71cae2dbf053251f37064e
+DIST scipy-1.6.1-html.zip 23946591 BLAKE2B d3464c342b1d4f43e17e214c7557737913bf4131f88b9d569cff106c75dc7ebf0d065283792fddc189e2a3ddc322f1b2b4f38c6d313569f28395e79680060b58 SHA512 73561f9daa303c6e967f9b11952c6239dea7ff1a2fa02434354ac78fcffe7a552aa0f1043a17cb5c35a442def499eff199856cca8efa1415449cbf54f0d4913b
+DIST scipy-1.6.1-ref.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
+DIST scipy-1.6.1.tar.gz 27346828 BLAKE2B 147d7b3f796023fe557f07b46eefa1b23631106556ff56bb0ab5640d7dccfa86fecc2031ba0571eee2560a9bf86705a5ef32527852650e6d0629a722574bf135 SHA512 778a7bca15bb880a3fd1c3d46ef753920335eca95fe5f2b8512883a2aec1bb8e9d8a8fdbf4fee90e823e31980408a51451cc53d4f10c632cd72faf2856c868c8
 EBUILD scipy-1.1.0.ebuild 4097 BLAKE2B 1e5c11336c35bd1a97e0ec15d8e4758a890f830bf4e529421da5d6f60962b318f4b2e4088ea3dabbac424ceb55beaeb78be1d0ffbb4e57c617a6264d7422ccef SHA512 91a4f1644fa44b6e438b7910bf9960a6729ac8c2a96566998edaf9b30d9bd0d52a224d53e2ea9e5eb086cb5f857e343aec07e56ac1ce6b6535abfe1ef30840e7
 EBUILD scipy-1.4.1.ebuild 4139 BLAKE2B 1a2f403c6ffc0339116db7c17dcb3965f120ae894d99eea94123573e72db8c6ee2c09a63dd2afd85eb2565fd4649ad8e12a7b211e59c6e7d21fc543031fda350 SHA512 8d98dac760d264e5d08eb2a64d54a54100f20b6a746275f8bc3337c56ce719f1f16ff9aeaca155f733e3eb7f0a72dee92d10ac7d3ee701b9624e00e59080ddad
 EBUILD scipy-1.5.2.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
 EBUILD scipy-1.5.3.ebuild 4382 BLAKE2B 7a33344b2c611098a2f13c970ef554643dcf19707754b20be2473b8dbfe8421e0675e891eb004cf0b34161b8e2220bf051972bd864c7cc2147e12756fd908a0f SHA512 2ca33651401e2d039bc8372d1a83198013e4cc673762d98b852033eb3ff0d077eceae8bbc87e35df0a5f34df3f6dd8e7ea6b535d3c87cb7a01787e89da858ee8
 EBUILD scipy-1.5.4.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
-EBUILD scipy-1.6.0.ebuild 4211 BLAKE2B ee63ef5ce1f5bb23dc5b10e6e1a388ee1f5f987807d86732cc3d35ef17dffaedd9950d2b1ddc6dd103efced4fef06c51a2d19e0f458067fbf38a6921173c8727 SHA512 a5541ad450a04be984abf628ae90ea4cc1b6f7383c19aa35e0eb56b3e6423acaf5ea9983ee27877614e1b9296ba5db9a10d54f9b1d91f25fb222db045f7e4d2f
+EBUILD scipy-1.6.0.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
+EBUILD scipy-1.6.1.ebuild 4211 BLAKE2B ee63ef5ce1f5bb23dc5b10e6e1a388ee1f5f987807d86732cc3d35ef17dffaedd9950d2b1ddc6dd103efced4fef06c51a2d19e0f458067fbf38a6921173c8727 SHA512 a5541ad450a04be984abf628ae90ea4cc1b6f7383c19aa35e0eb56b3e6423acaf5ea9983ee27877614e1b9296ba5db9a10d54f9b1d91f25fb222db045f7e4d2f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.0.ebuild b/dev-python/scipy/scipy-1.6.0.ebuild
index 65a1f0129c60..a1948aba7496 100644
--- a/dev-python/scipy/scipy-1.6.0.ebuild
+++ b/dev-python/scipy/scipy-1.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scipy/scipy-1.6.1.ebuild b/dev-python/scipy/scipy-1.6.1.ebuild
new file mode 100644
index 000000000000..65a1f0129c60
--- /dev/null
+++ b/dev-python/scipy/scipy-1.6.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${P}/${PN}-html-${PV}.zip -> ${P}-html.zip
+		https://docs.scipy.org/doc/${P}/${PN}-ref-${PV}.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${P}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index c5b8d6fc91cc..2bbc7665520f 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
-EBUILD scrypt-0.8.16.ebuild 610 BLAKE2B 48aa86b7e3aae8b5276de61d12374a2cc250a5f7946191f50f1ee6b92213b3113a5d044c25bc79590dacee4154cb98565c7e0c8e142df38cc9ead21262f99aad SHA512 34de42ea865d5294da0b3558a39dfb824d9204522d6a71d09112b5eebe695dd22b6841dbf9d8e9da95fe6d354e1d1bbc05cb07959cde5795c7eb6c8609077856
+EBUILD scrypt-0.8.16.ebuild 616 BLAKE2B 2e39cf9b8cccf507aaf8e0ceb79525159b941ffde9392f8a7ddbea8e1359a60dd614ef986aac3534d22818cbe4788dfea2845b2962e03051d3de548c4e6f9016 SHA512 f353ace88573692990a64595e11b4a416b17fac4a9b4e98d9c89593daa952259c463acf355d1bf72735c95bf12f34b887825841f8b18c353580a2cdf9ea49319
 MISC metadata.xml 476 BLAKE2B 3b898ca601f0aeb1e05247bfadb54156de56a5c425d1bda5c25cd0b3f05c51fbf1e14137022a954b74f0d141f494707db2e437beb0c742bb1bc4428a48e2a555 SHA512 821250cfea1c6d91a6165173d268a7aa8a61f19678c02d5df665ca568793681a1387b68e0d661c9f7b3b384c386a0b2b20a9b86ac8d1eedf1a06f06d9d2db65b
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
index e1bef6356772..9de6aa2a8c18 100644
--- a/dev-python/scrypt/scrypt-0.8.16.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.16.ebuild
@@ -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 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index e1e3f8704cb1..78cd0b3a6df1 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,7 +1,5 @@
-DIST SecretStorage-3.2.0.tar.gz 19311 BLAKE2B 06c3d6137d814f6c2f0cd35927b84c33e09d3c934e4dabfefaa682f3b220045b223aaf06ec970ccc0d39a7388cf13579338299136d13ad2c1b57bf064c278096 SHA512 668f3847f573e1756ffa3a38c278e6d4895223553830d49969e979003d04ca04fb5eaf8dfcc616086a6020f6a73fbe71f7041d4c4ee574205f00fbde945298e9
 DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
 DIST SecretStorage-3.3.1.tar.gz 19566 BLAKE2B 0b1ab822ee29f3d56148b558b3029fd882f1d10ceb3e026586de2e9bc72b7ac1b35df11052117a7c07524ca72d004ef56d99c845bc3600984fe84e5300f3dfee SHA512 5e874d08c9e00626a217db96b131884daf92429a91f690b32f62052747275ad0effbe2b4abe048e67fe7f81df97507f8375408898ff986e6f883b5fdfbf2a76c
-EBUILD secretstorage-3.2.0.ebuild 1136 BLAKE2B f8989c8241526455ea81ae4510be966e61e10a46d5694c81720eb0ddbf34b02457f84620b9aa6ba84eb6a9b11a0f79877eef7ddfe019416bb1e08fce589144ee SHA512 50bd7a4d9ad3db615daf46518b87ce4dd0106d10d50abba57d7cf383edb720439cedc76e1963d6480d4a5c923cbdb7c2ed2f6c9b41ec825757ca5962c0a7871d
-EBUILD secretstorage-3.3.0.ebuild 1134 BLAKE2B db3f5014bd3f20d0177dde1ccac108e3a848dd17553e02a507a12aa0d583d4a7361a8b7f612e66f842a3ffce5fb571d827d807d0f8e2cadb591c91c882d3a4f6 SHA512 4b8541b4143609ff6adb146c2ceeecf0fd43f0cc744861753247913f58ec824f95c009a16536f34c6cdf7d6a56b8b6f7cb739abd77dd78d1078a6c348b2b65f5
+EBUILD secretstorage-3.3.0.ebuild 1133 BLAKE2B bb91143eae619193b0844501319a8b2a1e12c6715a2293073bd411b4c4833608cdcb7e1c53675413e1e308e6d0dcd3e12a99d27be96636f8e03f30c58ee45df5 SHA512 e42c993cb35df37b1264f9e6ea43efa96155e706eb6388031f6cbcc6ee50bb142f8acea1cb93df03325bd09de72eeae78314412727112a3fd09adad8fd1089eb
 EBUILD secretstorage-3.3.1.ebuild 1141 BLAKE2B c021232401aefcde9c273d1a5b6ed42f99c59133a040ff12bcb087185cc9eb72d77efb5e72b4ca190e705be31c7a054b80eb9a8041509db96843f9e00506ece0 SHA512 888cbcebdead6a643dea37b5bc89fcfd9c74ef5956af34ee65fd561209b1c1b3676c7754914fc0049de66736ec309cedf100a29fd61212514b8f332bb9269cc2
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.2.0.ebuild b/dev-python/secretstorage/secretstorage-3.2.0.ebuild
deleted file mode 100644
index 4523aa493368..000000000000
--- a/dev-python/secretstorage/secretstorage-3.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=( pypy3 python3_{7,8,9} )
-
-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"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( !hppa? ( !sparc? (
-		gnome-base/gnome-keyring
-		sys-apps/dbus
-	) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_test() {
-	case ${ARCH} in
-		hppa|sparc)
-			einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
-			return
-			;;
-	esac
-
-	distutils-r1_src_test
-}
-
-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.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index 539878008c86..b1f1ed749489 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.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/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index b32e00c7d567..175f548e51e1 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
 DIST sentry-sdk-0.20.1.tar.gz 210762 BLAKE2B 64ff322667374c914aa00a80ffa5eca2d92ec0965bc6bf7bdc65cf89e75a3cd5f5db32cd7e442caae515348b1f7948209e9810729f4fbc913730337f06444b73 SHA512 cd7871bd3da31340752477058fcf788401910a4e0b4ac38d53beafbedcdfe62b3216d6d2bcf2d1998e8c3e02886da76f6a8aa2809ba1e473421f96257890e75c
 DIST sentry-sdk-0.20.2.tar.gz 210799 BLAKE2B 7a7b4350b664ee6947fcba64aa07a4e9f8ec274de7433d64acce55d490ea91f97a19ab7116e7af3109f806c91261f50127c72627bca1bbf76c43ad4ac89455e2 SHA512 3fb2d4ae960c86582e778afb0fdf12f3ff9103a83fb12a6c920bd6fe1e210842d29d2cfba12c254199a491a5b42288df0c388b37a8709fdabc9e6e9687b178c1
+DIST sentry-sdk-0.20.3.tar.gz 212130 BLAKE2B 48084039c493ca2903f56426913ea8f8f0480b759157270fe6ea4dfae72f9478d8566f8a86f6f863c06adb01379e980d5f873372f401a8d3f255f62f8a149b45 SHA512 0392fcf0e718f7d06200fa44fedf1aac46a2f61d11a8252ca339652d5385a377545128c1c4b9e31e1e1a8c8c9a8c57ded569b829312a748d84ad98696a897944
 EBUILD sentry-sdk-0.19.5.ebuild 2791 BLAKE2B bf6037e1865b83df6d926a799773cbf003e1bec23ff601e7e255d75f62e19f9350f5e066fac70fea809d4dd4aaf8d952532124e6edb028a7ade52831a3de7b34 SHA512 75552b6a55fedf3d05e346345aa153b030fdf13cc6f09c0ad433ddf321a1a0d126735fbbaa2665dc6ea5cb11ac85ef7b083ea9159b3c3bfd782c353bf99be792
 EBUILD sentry-sdk-0.20.1.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 EBUILD sentry-sdk-0.20.2.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
+EBUILD sentry-sdk-0.20.3.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild
new file mode 100644
index 000000000000..7b31e702fe53
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 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 client for Sentry"
+HOMEPAGE="https://sentry.io/ 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 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/stdlib/test_httplib.py
+		tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index e1a7f2abe89d..e6aedc515f6d 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,5 +1,3 @@
-DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e08045fc18230be017c642c2d4e1b4fb6809e1e2230160d46ba24ba893beb1f95f125b93e7d1b9aacd4ed333bfea7e SHA512 c11f756a61501c4126e6bba5d931a3fb26294d2a55255c717f0e3c3b72184841452195ddf04fb6e8b686d26caa36cb5e13fbd66c66c151c54981a9edc620da1e
 DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
-EBUILD setproctitle-1.2.1.ebuild 577 BLAKE2B 82b786ee3d227746944c9c26e3090e13919059faa2d688f4bfcf14665556509f2ac5a39e576617da3d1f7226bf8d1247ac1e7d15262f38d63f26e18349c84a87 SHA512 280516c3fcac4e9aaaf48ce5d3fe22de72ebe94e3eb9e22dcc9b2f2aa416c6c5a3ea064d62a88985f219959fe6ffca1bd2a5c8f4a0dfe682381409364d7b5f0d
-EBUILD setproctitle-1.2.2.ebuild 569 BLAKE2B 8d7558c76c7605a50f93f2e5621db1c886ab675b41f3dbb96d5563e9524f8c4d17f7a11b2b9c7934244696798cbb64caf6a7f978102a3239fa0d68cf552fff8a SHA512 360348cd4bafc1f616b08dacd780f45007f8791c4a73bd0912c6728e79460f94434a8c48c8920755ea58758c369d879f0332fb3e2b59f5e605442b6192b3520d
+EBUILD setproctitle-1.2.2.ebuild 561 BLAKE2B 071ebfecebc8777dd8bded925797d10d099e9a3064e0006177007d5c880ff00a3ef60815d9aa719528de835d6966ac2abca881f6d3e6715c5b56c215e7bff853 SHA512 25c5b629543ce643b8465afc52efbaac16f51dd9bfc2f4f56b59d78c1e7d72a6efc9fd55ed3edc760b58f81153ea157a9b43ab9f569d9ce16c9fe5b919a9a5da
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.2.1.ebuild b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
deleted file mode 100644
index 6a9671aa6d64..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
index 81bb11e0f58d..582ebb7f224f 100644
--- a/dev-python/setproctitle/setproctitle-1.2.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c220f8a8b1e3..7e741d216e69 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,17 +1,7 @@
-DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
-DIST setuptools-51.0.0.zip 2059134 BLAKE2B 449e87e413490181136ffa80a109e68b086fd0b1b56b2391e8cc612fb4c9cd4bb89acf05b464a5fa86c3984d3f22bc103dc9a21a2948598b7a17f770c4037008 SHA512 ec8c8a43ef176b5a4029f42c900690c1b9cb304efeb2cf8d36f3f2cb4343af4c1b1770f83ffb0e80ef237f58e6eeb233a97d6b3b8c6c6a2557bc4f14ccff9e90
-DIST setuptools-51.1.0.tar.gz 2050951 BLAKE2B 58890bf458ffab84f93e68393a092c2b2eeaf28e9e443c9a3cf50fb4bbb371bfe28032d08c5ce92fc0b28ad3f9b718f02542f948560b2a8a57af1ada9e77a949 SHA512 914f0d7692f519b658a55e1c7d96b93a45f34c1682c564c6232cd3771db15c91cfee7118ed61f1ae4655a1afe34c9a9c37f293eb6408eeeeeae9eaa6f3760324
-DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 182c8c4b4d3bb8caea8cb1812aaff929d7687942d3c469a7f6e0a68a0c5d3d001be2b42d0d131171815359f2c1d59a7b997c5deab657d2ec99c369c6b27ba03f SHA512 ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7
-DIST setuptools-51.1.2.tar.gz 2051107 BLAKE2B a9f1d5dac6bed7b8744f1a3f023398312f6e3696ea68a84bdb252afca3e88b8617ae632384c18cf49906b1ec97f78f467ec158cc09e1842055b5089e154e0429 SHA512 cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f
-DIST setuptools-51.3.1.tar.gz 2057167 BLAKE2B 4077e117c33c5eaad4de2bc66db0432dc14064de3f4a55e853541b09475bec81b9a07c3baec77a1574ed7912f3db2c6a83b7dcffbbe9bbffb15de13a928e6280 SHA512 5ae96ce0595bdaaa86fbe916e79b545db5a18278f150da2a38a83e43e891bbce8d4f03975ef0d7c6138b3ebcdb16fcfa4dae80a970007c8c60683fd57edc998e
 DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4 SHA512 5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345
 DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
-EBUILD setuptools-50.3.0.ebuild 2279 BLAKE2B a18ae61ea5f934d43a3c8897d5911b5b2045d84a5f5e3832457524c4d0872cdf7ec84b22b577e49823b0d0c31fd39d549ba573ba4f0b4ae12bdae850bb464d85 SHA512 42535432b004588cf7b5bf9a6c6707e289ac0c1d4d80a69d7140761410eccad15e73e807987f15c579c8eca25607ca122c88da30c364bdd7832d824f73b9c31a
-EBUILD setuptools-51.0.0.ebuild 2120 BLAKE2B 07b7729e9ca28a8278cca9be535098cf3e1afd79f37247cb99a638eab9f44edad71bca645eef7ac4b5ec5b30c2cc8bec992f5ede2fe037293e1f6f2a2837bd81 SHA512 4990f3d5c91081d96208e977041045507e5608bdaa81f665b8bc324ba6496dcf70de8cfd400db4ca6b181ae39a2a0c8772babeb9b3c9d335aa53c1bf55f714e4
-EBUILD setuptools-51.1.0.ebuild 2053 BLAKE2B ea654ff9b19eadad42038370ec83d4ad9cdb56b14ed416c3466e4cb5bbedc000dc51df2ce781be03d9159bd8153d0e963fa73c2b10939230ab20aba4f9df2aae SHA512 b49541d1e644ec79170aa3784541eb59750ad73b2c315e6ca28cf3053b3b4c30bfdc0310649d252ef42604087b8743d92aff342714957506a5cd81b3fe397f92
-EBUILD setuptools-51.1.1.ebuild 2135 BLAKE2B a26db5e2beca75c56823ebd23b28a196a738fdb7e949fe6778e3ade928deaa38f3f5351ff87da240139d757c23379d81f179c9c5d111915107682f337cec2c9a SHA512 ddf6072b1d1c303e6084942c3d4f638786f71939acb01e44438a38e3a45ba19fc5f323d072b75a392f23dfde90be2abc2c5c914919afb0aabb13d74966eff234
-EBUILD setuptools-51.1.2.ebuild 2135 BLAKE2B a26db5e2beca75c56823ebd23b28a196a738fdb7e949fe6778e3ade928deaa38f3f5351ff87da240139d757c23379d81f179c9c5d111915107682f337cec2c9a SHA512 ddf6072b1d1c303e6084942c3d4f638786f71939acb01e44438a38e3a45ba19fc5f323d072b75a392f23dfde90be2abc2c5c914919afb0aabb13d74966eff234
-EBUILD setuptools-51.3.1.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
-EBUILD setuptools-51.3.3.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
+EBUILD setuptools-51.3.3.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
 EBUILD setuptools-53.0.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-50.3.0.ebuild b/dev-python/setuptools/setuptools-50.3.0.ebuild
deleted file mode 100644
index b6b27c5f4b8a..000000000000
--- a/dev-python/setuptools/setuptools-50.3.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{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 ~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/setuptools-51.0.0.ebuild b/dev-python/setuptools/setuptools-51.0.0.ebuild
deleted file mode 100644
index ae3a120bb0ca..000000000000
--- a/dev-python/setuptools/setuptools-51.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{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 ~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/virtualenv-20[${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 )
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv setuptools ${deselect[@]/#/--deselect } ||
-		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-51.1.0.ebuild b/dev-python/setuptools/setuptools-51.1.0.ebuild
deleted file mode 100644
index 35fe6fbe7693..000000000000
--- a/dev-python/setuptools/setuptools-51.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{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}.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv setuptools ${deselect[@]/#/--deselect } ||
-		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-51.1.1.ebuild b/dev-python/setuptools/setuptools-51.1.1.ebuild
deleted file mode 100644
index 60899d4e6a10..000000000000
--- a/dev-python/setuptools/setuptools-51.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-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}.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || 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-51.1.2.ebuild b/dev-python/setuptools/setuptools-51.1.2.ebuild
deleted file mode 100644
index 60899d4e6a10..000000000000
--- a/dev-python/setuptools/setuptools-51.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-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}.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || 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-51.3.3.ebuild b/dev-python/setuptools/setuptools-51.3.3.ebuild
index 49b44d46c0df..4231ee0d4ba4 100644
--- a/dev-python/setuptools/setuptools-51.3.3.ebuild
+++ b/dev-python/setuptools/setuptools-51.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-51.3.1.ebuild b/dev-python/setuptools/setuptools-53.1.0.ebuild
index 49b44d46c0df..49b44d46c0df 100644
--- a/dev-python/setuptools/setuptools-51.3.1.ebuild
+++ b/dev-python/setuptools/setuptools-53.1.0.ebuild
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index d2f46e55c9b7..7f02a4008a10 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,7 +1,3 @@
-DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
-DIST setuptools_scm-5.0.0.tar.gz 51575 BLAKE2B 60f1faefe48eda74836ad4927fa851b014a7ead7da1dcd04d102052944fb4f48e18680b9e334d2c3578fa610b3ef7efc76bb0cfc9feb0fe51868290a7abcf180 SHA512 4e8dcb1528e48e76804e3c5eec97f2052b509b672d2671545e1dcd6a1c9604bfd1ad32fc7aecc5f4c48841dda0e36b083632463b2f14b263e857482ab4df19f6
 DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
-EBUILD setuptools_scm-4.1.2-r1.ebuild 1193 BLAKE2B 358ce381723d2cad83f1bcbf26d8eadf726ca9279e7ff785ceb0314a356e5cabc99c27e354e400fb8413c8ee02082f50847e84b7fd4a31545b9c53aa3c2d8978 SHA512 87bc0af3ba8fe4ed2764c6cdf9a08cb346eaf843e045570a3872a4f7aa01f6718342f847355f3e6ebdccf40133ca2ece5844ee23e0cc5ea36199a88b2d103059
-EBUILD setuptools_scm-5.0.0.ebuild 1206 BLAKE2B 379a415b7eabae5ebfd75f557a874cca9b16f79f5f31bffa8da6c79074b19f0e83fda5680a6bb8b1e659766e6568d5e29924bd6d11438892aaf47595b7a8a455 SHA512 93dadeb0f80529b5ade0d2e479e66155ac0555e87c361726e68781e6347364d8ad99eb2c9299392a7a72dfefd509cb255659869a4479d761a3bc00140bc946f1
-EBUILD setuptools_scm-5.0.1.ebuild 1206 BLAKE2B 379a415b7eabae5ebfd75f557a874cca9b16f79f5f31bffa8da6c79074b19f0e83fda5680a6bb8b1e659766e6568d5e29924bd6d11438892aaf47595b7a8a455 SHA512 93dadeb0f80529b5ade0d2e479e66155ac0555e87c361726e68781e6347364d8ad99eb2c9299392a7a72dfefd509cb255659869a4479d761a3bc00140bc946f1
+EBUILD setuptools_scm-5.0.1.ebuild 1197 BLAKE2B a94beb25a56928405b785bea232e2568addb05548294d028a8a76b10c8b9b8596ee38851ca9d61df2bf6c9d3f822378d4fbf9482495103493488495e51a3f14f SHA512 07841d4e3f94719fc04990f2c3d3834837f02fe17e357c864a46ed87830434e454d2aadd54685b8067df9d4f14cc09d6436eeb6e1dcce9b9fe92ae90c9e70014
 MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
deleted file mode 100644
index 290fb25aa148..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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
-
-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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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-5.0.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
deleted file mode 100644
index 99104ac71920..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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
-
-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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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-5.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
index 99104ac71920..11d71a366980 100644
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
@@ -16,7 +16,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 ~riscv ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 78dbce457a92..0416de8e9a01 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,3 +1,3 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
-EBUILD sgmllib3k-1.0.0.ebuild 437 BLAKE2B 2c99bd9d308277bdcae0edfb59d92c045c41b6d1c31f4b3ad435857da3d32030dd2ff6e7bed03f0b206975a8c980da7aaa7a45658033773ea293e3920b4e4827 SHA512 b423cca9ef442ba9196405429081961d242a2a16191e43c883681f6e6ef18972c2311f38f1c268fa4ac376ba7191402fb8559aebc9558c4c1ef95edf715a0add
-MISC metadata.xml 290 BLAKE2B 4445241192300419cb2486ad41b1d0f84b946880eb462962ccbccd40249a677865dec8faee2cde394112eafbb8adab1906ae1c051b4ddb2eba2949026f449b61 SHA512 d71c4f36afff7d4ca0a6d80bb68268ae72f5f600e60c9844589207f4ab3c8f1cd86e353d2b7782237460cef225648f9cc0af2f438837c0fefd88e4d2d6b40ba6
+EBUILD sgmllib3k-1.0.0.ebuild 441 BLAKE2B 8d9e7fa8feb19fae7afb69d9129f362544eeea9cd3acbdfe64718b911acdbf9c5d1c35437f60e6d08e7e6b9a6459865435aba4c69e06bd31d3855ffc01930561 SHA512 99598445eb8fe3375a157f77aa854ae7e1a0bd644a2d00c32d1173f9094efe0e91fe3eb1982a39bfd68832bb23e4fb36b42f42bee1cc10d97ea21318a55ab91e
+MISC metadata.xml 336 BLAKE2B 82e2d40ccf22eec4a3c7a3de45e5a5f4c72f1a59e8afca199a50374b8657ee2aeffebbcfbb60d69d123b78adb58466ba4ce3028a0c2deda4fe159e313020f575 SHA512 ea1ac65d445cc8a2883935035565c9391299a68a6db4fd405a4cdfba6027da49b67da820f90cfbeb5fe01e8809665306e085738a0411466c4f95566067efedfe
diff --git a/dev-python/sgmllib3k/metadata.xml b/dev-python/sgmllib3k/metadata.xml
index 494249786841..352df758d5df 100644
--- a/dev-python/sgmllib3k/metadata.xml
+++ b/dev-python/sgmllib3k/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sgmllib3k</remote-id>
 	</upstream>
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index a228a8a031d5..7e9bfa71d7ac 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index d397612a7937..77af7794f71b 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD shiboken2-5.15.1.ebuild 6583 BLAKE2B 184d3d24d12f60fa97c23d90fa685481b19f9bfeb8b19ee38eddf38ae6092d76f38b0e0aca95b1ab83aeb37b16296b77b656b3a8cfc9aaa5d31a179fdc725583 SHA512 188530a92061be39d1a7c5840d1c40ef8276d66e89724ada2672e84c43d345786564ca17bb76a55a83d02b59761820fb4af7f9da34f2fefd0a7f94b1526348a0
+EBUILD shiboken2-5.15.1.ebuild 6590 BLAKE2B caa058237017765580880dd24db76d40b8ed13dc542cf17d898d93d3947f3f3861ddb374408e98a71dd487819fcd599521d50b652896255c10e21c0c5f974792 SHA512 de86026e324693c2ff2fb2f8ad47be115663d38531490aea0974cd73c396172c768bc4fd9d2a192fbfcea71228fd0b7ecf3cc55f19530fbeaef2195d11f9a9cd
 MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
index c79b14a2f3a4..a7bf10d4fbf2 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 43bbc98bb714..9ce801795adb 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
+DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 EBUILD sip-4.19.24.ebuild 2282 BLAKE2B d58ef24520a95ccb3a4f2113769a9187f2b1ea7172e6e63ae992565c20a413b7d3a8ad91f00c719a8117ed3ef5d4a23e717f21d026cd1a37fea07b95b222920a SHA512 005130da866237d4b391c2b516c1741e9544503adce8e61bea83a654649e3b1e073682eae29022d5e506476daf51b127fcb95279500306a096bc61cdf6910ce3
+EBUILD sip-4.19.25.ebuild 2288 BLAKE2B 0366fb84cf759be9ad8793649147f1a9443156b30bf2ee26b4a34887128c46b83e04af4a1602f8cac9e052ab810e3642326a8d48933477744f4242cd1892657a SHA512 0475e769a3a3868284bd75c66eaafc8d7f00c76715350cf7c25addbd03d5659f47a91b994410d531e0f8d2eafe9067c84da740a6c5812a39182e6771ba425a43
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
new file mode 100644
index 000000000000..c4e7e7947b40
--- /dev/null
+++ b/dev-python/sip/sip-4.19.25.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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/slackclient/Manifest b/dev-python/slackclient/Manifest
index b1b3788c86ba..efe8d0a1f264 100644
--- a/dev-python/slackclient/Manifest
+++ b/dev-python/slackclient/Manifest
@@ -1,3 +1,3 @@
 DIST slackclient-2.5.0.tar.gz 49814 BLAKE2B 19f9e66af086d431494de0ef7f3569657eb769022223d0e9b0f74c0600858e20de397fd385dc1c41d416eb3a98a7437d2b0c1b5e156be6d98941b26749103c5b SHA512 3a7a1e741e81e673cb09f8b1d9a18ca3d0e7a0e41a7ac6062725b87752f3877548faa0f9150eb1b1775479dfe9035d03fd4d991ac108b0f634cc179f4b70e2db
-EBUILD slackclient-2.5.0.ebuild 862 BLAKE2B f12237c78e74b98021aa32f59af39c93c38073542f15064cbf16201ab22f8666bdff651c3a6470e2aaf3a0351b71c3d51020afb1d4296787eb66aa0d317d949d SHA512 7e55740e2f266549069043bdcb57e6f00f94d1bbe763757a277d21101bfbadbdd2b1c7384dba84574eb5a258be9176efe0479ea1ff7d991bec12dca90488c348
-MISC metadata.xml 492 BLAKE2B 080e1442246cf09dac496d27ac4d9ad8125e9c6395b4593e5f7086dda25e9ca2a878a904e7e7dd3c7eb5c5db39e82cccb1e093485e3a1138df1ae2b7b1f776a7 SHA512 b8ce210052a334d99aa307c20db50a806837d6233c223a1433d22492145829cd8549048bdcd922a61d6475fc200eaeb8703877943f4719c5a0b79bc58d9a5906
+EBUILD slackclient-2.5.0.ebuild 790 BLAKE2B 7c648214f76763f58e759472ff53257ec3d8a08f3748f21ce49e8ed30f3b73f67d47e7497d8391246aeebd199c5cc32941837d621f50aa5d95c1c893df274ce9 SHA512 a3552841681eb0fa346767048356ccba9e8ac0b20112ddf15462546e8f41c34dd4386cb59ab320bd9ee6fb55eebadacc12c8cf14246d2d80b99203bd5db53171
+MISC metadata.xml 516 BLAKE2B 5ccee35ac32b5d00ba1fbc50e39d4f415adced9388907c7a6c4ec42f1185cd8408dac2c2dfa7ea10c02c9a183e4f960278243e9fd0c6a06e997ec30b2b85f5dd SHA512 64bb4b7c75d0fc057780a81238122ea41c6cf88b6fe98088e644011d1062afcdb43e6c7f9329ca1c0647acf75f8dca25c7f507804eb234cfbb654613ea42779b
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
index aee7e2fc6f76..e277cccdff7a 100644
--- a/dev-python/slackclient/metadata.xml
+++ b/dev-python/slackclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">slackapi/python-slackclient</remote-id>
 		<remote-id type="pypi">slackclient</remote-id>
diff --git a/dev-python/slackclient/slackclient-2.5.0.ebuild b/dev-python/slackclient/slackclient-2.5.0.ebuild
index 7588be0998c6..b9fe8acb2f4c 100644
--- a/dev-python/slackclient/slackclient-2.5.0.ebuild
+++ b/dev-python/slackclient/slackclient-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
@@ -16,11 +16,8 @@ KEYWORDS="~amd64"
 RESTRICT="test" # upstream does not include tests in the package tarball!
 
 RDEPEND="
-	>dev-python/aiohttp-3.5.2[${PYTHON_USEDEP}]
-	>dev-python/aiodns-1.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	# Upstream uses pytest-runner as an extra optional target in setup.py as
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 6a6cd0b347d0..725781bf7571 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,8 +1,4 @@
-DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
-DIST slixmpp-1.5.2.tar.gz 886383 BLAKE2B 6b5ed074ab182f449bf7d2919c241694ea4ff24567546c50a3d228af7708826fb9bfd89b4fccf8a31ae2909399b57caa752a71c187cffbe133bab13b41da814f SHA512 4f377246526c03ae02ece370ba8c9fa7c26a89eca7a012a1a89b8186b6c226d72287c15a7668ca85bfc8f2200765406dbc0fa9cb0e358c3755f551df8eb0d59f
 DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
-EBUILD slixmpp-1.4.2.ebuild 792 BLAKE2B 3f1d07dfbb9d0dc8eb75d1a3724107ec3092500c59789a6dd809cd3f88a592852d1baea0cff14537e994168e25c09f84942f501785f8ab46101ab4f077175bfa SHA512 a0eae50c4760c7fc0b9f710cfef4053cf513732ea9b886f0506b1c71a3694d236224b24c757443a21295348651abdc33593cfb6ee0ed572d78917f744d569850
-EBUILD slixmpp-1.5.2.ebuild 758 BLAKE2B 6ecb34f715dd5f7cbed928a72ce0015c12519c502b737a6248afe043cd48be9f2ce11c7cca88b05868771fe39547ad17a14736f0539230d108cbcbf563b6eb39 SHA512 ff01c04430132ebe07bf9ca3d0092d2e40244dbee380c82f369942001101a6067d52a1c6e37a8a3092690f1680daa96405f16138780d790e9216f72afaf7ee8a
-EBUILD slixmpp-1.7.0.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
+EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 759 BLAKE2B 73307904570350f10e384b16d54944f2ad1d0c0ec07726367a3bcae3b9f37b2d790dcb65bb7ac4600185791fd8c656ab7525b6826ecd67b48131f05a1ce7b96f SHA512 4052ceccc8b8ac8c71d171f7c2238dc504e5cb7855a08af76fdc8f37aab792a6ed1cad4694f673d551eb69caf3c69851605b906b1ea1200f52f87da34310f579
 MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
diff --git a/dev-python/slixmpp/slixmpp-1.4.2.ebuild b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
deleted file mode 100644
index df50588e34ef..000000000000
--- a/dev-python/slixmpp/slixmpp-1.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/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/slixmpp/slixmpp-1.5.2.ebuild b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
deleted file mode 100644
index 462a6bbad013..000000000000
--- a/dev-python/slixmpp/slixmpp-1.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 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 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-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
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
index 0f5e88aa5f6c..19974e840958 100644
--- a/dev-python/slixmpp/slixmpp-1.7.0.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 2e8ece7f5820..782b9eb4aafd 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,7 +1,5 @@
-DIST smmap-3.0.4.tar.gz 22459 BLAKE2B daccd2cfa4d448297d1a0b2c33c1a316e8c84ae5dbe934d688fbdf034a660214c98d428206b8e9ce1cab3e5f3561309a1e7f29e3371b7358954f0fe7ea37092d SHA512 da7e5c0257f29b487eb5ee18f29656340f7f6999dd625d93560444d526df8036a8fc4452242a2d01203907798709d82a0015709e097bc22acd3d0a8b976ef9fe
 DIST smmap-3.0.5.tar.gz 23228 BLAKE2B ccc36c33e9239f69a41eff291dcde7e455a84d886c2b087464b1b084ad8506b9d0f862b083635d51465089564edbd27ed0b7c9c5a0d1e58605b3db6f84dea857 SHA512 82d0167ba439164b5b9e6ca6081558b7f32af364f7935aa40500b34ca80e0fcf8d014e53eb2963e189d28ef18c8dd48da0b515392d149608fc3179fae3f69ee1
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
-EBUILD smmap-3.0.4.ebuild 464 BLAKE2B 1365d2bc343394833ec431b248c7825b35d519897d5421e56d11ddf986168dda0d4831b6ee601cc0319a77a4b78c80b3ef75c0453fcec5be615edab19255f0e3 SHA512 e09050dba6e2ee65ba4648d3e0df886494454f7b9368f98c3fd2176404442bcf2b66579af69a67216b3851eab0fea884c791b5484499330d9b4d0fc891c12fb8
-EBUILD smmap-3.0.5.ebuild 488 BLAKE2B d61c4e81a5b6c62cff35e69d16544d25a52cef44a35219439f9c2a5d86336f45df708da6f417d063092e187e81dd8cf998478456f877361a94baf85dbcd5fd83 SHA512 61b2e8c3d41e42f33bf3d9f9b3a05b886fb19cc2de068c22b6338c2bb494d9360b794c258c60002a3e7e261535044600342280b57d0b6efddce06072fe271fa2
+EBUILD smmap-3.0.5.ebuild 485 BLAKE2B aa69721ac98f184219a36c1f3507f55ae53bd22c32f445ce467594f7c71ee91c412daa0cdd78eb188bf660c7b612291b6fd26c64d5ecdeac182ac93b357d4bb6 SHA512 7911d4ad2f47b7c50c415df887ca080e3fcf425467a4da67d2892fee4e498153950b27871d720fef3bdc1c8553c75a3b2cebb1b0f726953a867c3b2dcbbdbce0
 EBUILD smmap-4.0.0.ebuild 495 BLAKE2B 3df420392b994d505a0c10a5846b811da7c5ec4097e19115c6e88aa64db5a36d043cffd103ee04293f10f140f0e7cd7d7d0ad9df4bbfd6e691a8ff28ac6d396a SHA512 ed220f419964958f2eedc156502d6097d056657816b697f7f0eacc8de1ad302c47912197ecab047cd4c2dd488238129a83e5e79c3dfeb8d10bf49c25136a53b1
 MISC metadata.xml 411 BLAKE2B b6d13ec428eae8529a38571afc5c66e1c02f812667c0f27bc1db2d23a702d7d49ebe877087d2af0136eb4a34d6422c00cb132fe6e526c24646a742e167e16caa SHA512 8020f425757423d6be45a200bdd9ecd261a1f81fa148c16a08c343f8be83f558fb6bcd614d2579f8e82a139efaeecca568d8b65310613707fdfb3ea1367594c8
diff --git a/dev-python/smmap/smmap-3.0.4.ebuild b/dev-python/smmap/smmap-3.0.4.ebuild
deleted file mode 100644
index ef5a66ca77ca..000000000000
--- a/dev-python/smmap/smmap-3.0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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.5.ebuild b/dev-python/smmap/smmap-3.0.5.ebuild
index 64612c873ca5..98acaf2978b4 100644
--- a/dev-python/smmap/smmap-3.0.5.ebuild
+++ b/dev-python/smmap/smmap-3.0.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index d00d193b8f37..a33a9bfe0c75 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -3,9 +3,11 @@ DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd
 DIST snakeoil-0.8.9.tar.gz 271205 BLAKE2B dcaf4d26b430a2e99481182aa912a884a0cf5943f65028f4da098ec1b0ab177a97aeb0743d90cade589eba598598eccd275b15379d281ad0dc0bf62badd24c55 SHA512 d80f4c5be5d97598a119bd29413df1960487e4af2532b33b03c17337d15d24b34c4e5617f0d5d40db973f009697de25ae8c5bf5e60c19409835b3e77b4ffb461
 DIST snakeoil-0.9.0.tar.gz 271675 BLAKE2B 7dd65335fd79a7d335e5047ba928d7c156c5758874e20e41a06fc25fd2133697bccadc3cd24bcd611b7b210dfe330c121487c6d5bf5afa6330b714c928f3fd44 SHA512 c34938fdc5dd41ab84c5775090cc6bac1ac6bf0bd145c8d8966582917205ef422da272d12e4272afde764f52c62c8f02be076ce13c6552e0384a18fc8442cf96
 DIST snakeoil-0.9.1.tar.gz 271045 BLAKE2B 74c45d38d294e06940d4a339e6d6c6e66d84b7fd174b4d79a9716262bc1902d47dfed1751b44183f9119ccb3bd50e11700951d15070a15b94d6a7b20f77c5919 SHA512 94d8baed4baaab8c3cb3631fed4e6cced8fa32c953bba2ec2afd0cc99eb9b526dc58e5e9efb402513b0416cda21a0811b14a2a98044fd1d5bb7f6f2b349db24a
+DIST snakeoil-0.9.2.tar.gz 271441 BLAKE2B 754030285f03c83979c74da6cf8ee585486631e2dd1410c0da4a8e4c59a0367d911af3bc82ecf9e04438e3227982af8789662022ae5dfe5e1d83863aa2ec001e SHA512 664c91236500aafc81157132c5138d14972e9b74a344fdad65064440acdca0cbbdcef63b1d3b4d09f120a14a1eb40bbc8e7801fbbf2fc3b289b615cdd6caf61e
 EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 23757057ae12f52670278b905bbc32c5fe937587cd1db49eed123ce31163f4c3d1fbc2d1434c290aace0bf14756790b35fc6e48b176f790c5635628abc7e716f SHA512 44cd2098f4bad925f8d4fcec61d4367f963bc4a10566ca52542c4eeda5019527166ab9f358c3b289a5c6c1ff7698f770da84cb799f57d68196ef9c28286aeb94
 EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce7c16bffa2902eb14d3b00fc534ca566f9a22665463b5ca48532a86f91ad396292b2774e9ed9a4c46022bc7699 SHA512 75db4d4ef4b92d0cde7c42cc9f7bf9bfd0a5aa1d148aff6dfe9b32bd695d121f4738cfe2805d48a1db34e1bf4a7d0766c82dcb51560b27cf0749cffed0c0e6c5
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
-EBUILD snakeoil-0.9.1.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
-EBUILD snakeoil-9999.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
+EBUILD snakeoil-0.9.1.ebuild 717 BLAKE2B fe7fc18a2b270b859857d1a2127d48e42fd36ea9a39d6bb60879df026e4074f96811acae535727b7e030a8bb811ec7084fff1422758e8594394c1e53f4d16b60 SHA512 38d9fdab976098e044bba394cd4b3df90d5385bb9f6022c44075fd2d303d7ecf8978a70559a77e637bd9bf28cd24877f1cba52d656721b8365bce126abc8df95
+EBUILD snakeoil-0.9.2-r1.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
+EBUILD snakeoil-9999.ebuild 780 BLAKE2B f45e83fc2a91d592ea3a2586a1162345e9d3f4520226ab5ca7cffd372868cea009a6c08844bfd5b417e26a41ebe435d027ca82b3de614b7641a2d330ad66f2b3 SHA512 8c3f35c0136e4866d1443c91d7fa43445f83d2cf86dc4272240322e89778495af1074f61d165b74d301c5a9d5775fe8391cc5e9aeda3e9781465425d3dc30261
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.1.ebuild b/dev-python/snakeoil/snakeoil-0.9.1.ebuild
index 0a7822decd00..aaac1cdf615e 100644
--- a/dev-python/snakeoil/snakeoil-0.9.1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..c15346749758
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 0a7822decd00..b0babaef124a 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -20,6 +20,9 @@ HOMEPAGE="https://github.com/pkgcore/snakeoil"
 LICENSE="BSD BSD-2 MIT"
 SLOT="0"
 
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
+
 [[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index 8a7c97088fb3..df66e8408504 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,3 @@
-DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
 DIST python-snappy-0.6.0.tar.gz 21344 BLAKE2B ed5b3796a6af9b2196a1cd5353cefb808a878b324d2eae6f83fca12400365c069ed38ad50d790d6201ae9584128371a655ac2003708d324fe227e0153ddaca5d SHA512 185f43fa3adef2a5ec7468f993b83d356dbd76b3340badd308ff2350352b004c4c9528b73282407ebc4f6e1c23a03c1b9abd9f3915b04771ad9b011d7163a63c
-EBUILD snappy-0.5.1-r1.ebuild 672 BLAKE2B 8c57d1072a108ae097c7e7957078b3261d82a1e66d386e3bb3287c697c8ec57b1f72dfdce7ff50e3bfaf3e4ad20e7c94f53bb2f48b7a8371ab7a45dceb04f521 SHA512 5b129766c3af98b4426399bbb1a7471fe96d07440075087bb5904fdd23b3f08d411c40d42ccffef77359dd36e746f09d361ecc98231b012cb5374d95f5228d0d
-EBUILD snappy-0.6.0.ebuild 699 BLAKE2B 2b0f0af03d9fd01da6ef915dafffdb3c83d41491b8f1f9d2c333beb1c8e4e7dad0aa3265140849268ee8b021681963f25ea2fb2b54c937a2d0c1d0cd7fcfda92 SHA512 3cd6cdb6b226091262bd62d082630b862a54a4916973e20f0db40d156f3c0222166037ee399404b93078e77f91646023023af8342465d6d873f828170578f16e
+EBUILD snappy-0.6.0.ebuild 695 BLAKE2B b0b7f0368b55ddc651a00d7909ab6d04d81db634549df9ded9c0891279444fe4cf5cb3bcb7a091f124efaeb7fe8c5ca864fe41d82aedd1e52a7dab1c1d3024ba SHA512 12edb4b2df1c044b2e8c011d7199edf77eb9ecf6f9499680c959ac3c6d6ed3612ac8b7df3e21486adfe8f2cc6f6a0a59e48f2664938ec426a1e7bccddcd724f6
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5.1-r1.ebuild b/dev-python/snappy/snappy-0.5.1-r1.ebuild
deleted file mode 100644
index cb87edf6551d..000000000000
--- a/dev-python/snappy/snappy-0.5.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=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN=python-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.org/project/python-snappy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND=">=app-arch/snappy-1.0.2:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${EPYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/snappy/snappy-0.6.0.ebuild b/dev-python/snappy/snappy-0.6.0.ebuild
index 62f6618db87c..b2a7e507a33d 100644
--- a/dev-python/snappy/snappy-0.6.0.ebuild
+++ b/dev-python/snappy/snappy-0.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 2b61f93fef73..28565fbd8fc3 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,3 @@
-DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
 DIST snowballstemmer-2.1.0.tar.gz 85674 BLAKE2B 3301e3f799fa61a679b88efc87b3d019231ae7172172f136eb7e1bdfb40d054489aaa29ca1b8b2a04d8260a82ef7f4a8da75a9784f69942aac57ccfcc4983e5b SHA512 e0550d3389074d7686d26397ff2289519cd8b26cf7090fe781d6407d1c2b95f912347d70cd25e02d6016c454ad6c5cf6d648e54ef87161328ac57bc1ceaf7826
-EBUILD snowballstemmer-2.0.0.ebuild 553 BLAKE2B b2df38c54af4cd19424ee1ca0789e99591b776d3f8dab98a2f465490ad6606bc83b8dcb5a3948dd8242a4ee5d3009ec55bc9456a9fc5bf7c780b1508f192bc02 SHA512 b2756ade527d6867d88b21f2f0a2e40dcf979480233f5f675b0a4f03a236ceb7469ab83208c1496af1c38e125867485df47603ccf63733890ad4412e0d47abe6
-EBUILD snowballstemmer-2.1.0.ebuild 562 BLAKE2B b35c24e91359147770c56a866124ad42295f2295d5a5ca612ed6c4c515dc90f000c64cae6bc3494e14d3c0e19bb5c188cdb88bd3a64df0389468f558c5b1a243 SHA512 f8c4b4f745e073ac7618a2e80ce75500a78ba92b22d49df3bafd09136574148c3566c7c2cd1e28f7694ce8337fbfc6befefcd8e268bb15c989374f8f0c4f315d
+EBUILD snowballstemmer-2.1.0.ebuild 553 BLAKE2B 4cb85e4a26ac0773932d6959e4afff7dabcd893c1fc659b1269d902e3a2b213cab46e1c009817bedca29847c06fec1aa7cb56936e7333a0344bfc57a41441540 SHA512 e587df7fe5bc978db51e0e16551e730af4ffc2bf15d87c2cd030dbd9bf02ff20fe1b3434515ba58dc99c62e1bed663106f0035b21a9669be7bf559c17b8876f2
 MISC metadata.xml 403 BLAKE2B 2a098a90b645d8725836da0c99c4143aff56f3fde6b094f2a99968f585684801fc060e88606d7d9ad1e08f52230e8c03eedd996708aa52ad3c07c7da28a1f447 SHA512 5c2c1b79cfc92f8eb602c54f1772791f772f969ce9125e2920a0eb6f150d3de29bde1935111f820f74562389bca047f0306d60fdeec040eb586d527f62ea558c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
deleted file mode 100644
index c04bc14ab321..000000000000
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.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_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://snowballstem.org/
-	https://github.com/snowballstem/snowball
-	https://pypi.org/project/snowballstemmer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
index 75c0271af099..2da4295832ff 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
@@ -14,4 +14,4 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/socketio-client-nexus/Manifest b/dev-python/socketio-client-nexus/Manifest
index 395d5f85faf3..ed7f78d6564c 100644
--- a/dev-python/socketio-client-nexus/Manifest
+++ b/dev-python/socketio-client-nexus/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-nexus-0.7.6.tar.gz 20128 BLAKE2B 84b032fda25a7aec40a4223f18d446da563a4c46054e79bfd38d1871233c88a66cb0213e3e825e5c91f6f587e671f5cfed75465c6f6895a84e1f2409facd330c SHA512 5c0301118beba684e1220c8984052e619d29037ec2c819eec13ac2ec4120025c85fb5b410285ee8466a105330f4a47b87f80116d7ff292c6b3e47a19eaa46702
-EBUILD socketio-client-nexus-0.7.6.ebuild 701 BLAKE2B da7fb280386b910fce42bac12da3437eaa9b40c810ce9d8590d088685469d8e3d0023764dab2f36d5d6b82bb30826454ee6ba3f1291ebe4608a106bb10f21b99 SHA512 4e4c37bbd7b9efeb4f4a7b78facdd4380b73f1815b4d4d0788cbca2d7026e94f6a04e92897fcbf3d8490f81807b74f244e80363e6f0388be2c6c7947f6cd6498
-MISC metadata.xml 374 BLAKE2B c3d0feea5a61f13a9198e1d1904e1bcea718e9dde5ab62ec20a209f22498ee680693f55d3acf3d2d34a947d0a61b8e19620229c3e5902f8c8fade284f77c28f1 SHA512 6c2c21782939445fc5f470b60cd004ff4aef1909098794a970765da39d15c85440b2490d68a48113e80c512124519f090d528f4c786c29f699b7c95c29e42d2f
+EBUILD socketio-client-nexus-0.7.6.ebuild 693 BLAKE2B 83ed317e3035531fbb251f464ab18f6c374ef8ccf351a38884e8583a5f13eb56f4ddae82ccb4b9a8253715fa3ee2084d34454c4b0694e8310e6b9784161186c0 SHA512 b72be1f48d2635546b3778075cfe9ababdda11abfc26667ab8665ab7d08c3e479f2584285ea026f978ede317e20e5404d0d69170ffccc741a3d227a17202c635
+MISC metadata.xml 424 BLAKE2B cdf45a304bbed6737d5a9681f55b8568d489345e78783bf5a91f73fb0f197a3d76a986001a009fcdc8f470993e70c0060854a101bf0862a9922172ebbe0bf50b SHA512 2b5639f91733c5df4b76b2f53a285fa963a2f7b486dcec2fbcd45f69f734612369f6ad46f5511eeba90465278b1b3779d9080e2f29aafc6b996a0e55d6aa7cab
diff --git a/dev-python/socketio-client-nexus/metadata.xml b/dev-python/socketio-client-nexus/metadata.xml
index 178ab4da2d8f..972226f29981 100644
--- a/dev-python/socketio-client-nexus/metadata.xml
+++ b/dev-python/socketio-client-nexus/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">socketIO-client-nexus</remote-id>
 		<remote-id type="github">nexus-devs/socketIO-client-2.0.3</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
index 806a2fe76a97..1a81504b2899 100644
--- a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
+++ b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 MY_PN="socketIO-client-nexus"
 DESCRIPTION="A socket.io 2.x client library for Python"
 HOMEPAGE="https://github.com/nexus-devs/socketIO-client-2.0.3/ https://pypi.org/project/socketIO-client-nexus/"
+S="${WORKDIR}/${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+# require network
+RESTRICT="test"
+
+RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index f859eb8efac6..e21f15342484 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,3 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
-EBUILD speg-0.3-r1.ebuild 451 BLAKE2B 5dead647ee073225ca35c8900f9b0fc8cf14dc9f8496d06d6bb82af7441381493a430201f2d37f3cd6ba8dab61bff454913dbfec6faadebdc850845283acf31a SHA512 9801de386509f5c0f35786728415e4ad0724c1fab980d83083a61fb94c2febf6b93c3959df9a0937b620f928feafe1609ca7193c1e903f4f976d565ea2790b5b
+EBUILD speg-0.3-r1.ebuild 456 BLAKE2B 40373c137c0343e0a35edd1afb2016f56c38e5224a557bf03e1d399ccaf6beb97f34b41c8ada103cf905b975e0360e1d08374b996b89969d63d2038407896ecb SHA512 3a2506460b69f347c8ee26c0a4e3f3d1d83711c11f9758652aa139dd0867520340b2069e101446f6111affeaf3564bb1dab1a15fac11a84e1c482641484350fd
 MISC metadata.xml 401 BLAKE2B c5fa200b5f73af48756fd3561d26a14945d834a88d3001a063056637d72e02ce41f504911ed1a978ae55ffb801d876a3481d60a0bb13baed5122fada979fd096 SHA512 af1a6d09b71c28037ceb11aaf845abad8844a27114223adc6a82206881720e52925b294a4dca33e8ab13985c163684b19d08a369fe04bf3253e51a5fda5c40f5
diff --git a/dev-python/speg/speg-0.3-r1.ebuild b/dev-python/speg/speg-0.3-r1.ebuild
index 1f15bbbbd9ad..f2f9c8c6561c 100644
--- a/dev-python/speg/speg-0.3-r1.ebuild
+++ b/dev-python/speg/speg-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
@@ -8,6 +8,6 @@ HOMEPAGE="https://github.com/avakar/speg/"
 SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 09635ef5d40c..e94fece4c0cf 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
-DIST sphinx-gallery-0.8.1.tar.gz 6502920 BLAKE2B 35f6bfe6039910518c21dadcdb7d814f4400baf3996ee5df21ff6a16b8fe87b0ec0355073b854e9b07ab7f2aced6d2de4453b9ebb2aa142506e9cbfebb99ea4c SHA512 0e77b75fe1d9c44d68235603529c116fad0460156d59f6b2f41ff299e42074930694f1768d99fe585428734617d18e1f1379fdc14e359b0274d1614c092141f6
 DIST sphinx-gallery-0.8.2.tar.gz 6530210 BLAKE2B ba1500b9870d89c686dd1afbcab4797e15944cbda4d8d2faf02bb65435fa4208bf7dfae70285c920ad2f3b82bc085b06629fb3d2807462f92e75be91ef1e81a8 SHA512 52dfcf320d1e53b2ee985482af5cee63582b26aa6f3969f2d83e6ffb9503712f5d1a865c849c4b2111f7fd4349cefb158874d8faa323e4e7d73bf547a26f3a93
-EBUILD sphinx-gallery-0.3.1-r1.ebuild 709 BLAKE2B 82d671684b82ae1ba782b96c979f58db54fc5f432161617fdfe630851228a1e1d4027ee4d25ea73ee1265dd7235361486c200812d3dffe1d668f905f6f2073bf SHA512 5893260cd07e77c6cccd8774ebfb9647a0725f62f8083808f6ee799f56d92cc3e0df523d53fe282151016e1c7d7e05a8bb0f39370249fe18a7e59aa562a219fa
-EBUILD sphinx-gallery-0.8.1.ebuild 1081 BLAKE2B cb8203fdaaec8be5270ebc2b3662128f4133c3d2c9f479bd69aee3f226bd83ab140ee28561b80f8488ea3aa876b0f6a1d20e7e248546f9874578c2f6ebdbfdc4 SHA512 58bfe1e8198b360a95e4c56d19a7d239bdf0b148f09f5689334edf6a641dea571b78508a73b5aa70e898debaab0a020b15c240b1d550302aef30ff31a41ccc2f
-EBUILD sphinx-gallery-0.8.2.ebuild 1086 BLAKE2B b397e76f5720995ce9eb6081c6e8d64ef063c46cf1db0a7aa729d242ef68182b554611f0b2d269ad7a3d83dac3831b8c4556e6169797b2f3efdc6f68742647de SHA512 2c506d255fd355f843080d90e95795922828e3ba7fbebb04463e47295e91c230036ccac515647e1af282532932c65261f7f34bdcc6ff5f4f34a6267cb65b2608
+EBUILD sphinx-gallery-0.8.2.ebuild 1083 BLAKE2B da6179da23af96f1e68fa0e14dcbb63acd216e8b649f84429c7617e8b44ed0248c6d11860de23f316cb2419b9df3940c821f88ac4e7b29341cca67cded577d1b SHA512 cf8379ee6f0dc0b5c946c65ae49003015a97df109e4d4476f3b1d26b003866023271b632279a482c149ac24246927dc20d40e621947f867c31b8fee73364adac
 MISC metadata.xml 423 BLAKE2B f19c62636f116f7d1864c30fba6d99d11759e425b2395bc8f0444c7fe6b1f5092bad3af576e9e9e5ff06e789a3e60e5c98bd87852b8f8670bbba93df4f632acb SHA512 377d09b8209490eb7b591abd00b3e6a077df956acd576844424cb022ba7948298f8ed36919b2903718d9a44b7aec2877b00b1e6f272f4768144772883a6ad8c4
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
deleted file mode 100644
index d9b82a58186c..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests need extra files not distributed
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild
deleted file mode 100644
index dbf62e05f79d..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
-
-	# tests require internet
-	sed -e 's:test_embed_code_links_get_data:_&:' \
-		-i sphinx_gallery/tests/test_docs_resolv.py || die
-	sed -e 's:test_run_sphinx:_&:' \
-		-e 's:test_embed_links_and_styles:_&:' \
-		-i sphinx_gallery/tests/test_full.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
index 928a61793224..d03b672455fd 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 9fd02d64cf49..c3320e470dae 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,14 +1,6 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
-DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
-DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
-DIST Sphinx-3.4.2.tar.gz 5996867 BLAKE2B 4ab0989d521702a5e84148d12f57c2332d27519807de1aa33fff3a17813c8be0247e413c768cd3062c4c52372607cc6f5f16ca0a2ff46cbb8e73db4dd7270796 SHA512 7af39a6c40f54018cce59c2407af278bcbfbded305742918d053e75ae7bdc3a1ea8cc615fd554c9f9581c84723cf5f70ebed8916c54215c5024cf63e31dd3a0e
 DIST Sphinx-3.4.3.tar.gz 5997116 BLAKE2B 73a488564d5889bfc6d7f6f797aa3b144b03cf5f086a4543c3f4b2a452b353f4d799b80a14a0d4118e227660b7f9367fe8f3a2e91f6127cdca489cf4fad215f3 SHA512 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
-DIST Sphinx-3.5.0.tar.gz 5889244 BLAKE2B 7a6cf06264a62d6adbb79f80120e1182a37a73e3f600f30325a6c32d58423e4f7d02bf9d737c31c5ba7f91e23e6e19a59486c58ec0d4e31636ac39ffce6a46b0 SHA512 d0c146cf698b59b93e4867bb9930b08aa7ed877e892783c66d34362fa8e485cdc403811e5c94ad08c7b574c2b8d8e83df71f9856ef0d2e8057572224b8444ff7
 DIST Sphinx-3.5.1.tar.gz 5905170 BLAKE2B f374a65d66f404b2a7486c58a0e13e228e0de88985fed18cfa74e8219759af6afb1bb05cc10b6a8ed8ad7b413889b7282de7212010fe6d3bd30ce04fe9b59b9a SHA512 31a9253e30d5616c99161455fb61ab3b8298b5364d5eeb5c7b23466182913c99fea4cec14d088b6b64a530cbfb60d691ad093a6f6a0f9060f847f0b73d5e6b3f
-EBUILD sphinx-2.4.4.ebuild 3631 BLAKE2B 1153a2e470c385afbd09d90dafd01bc57c0b1293e51c51d855c67d68d0fcce9585c3d69610cd3976ae690957037989cb86debe98a19053bafded265f09e91c9b SHA512 f84e26e0fe019751e54bccb77e426b48fcd2d04a1e6cc96445f38f46fd626232fc5752640b85be7b1864e8f51fd6efbc6ff2da5d775c4746b66ae18d85d45695
-EBUILD sphinx-3.3.1-r1.ebuild 4856 BLAKE2B 821c677be44b40a5d55511afc8bab2b55375c864f0c9a7ea7cdc8c146bab6a5a12242faf87dd3e10f70bdff5fbb3e55c9a91790d38d1f0dc0e6cfd081008f649 SHA512 ec5c6a94affaa731714069be477e252ea6a463724657a2207c56366a34e231d3959e0d92155fc9729d2f22b89b79f362c0385e766922e8a7858142497fbed62b
-EBUILD sphinx-3.4.2-r1.ebuild 4237 BLAKE2B 6b8cc5723adfe35224d1a90ae8f8820a5713de10540bd1f62738327d2b5828d3870a9844aa22ec6c2ba01ef4d4548a02aae602c316546f497e90213e509e7f01 SHA512 200cdc2ee38b16fd070a349b91497b035c7f4b1d4c44d358a97be63351b1650463e0a221a477621a43b3188078841059cf502577faa48110d116087333a3ff1b
-EBUILD sphinx-3.4.3.ebuild 4237 BLAKE2B 6b8cc5723adfe35224d1a90ae8f8820a5713de10540bd1f62738327d2b5828d3870a9844aa22ec6c2ba01ef4d4548a02aae602c316546f497e90213e509e7f01 SHA512 200cdc2ee38b16fd070a349b91497b035c7f4b1d4c44d358a97be63351b1650463e0a221a477621a43b3188078841059cf502577faa48110d116087333a3ff1b
-EBUILD sphinx-3.5.0.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
+EBUILD sphinx-3.4.3.ebuild 4228 BLAKE2B 03956198ff8572f45558478db5d23e045c52ea99c6cc30344b9d9db119fb495b8948da092a922857c2089e388bdb7ddf5f2ced2dd4c3c865dad63779271743d1 SHA512 853b855364f0559bf63e8342d91a3dda21aa04d67c349108f86522a8968602b61e9a60fa6262a7af1e18ac50bdfcdb4e8283fac384c879eb087ff15998569cae
 EBUILD sphinx-3.5.1.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
deleted file mode 100644
index c2dcbe44b681..000000000000
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{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 ~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")' \
-		tests/test_autodoc.py || die
-	sed -i -e '11aimport sys' \
-		-e '/def test_autodoc_typehints_signature/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_ext_autodoc_configs.py || die
-	sed -i -e '/def test_annotated_assignment_py36/i\
-@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
-		tests/test_pycode_parser.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-3.3.1-r1.ebuild b/dev-python/sphinx/sphinx-3.3.1-r1.ebuild
deleted file mode 100644
index 6e59ac526bfe..000000000000
--- a/dev-python/sphinx/sphinx-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${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^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-)
-
-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.4.2-r1.ebuild b/dev-python/sphinx/sphinx-3.4.2-r1.ebuild
deleted file mode 100644
index 575240984120..000000000000
--- a/dev-python/sphinx/sphinx-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${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^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-)
-
-python_prepare_all() {
-	# 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"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_build_latex.py::test_latex_images
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment_py36
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-3.4.3.ebuild b/dev-python/sphinx/sphinx-3.4.3.ebuild
index 575240984120..0084df7a7d29 100644
--- a/dev-python/sphinx/sphinx-3.4.3.ebuild
+++ b/dev-python/sphinx/sphinx-3.4.3.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx/sphinx-3.5.0.ebuild b/dev-python/sphinx/sphinx-3.5.0.ebuild
deleted file mode 100644
index 86421550c2b5..000000000000
--- a/dev-python/sphinx/sphinx-3.5.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${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^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-)
-
-python_prepare_all() {
-	# 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"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment_py36
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index ed0d9cbcbab4..e078e42a1ed7 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,3 @@
 DIST {PN}-v1.0.0.tar.gz 9793 BLAKE2B 07b99851b264dc913e4774217e43692fa72d4f654cb8e3159f919952a25125de99a6118e422b36ae3661024adee2b34f94e45d9a1b801ea80936f23cc65bb861 SHA512 d50eddcf76bd5dd6f35b5891c96c0df2c7646c06603be6c526035ea2ed886b62dd8919749cef9b29ece0584e8a5e24a02d6f5e711dc20c2eadd76c020029292b
-EBUILD sphinx_lv2_theme-1.0.0.ebuild 536 BLAKE2B 902146c094e0e1556be318a5714264b2ed3072d718ff6737972aba9972e72176bdaa775c58706d1fd6954e6a9be32adac448142bd1d9c1323c7f45d3297fb9e3 SHA512 1b7fff5e7ae232fa087ad03911a1c8beadc9dac938d860044e5dfca3a32278aca7007232470d1a064b3ef7dee579d04de0fe1579b6b9a16ec3c7f353928b2874
-MISC metadata.xml 372 BLAKE2B a87324f75bcf8a1c0aa76fe05695f5f958b2350028291e1d1dcca8a290e2513b6925ba49b46e98c2624575db6994e0086f255135b55e247b98e1e3413bad88d5 SHA512 74b7e90b9968b3914ce8a1881cc2435f0951eb7f242e5cc9b81cc8f40080075378bb8630d5e09ff6c80512c370d7a863f85162fe4301fb3ebfee1cd4e05ea220
+EBUILD sphinx_lv2_theme-1.0.0.ebuild 560 BLAKE2B 89fb24af11e88e41fa49ccee7032ea7f711ecead4d02599993c132869e28a92288bbef550f530fc2b294710de55039a295fc568e8368e47fee6b53f3855bd9ee SHA512 821c63187f249f508afdffa747795f0dd0ffb0271bccdf3c542522c0f305ffdc1f926799cc4b794ee60c66ca1a8ce559f7a4facc2c5d0839d43d647dbdd4c984
+MISC metadata.xml 428 BLAKE2B 26d3ff896e1e61ee7096f56048ada2ea17e8d9f232006816f555a5bc174bcb9ffc592eaff6c2bd6324465cdbc24039b5e373db3014af61f48bd2d6a97c738d38 SHA512 3f0582cc9ee9fe891ffbde6f43f00dd1b625eb442b5974c10d7364dee5b89ba1596ee5bcbc41dc6ee7c550498b8124c5f7c9cb86f3b7636c42eb5e89e4891a6a
diff --git a/dev-python/sphinx_lv2_theme/metadata.xml b/dev-python/sphinx_lv2_theme/metadata.xml
index 418c978c006d..6722854369a6 100644
--- a/dev-python/sphinx_lv2_theme/metadata.xml
+++ b/dev-python/sphinx_lv2_theme/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="gitlab">lv2/sphinx_lv2_theme</remote-id>
+    <remote-id type="pypi">sphinx-lv2-theme</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
index 310b7507f720..df6c7200619d 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/{PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 S="${WORKDIR}/${PN}-v${PV}-${COMMIT}"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 099efde0a569..314dd9533e4a 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,7 +1,3 @@
-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
 DIST sphinx_rtd_theme-0.5.1.tar.gz 2774928 BLAKE2B 1ff9c2e1b7ef7740de4969b6b4862d9ac499d515163a32ca2b5438c84910d610c80f5e8c3d03e3016ffa8c58003abecb67bd036ded065dfb65318e2f1d7e69d9 SHA512 20a04408fdf3f5698fecb2a0a430eba6f484770c8e01026c0d444d25ffcbd798edb82aa4b489df10b63d9fcc5eac204e9e3ccdaaf7eac7eb0baee2a5d7960c30
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 528 BLAKE2B 8e9ec378f57eb560ae886a8f7b0398d43c3eb47377f8e2ef9216dc5a2460f3a017258ed3ffe118e2fa068a411dd23d91bed93e4626975a45a93e042d5a180fde SHA512 8adc2f32518f0c07f7dd05cce19fd3a0cf99a40cfb3525f0390a85d5a87bf0cd4523c015f985966887a69684ba362717a77cd19e55c47aaebcae56e1aef84ccb
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 655 BLAKE2B 3cdca0e1e5d6d04ef1b7f2848e11c378e4cd2f5bc04a8bcb5b10bd5f50b6acced523cb4e48a9b8f201721cc958b6482fd6eec5b0b308aebd3cb0abee8dae1404 SHA512 d2e1d1d81a5e122a0d721d566a47ff78984f1b1599941e1ee578a69de2fe4f07b35b434fe4d19f779db7c7d11c142ffb4866dc718da2950b8e592fc7bca7424b
-EBUILD sphinx_rtd_theme-0.5.1.ebuild 787 BLAKE2B a299c488715227080239d99a64bb90aedde97f6cc2bc1becfdeb5e8dad46b9de024a78eefa4463526afec714dec46ceddd38bfd95dbf725684c1561b314c5284 SHA512 99398f554fbe4a69668396c27d0d2aeab8c5d287c4e839d70834e91bf2a8eeb7fc8ae51d3f4f8a97d3512f717fb2d1461392fac9537e20687903fd7974d5b1d1
+EBUILD sphinx_rtd_theme-0.5.1.ebuild 778 BLAKE2B 86eaae872486bd0cb3e2bc55d6c2d6cba7ecdade377a33d93b8811b3e431c56585dd1f331a8f034f3f5ee13e260b294ca5a6c6586375433ea6269a7622e19e32 SHA512 807765f2156257d647c081f8fc967673604f3f46e64dd5b6df8517a1eecc28b19f74d74bd064de80620d637cfa19e6c450337c153324cc3050f7cc4c74bd7e57
 MISC metadata.xml 411 BLAKE2B 940c85be81b5a0cd6896bda1f43a803c46ecc619a9c5c9de62b69063faef6326a2897f294bb9435ab717fb3db723a0d243961db706a9f6cc95f8457ac7fe001b SHA512 a094111815931f7efcaea5c2f05aa421921cd919c1698ddecf9744107e9cea8b1e7005d515fe50e13159c5dea2afe1513ac97ec562ff781504c2e3d9774288df
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
deleted file mode 100644
index 5796929cce7a..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
deleted file mode 100644
index 4803cc49359a..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-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=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
index 5f74a92cb962..4623a628d9d8 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index cad8b4f559a3..530e25987274 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,7 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
 DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
+DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 EBUILD spyder-kernels-1.10.0.ebuild 1236 BLAKE2B 7c1d4a27dc1538e24f72139f4e28324c6abfc995395da615b37db9eaba7e62db6366c990fa954093213c8109460669411b9f0c0dcb29351339aa6226e1df1b3c SHA512 de0cbc3b385b2e785d9e33a835ce700008b1f61ef1373bdcca5412ccd5b9cbbb5670960b1b5c996a7019ad194a55217b4d74200e19d3eb8cf0bda24883284fb8
 EBUILD spyder-kernels-1.10.1.ebuild 1340 BLAKE2B c86fa76fe0f0043f4d8bfb1bdab61fa52e598c9b33a7135aa9dda56fb1b7f467c0b313cecf508e7ae1fc3a85cdebfcd4c08a17416f171f14c81dfd3a0a00cfe6 SHA512 98892df16bc92e9346cd5457ddebf057713a463b176a7e4dea25929740dd1460f0c22125d1d2d1a2e0cbe3d733dee3d5bf63d561790700747f3a601c8c247363
+EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
 MISC metadata.xml 642 BLAKE2B 4d1ec2e5bdbe47e459f37b32953c64c302bcf82e3aa97c8d166c17f6f2bacc4382ed5e74606487e09f2db30230bf90162191aab58f2b8aad3431d3cbfb56339f SHA512 567aaede7b3c5ae9a0dfdfb80f742fa41a96576e48498729b3dcf2366daccd9f9f2bcf3417485aacbfba9bd4fd3cefc59b0126dfc885179413ee194dea0d2cbf
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.2.ebuild
new file mode 100644
index 000000000000..e158e9fa6068
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${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}]
+"
+
+BDEPEND="
+	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}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires dask[distributed] while we last-rited distributed
+	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/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
index e53b1bb9d46a..c37fce550f08 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1,4 +1,3 @@
-DIST sqlalchemy-rqlite-1.0.tar.gz 3910 BLAKE2B c2a07ba91812ea2223bdea4e715b364a96b66057f2ed1c7bc0d373860880f3e0d7188ea8d513b127d8c7138695b9703b4a2ed5f6a4a001a8b2ae68020189a058 SHA512 794d0a1d80803f624af4b530efe277947d3a8fa7001df2177de6bdb34ffc9fc76e22c8b73caad7cda02429ddc251fdcbdd8e95ea286a6540054efb28ee53d2bb
-EBUILD sqlalchemy-rqlite-1.0.ebuild 800 BLAKE2B 4fa6501062a11de73b6321620402147a61cf03f74470dc433b749fc9cb97ba94d3c2846d2ffa66e48d8d3ced2764c8b87e7677736f2645a26b917e2664f1d840 SHA512 6934f787b686391e53d173c33ffac35024cc152affeefc47232bd4c0bd2ec73c32844e9b8fa4612174a65eecd5438c3ff2806c0292fc998732be86fd67592b0b
-EBUILD sqlalchemy-rqlite-9999.ebuild 720 BLAKE2B 3d0cb61b7ad721ffa1d4e578c530aca8255cbe22ce6ead82194a65b79fa9b12abafff8087f4b138a35fccee93b9cd4aabd7ee48c671c044ade6fece2d490acca SHA512 f9eb6c48791e816bf9e4c0ad5700aacb666689ee4f020428ee116794449bb27dab95499c1fdcefebcba504624788e5877fd76dec29bc869e3971c5146297de5e
+DIST sqlalchemy-rqlite-1.1.tar.gz 4281 BLAKE2B 09cee627790d15715c0124a1065f5cc2c72820a652a99e4c2088de21c980071f27c451e438e84d4c92222d19b651b0e239fac8280c2bbb33c55e76c9b77868b7 SHA512 da11cadd2b6dd0f3501bdf717ad7dd7552edfcf7f32a57ce09b6dadc7eb7fb31fd92e7143151a3e3b2d5f75793f6e5096d13dbe446cb71cfa901d6ff8d4c6e12
+EBUILD sqlalchemy-rqlite-1.1.ebuild 772 BLAKE2B b5cc55a78de3a54dab08584b82342948496218ca90903bcc0fdb57d5b48f1c5a63ae3b633dc54ff77d4df5cb7f2042bb12e2e7821d15246546eaece4c4b2c280 SHA512 05ada04c7c54c0d9e1e678f8174b59a2d8eafd2eb27838835cedca1c2aec8499ac5c2781e0d3173e5412fdfbff31b0a7a55b1b57ae28a0a1d8c2b67a38dfec4e
 MISC metadata.xml 307 BLAKE2B 29ea763c455895cfa0961f68cb2933a3354eb233efa9bf18398146aee9a4caf8a50d53dd4542d76e3cd5cd2c0b412ad435cb377f27559209df3e92438c5c712d SHA512 ed97acffcf63e1d7d8ec644d8e050848645f93d77b2114e11e49fc841cdc35f7e2a5be4a1fedc235b1ceb4bbf14a03db47d6aa805b48537acd164357638582d9
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
index 868942b0d17b..01430eebf3e6 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,14 +8,10 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
 DESCRIPTION="A SQLAlchemy dialect for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
 HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
-SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/sqlalchemy-rqlite/archive//v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
deleted file mode 100644
index b09f2dac079c..000000000000
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A SQLAlchemy dialect for rqlite"
-EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
-HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	dev-python/pyrqlite[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5c6d51e525fe..769b134bf55f 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -7,6 +7,6 @@ DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
-EBUILD sqlalchemy-1.3.22.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
+EBUILD sqlalchemy-1.3.22.ebuild 1895 BLAKE2B 09c734bce4e8f97774df0033f51b94e0ad31c29cc3f3b2ec42a546a2b9df02300efdd12633bc79e089c3cba85c1e42a45595e1553ac98c4e4885498779856b17 SHA512 3879901627dfb6733bb1de5ae300319b7e1813badd241862b081e9435b446422fe8d019daa1b03d2e6c2bbe4973afdb0bff71e92f6e8767d633de2a37f93d2bc
 EBUILD sqlalchemy-1.3.23.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
index 0c7cc3a6397e..1a71141cf235 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -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 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 # Use pytest-xdist to speed up tests
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index e8226fec322a..98ee69a8c522 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
 DIST stapler-1.0.0_p20200531.tar.gz 42840 BLAKE2B bfa909e25dfd65101321e153f5129d28bbb360845d6a3622c53ec3921610b9987a8e5c85c4428ee1cd196c0ee42b5a2eefdca7c4a75be223867fad4d830b148a SHA512 7c5f76240f1dff67eae3eb25d29087c7bbff3aace65030d10836f60769798d653b30acb6cc89355ba1eb590dbfc3236cb4ae95c02db6e779ad474781a17bdbc8
-EBUILD stapler-1.0.0_p20200531.ebuild 604 BLAKE2B 797357ae88b6f5de92f05402d1ae7aac0ad575bb58c99fcad13325fb7548ec4865a6cb669066b503f2a633742ccf9f9360217a107c27d427489251c19b891ae9 SHA512 9e12191262c0f5622f96fa7a72e604ba923cd53af4b9b4043b5f116731845c578dcc4ca70a1f61e69250396f9e60e86bf72a0d796934eb220121462253a955dc
+EBUILD stapler-1.0.0_p20200531-r1.ebuild 606 BLAKE2B 8f45976ada21ac87fa280fd14262c9cebc0e83684a987873c0719ef65559752cf4668407660fd6fd442116d92f052edb7e489a4f40c0e22bee4b5715ae59ec92 SHA512 78ede8511291934362b7de9926f47bbd01d1763e7af80109238d38854bdfad00e88d67dd40e76e7c2c43d417571d3bd6ead82b00a38dc11dff811a4da5085d49
 MISC metadata.xml 373 BLAKE2B a86fe12fa7be536472c580392f7e047d5d64c9ec8596f9a5dac87884808765c49e4047e27d76862cf94247dcace9c9233429d8896d74d9685fca22f6efe27aa0 SHA512 771f24c10c052850d7ef3c8f890febe683878266afd425389b8e3f81623bd5660b1a4f17a063f51edbdb61d31d80d9f6c28365af9cb01e9530454847af2a0241
diff --git a/dev-python/stapler/stapler-1.0.0_p20200531.ebuild b/dev-python/stapler/stapler-1.0.0_p20200531-r1.ebuild
index ab82faad35b9..d71209069acb 100644
--- a/dev-python/stapler/stapler-1.0.0_p20200531.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20200531-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
 inherit distutils-r1 vcs-snapshot
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 6b6b806bb0fb..aa8a585c73e4 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0-r1.ebuild 972 BLAKE2B f0416c0449e93986aab5f4ed2317dcecb593a7e1e7650dfb3e5ae1f204f6f7e3b2884846285b98ee437c4bbd3d4c0ea8141c1c2f5d19c41e2a3f50a9d31b645b SHA512 a466b6f52c0b25fca0b13804ef89263bd747473a3513bc2dcf3538320494e850a0e16a5d8e2d4de927b43acef64d9767941876ff76a41ca7929e2fff6594a972
-MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
+EBUILD stestr-2.1.0-r1.ebuild 961 BLAKE2B 10cd7f9efa5ccfca094964922f35f425df8476b20140d640f7d1307c41e178b247a6017b7a5a15bd51b5641831b74e5d25db6ac02b6aa9c29479dc66f32b558f SHA512 b931a6ae6b2b3becb60bfa7ff6053c1f3b62cb47c9b1a94eb4b1fecb05a29adc100592c96d0030f1c7a7fd780298ae0a1ffaba63233ae8320e7023ad27b22d87
+MISC metadata.xml 639 BLAKE2B 1a1ae7ac17a9cd8b64fc394ea8d4aede9f7ed1d8142c22eaa88e6315feeeb48e70c074e021dfc8115fce3a8e1b70d0a7739f66e9021e648609d5244548e42f2f SHA512 bcce81b4b21946c4762b334086ba5b72b899f02731de74cfc9bf6a6890bdb0211c7346adb76bc7dbee8edd200392584a1a29bdd5eb6722be1b8a13aeab734533
diff --git a/dev-python/stestr/metadata.xml b/dev-python/stestr/metadata.xml
index 9eb8d3adbf9f..87444612cbdb 100644
--- a/dev-python/stestr/metadata.xml
+++ b/dev-python/stestr/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		stestr is a fork of testrepository that concentrates on being a dedicated test runner for python projects
 	</longdescription>
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index 420e4cdb2d60..17c04bb67e58 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(  python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=(  python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="A parallel Python test runner built around subunit"
@@ -14,10 +14,10 @@ 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 ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/subunit-0.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index b11691d0ead0..02f00f1cfcbe 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53fe830a10938355cac10287542284a73f99332878225388a3c28ba431baf96fa4e6e745345c9fa02e64a7e33c0f SHA512 dbfa586cfe7897b32fe95b7230fca5ccb8a12b429982776ee8873878fb6b7284cbb924e8dc6031d59647cc6080115ad541fda02d320c091b6c1bb374679d2213
 DIST stripe-2.55.2.tar.gz 215652 BLAKE2B 28bf455a202df7ff7529f932eda50ed4942e72ccf0453b7ff50bcc63c4f3d2177194d2dd6a95391cc5fe7a55c26abd5ba1225fc830ebd9d23a20ebffe2b82911 SHA512 9e14edf57e394837fdc4457bded274b45c309353488adf81a5fbea67ea4c3321392c5316c9a60dfe975110791672b8e7d1dc7ae14994a320c41b1efb7f75695b
+DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
 EBUILD stripe-2.46.0.ebuild 2027 BLAKE2B 1913565a4739d21feb214e075635a3b22dfaa6377912d9a765cdd701715abd5ae7a9ebf1554418c834d4fb47d58e4da770d4cb370dc910bc092bdefac6a9c70b SHA512 cc4364ae7196abbd62054fa4ad7ba84f6c59884c73b3e755a5c6c783edf396a38f5934aa5034a8347b0cb7963a8b651ee41c3ae1fda3ec96cfcc02d3bf080250
 EBUILD stripe-2.55.2.ebuild 2031 BLAKE2B c3c3353a3f119fa9c5887ba19e47125fd479e2e553bf4701d9111db7af66564e37ea1ed5d96120759ff662b479945bb3901643fafb1c278aa2af4349e4e0a79b SHA512 783a5a88a81570300f3c64d8383fa9b49a3c48cbde7a60c0cccf92e3644eff6a41469d1c88122c7bcfb82cbaac4688a19de6921dee097f695cf01305c8dcc7ef
+EBUILD stripe-2.56.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.56.0.ebuild b/dev-python/stripe/stripe-2.56.0.ebuild
new file mode 100644
index 000000000000..3895e0af78a6
--- /dev/null
+++ b/dev-python/stripe/stripe-2.56.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} 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"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-util/stripe-mock-0.103.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 2b0afc2707ad..e6576d2d7292 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,5 @@
 DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
 DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
-EBUILD svgwrite-1.4.1.ebuild 569 BLAKE2B 626c0dc17dfb559a677d98945349c382b582a187ac60e9352a20ed1c83a115596a9eb04e3c95e9d2ddfaedc46e2b961c6de8c28fc948451406aafd1678e172b9 SHA512 d6c433400b03c5d6016ed9cc92d8df53c6ed4d98cb5d0d060d419fc191b530a87c7398f987f53f73e0fdbd6df02ac9116de084453cebe7de3e0665961499681f
-EBUILD svgwrite-1.4.ebuild 569 BLAKE2B 573348c70fb923d4a004a0800b94b7e8380a86d39c10d781dc610c5f97b1b7836db99fed61e7db718866ab3567ddf27118499bd468bf386495e2391897b8cf6f SHA512 3ba8d0588eebccab7e1962cddc472994bb7e9ea5de51bf8dafd7a31fe94926630116ca70c0f9c7dd4a290c17fa37189c20e9dfc411b45c53851655c41a43e2c3
-MISC metadata.xml 311 BLAKE2B 1a82ac1e90fb76a6a251daf9be2608d70700e85af85bfc00ec3932057af468d6a40c25163fc4b45c59e94ca225375dd5d24733ab2046cdf775f9d59eca2d42c9 SHA512 31e3661085c3155ce8f9ca6641429fa9dff06d5a640dc90c99c953e1b0cd7bd1093e3e7c9af9757d492af64240860454491c452f829805e5d02130e967b488ad
+EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B c117f111cd77172547f0da93cc8374a61aaef1de67de00d556733fa599151724e4fa22eb08a33a5c8c10e683bf6496c20c1bfc5da048edcaa58b73816c02a3f1 SHA512 001170e4fa91827fc95c1973921193bda4c7b7316be991403edb904cc787f6eb7670db47590cfa6f673d23a2e966640c7e5a68bdaafcc6d7a5320f3139f4ac08
+EBUILD svgwrite-1.4.ebuild 572 BLAKE2B c117f111cd77172547f0da93cc8374a61aaef1de67de00d556733fa599151724e4fa22eb08a33a5c8c10e683bf6496c20c1bfc5da048edcaa58b73816c02a3f1 SHA512 001170e4fa91827fc95c1973921193bda4c7b7316be991403edb904cc787f6eb7670db47590cfa6f673d23a2e966640c7e5a68bdaafcc6d7a5320f3139f4ac08
+MISC metadata.xml 335 BLAKE2B c8d7679a8d335c10e6819b97aac29604070e333f657d8f0d82883117d765d97db4917124e657a1d7131ae37d925a47f808ec42d490795b9cb98a3c4c076a5d57 SHA512 659d867e66ee12c0e62ab7a6903429adde38fec68bcbd7e448aa6d27bb28b3b5fc5d514c61658444e56435e38916bdd71055482c3d0a5e0255aae82f31c7c147
diff --git a/dev-python/svgwrite/metadata.xml b/dev-python/svgwrite/metadata.xml
index 833a9c5c9c84..5644bd6b0315 100644
--- a/dev-python/svgwrite/metadata.xml
+++ b/dev-python/svgwrite/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">svgwrite</remote-id>
 	</upstream>
diff --git a/dev-python/svgwrite/svgwrite-1.4.1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
index 763d918e38c0..cd4261420871 100644
--- a/dev-python/svgwrite/svgwrite-1.4.1.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python Package to write SVG files"
diff --git a/dev-python/svgwrite/svgwrite-1.4.ebuild b/dev-python/svgwrite/svgwrite-1.4.ebuild
index a631794d348f..cd4261420871 100644
--- a/dev-python/svgwrite/svgwrite-1.4.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python Package to write SVG files"
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index d8a502333348..c0b86bf3a51b 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
-EBUILD sybil-2.0.1.ebuild 410 BLAKE2B 9d9130f8b3fa1e707b4ea852b504d3d437a01d1be2551f880f2470137a35883c3505b1aef149d0371a6a949543f49fee6032bc4a692bd2267cf919d8eba439ac SHA512 2d3e52c2605b31e61b32dd6bf2fc1aa8571b46b989c7e49f25edd9760a9eb5ad52d60fc18b544fa1d95d45e2f5a1c30b3db642a271c87bf1168eca23879c612d
+EBUILD sybil-2.0.1.ebuild 415 BLAKE2B 4aba9800c8b13be28ca4641541cfc52eb78ea1afde658c9deb2c8e5b59715710ac542d8d7c5de7e73ab76fa9e18a83ee604736bf47fb6a11d099b778ef2a63ca SHA512 71715d7e234985ddb6804bdd2d215b9ab9ed4cc971b8b736052501a09a5eb8393b2f6e06bd9d1f79de2c71d256938a3b7da48b3105f832215199ea4d2ece94fd
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
index 2884e51e7b0f..536800f0b0a5 100644
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 1e936c30b2f6..379446e278f7 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.7.tar.gz 40800 BLAKE2B 4e15ef79d152ed6a01fcc88496aed81462e2ac5c5aea1a9977eca955d3c6d743019f8c56a48ef268217cdd7c2780505c4837020ff8cb1bda442304d82e560a5c SHA512 77eb619d3115bbd574ff72b82d55e09f1e2bfe29da0b937b72930b3e65423135722bdc54bed818adf2e25cb49a58f8f85d0ca3b3ed0fcfcfda34a25e54781d0c
+DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
 EBUILD tabulate-0.8.7.ebuild 897 BLAKE2B 3f89d10ab6860b45237c3c5a9a92b94cd8f7e4043ab262ccdc35adf07a4993cfb7972f4eed0563b341a19331a32e5daa36c85330ed0a800811f8f87c64a752ce SHA512 379373c73f2c21a9714cb30d2b2bda6d176fd3badb5d7a6cf7f4806a309764f89f9bb94aec88df130b39f8dbb7dd94fb393317f521ad645330d2b4b0db65a15a
+EBUILD tabulate-0.8.9.ebuild 849 BLAKE2B 20cf32e01ec95e56ac18085aab88bdbbeccb8e724fe4722019471d0c1f5bfcd4bec26fbb1a33f7602d44df4b1adaa979160414785f3e68391b7651a490fdd932 SHA512 628e0b595b3feb4d825490bb98c2837843280bb7b31ce82ef64eadcc1ea9edeeda319da6f5a562b7572062a18bcfedd12e0874bad0915da5944e04eb5217bb52
 MISC metadata.xml 398 BLAKE2B 3d07c5c3361c606537260a267c25d62b8564c3491a65aa425b418a9a58eb137d23ae7a0902e61b4fda33a5d693e9e1ae7f45d6c1d3eee24b46ad88b817c93868 SHA512 4ddb470a137b30099d06b9577f4dc2d5188185b3ec74393e0b8d3e7a388a20134e91bcc0ff0ddb782c6fbc07b95d72ad43fa5ffabc4a0587d0b94b0faae1dfcf
diff --git a/dev-python/tabulate/tabulate-0.8.9.ebuild b/dev-python/tabulate/tabulate-0.8.9.ebuild
new file mode 100644
index 000000000000..c71572c40741
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..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"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(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 pytest
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index 5dfe561333e7..08cbc72a8ba6 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,5 +1,5 @@
 AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97d605cb22dfa0b9695374260658f8dde0d49e84de0e7d289bff705beed1244215e70cc7f9d8d587d505322a20 SHA512 0d9cd79986a16ad78e76911f9d3c1b36fb706c74c58e9d29dce817bcf4bbd8b29c9596f1228a0524fdf6538f2c685901a159fd9bd0b629d0dd1d60c75c2820b0
 AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
 DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
-EBUILD tagpy-2018.1-r1.ebuild 1082 BLAKE2B 80fa3e5fb48d8827901eb41a582bb25298c9cc86fedec297ed2e34e7add14b2223c20a6086c72b38806cec3bbd493711f12620b6b021765a101acfafbad33c92 SHA512 9e8801795d514dbc1dea4932d0005196cdeb639b71b53efe0206c5193c6963714c5c8678a65f0b3c3fc4abfb43373d73d2c5fce4a5ea2828d5400a73e915c3b6
+EBUILD tagpy-2018.1-r1.ebuild 1186 BLAKE2B 2a3a321c39967785360ef78ea5bb151b9f6711f4e8154b94dc728e582242156d035a406e6a04a51cbec49b715992b74db213fa941ea5910b6cda92a3f08910d2 SHA512 304e15eca95e5598d45938ec353d729b7ae061f67d8dc12f1ddaf1fb45e419a64c7003bbe3fd3cc03672e8e77fcfe52dd89575fc7d1db5d362889bb8b6afea80
 MISC metadata.xml 547 BLAKE2B c5c61e36e108060392467ad7bde0c8869b6df0f55367e528e9165d216f4c9674af13ec580c1b2fe6c231843cddd40b621f816c71e1d718126583085780649d66 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2
diff --git a/dev-python/tagpy/tagpy-2018.1-r1.ebuild b/dev-python/tagpy/tagpy-2018.1-r1.ebuild
index 35daa217ce97..56a858f2cc9c 100644
--- a/dev-python/tagpy/tagpy-2018.1-r1.ebuild
+++ b/dev-python/tagpy/tagpy-2018.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 DESCRIPTION="Python Bindings for TagLib"
-HOMEPAGE="https://mathema.tician.de//software/tagpy
+HOMEPAGE="
+	https://mathema.tician.de//software/tagpy
 	https://pypi.org/project/tagpy/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -20,11 +20,12 @@ IUSE="examples"
 
 RDEPEND="
 	>=dev-libs/boost-1.70:=[python,threads,${PYTHON_USEDEP}]
-	>=media-libs/taglib-1.8
-"
+	>=media-libs/taglib-1.8"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-taglib-1.8.patch" )
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${P}-taglib-1.8.patch )
 
 python_prepare_all() {
 	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
@@ -34,15 +35,20 @@ python_prepare_all() {
 python_configure() {
 	local boostpy_ver="${EPYTHON#python}"
 
-	"${PYTHON}" configure.py \
-		--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
+	"${EPYTHON}" configure.py \
+		--taglib-inc-dir="${ESYSROOT}"/usr/include/taglib \
 		--boost-python-libname="boost_python${boostpy_ver/\.}"
 }
 
+python_test() {
+	cd test || die
+	"${EPYTHON}" *.py || die "Testsuite failed under ${EPYTHON}"
+}
+
 python_install_all() {
 	if use examples; then
 		docinto examples
-		dodoc -r test/*
+		dodoc -r test/.
 	fi
 
 	distutils-r1_python_install_all
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 2a7abf9bacc6..3ee7e9a3e2e2 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,3 @@
-DIST testfixtures-6.17.0.tar.gz 121419 BLAKE2B 62dc8808cf9fbc37386fcf9e44c56edbdc2c51ee0698518142dcbc52b73ab538445d49d5d4a779cd68bf51b6aa267222f877bdc703d3dc87230f6a6db81e258a SHA512 2ace802d3bf8b261727037a5ac26a0beca852ca8c2e57ec33344707f300edae7cf317f1bb79c05aa809b1f68d38ffabcc6c5383ce9ecfd4f66a80b02ff4c7315
 DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
-EBUILD testfixtures-6.17.0.ebuild 1087 BLAKE2B b396b4b5832b6360359eb4b74c20a6f93bb5b7aae3e0fcefc9817318705a9b8ca48acb618900ea1299596800a4509525cdc6077294e125353ac70a23c498a816 SHA512 a4128c8b0e3fe62cb4ef9c5132576cc4ae01f0a2b77aca40a74cf8c9d447c81ddd39898f555b2089dcf12e796fba7586fa29f958ba865e3242e5392de7a05350
-EBUILD testfixtures-6.17.1.ebuild 1089 BLAKE2B 1155fa043186067dae3b2fb58b04aebd85e4d864a8db0a8a5b58d98fdfe468d7c2443685ec40c56b58a6ec0d4da54abaac297ac39e8fd9f510f2044ad4a11162 SHA512 dffa7a6e0450d96d4ebcea3fd21fe8d3c96d92a3e9530712c60e26cb7a60e6a9deb609398692b98aca2874f8406b6f649ea8f536b1f3e84e44686dc2b0ef5911
+EBUILD testfixtures-6.17.1.ebuild 1092 BLAKE2B 3e62c79714fbcb16edbbf886844d6ede93ef7fae7370871b221295dee233d1b673e0b31fd7fa1e4e9d4335d5faafbd8a371380f9aac0e538b82d4151f5e18ec7 SHA512 715f9f6b42d6ca147c1d8300985a1eab042a08e0e4f2177a84e5ff635a07884d7142de5c1bb98aa50566d109889ad31f5cc0cce5b1daa5d0386740fe1c159833
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.17.0.ebuild b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
deleted file mode 100644
index 0ae89716b13a..000000000000
--- a/dev-python/testfixtures/testfixtures-6.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="." \
-	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
-	pytest -vv || die "Tests failed with "${EPYTHON}
-}
diff --git a/dev-python/testfixtures/testfixtures-6.17.1.ebuild b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
index a7e0b18918c0..af5e5d8c2a52 100644
--- a/dev-python/testfixtures/testfixtures-6.17.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index 8fdb12261bbd..3a88a71a34fc 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,7 +1,5 @@
 DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
 DIST Theano-PyMC-rel-1.1.2.tar.gz 12482962 BLAKE2B 427afab5b831f625b0825746d24d68d7c7a2ea853f83d0b543f9c16baf7f120bb26446a438fa69279cd55e7788b3f1aaa6c6ac787231415f49a53e34e6b92584 SHA512 f582e23803d392fc469ed4aa13ee8615b7ce367de0a95d57fb71217f578112bd1611df1fa580f19970e1e3681fc5dc7d80d9bb9c2c40e5956d1eb937a9271431
-DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
-EBUILD theano-pymc-1.0.13-r1.ebuild 1230 BLAKE2B 5c4b0c5f4d00c55006ec7e05aab7658b9b936d351825f2af419c6ddb833b0092206de065d992a677b2ba47e562e9d8ee25f203186c63d8c30f2d005a713c39f8 SHA512 14e00e630d8f54598175079b7bb5568bacbde4a01a36b56fa4b073c9f0fe1966cc8a8c26081a7233910234bb1ef51c16988d3cc8ebf7f98a3eb6a584013860df
-EBUILD theano-pymc-1.1.0.ebuild 1713 BLAKE2B 1a7de27bbb932b8c447b0f2689295a9c3d5f8370ab98a064ec36629e54535601b1a02479249177f59c273993bd4e7143c2d0a67ddd5fda6b9f14d3203dc10770 SHA512 0cab85931fe676fefaa9db25ea37cba43590e5b80920caebaacee18615eee8480cc862e76dea022baf772d2a26be62fee1c4e5dbb2078483a4868988a082f445
-EBUILD theano-pymc-1.1.2.ebuild 1718 BLAKE2B 85679937700fb93e881054083db2f03ac73e875e6122ca1e61e632248efcfadda5cfed1eb6386e1e44afe43e57317f458c963c4daed3677e32f5d01760f18b9f SHA512 50f72e164a52c1c5e7f896bd741baabfea31553b6ec453977f3ee66c58f3c586daf82140fcb63088875db9cc62c40d5174a8ac7e7c2bf249f74ed1eb83dfb10a
+EBUILD theano-pymc-1.1.0.ebuild 1712 BLAKE2B 2a34d16d3e5f058c28ec775a7c0c216aca942ff9653f6766762d451971008f322149c44baa240e88e8bfc9e6a4a6074e41fa3f0d3a557c7bbf5cda9855baddab SHA512 c21327fcf0a210c7ba2ac6923360991b9156d24943f9ecd11d7b5a45ec3f1a57e5f3b4a2cb57f83310a1d98197d5500dc5048f373bff0813963891609395caa9
+EBUILD theano-pymc-1.1.2.ebuild 1725 BLAKE2B 76758a0ae576b15401618d7f836c955dcb1595d4e5a2dd51c309e4bf0ecbfabf0bfe2e883d74ece67fe950f6df570cba6f6b8d4b7a4908ed17279e4867e5073a SHA512 3c4197587819fc90830b62b254bf45e5e43f8b75a8292d90c95e187def7e757e375d20e9135ef7bbaaf7a7a7aa9adf82c70d652b22d728692c33cd2307032251
 MISC metadata.xml 400 BLAKE2B a9f06ebe35c874d15d1a6608e8398a79480b24cc0ec1b7a45db8c8d18aa24d26817c47a62ad13fba1f32286699749679568b75593c0909dd2ef5785450b379f2 SHA512 530f9e294ab4481624cd9757d67a9e8a67dc2a023002a7f312de619bf05bfd1a06c30ecebd0606f76a1dbe37176697e990867c95de9f411b7631bcc341192e93
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild
deleted file mode 100644
index 1041c4cd8c8e..000000000000
--- a/dev-python/theano-pymc/theano-pymc-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 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} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
-SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/Theano-PyMC-rel-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/, 'flake8'//" setup.py || die
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
index 221894445d0d..b777ceb18a18 100644
--- a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
index ca106ea987bc..993d261ea618 100644
--- a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 6d573b27b4cf..e21d4d45796e 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
-EBUILD threadpoolctl-2.1.0.ebuild 629 BLAKE2B 5390f672f998aa4bb0b533471a5c9e0bf141243e215fb9fd88bf653463b03058c74588ccfd09050e3a151881b8ba6c46c608c60761f2174fca94b4ba087183b3 SHA512 6cb3a404c47fc738c4bcef9b565516ffa32596c984facd0164a0fec3dfa78d562bf51882845212355d6ddbc1b7b1c1ae35750b2cd05467590a652835ec212b9b
+EBUILD threadpoolctl-2.1.0.ebuild 633 BLAKE2B 7846d9b24174443bcf2c101cfc3c4e538f1e300f730becc6e3d056dde08f67fdc8a5e17c26b50514cfc6a2f3817b429fe78ea5efba7899fd1ec7b9deef1342d8 SHA512 cd7374b4d0c52e0cd62b29077ddb9b5ca3e93ddbe62f5531d58c0060461cd23e263eb8ee03cf9c7996d591c84fea2c4aafdfd75caaaec74fdfbf2f8b85579e47
 MISC metadata.xml 428 BLAKE2B 5021cc6c0dd7953c65d3b4f156fc8ad9b8fe51480f5a77678c0ccf8983fd4dc815e11fc91e12d2c70454cbf92237033945beba1489d23a263952efe8880ccfa6 SHA512 4de57c2178b26934e745c96f0daeac26a7323a07641104f5d1bcb7095281bdf5e390c721ad1d68513caa00e41e4c8e0d506c3ee3c4488b25f22ccb21c2d74897
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 37d244fd73b3..ea324f5c845e 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 35459687881d..4ce703c521cc 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,7 +1,3 @@
-AUX thunarx-python-0.5.1-fno-common.patch 3161 BLAKE2B 5af487237d518c08a068b592000c4dfffb9e63f4004ed691343d446058adf070bd1d7710c6eb740dfa6602726bfe53f59309a4ac5991c74b46206f6d076c1977 SHA512 501faf134750e07584b0464c1881934fc881cae888bafa4e53afd56f34f1d10a34cf1d90bb39955bc98bd9b0d804cd0a5f636b68f34c8e935860b1019d8cb059
-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
 DIST thunarx-python-0.5.2.tar.bz2 348120 BLAKE2B ddb098857a7411c1ce4dedf8b406cf6583e78f2ca4b012a9e0346c5a7132c40fd9cf279dc5d054ec827028cdc67321a65fab5e9d3912287ea9ed1f0cf4e72248 SHA512 49d009c84d69f0a1938ed6cb46fe04326c7323edecd79f6d9978ce2306fb95f20c901174f1cea31d5e436c85537efcb79c8613be857a3e4143f7b55b895616b6
-EBUILD thunarx-python-0.5.1-r1.ebuild 843 BLAKE2B a5f1ad61fb3083314ff4ccee90f9eafdaa05b8b545598f7fc4d656d4d53e92aa4392e9b283a5deb26dd85c3865c747c6fd64c444a2afd6f678d4e2c991770aaa SHA512 07ee2693b5d268d64565d94608a7fbacf50e15f4b9f32cf96592c82dc82670fa97022d70f392cbb5b396d516bcdea568a1e5b0dc07d232b2376e785b523477e2
-EBUILD thunarx-python-0.5.2.ebuild 763 BLAKE2B 0cca75ca1b5ab49d4da2671232ead1eae82f14ef65ab927740f582ff8e2f931504f8fceac0baf4a623885828c76e883ea4a23de8e4c7480485c50fa346d24fb5 SHA512 2308fe1163a4b54ea4825039cf2d0e1f1a0bfb106eb163aaa6745d7d1a58801d5f61fceab54b5c3031c2793f25d3e7cd03ce0b882fa61e8a000a8a0acf4236db
+EBUILD thunarx-python-0.5.2.ebuild 761 BLAKE2B b274b577081b19404256ca7fed4ad80b7fef58b4fc04c28480a8cf5404ec2acf5da672b5265facbbc57a47c01c4d1a25e70da97da11719a5f0b4adae1c406019 SHA512 df4e390d49a21afa5884c4f8be449d7055d4772cc4a120ccd26de463711dbe04a6d876b2593cb785b8a111ba2f666836068da06538b1dd351202a6d2a7a09ca7
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch
deleted file mode 100644
index 21f55c0e6f8e..000000000000
--- a/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Taken from: https://git.xfce.org/bindings/thunarx-python/commit/?id=3037ebe25d5c6ed58699e56b61f657cea3e5a5a6
-Author: Mukundan Ragavan <nonamedotc@gmail.com>
-
---- a/src/thunarx-python-object.c
-+++ b/src/thunarx-python-object.c
-@@ -24,6 +24,7 @@
- 
- #include <thunarx/thunarx.h>
- 
-+#define NO_IMPORT_PYGOBJECT
- #include <pygobject.h>
- 
- #include <string.h>
---- a/src/thunarx-python.c
-+++ b/src/thunarx-python.c
-@@ -30,6 +30,18 @@
- #include "thunarx-python.h"
- #include "thunarx-python-object.h"
- 
-+PyTypeObject *_PyGtkWidget_Type;
-+PyTypeObject *_PyThunarxFileInfo_Type;
-+PyTypeObject *_PyThunarxMenuItem_Type;
-+PyTypeObject *_PyThunarxMenu_Type;
-+PyTypeObject *_PyThunarxMenuProvider_Type;
-+PyTypeObject *_PyThunarxPreferencesProvider_Type;
-+PyTypeObject *_PyThunarxPropertyPage_Type;
-+PyTypeObject *_PyThunarxPropertyPageProvider_Type;
-+PyTypeObject *_PyThunarxProviderPlugin_Type;
-+PyTypeObject *_PyThunarxRenamer_Type;
-+PyTypeObject *_PyThunarxRenamerProvider_Type;
-+
- static const GDebugKey thunarx_python_debug_keys[] = {
-   {"all", THUNARX_PYTHON_DEBUG_ALL},
- };
---- a/src/thunarx-python.h
-+++ b/src/thunarx-python.h
-@@ -43,37 +43,37 @@ extern ThunarxPythonDebug thunarx_python_debug;
- #define debug_enter_args(x, y) { if (thunarx_python_debug & THUNARX_PYTHON_DEBUG_ALL) \
-                                      g_printf("%s: entered " x "\n", __FUNCTION__, y); }
- 
--PyTypeObject *_PyGtkWidget_Type;
-+extern PyTypeObject *_PyGtkWidget_Type;
- #define PyGtkWidget_Type (*_PyGtkWidget_Type)
- 
--PyTypeObject *_PyThunarxFileInfo_Type;
-+extern PyTypeObject *_PyThunarxFileInfo_Type;
- #define PyThunarxFileInfo_Type (*_PyThunarxFileInfo_Type)
- 
--PyTypeObject *_PyThunarxMenuItem_Type;
-+extern PyTypeObject *_PyThunarxMenuItem_Type;
- #define PyThunarxMenuItem_Type (*_PyThunarxMenuItem_Type)
- 
--PyTypeObject *_PyThunarxMenu_Type;
-+extern PyTypeObject *_PyThunarxMenu_Type;
- #define PyThunarxMenu_Type (*_PyThunarxMenu_Type)
- 
--PyTypeObject *_PyThunarxMenuProvider_Type;
-+extern PyTypeObject *_PyThunarxMenuProvider_Type;
- #define PyThunarxMenuProvider_Type (*_PyThunarxMenuProvider_Type)
- 
--PyTypeObject *_PyThunarxPreferencesProvider_Type;
-+extern PyTypeObject *_PyThunarxPreferencesProvider_Type;
- #define PyThunarxPreferencesProvider_Type (*_PyThunarxPreferencesProvider_Type)
- 
--PyTypeObject *_PyThunarxPropertyPage_Type;
-+extern PyTypeObject *_PyThunarxPropertyPage_Type;
- #define PyThunarxPropertyPage_Type (*_PyThunarxPropertyPage_Type)
- 
--PyTypeObject *_PyThunarxPropertyPageProvider_Type;
-+extern PyTypeObject *_PyThunarxPropertyPageProvider_Type;
- #define PyThunarxPropertyPageProvider_Type (*_PyThunarxPropertyPageProvider_Type)
- 
--PyTypeObject *_PyThunarxProviderPlugin_Type;
-+extern PyTypeObject *_PyThunarxProviderPlugin_Type;
- #define PyThunarxProviderPlugin_Type (*_PyThunarxProviderPlugin_Type)
- 
--PyTypeObject *_PyThunarxRenamer_Type;
-+extern PyTypeObject *_PyThunarxRenamer_Type;
- #define PyThunarxRenamer_Type (*_PyThunarxRenamer_Type)
- 
--PyTypeObject *_PyThunarxRenamerProvider_Type;
-+extern PyTypeObject *_PyThunarxRenamerProvider_Type;
- #define PyThunarxRenamerProvider_Type (*_PyThunarxRenamerProvider_Type)
- 
- #endif /* THUNARX_PYTHON_H */
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
deleted file mode 100644
index 19ad0886ad52..000000000000
--- a/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index c58a1be9dac4..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.5.1-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_{7..9} )
-
-inherit python-single-r1
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/thunar-1.7.0
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
index 3c38ae815633..289fceec2de2 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.30:2
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index d0741b9d8927..9dc5701d0937 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 946 BLAKE2B 7a6b7e3303c33f996070059315b58687b6ade08f66c1929b803bc3d8c366a18d8f7f6a94cdfba95ac72a7e3942c1997fc38331fb265c798a2ff51d169d053fa5 SHA512 cdaf6fe7328cb567f381050212b29a451340ed5a206224fd6cba8211132b486c16d2268158ad2b2aef30af58e4594aea7eafcf162972af0821203f0e0f49682b
+EBUILD towncrier-19.2.0.ebuild 952 BLAKE2B 502faffc97c4947364f0da43c352276cf4c906c6d30a1ad06486805d83b6a57259358a337148d5f072980d897c78ae02b958571b97ac613670ca4abde53b5691 SHA512 26a20814d23504547c929f6d9df949c0ef971d8562082f42d06569da6bc0ac365b8cce3963aade58761fdef595c98738d29e375ab832a27732c2e405cd87072b
 MISC metadata.xml 369 BLAKE2B 8ee1cb62419fb6c4cb90090f486c6418d6f78588354f6cc5f60785c3ad4679c7198bdf99cf3a7c9bd2ca937f61ee9391fa10cd7d0ab50196650a4e7c5635134d SHA512 f5ad66e0cf77bfe75e50712974f2660f349136790f4dbd3f68d6968bcf025c885972101d0157ec6df39e03d8e8ba4f18188f0b2ff60160a48072b4e9944a0623
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index c55042f2d3e1..a0cc11bebd56 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 1fbbb2b26a0d..7e4a0b0a9b1b 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,15 +1,7 @@
-DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
-DIST tox-3.21.0.tar.gz 300962 BLAKE2B 360aedb86ef1f918e73f726af238d8fdb20c3217b45ef068ec833b14e17af018c1115a2df43b441b9a4af802c4aee2fcaa9bac8f519028dd05b112902c47b2ce SHA512 50041660839cc081d491f867db74c6e95c93b81b2264785b3ccf7b80fbf3a1250028755ddc4243a285ebd005e12f897001d6ea7efd45d0278ce3cb14f7021572
-DIST tox-3.21.1.tar.gz 301387 BLAKE2B 3b15a17cfa8f2df1c8c3558cacde81d818cbc72b3dd0c4e4868d2fedace61c85ed484ad08e8abec10c0bef4062e623c75e4bf1122b4d15151b741057ea90fba3 SHA512 c3feaf1832db2b16df444d52ea774602c9a68eabd379c86483d33716f414df901b5e95ea9d63dd7c2f4338227cb5d9ee521a56f2dbb0d9c7d21221f49d1fc335
 DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191
-DIST tox-3.21.3.tar.gz 301828 BLAKE2B d777a858c07d94b9239ecf8286bebc5b4efe1a79cd15b37dd2a717df06cb189d4ef3126da0523719289f8fb410965c4f9c06b02c56dfa5af6ad4fb6a60c6514f SHA512 1975efcab6af938058642a85675907dadc17bd14f881c074087b221cd22d42bd1fcd577bcbef134a499c9a5b2ee583af2b557657fbfb7db30261ff9d394cf82b
 DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
 DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
-EBUILD tox-3.20.1-r1.ebuild 2332 BLAKE2B 048645ff262c44198fde1fe5000619e9ee4f918e0ec5aa143449506dad607de73774ab4ca88c2f67619dfb380d1be5d4afc64103217bb651327487b337c30eff SHA512 9a8f1200fd68f51a90329f3d6128d190ca5dded6d3d67f42a19a4b6436f42f03883a738681bfad8b0a9a51641a64780dd9717107fa966b55dbaf3d2ab6acfcec
-EBUILD tox-3.21.0.ebuild 2115 BLAKE2B fac409f5028d9ad9efdd2ed9da5e4bcc76d6081c9e04f672510962c4ce0cf7ad88eea688b590f4543747f53dec80edb4ca41bcf59ffd84fef16d8131d0fa252c SHA512 3dd6f84f835452f306c942b20f6e65684c161348d0ec648371c574fee8279f9e8e044e1755784b8dea7c05fdf515818bf6888104ba4255de3cef22a54fdb93fc
-EBUILD tox-3.21.1.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
-EBUILD tox-3.21.2.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
-EBUILD tox-3.21.3.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
+EBUILD tox-3.21.2.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
 EBUILD tox-3.21.4.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.22.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.20.1-r1.ebuild b/dev-python/tox/tox-3.20.1-r1.ebuild
deleted file mode 100644
index bf9251adcbb4..000000000000
--- a/dev-python/tox/tox-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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
-	# Remove unneeded version constraint
-	sed -i -e '/^[[:space:]]*importlib-metadata/d' setup.cfg || 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.21.0.ebuild b/dev-python/tox/tox-3.21.0.ebuild
deleted file mode 100644
index e56cf3407d1e..000000000000
--- a/dev-python/tox/tox-3.21.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.21.1.ebuild b/dev-python/tox/tox-3.21.1.ebuild
deleted file mode 100644
index c21ec8453e95..000000000000
--- a/dev-python/tox/tox-3.21.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# broken without tox installed first
-		# TODO: figure out how to make importlib_metadata work
-		tests/unit/test_z_cmdline.py::test_tox_console_script
-		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.21.2.ebuild b/dev-python/tox/tox-3.21.2.ebuild
index c21ec8453e95..78e1824c9517 100644
--- a/dev-python/tox/tox-3.21.2.ebuild
+++ b/dev-python/tox/tox-3.21.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.21.3.ebuild b/dev-python/tox/tox-3.21.3.ebuild
deleted file mode 100644
index c21ec8453e95..000000000000
--- a/dev-python/tox/tox-3.21.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# broken without tox installed first
-		# TODO: figure out how to make importlib_metadata work
-		tests/unit/test_z_cmdline.py::test_tox_console_script
-		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 85688aa50b5c..893bfaf62c80 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,13 +1,9 @@
-DIST tqdm-4.55.0.tar.gz 161594 BLAKE2B 890bbb47db356678be2c3edd893d70b085f5bc8fefbf87f12ba8c69fe14ac523a1eed6e335fb84f2ff43b2b0fea901411f8a72b24212cb2ad5ef4955ec8f2df5 SHA512 84062f7d2a109e4067e0868990b6e53578c7c2ec2b81a0cbdc980c91d2d82a8bda37e0c9688777fcf14cc80b7ddf7b28b7a5acfe37608e37903fe45908103913
-DIST tqdm-4.55.1.tar.gz 161638 BLAKE2B 0149269f1ea854589647deb4ddd7415748924942ecc03d5fd6231470e5df959c1b8034d4d8416d83aa0a43ad1fafed15789f7ebaac12e5d525a7fe0bee88752a SHA512 82a6d3d8e10d4c46e40e03e557febe9f7cac3cc01c01c9e29b20cf8f2adcc7370829fe5d4497ff0edb506bf38b9ec14de86377d1bbd9b8b9e57687d951ae683f
 DIST tqdm-4.55.2.tar.gz 162632 BLAKE2B 02e49f442c8d5ad3799de143dd8a188796293253e836c24d04e75aa45f7cbeecb967f1503467ca7486dfd412538da6f7a3aa4c674e16f0da3954f44347c5a498 SHA512 f61f28f2b8f7c4d848e31a3d791822a0433573b36aa900d055e1919b555b84ee36d988c6f51d6951355e70821f4d24bee72bdd4472262ea55ea012ff0556b0df
-DIST tqdm-4.56.0.tar.gz 166848 BLAKE2B d2239ff7efd9c91b7101357b6c7d352c42c49c41c34209092fdfe420e090458581aed61f2ddff09d1c64539eed0d83eb240e6b467b82193016cf13bac94f3313 SHA512 c65eb167063c4b6a0931a6f19fb2e4d88eb92fe3f3118c0247cd0e148220523097c4419289428d2a4c22cc187011d78cba32fc080eb2cbe352f873e29646094e
-DIST tqdm-4.56.1.tar.gz 166899 BLAKE2B 11c40049ee2d3ce890a6a443432fd2834b177ea4d19549c179dcc9da6bcd71093b54a5f2a7027ab40e9c5c7bf48581c7fe4cd4ad819a3d60a8e3c7c5537fd357 SHA512 4b940bbf2fdd1093e1e0c50f17de7231dd58b0f04d9a8a97df4835f23e46b7b58f68e1ad96f77b191cae49e80498fd31ae67ff4fb4db821d90ec85bf83d48043
 DIST tqdm-4.56.2.tar.gz 167040 BLAKE2B c1754cb262977688365c6bf17ec6b6ec31704cdb22aaf05261653c4c9609bdbd16863a15f58a7fe0fb2c0983513b091be55dbca48a0a7b1177a4d017d6800ce0 SHA512 8e7ec199c43a3cdb69bdbfaaec33c11ce8b337255eff4ae6af9928c2a2c5adb065698538562020c9f0a29a63671cbbfcf2c4c9ccb25bec0ec1d8ae8df66516c3
-EBUILD tqdm-4.55.0.ebuild 1128 BLAKE2B aabf152a463288eb489da325c4ae8c56fe305c4e8f17dbeeebd460e089c3d6001c999e63d645316b23b8eeaeac2f86a107e85e218c38ca5d36c55d94a94e8cb1 SHA512 b0449d785ce81cd2b188806e2e34afcabbb1cb8d6ccdbc3e9e60cf49720a3e76fafcb5af8e3e2434327b90a0c52924c90c7de68f500554c95fe9062fe6231ac7
-EBUILD tqdm-4.55.1.ebuild 1193 BLAKE2B d0966368358544f98714e9c8d88e52f6933a4aec5eec16b0a336cdb31368b9da7ca4f79f7fa14016b3e7ba19a72074c137a2cde7b147ac2f2c08e425c2f987eb SHA512 b92db33202d0163dea498a9b760736c1b07aff12e3f9b42478919afe1fa26cc605c21a6a240c4d467cae069b5f3d624b5dd11e311faf8214bb789c69f2c7dfa8
-EBUILD tqdm-4.55.2.ebuild 1193 BLAKE2B d0966368358544f98714e9c8d88e52f6933a4aec5eec16b0a336cdb31368b9da7ca4f79f7fa14016b3e7ba19a72074c137a2cde7b147ac2f2c08e425c2f987eb SHA512 b92db33202d0163dea498a9b760736c1b07aff12e3f9b42478919afe1fa26cc605c21a6a240c4d467cae069b5f3d624b5dd11e311faf8214bb789c69f2c7dfa8
-EBUILD tqdm-4.56.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
-EBUILD tqdm-4.56.1.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
+DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
+EBUILD tqdm-4.55.2.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
 EBUILD tqdm-4.56.2.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
-MISC metadata.xml 830 BLAKE2B ed76068aa9a8f70bd4bf045dab72dddba06f795a3c4ffefed09317c5e82b1b74cc322be2b8e7beaddd4a40653ae3f629d9584b56648c6c13d82f7bbcd6a20d26 SHA512 9e7f241bd25cd8e6cfa001dd6210a634b665dea8adea4c5d3d96e47cfb1d481be3393fc6a3148ae02dd5cf02c13ebcb39bf2235875f5ab662ef1bcf1cd4201ef
+EBUILD tqdm-4.57.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+EBUILD tqdm-4.58.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index 3625874f6b11..9ab5e65d01de 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@chymera.eu</email>
-		<name>Horea Christian</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/tqdm/tqdm-4.55.0.ebuild b/dev-python/tqdm/tqdm-4.55.0.ebuild
deleted file mode 100644
index 1e87eb808d07..000000000000
--- a/dev-python/tqdm/tqdm-4.55.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{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 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/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
-}
-
-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.55.1.ebuild b/dev-python/tqdm/tqdm-4.55.1.ebuild
deleted file mode 100644
index 81b4fb498481..000000000000
--- a/dev-python/tqdm/tqdm-4.55.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..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 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/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
-}
-
-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.55.2.ebuild b/dev-python/tqdm/tqdm-4.55.2.ebuild
index 81b4fb498481..9f4656c29579 100644
--- a/dev-python/tqdm/tqdm-4.55.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.55.2.ebuild
@@ -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 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
@@ -28,6 +28,7 @@ BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tqdm/tqdm-4.56.0.ebuild b/dev-python/tqdm/tqdm-4.57.0.ebuild
index 0bf4e4570b83..0bf4e4570b83 100644
--- a/dev-python/tqdm/tqdm-4.56.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.57.0.ebuild
diff --git a/dev-python/tqdm/tqdm-4.56.1.ebuild b/dev-python/tqdm/tqdm-4.58.0.ebuild
index 0bf4e4570b83..0bf4e4570b83 100644
--- a/dev-python/tqdm/tqdm-4.56.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.58.0.ebuild
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 786cc3732341..2736a62b44a2 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,10 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-toolkit-3.2.0.tar.gz 6029254 BLAKE2B fe4c30e09fcba6755a928775f931f1027bb5678606e74aa435fd5803642ab39b8b55d763bb96dba6b1a957d6656cfca4ec6400b735afd8df7f2c1273ac173c89 SHA512 1045762a5c63cc2bc8459b61a85ef56e4f1d1f705d74646b8235169f22d8d5aa4ab5e3599af52a860d9e434df0fad3e98836b0c021bb0a9697b36a59edbfb6ec
-DIST translate-toolkit-3.3.0.tar.gz 6122607 BLAKE2B 77e4d4e37fa5fdd0a735b04ccef40769863134411476abe2852855970594f7a11cf06114831c196a744a5e76d50b1707b630a738213d0ded5f588ad98dcfd613 SHA512 3529e5301e8e1f0d89bbadff92cebd5d55ada29fe5eb8d611f604139239645dd6d110bf93180b18faf2ececafb675f2fc6dfbe30d7631ba606a7dfcd5d8f27ca
 DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01bab881e6070820f362c53f47b5f88e192bcb7a18d2bf667a678378110046f70a035d42b67a77e2dc70829da323d69f675d21cc SHA512 1578fb8f96fa83ad97051a20f02d6570f96f2346d99fc86172718c995468c318f318f27f2ef259bd5dc10521bda4ac7da17385f72b726d7ea3c0fe65af8f313e
 DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
-EBUILD translate-toolkit-3.2.0.ebuild 3289 BLAKE2B 421050ac03ffc23314f7a827b7b98132674e696df390a788ccdc6be95ff01ccf76672ea8e34fd404394f3b1db6dbe30605668ffed6684587d861edd3b0fe33c2 SHA512 61e6941b491c922657cbe3f91fe2673dc6e54608c129ee63e3736a9c64a50681d9661da1a847b217f2de831b526f8fcb013878f55e6ae9eca3495e20cf53fd80
-EBUILD translate-toolkit-3.3.0.ebuild 2869 BLAKE2B 1f92ebdca016b10cd36451b36c2c2af265bda6ce77705cd2113540b0dc60ca88c8c465d14d64b0ec76f86b41a82c44f35d7f6a1bb337d29dfaa21c5d7b69bc0c SHA512 2c7ebf68a316347b2899575031695ad29e556435a5b211f83e834428d0bbdad3dd6415eea6b6f6621a5ee32789f2ab87729fdab88968344f338775104dfe7e3a
-EBUILD translate-toolkit-3.3.1.ebuild 2868 BLAKE2B 16fdac0b9aee9b55f316c5ca55a294d8b09f283574703c6a46a235e99352f0c69a971cb1712ac3845b607fefcc51fb4c03140c20f000657c7adc09a9734a166b SHA512 4f5bd68b33d38fa9cfca849b60056d170fa79b850575ff4d1933505918f11a426612d85810dfa333e268bd82b97091c67e7261dd40112d1f7cf752c5139af46c
-EBUILD translate-toolkit-3.3.2.ebuild 2486 BLAKE2B a312543f0cd2023dc80241660e8a14a1cba89af0ae251a68810b39f1493b42aa87852d6125a7d01aa78016b2ca81f2e25f300680c1388c3199ddf226eadc83ee SHA512 aac5e05ad9f24051a925c9546ca069ab5f059faebadd0b88fd1d24a0cb8781fabe2d4f3da00c127e77a9dc12c952d0b728fb7eb2535b85f2c1009f72e9d869a2
+EBUILD translate-toolkit-3.3.1.ebuild 2865 BLAKE2B 241cd7c4edb1c7ac600d0b426510eea52e85eef01318b3453afa9b9f35cd77e23c79b93e1566e16b2a4fef07a71d1c1d4e68edea50e9a96e8ce817e76cf0cb34 SHA512 33c174b4ed4d7eb7563ff060324971da0e39cea92bd59e35291aa787bfbc8df805ae4f020c44fb6a74d063d715409f44535b10c13b2c2ae2667568192c21d95d
+EBUILD translate-toolkit-3.3.2.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
deleted file mode 100644
index 8b289f3448e2..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="doc? ( >=dev-python/sphinx-3.0.2 )"
-DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-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_test() {
-	local deselect=(
-		# Not packaging optional phply for now.
-		# Seems inactive upstream.
-		--ignore translate/convert/test_php2po.py
-		--ignore translate/convert/test_po2php.py
-		--ignore translate/storage/test_php.py
-
-		# Need installed 'pocompile' from this pkg
-		# distutils_install_for_testing doesn't cover fully
-		--deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_mo.py::TestMOFile::test_output'
-
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-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
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild
deleted file mode 100644
index e26208def259..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Not packaging optional phply for now.
-		# Seems inactive upstream.
-		--ignore translate/convert/test_php2po.py
-		--ignore translate/convert/test_po2php.py
-		--ignore translate/storage/test_php.py
-		--deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
-		--deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
-
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing --via-root
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	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
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
index f4c3227ffcd5..34d7b5c496f9 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.1.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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
index 4451efd29cfb..fe65fd0c9450 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 97e3215fa177..9bfb4508b230 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,5 +1,7 @@
 DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
+DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
 EBUILD tree-sitter-0.2.0.ebuild 499 BLAKE2B 55744148da398f8871c869a4d3e8cae5cae12fc057689d15a6691d5fbc70615496f8b4411181adffe681f4cab32032feb0c94dfa1f3144040a61d4232a852cb8 SHA512 364a37e0857a9698a7b97e73d5757e6e2f6d929d769168d8329cd116827af84837e2e407304838ca44b7a2b82beb5e971f8327c111452a816651f504d9eac453
-EBUILD tree-sitter-0.2.1.ebuild 530 BLAKE2B 745c15217dfb4567c6f3c80121a3c9c253cd78fa452454ebe5ee9e0099089da1b465e1fdd59e462e5dce0172153394ddc4f5eb99f60de0057ca2eadfb7268a51 SHA512 c65e32e90e905c21d9f0ec7aa9f14ca19d13a1ae5c746e76718810003982b67fb9add980e063d96b33b5b9d84c25e446d263fd11bee2324a5ccc73cba0f6910e
+EBUILD tree-sitter-0.2.1.ebuild 546 BLAKE2B af033072907fe2df78bc0fd8fd9afd6ad4e4d75d926b077fedd6b1682125be08dcf145bf5f1f800b8f2db9752dbbde7720814d36ecc7d15f6eeef578886e5098 SHA512 e422ab36826600a1081a72358484ff32918c8bab7d1e2430037051c92012b7ddca810b7c33200088d3379c36d08f243acfeca63be4720e8e683d808e259e8d6c
+EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
index a5af04f6ae39..948a693cf3a8 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
new file mode 100644
index 000000000000..9f91d8ee2512
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index 41418f18f8b8..d61e3a99652a 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,3 +1,5 @@
 DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
+DIST tvdb_api-3.0.2.tar.gz 20436 BLAKE2B d9df5f1e2e8dd26486ec5aa2fa542534e43e08ce9c19ae8f8e48a05b3167db856ccb7765bb7d7acb4adcf7a53f5deff299f69123d60c3495ec1cc4d849d3e0b5 SHA512 b6c3c04eb300f2a371f50ef0331ca1ae602c7ccda2a0d8ad52f5c89fac5cf4dff77ce11d0dc774aa2a8dc1e02798a4432262cbaafea9239693c300931213107c
 EBUILD tvdb_api-2.0-r1.ebuild 473 BLAKE2B 6ba7cfe435c6f381eb3076d4e7eef41d6b68905dd4b846a8751d08d02c72f0b0ea4a17a4dab7d39e8dbcc04d540c0113ee01cd96e0f95a462015aaa5804d7072 SHA512 6e2c37eda167125829336843aa91c021fe828fdbbf12810c9c5eff7c314aea258c3f58e999652b6749f1bf4782c177e31c9d25ac59cbd90a7e9b5c63ab276772
+EBUILD tvdb_api-3.0.2.ebuild 467 BLAKE2B 3421185388b3bfc447d1c6d951424bcabccb85af11abad706148f44afbae81260711a4b107f3c8167aeda7d7210f9a3ba3e9f816a9540d0018be8a6bbbdc32a3 SHA512 a31538815ba66c30e64caec4867957d7cc4123e2416ad724a50ada3e392eeca8aba0e62ba578c8c4eee7485c73d0f63b76a7fb36f340cb8b2e6fb7f1996663bc
 MISC metadata.xml 369 BLAKE2B d6cd298ce14e9a1324fb56608d01ab090d90e86a9190ab42c06767f9b26cfef2e85be45ef614a8265ce28e82854820be3a9c0843c18f33d370d9d0f7e584e3ec SHA512 1785932fccd60c8f86f13b05d58f542ef108ebec4f1f2598b57d98396e4fc07e24d3d15805df5d28bcefac63dad03b07454af5480d4c032ba237e64ef9234a64
diff --git a/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild b/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild
new file mode 100644
index 000000000000..8604174a6448
--- /dev/null
+++ b/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 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 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=""
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index ec0b582ef662..65a091cf090d 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -9,7 +9,9 @@ AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e
 AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
 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-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5777 BLAKE2B 163fac4a0cdc830f9be404a69c43287f8594f2a71dacee4d4b37a56e5fd140c060b1a3e765e63bcd4b1a4fefff0bb30a1df007b6f7ad0f01adb0b6ad8f1687ee SHA512 124513b07e486caf4655534cfa0fd3c34facce3f16fe42977d41f2fcd7fa032e3dfd0ea85cf461941539ca8e0768e015809f33c798e49582aaef657aa02ce499
 EBUILD twisted-20.3.0.ebuild 5611 BLAKE2B 598bfa6c58c1acae83610bf1472d49ddf65ba75689e7c76eb356af50b1c786b5201dfb696afc7ab0ac0439878e2119de9f359250d2ba373de146ebe9edb5b37e SHA512 bbebee3ed4a72f34d346dbc38141f2a461b61c3d3a8ca99be711d16ee10a8759aaefc9f780daa0ee2dca589b4f273fb47c69b6b694c19a437ea3ef94d3ca2d14
+EBUILD twisted-21.2.0.ebuild 4685 BLAKE2B 6bd631d322a8a8a48508578a2e4011cf6b1a9434d43e5c93399bd0cb9526aa416dabce547cb8d4ec4c1f18cbee60a06814bc74ce94d4b67c5f7483e4a5981560 SHA512 4eceb533fcde6b215983005c57cb56d273f3300270396715f913a109f6081765e835d0f069e1c6c9432ac3f94facd9ebe4977c144cbb38f896bea2e8c77b9a10
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
new file mode 100644
index 000000000000..7e25407c0205
--- /dev/null
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="
+	https://github.com/twisted/twisted/archive/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conch crypt http2 serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+BDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		net-misc/openssh
+	)
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# puts system in EMFILE state, then the exception handler may fail
+	# trying to open more files due to some gi magic
+	sed -e '/SKIP_EMFILE/s:False:True:' \
+		-i src/twisted/internet/test/test_tcp.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	# accesses /dev/net/tun
+	sed -e '/class RealDeviceTestsMixin/a\
+    skip = "Requires extra permissions"' \
+		-i src/twisted/pair/test/test_tuntap.py || die
+
+	# relies on the pre-CVE parse_qs() behavior in Python
+	sed -e '/d=c;+=f/d' \
+		-i src/twisted/web/test/test_http.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# TODO: upstream seems to override our build paths
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 27b82e81356a..81015e682a04 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,3 +1,3 @@
 DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d5f7a43d7fbdce4e8c58b641f671a1c4c10f44c5b6d6ce9f0646860d35c14414b17e84daeb74f6e2c8871207b6fd4 SHA512 33eb35ea811ec1964fcd51fad54ba53d60e6caf3b5b7d11ae138f7228be9fb1eca7a02b1c6699a62cc2f6c39e035cb5a28f53ef67a98d019cdf91c9874867871
-EBUILD twython-3.7.0.ebuild 900 BLAKE2B 2d370e60005ac00094cf791cc50c559c13df13271fa21a9c74f203f54509b2fd9efdf62425bd10aae9fdf836d980c05852ac8822e384a1cd70738de8923144c7 SHA512 c2976f023066e328e673151f8c1b924acca4857c2122b97b2ce7104ab71be94c00a464a12b27e052c9ecd61dbdda980640c3ba36ac77de5010bbe239e68cf493
+EBUILD twython-3.7.0.ebuild 900 BLAKE2B 11d5468dfd9a83fee82fbab7edd46933235894218eaeb38285b40758c5fce52eb9b736109deae083b728082bde8667c91aef209cff9b8ef22bbfe60334cc7da3 SHA512 3561737b9e2e08c13e0c7a8355b14539de2c53069ab39533fb9f0661ce6999e4005077b45942cf73225e3917a38da503f656589d6b4aa65812e8289644d17797
 MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
diff --git a/dev-python/twython/twython-3.7.0.ebuild b/dev-python/twython/twython-3.7.0.ebuild
index 207c017737ed..8850d99906b5 100644
--- a/dev-python/twython/twython-3.7.0.ebuild
+++ b/dev-python/twython/twython-3.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index e7e97d38b6fc..4ec7e80087a3 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,3 +1,5 @@
 DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
+DIST txaio-21.2.1.tar.gz 53383 BLAKE2B ff245c7e303a88e0e0f71bfa99ec5cfa2e6ec026e43e9477beb711cc753d73d4f49079727f9f86499779819fda74747edee00ebe22c0ac59c764c1403b983960 SHA512 762875b9c10304dab31dd54f7830f56b0cc26dd6e7a98c8faf57891a2810e36f53004833f872f0f51bad61cb62be033cfc228c99fd6aff60cd4dd2ae2f2e5c37
 EBUILD txaio-20.12.1.ebuild 862 BLAKE2B 79cb697e1d575f90ef6743273fe17cd3c40a7d038321e13f31e068404e9fb627d47e57fbfac403509dd2a8729e15f65a29bee9f4adc2918e9508332d65c0ac71 SHA512 fc83f15d64dec93448cd497e90617acdf0977039dacde7bd0b47b0ed0d099f01498cc72cd5984d317803554303cfa02fcb0eb738da8c0776790f93a3e8bd8ff5
+EBUILD txaio-21.2.1.ebuild 866 BLAKE2B d597817e162900c28149f5a2588ee93941cca0ac4d6c2a3da93046f0b183332c478bcbd80f972d5c5de6cd440ca41ab10358a2bccf6b8a452a8b6692e50076c2 SHA512 8a1576541d30e66f0535e14cf61bf526d858a0dffcc728fbc63e365633781cb1feeb7e472e83124e62ecde25db63e1036dfadd0ae6fad985f6b4518d0ce00b12
 MISC metadata.xml 617 BLAKE2B a846ad814e7b2107ba9a865cfe98e0ba500b11b2a35dc04efb8f141e7c9abbeedcbbb98df1faaccc7675f0b9076b1294efff20cad07ee6f2b36ef2487a38594a SHA512 2460cee3a6f12587021f87733107903295d1b357d19467df2a2510700a1b0f11d16b6a8e63065692c1ff4ac5c3738a5d75f17f10b6c769d022a7f9d437c040b7
diff --git a/dev-python/txaio/txaio-21.2.1.ebuild b/dev-python/txaio/txaio-21.2.1.ebuild
new file mode 100644
index 000000000000..d4a805dd4f33
--- /dev/null
+++ b/dev-python/txaio/txaio-21.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+
+BDEPEND="
+	test? (
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+	)
+"
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
+	'>=dev-python/sphinx_rtd_theme-0.1.9'
+distutils_enable_tests pytest
+
+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
+}
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 7ec625d5864c..c37221f134ba 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,5 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
 DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
 EBUILD typed-ast-1.4.1.ebuild 584 BLAKE2B 612d3dd28ebe656f5c8db2db64fd75c6e770be74f11d3d3992d2b0cd9a327fe0349b3258815a4243cd574bc19c9d9f170ddaca606c063856d2386bafba48c921 SHA512 69169841fccdd19dcc35012da4efb4877e77e23bc6291851c4b7224a133594f05cf5519938121a34990f420d1da5cb26da2f5982235baa45b0d45406b7b93c03
-EBUILD typed-ast-1.4.2.ebuild 592 BLAKE2B 8bc9a082b01a2acc78cccf72c78aea9573144824b04847e01a4adb5faf0d16c20b1fb487cab34ab101f9e9c57a51dae7083cdacc9a2bab777ee2eb053349429f SHA512 9673d27a409c2e5138b805121e5ab28fe60ba3434409e40c514e79ded20467b8c852e0675543781a113912820a95e60d3d9c67b8e2f0f02f3fcc2ec89439ccfe
+EBUILD typed-ast-1.4.2.ebuild 586 BLAKE2B 95ea09ff800d30f4a40a0493153728a201acc1b8158a887f3fe8019dde35cf42fb25d61597bd7da7e561a0d252af6c25641eeef2a12dd6b851489c854d06837d SHA512 ff831311da690af37d0d654d188eacb2faa65d5798ecbe7aa1e50a3ece7bfffacbdb83f4af1b0d58d4e3c2f6d77c4c5346d8c365c0757ee3dc1aeb6af766bd9b
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
index 99eadef4aee1..159f3afdaacf 100644
--- a/dev-python/typed-ast/typed-ast-1.4.2.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 911205048c91..8f843bb172ec 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,13 +1,3 @@
-AUX ujson-1.35-fix-for-overflowing-long.patch 2630 BLAKE2B 39bb394773d6cf8b395701d32b4e8afc6de09c901c4e22e38ba78c37788b0e6ed69c28c3782e2a196e00ee22f21b1c93579ced48d968a5c346b6ba16ecbbe199 SHA512 1006a559fba644985663acbf3a94b8485511a0b137e96191c15f791ef1b84824dfd3d26ffb7de3bcecd011ab94e04b46e2ffbdf90766cb95c11be9c508cfc847
-AUX ujson-1.35-fix-ordering-of-orderdict.patch 4046 BLAKE2B 24d5bc9401ec44939f355aff06cabb7e2a52f8dc41dff419e48d2d84c64c40fcfc786131f9973c1ba804d110443ec8af621602ecc33ca17a47b82036bf9ebf57 SHA512 e3c392a4298f65154549f077c55da7b78d6e9085a217b3ef574ccec4d9f0466f5d0901c039afb1fb44b1e26042881abc5007eb045a3594ee365c09f46443d134
-AUX ujson-1.35-sort_keys-segfault.patch 2360 BLAKE2B 774cd15a52a333456e0f7a4996d111123aa315c41c7e6d01f2618ca459227ae74458202b899d6676a8f03e229056759d1e3c0d36a7204cfd8ce947787a010b38 SHA512 aac5b264187be10cbfb2d128f1a415fd0d841a728b7c1975232e5fe37fc042b19aae084e9c807eb5c23b1fe8306565bb2867543c08d88c2abcf474401644f114
-AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f92727e9bfab2c41a734412706102e1b0df8c04f969d4273354cdb570b3334a4bcb7ec3cdef7c1c836405345165e129ab82a0f53f8f35 SHA512 3d3b7a3dc3d055c4c3cc94acdced6d5b154bfe23ff371230924f5ac7ea982997b2d404dc643c53e606c76b41a5d8c41d506d3f5d3adcc6cd61633f7dbaf3e30e
-AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
-AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
-DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-DIST ujson-4.0.1.tar.gz 7128868 BLAKE2B 159496bfa2b7efff744c1f725c5a8c362c6baac20518d440e5827ec8af1a9a77b4e060126d9b35b39baae079f7092e64d49d0cd23a637174a4bca261203939d6 SHA512 11fb28166afab30e29d71070c91cfb78245eed704a769bf6fb0871c267135fac3fa1042c4ac875dcb870f8a00615e6bcc8fdcd0168edd5ccbae6437605b4df0d
 DIST ujson-4.0.2.tar.gz 7129106 BLAKE2B 8ebf68c6bac65100baeee4f95f175ada09ba48b9efe1876b7b1ff2c3cf87d1a50d8300a981fd97eac73e4c5a70af1b7fddcd468aa6067aac8a2e44133f397057 SHA512 ece12d4407cb7cdb647597ff7fc32e4390fc4c790c59e764da5c5644e5dec470c48cb6a6aaa18429cb713643e5205c5d26b2d2d2195bc90f3a171615d3dbd80d
-EBUILD ujson-1.35-r1.ebuild 921 BLAKE2B 0aa75603e374f38cb7f62718597eafe2b3b1baefb45ffdd3fd26c073399c14bbddf6c69e2e6a34607660b1ed1bfa0ad807c5155d4655f40c8382856baaa2a57b SHA512 cd1cc7f86aeebaf5000a114372045c7e04c395e9dda76362e5c549ae9d65824f2156329e048a730a4fef5482a667f1fe01d2136e2f4939e4156574e6a5469655
-EBUILD ujson-4.0.1.ebuild 581 BLAKE2B 9f4856cec5864247e5f6b4534fa19ffe9e092994c7cbec36d70f0df8b0cd2ea721ab1e1c41d9e7b8ac39e94754169cf2bdc8b43415f77147eca6b34d32438566 SHA512 c0da72fdef65bae733f0920050db37d2c7dad051f15398f463012fdd70c2d6e144b820156d3986d8768f7239ade934bd89fe8ff6663d588cc330c3fd968ee626
-EBUILD ujson-4.0.2.ebuild 547 BLAKE2B 6677f0c78e64e1150d4c85d338ff7182ef81f090b852f472b10181d9aad92b16767cae741acf3f0f2334d47a692549f0f02546e44279e0a66dcd7fccb6c32f22 SHA512 2ec675c15a469e46a8a5ba15da5f57f71b454c02061e998c7788f55c3cbf91ed8ba13137558502b2bcf735972bcaf2fb8895ebe84312d0e1ddb5017b1f8b6696
+EBUILD ujson-4.0.2.ebuild 543 BLAKE2B f1e3d5946f7964f4088d019b6a851935e06b9e1ce241335fa798d1621de9b4426a490f9d59ada01b7d1a2ac47e78c3035a5f41b9e2e7947de49d3adb752948bf SHA512 eeb3502ff893ab0962a2adc5551e0406bf09fc9cd1d04bff8b5ac3b8d398049804a5738e95e2e4358c0d823b7aa9e24272e2b4472c68cf226641bc8d59f230f5
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch b/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch
deleted file mode 100644
index 98659ce1722b..000000000000
--- a/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-commit 409c6d4006fdea27e746ea397124f98c92a41a92
-Author: Joakim Hamren <joakim.hamren@gmail.com>
-Date:   Sat Feb 4 04:21:05 2017 +0100
-
-    Fix for overflowing long causing invalid json
-    
-    This was caused by checking for "__json__" using PyObject_HasAttrString
-    which clears the error set by a previous long overflow. Thus this was dependent
-    on the order of processing of dict items, which explains why it was
-    seemingly random as the dict items are likely ordered by a hash of
-    the key.
-    
-    This fixes GH224 and GH240.
-
-diff --git a/python/objToJSON.c b/python/objToJSON.c
-index 8133fb5..adea2f6 100644
---- a/python/objToJSON.c
-+++ b/python/objToJSON.c
-@@ -226,6 +226,21 @@ static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size
-   return NULL;
- }
- 
-+static int PyHasAttrStringPreserveErr(PyObject *obj, const char *attr)
-+{
-+  int res;
-+  PyObject *excType = NULL, *excValue, *excTraceback;
-+
-+  if (!PyErr_Occurred())
-+    return PyObject_HasAttrString(obj, "__json__");
-+
-+  PyErr_Fetch(&excType, &excValue, &excTraceback);
-+  res = PyObject_HasAttrString(obj, "__json__");
-+  PyErr_Restore(excType, excValue, excTraceback);
-+
-+  return res;
-+}
-+
- static int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   PyObject *item;
-@@ -471,21 +486,21 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-     GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
-   }
-   else
--    if (!PyString_Check(GET_TC(tc)->itemName))
--    {
--      GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
-+  if (!PyString_Check(GET_TC(tc)->itemName))
-+  {
-+    GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
- #if PY_MAJOR_VERSION >= 3
--      itemNameTmp = GET_TC(tc)->itemName;
--      GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
--      Py_DECREF(itemNameTmp);
-+    itemNameTmp = GET_TC(tc)->itemName;
-+    GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
-+    Py_DECREF(itemNameTmp);
- #endif
--    }
--    else
--    {
--      Py_INCREF(GET_TC(tc)->itemName);
--    }
--    PRINTMARK();
--    return 1;
-+  }
-+  else
-+  {
-+    Py_INCREF(GET_TC(tc)->itemName);
-+  }
-+  PRINTMARK();
-+  return 1;
- }
- 
- static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-@@ -728,7 +743,7 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
-     return;
-   }
-   else
--  if (PyString_Check(obj) && !PyObject_HasAttrString(obj, "__json__"))
-+  if (PyString_Check(obj) && !PyHasAttrStringPreserveErr(obj, "__json__"))
-   {
-     PRINTMARK();
-     pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
diff --git a/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch b/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch
deleted file mode 100644
index 37270d41e3b1..000000000000
--- a/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-commit c9f8318bd823ae9d44797b6b881a2b3e22cdbade
-Author: Joakim Hamren <joakim.hamren@gmail.com>
-Date:   Tue Feb 7 02:02:38 2017 +0100
-
-    Fix for incorrect order when using OrderedDict
-
-diff --git a/python/objToJSON.c b/python/objToJSON.c
-index abe6588..9e6a390 100644
---- a/python/objToJSON.c
-+++ b/python/objToJSON.c
-@@ -253,8 +253,13 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-     GET_TC(tc)->itemName = NULL;
-   }
- 
-+  if (!(GET_TC(tc)->itemName = PyIter_Next(GET_TC(tc)->iterator)))
-+  {
-+    PRINTMARK();
-+    return 0;
-+  }
- 
--  if (!PyDict_Next ( (PyObject *)GET_TC(tc)->dictObj, &GET_TC(tc)->index, &GET_TC(tc)->itemName, &GET_TC(tc)->itemValue))
-+  if (!(GET_TC(tc)->itemValue = PyObject_GetItem(GET_TC(tc)->dictObj, GET_TC(tc)->itemName)))
-   {
-     PRINTMARK();
-     return 0;
-@@ -295,6 +300,7 @@ static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-     Py_DECREF(GET_TC(tc)->itemName);
-     GET_TC(tc)->itemName = NULL;
-   }
-+  Py_CLEAR(GET_TC(tc)->iterator);
-   Py_DECREF(GET_TC(tc)->dictObj);
-   PRINTMARK();
- }
-@@ -425,20 +431,23 @@ static char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outL
- 
- static void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
- {
--  if (enc->sortKeys) {
-+  pc->dictObj = dictObj;
-+  if (enc->sortKeys)
-+  {
-     pc->iterEnd = SortedDict_iterEnd;
-     pc->iterNext = SortedDict_iterNext;
-     pc->iterGetValue = SortedDict_iterGetValue;
-     pc->iterGetName = SortedDict_iterGetName;
-+    pc->index = 0;
-   }
--  else {
-+  else
-+  {
-     pc->iterEnd = Dict_iterEnd;
-     pc->iterNext = Dict_iterNext;
-     pc->iterGetValue = Dict_iterGetValue;
-     pc->iterGetName = Dict_iterGetName;
-+    pc->iterator = PyObject_GetIter(dictObj);
-   }
--  pc->dictObj = dictObj;
--  pc->index = 0;
- }
- 
- static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
-@@ -446,7 +455,8 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
-   PyObject *obj, *objRepr, *exc;
-   TypeContext *pc;
-   PRINTMARK();
--  if (!_obj) {
-+  if (!_obj)
-+  {
-     tc->type = JT_INVALID;
-     return;
-   }
-diff --git a/tests/tests.py b/tests/tests.py
-index cd928e6..b7e46af 100644
---- a/tests/tests.py
-+++ b/tests/tests.py
-@@ -10,6 +10,8 @@ import json
- import math
- import time
- import pytz
-+from collections import OrderedDict
-+
- if six.PY2:
-     import unittest2 as unittest
- else:
-@@ -383,6 +385,10 @@ class UltraJSONTests(unittest.TestCase):
-         input = -float('inf')
-         self.assertRaises(OverflowError, ujson.encode, input)
- 
-+    def test_encodeOrderedDict(self):
-+        input = OrderedDict([(1, 1), (0, 0), (8, 8), (2, 2)])
-+        self.assertEqual('{"1":1,"0":0,"8":8,"2":2}', ujson.encode(input))
-+
-     def test_decodeJibberish(self):
-         input = "fdsa sda v9sa fdsa"
-         self.assertRaises(ValueError, ujson.decode, input)
-@@ -668,7 +674,7 @@ class UltraJSONTests(unittest.TestCase):
-         d = {u'key': JSONTest()}
-         output = ujson.encode(d)
-         dec = ujson.decode(output)
--        self.assertEquals(dec, {u'key': output_text})
-+        self.assertEqual(dec, {u'key': output_text})
- 
-     def test_object_with_json_unicode(self):
-         # If __json__ returns a string, then that string
-@@ -681,7 +687,7 @@ class UltraJSONTests(unittest.TestCase):
-         d = {u'key': JSONTest()}
-         output = ujson.encode(d)
-         dec = ujson.decode(output)
--        self.assertEquals(dec, {u'key': output_text})
-+        self.assertEqual(dec, {u'key': output_text})
- 
-     def test_object_with_complex_json(self):
-         # If __json__ returns a string, then that string
-@@ -694,7 +700,7 @@ class UltraJSONTests(unittest.TestCase):
-         d = {u'key': JSONTest()}
-         output = ujson.encode(d)
-         dec = ujson.decode(output)
--        self.assertEquals(dec, {u'key': obj})
-+        self.assertEqual(dec, {u'key': obj})
- 
-     def test_object_with_json_type_error(self):
-         # __json__ must return a string, otherwise it should raise an error.
diff --git a/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch b/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch
deleted file mode 100644
index 7239bca3e238..000000000000
--- a/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 870ee48fe109c289033cd0b7543b6f5ea4e6f128
-Author: Joakim Hamren <joakim.hamren@gmail.com>
-Date:   Sat Feb 4 01:07:52 2017 +0100
-
-    Fixes for sort_keys bug and a typo.
-    
-        - Fixed segfault when using sort_keys=True on dict with unorderable keys (GH247)
-    
-        - Fixed refcount becoming negative when using sort_keys=True (GH243)
-    
-        - Fixed compile error when defining JSON_NO_EXTRA_WHITESPACE
-          caused by a wrongly named variable. (GH245)
-
-diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c
-index cb10024..1bfa8f4 100644
---- a/lib/ultrajsonenc.c
-+++ b/lib/ultrajsonenc.c
-@@ -717,7 +717,7 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
- {
-   const char *value;
-   char *objName;
--  int count;
-+  int count, res;
-   JSOBJ iterObj;
-   size_t szlen;
-   JSONTypeContext tc;
-@@ -796,7 +796,7 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
-           {
-             Buffer_AppendCharUnchecked (enc, ',');
- #ifndef JSON_NO_EXTRA_WHITESPACE
--            Buffer_AppendCharUnchecked (buffer, ' ');
-+            Buffer_AppendCharUnchecked (enc, ' ');
- #endif
-             Buffer_AppendIndentNewlineUnchecked (enc);
-           }
-@@ -823,8 +823,16 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
-       Buffer_AppendCharUnchecked (enc, '{');
-       Buffer_AppendIndentNewlineUnchecked (enc);
- 
--    while (enc->iterNext(obj, &tc))
-+    while ((res = enc->iterNext(obj, &tc)))
-     {
-+      if(res < 0)
-+      {
-+        enc->iterEnd(obj, &tc);
-+        enc->endTypeContext(obj, &tc);
-+        enc->level--;
-+        return;
-+      }
-+
-       if (count > 0)
-       {
-         Buffer_AppendCharUnchecked (enc, ',');
-diff --git a/python/objToJSON.c b/python/objToJSON.c
-index 1960d40..8133fb5 100644
---- a/python/objToJSON.c
-+++ b/python/objToJSON.c
-@@ -537,6 +537,7 @@ static int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-     // Sort the list.
-     if (PyList_Sort(items) < 0)
-     {
-+      PyErr_SetString(PyExc_ValueError, "unorderable keys");
-       goto error;
-     }
- 
-@@ -607,7 +608,6 @@ static void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   GET_TC(tc)->itemName = NULL;
-   GET_TC(tc)->itemValue = NULL;
--  Py_DECREF(GET_TC(tc)->newObj);
-   Py_DECREF(GET_TC(tc)->dictObj);
-   PRINTMARK();
- }
diff --git a/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch b/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch
deleted file mode 100644
index e2b7b9103f48..000000000000
--- a/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit ac4637fbc4e72bd59f221d9bba19127820d21023
-Author: Joakim Hamren <joakim.hamren@gmail.com>
-Date:   Sat Feb 4 16:36:14 2017 +0100
-
-    Following std json handling of None dict key
-    
-    Previously a None dict item key would be outputted in JSON as "None".
-    To better align with the standard json module this was changed to output
-    "null". There's no proper representation of null object keys in JSON so
-    this is implementation specific but it seems more natural to follow
-    suit when it can be done without a significant performance hit.
-    
-    Added and used branch prediction macros (LIKELY/UNLIKELY) as well.
-
-diff --git a/lib/ultrajson.h b/lib/ultrajson.h
-index 6c1dbc1..ca82a29 100644
---- a/lib/ultrajson.h
-+++ b/lib/ultrajson.h
-@@ -117,6 +117,14 @@ typedef uint32_t JSUINT32;
- 
- #define INLINE_PREFIX inline
- 
-+#ifdef __GNUC__
-+#define LIKELY(x)       __builtin_expect(!!(x), 1)
-+#define UNLIKELY(x)     __builtin_expect(!!(x), 0)
-+#else
-+#define LIKELY(x)       (x)
-+#define UNLIKELY(x)     (x)
-+#endif
-+
- typedef uint8_t JSUINT8;
- typedef uint16_t JSUTF16;
- typedef uint32_t JSUTF32;
-diff --git a/python/objToJSON.c b/python/objToJSON.c
-index adea2f6..41d4289 100644
---- a/python/objToJSON.c
-+++ b/python/objToJSON.c
-@@ -488,6 +488,12 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-   else
-   if (!PyString_Check(GET_TC(tc)->itemName))
-   {
-+    if (UNLIKELY(GET_TC(tc)->itemName == Py_None))
-+    {
-+      GET_TC(tc)->itemName = PyString_FromString("null");
-+      return 1;
-+    }
-+
-     GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
- #if PY_MAJOR_VERSION >= 3
-     itemNameTmp = GET_TC(tc)->itemName;
-@@ -743,7 +749,7 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
-     return;
-   }
-   else
--  if (PyString_Check(obj) && !PyHasAttrStringPreserveErr(obj, "__json__"))
-+  if (PyString_Check(obj) && LIKELY(!PyHasAttrStringPreserveErr(obj, "__json__")))
-   {
-     PRINTMARK();
-     pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
-@@ -837,7 +843,7 @@ ISITERABLE:
-   }
-   */
- 
--  if (PyObject_HasAttrString(obj, "toDict"))
-+  if (UNLIKELY(PyObject_HasAttrString(obj, "toDict")))
-   {
-     PyObject* toDictFunc = PyObject_GetAttrString(obj, "toDict");
-     PyObject* tuple = PyTuple_New(0);
-@@ -863,7 +869,7 @@ ISITERABLE:
-     return;
-   }
-   else
--  if (PyObject_HasAttrString(obj, "__json__"))
-+  if (UNLIKELY(PyObject_HasAttrString(obj, "__json__")))
-   {
-     PyObject* toJSONFunc = PyObject_GetAttrString(obj, "__json__");
-     PyObject* tuple = PyTuple_New(0);
diff --git a/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch b/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch
deleted file mode 100644
index 6ce987581c4f..000000000000
--- a/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ujson-1.35.orig/tests/tests.py	2017-04-14 18:14:36.298345782 -0700
-+++ ujson-1.35/tests/tests.py	2017-04-14 18:14:47.899947795 -0700
-@@ -702,7 +702,7 @@
- 
-         output = ujson.encode(ObjectTest())
-         dec = ujson.decode(output)
--        self.assertEquals(dec, {})
-+        self.assertEqual(dec, {})
- 
-     def test_toDict(self):
-         d = {"key": 31337}
diff --git a/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch b/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch
deleted file mode 100644
index 7ce5d44e0e7a..000000000000
--- a/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch
+++ /dev/null
@@ -1,591 +0,0 @@
-commit 6cf6c7ff25c883349e8e9e5468e61498358e2e91
-Author: WGH <wgh@torlan.ru>
-Date:   Sat Aug 27 17:34:22 2016 +0300
-
-    added "static" to C functions, where possible
-    
-    1. It reduces clutter in symbol table.
-    2. It fixes issues with C99 inline semantics for functions
-       marked as inline (#237, #180, #222), which manifests
-       when compiled with GCC>=5.
-
-diff --git a/lib/ultrajsondec.c b/lib/ultrajsondec.c
-index 21a732e..19efc60 100644
---- a/lib/ultrajsondec.c
-+++ b/lib/ultrajsondec.c
-@@ -66,7 +66,7 @@ struct DecoderState
-   JSONObjectDecoder *dec;
- };
- 
--JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR;
-+static JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR;
- typedef JSOBJ (*PFN_DECODER)( struct DecoderState *ds);
- 
- static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message)
-@@ -76,13 +76,13 @@ static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message)
-   return NULL;
- }
- 
--double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount)
-+static double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount)
- {
-   static const double g_pow10[] = {1.0, 0.1, 0.01, 0.001, 0.0001, 0.00001, 0.000001,0.0000001, 0.00000001, 0.000000001, 0.0000000001, 0.00000000001, 0.000000000001, 0.0000000000001, 0.00000000000001, 0.000000000000001};
-   return (intValue + (frcValue * g_pow10[frcDecimalCount])) * intNeg;
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
- {
-   char *end;
-   double value;
-@@ -99,7 +99,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
-   return ds->dec->newDouble(ds->prv, value);
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
- {
-   int intNeg = 1;
-   int mantSize = 0;
-@@ -309,7 +309,7 @@ BREAK_EXP_LOOP:
-   return ds->dec->newDouble (ds->prv, createDouble( (double) intNeg, (double) intValue , frcValue, decimalCount) * pow(10.0, expValue * expNeg));
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds)
- {
-   char *offset = ds->start;
-   offset ++;
-@@ -329,7 +329,7 @@ SETERROR:
-   return SetError(ds, -1, "Unexpected character found when decoding 'true'");
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds)
- {
-   char *offset = ds->start;
-   offset ++;
-@@ -351,7 +351,7 @@ SETERROR:
-   return SetError(ds, -1, "Unexpected character found when decoding 'false'");
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds)
- {
-   char *offset = ds->start;
-   offset ++;
-@@ -371,7 +371,7 @@ SETERROR:
-   return SetError(ds, -1, "Unexpected character found when decoding 'null'");
- }
- 
--FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds)
-+static FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds)
- {
-   char *offset = ds->start;
- 
-@@ -422,7 +422,7 @@ static const JSUINT8 g_decoderLookup[256] =
-   /* 0xf0 */ 4, 4, 4, 4, 4, 4, 4, 4, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR,
- };
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
- {
-   JSUTF16 sur[2] = { 0 };
-   int iSur = 0;
-@@ -672,7 +672,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
-   }
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
- {
-   JSOBJ itemValue;
-   JSOBJ newObj;
-@@ -736,7 +736,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
-   }
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
- {
-   JSOBJ itemName;
-   JSOBJ itemValue;
-@@ -819,7 +819,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
-   }
- }
- 
--FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds)
-+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds)
- {
-   for (;;)
-   {
-diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c
-index 6c1b120..f330171 100644
---- a/lib/ultrajsonenc.c
-+++ b/lib/ultrajsonenc.c
-@@ -112,7 +112,7 @@ static void SetError (JSOBJ obj, JSONObjectEncoder *enc, const char *message)
- /*
- FIXME: Keep track of how big these get across several encoder calls and try to make an estimate
- That way we won't run our head into the wall each call */
--void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
-+static void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
- {
-   size_t curSize = enc->end - enc->start;
-   size_t newSize = curSize * 2;
-@@ -148,7 +148,7 @@ void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
-   enc->end = enc->start + newSize;
- }
- 
--FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value)
-+static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value)
- {
-   *(outputOffset++) = g_hexChars[(value & 0xf000) >> 12];
-   *(outputOffset++) = g_hexChars[(value & 0x0f00) >> 8];
-@@ -156,7 +156,7 @@ FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (c
-   *(outputOffset++) = g_hexChars[(value & 0x000f) >> 0];
- }
- 
--int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end)
-+static int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end)
- {
-   char *of = (char *) enc->offset;
- 
-@@ -260,7 +260,7 @@ int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, cons
-   }
- }
- 
--int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end)
-+static int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end)
- {
-   JSUTF32 ucs;
-   char *of = (char *) enc->offset;
-@@ -498,19 +498,19 @@ int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char
- #define Buffer_AppendCharUnchecked(__enc, __chr) \
-                 *((__enc)->offset++) = __chr; \
- 
--FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end)
-+static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end)
- {
-   char aux;
-   while (end > begin)
-   aux = *end, *end-- = *begin, *begin++ = aux;
- }
- 
--void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc)
-+static void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc)
- {
-   if (enc->indent > 0) Buffer_AppendCharUnchecked(enc, '\n');
- }
- 
--void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
-+static void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
- {
-   int i;
-   if (enc->indent > 0)
-@@ -519,7 +519,7 @@ void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
-         Buffer_AppendCharUnchecked(enc, ' ');
- }
- 
--void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
-+static void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
- {
-   char* wstr;
-   JSUINT32 uvalue = (value < 0) ? -value : value;
-@@ -535,7 +535,7 @@ void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
-   enc->offset += (wstr - (enc->offset));
- }
- 
--void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
-+static void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
- {
-   char* wstr;
-   JSUINT64 uvalue = (value < 0) ? -value : value;
-@@ -551,7 +551,7 @@ void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
-   enc->offset += (wstr - (enc->offset));
- }
- 
--void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
-+static void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
- {
-   char* wstr;
-   JSUINT64 uvalue = value;
-@@ -566,7 +566,7 @@ void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
-   enc->offset += (wstr - (enc->offset));
- }
- 
--int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value)
-+static int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value)
- {
-   /* if input is larger than thres_max, revert to exponential */
-   const double thres_max = (double) 1e16 - 1;
-@@ -714,7 +714,7 @@ Handle integration functions returning NULL here */
- FIXME:
- Perhaps implement recursion detection */
- 
--void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName)
-+static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName)
- {
-   const char *value;
-   char *objName;
-diff --git a/python/JSONtoObj.c b/python/JSONtoObj.c
-index 79d9f1a..6cef088 100644
---- a/python/JSONtoObj.c
-+++ b/python/JSONtoObj.c
-@@ -43,7 +43,7 @@ http://www.opensource.apple.com/source/tcl/tcl-14/tcl/license.terms
- //#define PRINTMARK() fprintf(stderr, "%s: MARK(%d)\n", __FILE__, __LINE__)
- #define PRINTMARK()
- 
--void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
-+static void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
- {
-   PyDict_SetItem (obj, name, value);
-   Py_DECREF( (PyObject *) name);
-@@ -51,59 +51,59 @@ void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
-   return;
- }
- 
--void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value)
-+static void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value)
- {
-   PyList_Append(obj, value);
-   Py_DECREF( (PyObject *) value);
-   return;
- }
- 
--JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end)
-+static JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end)
- {
-   return PyUnicode_FromWideChar (start, (end - start));
- }
- 
--JSOBJ Object_newTrue(void *prv)
-+static JSOBJ Object_newTrue(void *prv)
- {
-   Py_RETURN_TRUE;
- }
- 
--JSOBJ Object_newFalse(void *prv)
-+static JSOBJ Object_newFalse(void *prv)
- {
-   Py_RETURN_FALSE;
- }
- 
--JSOBJ Object_newNull(void *prv)
-+static JSOBJ Object_newNull(void *prv)
- {
-   Py_RETURN_NONE;
- }
- 
--JSOBJ Object_newObject(void *prv)
-+static JSOBJ Object_newObject(void *prv)
- {
-   return PyDict_New();
- }
- 
--JSOBJ Object_newArray(void *prv)
-+static JSOBJ Object_newArray(void *prv)
- {
-   return PyList_New(0);
- }
- 
--JSOBJ Object_newInteger(void *prv, JSINT32 value)
-+static JSOBJ Object_newInteger(void *prv, JSINT32 value)
- {
-   return PyInt_FromLong( (long) value);
- }
- 
--JSOBJ Object_newLong(void *prv, JSINT64 value)
-+static JSOBJ Object_newLong(void *prv, JSINT64 value)
- {
-   return PyLong_FromLongLong (value);
- }
- 
--JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value)
-+static JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value)
- {
-   return PyLong_FromUnsignedLongLong (value);
- }
- 
--JSOBJ Object_newDouble(void *prv, double value)
-+static JSOBJ Object_newDouble(void *prv, double value)
- {
-   return PyFloat_FromDouble(value);
- }
-diff --git a/python/objToJSON.c b/python/objToJSON.c
-index 04a4575..1960d40 100644
---- a/python/objToJSON.c
-+++ b/python/objToJSON.c
-@@ -226,7 +226,7 @@ static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size
-   return NULL;
- }
- 
--int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   PyObject *item;
- 
-@@ -242,21 +242,21 @@ int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
-   return 1;
- }
- 
--void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
- }
- 
--JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->itemValue;
- }
- 
--char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   return NULL;
- }
- 
--int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   PyObject *item;
- 
-@@ -282,7 +282,7 @@ int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
-   return 1;
- }
- 
--void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   if (GET_TC(tc)->itemValue)
-   {
-@@ -297,17 +297,17 @@ void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-   }
- }
- 
--JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->itemValue;
- }
- 
--char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   return NULL;
- }
- 
--void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   if (GET_TC(tc)->itemValue)
-   {
-@@ -325,7 +325,7 @@ void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-   PRINTMARK();
- }
- 
--int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
-+static int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
- {
-   PyObject *obj = (PyObject *) _obj;
-   PyObject *itemValue = GET_TC(tc)->itemValue;
-@@ -401,20 +401,20 @@ int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
-   return 1;
- }
- 
--JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   PRINTMARK();
-   return GET_TC(tc)->itemValue;
- }
- 
--char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   PRINTMARK();
-   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
-   return PyString_AS_STRING(GET_TC(tc)->itemName);
- }
- 
--int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   if (GET_TC(tc)->index >= GET_TC(tc)->size)
-   {
-@@ -427,16 +427,16 @@ int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
-   return 1;
- }
- 
--void List_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void List_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
- }
- 
--JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->itemValue;
- }
- 
--char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   return NULL;
- }
-@@ -447,7 +447,7 @@ char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- // itemValue is borrowed from object (which is dict). No refCounting
- //=============================================================================
- 
--int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
- #if PY_MAJOR_VERSION >= 3
-   PyObject* itemNameTmp;
-@@ -488,7 +488,7 @@ int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-     return 1;
- }
- 
--void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   if (GET_TC(tc)->itemName)
-   {
-@@ -499,18 +499,18 @@ void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-   PRINTMARK();
- }
- 
--JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->itemValue;
- }
- 
--char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
-   return PyString_AS_STRING(GET_TC(tc)->itemName);
- }
- 
--int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   PyObject *items = NULL, *item = NULL, *key = NULL, *value = NULL;
-   Py_ssize_t i, nitems;
-@@ -603,7 +603,7 @@ error:
-   return -1;
- }
- 
--void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   GET_TC(tc)->itemName = NULL;
-   GET_TC(tc)->itemValue = NULL;
-@@ -612,19 +612,19 @@ void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-   PRINTMARK();
- }
- 
--JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->itemValue;
- }
- 
--char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
-   return PyString_AS_STRING(GET_TC(tc)->itemName);
- }
- 
- 
--void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
-+static void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
- {
-   if (enc->sortKeys) {
-     pc->iterEnd = SortedDict_iterEnd;
-@@ -642,7 +642,7 @@ void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
-   pc->index = 0;
- }
- 
--void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
-+static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
- {
-   PyObject *obj, *exc, *iter;
-   TypeContext *pc;
-@@ -929,7 +929,7 @@ INVALID:
-   return;
- }
- 
--void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
-+static void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
- {
-   Py_XDECREF(GET_TC(tc)->newObj);
- 
-@@ -937,33 +937,33 @@ void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
-   tc->prv = NULL;
- }
- 
--const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen)
-+static const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen)
- {
-   return GET_TC(tc)->PyTypeToJSON (obj, tc, NULL, _outLen);
- }
- 
--JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   JSINT64 ret;
-   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
-   return ret;
- }
- 
--JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   JSUINT64 ret;
-   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
-   return ret;
- }
- 
--JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   JSINT32 ret;
-   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
-   return ret;
- }
- 
--double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc)
-+static double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   double ret;
-   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
-@@ -975,22 +975,22 @@ static void Object_releaseObject(JSOBJ _obj)
-   Py_DECREF( (PyObject *) _obj);
- }
- 
--int Object_iterNext(JSOBJ obj, JSONTypeContext *tc)
-+static int Object_iterNext(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->iterNext(obj, tc);
- }
- 
--void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc)
-+static void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc)
- {
-   GET_TC(tc)->iterEnd(obj, tc);
- }
- 
--JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
-+static JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
- {
-   return GET_TC(tc)->iterGetValue(obj, tc);
- }
- 
--char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
-+static char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
- {
-   return GET_TC(tc)->iterGetName(obj, tc, outLen);
- }
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
deleted file mode 100644
index 389113fbc471..000000000000
--- a/dev-python/ujson/ujson-1.35-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_{7,8,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[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sort_keys-segfault.patch"
-	"${FILESDIR}/${P}-use-static-where-possible.patch"
-	"${FILESDIR}/${P}-fix-for-overflowing-long.patch"
-	"${FILESDIR}/${P}-standard-handling-of-none.patch"
-	"${FILESDIR}/${P}-fix-ordering-of-orderdict.patch"
-	"${FILESDIR}/${P}-test-depricationwarning.patch"
-)
-
-python_test() {
-	"${PYTHON}" tests/tests.py || die
-}
diff --git a/dev-python/ujson/ujson-4.0.1.ebuild b/dev-python/ujson/ujson-4.0.1.ebuild
deleted file mode 100644
index b6555cc8fa73..000000000000
--- a/dev-python/ujson/ujson-4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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/ujson/ujson-4.0.2.ebuild b/dev-python/ujson/ujson-4.0.2.ebuild
index cf43a19546ea..555f2bbcce49 100644
--- a/dev-python/ujson/ujson-4.0.2.ebuild
+++ b/dev-python/ujson/ujson-4.0.2.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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 36982f15050a..af57496a6caf 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,7 +6,7 @@ DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c06
 EBUILD urllib3-1.25.11.ebuild 1879 BLAKE2B c6a79fb4d9b36011fa0c0602e2853c1f8f289e3e87ce04da163d6c4af39654f8fe47e98c380c9e6f66f749118be3cdf237b66f86eab599fc0c0fc695a26ebdce SHA512 ff5c93995e8dc5c6b4a62e3c8035629ee79db816807a81805bc10dc4b30e51e0ee87fb47f51d13755f1097ccc1c76c26a69a0fe7f432fbd5ea3ac312d2783385
 EBUILD urllib3-1.26.2-r1.ebuild 1988 BLAKE2B 26f5b04b66559676c61460323f2a3a53ebd802581960ee674a76e7a73976f2033540375fbebcfa73b3632ae1c614fc7f649c150a324219031037a84c789b4549 SHA512 edb984d5f3733124863f20d7da469963980b14fa54de736947ddf5109e73aa86d27b9fadb9cd5e7c7bc877d704f56976d829add6880168a10f6aab4a2f5283d7
 EBUILD urllib3-1.26.2-r2.ebuild 1930 BLAKE2B 91598ad9fafe2c16e899efbce7c7d51b918b8b7ca25c421ec10541b2e3198c64d0403e41e06ea3bfb18b5012d943385bd249cb08970ea27015b8dcecf19c0038 SHA512 6d7efbb902fcf41841ae28c8e3a3444d10a6245d7f7014efe5b38c30c7871f730b20423070e6889306d595a369a5114bb7432fe3bb54edb8a18736d0c133af22
-EBUILD urllib3-1.26.2-r3.ebuild 2338 BLAKE2B 8f0ced0146e0fe6e895de3bd709ba5799cf006c7f79b3c5357f27fbfc715504cab210c3b3fa3ea1935e8045d06ecfd5e4b24088bde212444e40544c97de08364 SHA512 1585581027037e69fbb8e88d69f06fbb686bb54bbad3e276d2fa5c838bc4ed04e67b03aa1621e6d258c71a775cd7f1d4c06b385273d62512b4224bd297493bc8
+EBUILD urllib3-1.26.2-r3.ebuild 2337 BLAKE2B c2e6a5e27d1859743e802aa67164f40700036034706320841e9dfa26b3c41b9a01045d18c677525f893ffb10ac891f13d37d89fa532aa34353a9148e160c4152 SHA512 a0e37882b07b63dbb10608399893d93de90cbcf97cdb29862121b94ea57176fdb5e50b2f7eb999b0b05ae9264a79ab6d038ca56fefa31588bffeaf379c26be33
 EBUILD urllib3-1.26.2.ebuild 1891 BLAKE2B 323e3851652351ba52778954d3d9731afd4846702049e14497836b250b352b4176daf83f1e4c45d8ab141474df2693dccdfbf4bba371ece5f47f1f351bdcd3db SHA512 e427406ad6efbdf95dc470f3c9864c52c70374bda2958b447770edff68f67f5fd00a2cd91b4c5d79070208d485cc0a6b1b380d3ad153cc1fdc7c96e50d264da4
 EBUILD urllib3-1.26.3-r1.ebuild 2245 BLAKE2B f43196d80fc5b56c121a5cf0b50a265f7d9725bbeb8f05fb63e63fbee63027ff0cc4f2b3dfbb1ad085fac0106ae46e4ede71d402a167b3231056c524292c00a0 SHA512 03d7aa95f3d71ee58827c4d4d30717a51e2e41c15849d621c11265a29df37a23bd1a0c8ab2d65082f98ce5dba965f2801ef43848a6bbfca8ab8ff3d5f9fc74ec
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild b/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
index f476dfa93e2b..33e9f7fbf871 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r3.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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index b3dc27d2ffba..c70056920f25 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,3 +1,3 @@
 DIST urwidtrees-1.0.3.tar.gz 292930 BLAKE2B 91487debf4878fb58cf2505366a4762a4c755b53eaac86e3ac912d2972c66442828e152749f34e73ade10fd1b912054e4047900e0b54b960629909c1b03e2270 SHA512 f7d69d359ba24345a694659fd9432335679f4b505a5c0e33baf9fc0c068935148c393aff8e11cd5f2c12aa26884aa37ba86e9b3a763472e382d73dd57fd32cd6
-EBUILD urwidtrees-1.0.3.ebuild 665 BLAKE2B 553b0b59b4810d600afff4c428c604e02e02445bdbf2cadb8586beade9e9c3086e8354cc676d5b4322d37ba865e0a15264a9f6ac93f45aa0158922b7bdd6ce75 SHA512 f968f59c3eb31cf4a6a5c68dabc21a84f779fd4c7680f78fa73497dbd0af06216971dbb34a9da7fd22fb3cf780cb8b73589726e35a49b4dd8ddadc7b7f011c8a
+EBUILD urwidtrees-1.0.3.ebuild 667 BLAKE2B a1a5756b5d2fb36d8710f5cdae280e43c57d1eea9a5f419aa6de1de6460a60630d86854a93b98c6ceac99af62b0b312d0e894688236cda410ed4570a76c91932 SHA512 ce8cd0cb94d1cb95ee7ea39782cc870ba56056273cdf6d40b55e09bfb216ee91f6b937f06485eef062890fca496f567925a73bf6a8707190c69995024fb61f8b
 MISC metadata.xml 668 BLAKE2B ca8e96fbb2a3ccc7514e4800780a1e0e153edc50a72e7834bc22b3ec539272ea5b9e39060f55698985c8785e92cb148294888976de60628e2094578db92853e1 SHA512 0e2b5276ab8bd5d16f94c28a39cebaacacc297da93fbd25f0d9afeb150af820930e0ca63e6adff20ec53fef4274062e8c607b5aaf1ef07df6d34cfce0b6c9f35
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
index 2062d498b688..b78d5b645888 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
new file mode 100644
index 000000000000..c9966105e8f1
--- /dev/null
+++ b/dev-python/uvicorn/Manifest
@@ -0,0 +1,4 @@
+AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8bea17f137258944ff0c9a1384255a11c1f5ceb879746b47331247a6a24a5a45706c22fc70e19e2d5d1b8ea9cce6cc2e483df6150 SHA512 909ef4494cf395adbaedbaa7e6fa0561f44392126f19e08192842eb3148f0c19639007b3e54014758e1f00e6b8ba8fa5a06d9dc14f87e63face47e0759ac2bb1
+DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
+EBUILD uvicorn-0.13.4.ebuild 1266 BLAKE2B 899d41ee58589f4a67fd64f31c71faf614a02e01bec0a1e375ab791cc508057a682849fb3794dd64c0b124daa465ffcbee7dc044b9eb5ee25f7d7a7dcc7f73a1 SHA512 ec1e66c572e349451ede00e67d3ccb05d73013a3cf99d350e4dbc39accf0006a28e7dd12306aa40246febcf56429da2bafc817ba80a25ff2b121f2ca73597754
+MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch b/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch
new file mode 100644
index 000000000000..da3038d6db40
--- /dev/null
+++ b/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch
@@ -0,0 +1,31 @@
+https://github.com/encode/uvicorn/pull/892
+
+diff --git a/tests/protocols/test_http.py b/tests/protocols/test_http.py
+index f35a965d..25110fc6 100644
+--- a/tests/protocols/test_http.py
++++ b/tests/protocols/test_http.py
+@@ -67,6 +67,7 @@
+         b"Host: example.org",
+         b"Connection: upgrade",
+         b"Upgrade: websocket",
++        b"Sec-WebSocket-Version: 11",
+         b"",
+         b"",
+     ]
+diff --git a/tests/protocols/test_websocket.py b/tests/protocols/test_websocket.py
+index 24bc285f..7c3fcc08 100644
+--- a/tests/protocols/test_websocket.py
++++ b/tests/protocols/test_websocket.py
+@@ -51,7 +51,11 @@ def app(scope):
+         async with httpx.AsyncClient() as client:
+             response = await client.get(
+                 "http://127.0.0.1:8000",
+-                headers={"upgrade": "websocket", "connection": "upgrade"},
++                headers={
++                    "upgrade": "websocket",
++                    "connection": "upgrade",
++                    "sec-webSocket-version": "11",
++                },
+                 timeout=5,
+             )
+         if response.status_code == 426:
diff --git a/dev-python/uvicorn/metadata.xml b/dev-python/uvicorn/metadata.xml
new file mode 100644
index 000000000000..70a689a65186
--- /dev/null
+++ b/dev-python/uvicorn/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">uvicorn</remote-id>
+		<remote-id type="github">encode/uvicorn</remote-id>
+		<bugs-to>https://github.com/encode/uvicorn/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/uvicorn/uvicorn-0.13.4.ebuild b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
new file mode 100644
index 000000000000..afae4f633023
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# entry points are used
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/click-7*[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-wsproto-1.0.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# watchgod is not in the tree
+	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
+		-e 's/, WatchGodReload//' \
+		-i tests/supervisors/test_reload.py
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 8a5c038db7ad..18158465e14d 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -2,7 +2,9 @@ AUX uvloop-0.14.0-asyncio-test-hang.patch 1175 BLAKE2B e97cef3438a603249e8b1977b
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
 DIST uvloop-0.15.0.tar.gz 2086686 BLAKE2B 34bbce58f47a4da1c8fa27011c4a39e864ba1959affe2584eb33425ddb3fbb3a59783e3cf771669cdb1343299bbc7a7a8a14f4bfcbf2b694ac71b9fc055341d1 SHA512 fcb18511a1af89c11cd4022ecb6e8893915a159b34a054bab5e82da3b9127b886ab3e785a98ca39e612cdf2b18abd95bd7fc505808cccf9d4ac281f5a0b6e0d7
 DIST uvloop-0.15.1.tar.gz 2087966 BLAKE2B 31892cfa2cacb02ae8a78ced2066a60012dfdc95ff9b1d68119487ec543e45fe7867c6a4b597b2ee83632c48d6d53216f648005a6202036e99f38b34b8d5e60a SHA512 104153760781b5596b552f00d0c897144fe2fbe208c2216e94daf5eef08ebde2ec45ddeaf6a24d1b28f9351d241832541a754124229af71245695da262458ffc
+DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 EBUILD uvloop-0.14.0.ebuild 1278 BLAKE2B d759bf6d27d570be076ea992a6d93ea5a75cf9e3295b1d13477b8d08116181d28bcb6a09638ef3a0b82269c0b138c72076670d7d173f7ce1fd5a08b595ce5e77 SHA512 7953803d55a77561bb6e8a901125ca9b22cad1d3afeff20e8ec9c9a30e169e2a447639487664e70852ebdaf2c2a0a36e90798d900af2ca63c2b4b8e545845faa
 EBUILD uvloop-0.15.0.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
 EBUILD uvloop-0.15.1.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
+EBUILD uvloop-0.15.2.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
new file mode 100644
index 000000000000..1ce46b172f5b
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 39c909c57d24..9c409814bdc4 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,17 +2,9 @@ AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b23
 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
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
-DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804861ec0a3c0d0ee5c042e39a8edf894e89d6e78093fe1a4fecaf8b43bceff82e47a1ef7b8a92a1d2bc58d61411575b9 SHA512 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b
-DIST virtualenv-20.3.1.tar.gz 9077527 BLAKE2B 9932c75ffd42c2448a3f5dc49aa8b31f7cd169cc671e225a97fa75fabc3339728d0b280abec9616c11fc869dc696bfd17da05bf911c6f8a14947d710ade86897 SHA512 ee95e851e9e3597fd1691086d1d4dc72a41d6a143e9644be208cadbc1dfe7c8e562cd506a657ba1f77161d8d80a9f6f648b345e6533265b0e989c7ad39cc7680
 DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
-DIST virtualenv-20.4.1.tar.gz 10578390 BLAKE2B 6304d9296c69da098e2f348aeaa42ad46217975070661f4233a8e8b3c733f366bf2a44eaa887269923a1d0329aa06cd4095342025b595b2d8a0c31171c6b1264 SHA512 7e95174de155fa1b3671cfaa7c5a122dc0626f696c033226c20bec37747fd3c270ab2f843e83da91fc8a6bce53712f4eca5b8fb3d94a92e3ddc19f7e43cb83ee
 DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
 EBUILD virtualenv-16.7.10-r1.ebuild 1846 BLAKE2B 59818b64498cb3ef09d0b95b32e24873faa5a0760681362ebfe5bd3fdd6b1cd914ddb1f0604b5b7bf22ed108f0b096ef7e2a738fc9717ee6dc4260a45f46a882 SHA512 e7c0fe99c605ad2dd5c0c83f168ea70dab48973134c8819924f4296ffacefccc017048f237506024b9c8ee4a84580a31ca76370ca8eea9f6c079f0eca773e37b
-EBUILD virtualenv-20.2.1.ebuild 2586 BLAKE2B 92b28643f7174cadd031218df76aa54358c0fec4300538e835807099ac7c47e6d19ccb67a55f47d3db9c2c30c0593e530fd5ff51c6c7860b89cc2c2d7b4dccf2 SHA512 c368563a3933f74c6affa1340c4f5fc6f0a0dba6571302c66f34432d81e855c72bab07b66e773f7c27fec3d5f319109891dc8960434e233fd64482d12366f5b3
-EBUILD virtualenv-20.3.0.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
-EBUILD virtualenv-20.3.1.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
-EBUILD virtualenv-20.4.0.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
-EBUILD virtualenv-20.4.1.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
-EBUILD virtualenv-20.4.2.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
+EBUILD virtualenv-20.4.0.ebuild 4014 BLAKE2B e1319708866055e80b6810abdbf159dd221b7b381a256602d67a6b0e28e68eabc683132c81d1b2245a89327911b2eda7a95c82979c6219d78fbe9d820a6ba250 SHA512 c80fcb7d31e2eb60d4bd29d859a4b8745b4930d09f9e61e43d94130f39771c3d0f18b87019288142228a0046516a1868f104029e195159f13f67c91a3091d838
+EBUILD virtualenv-20.4.2.ebuild 4028 BLAKE2B 23cefc6f58bcd644d5d742aa2b1be4e192e13a7fcd6e126e5146d180cb73e41efc969f48f21f5b8326e347be1436e3d4ef495826750239382320c58b52863ee5 SHA512 82d8fbec453c3aaab3abbe2c98e696ed2923a079cdcc4bad6ea4754363c2f35185254109a389e868addd6748eca41fbf66d04be6d86101901f7c4ffe19ee1c01
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
deleted file mode 100644
index 9323fa4eb6d8..000000000000
--- a/dev-python/virtualenv/virtualenv-20.2.1.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
-
-PYTHON_COMPAT=( python3_{7..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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-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/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' 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_bootstrap_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 [[ ${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}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.3.0.ebuild b/dev-python/virtualenv/virtualenv-20.3.0.ebuild
deleted file mode 100644
index 2b78ff679af0..000000000000
--- a/dev-python/virtualenv/virtualenv-20.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' 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_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.3.1.ebuild b/dev-python/virtualenv/virtualenv-20.3.1.ebuild
deleted file mode 100644
index 2b78ff679af0..000000000000
--- a/dev-python/virtualenv/virtualenv-20.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' 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_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.4.0.ebuild b/dev-python/virtualenv/virtualenv-20.4.0.ebuild
index 2b78ff679af0..90ed5dd3c943 100644
--- a/dev-python/virtualenv/virtualenv-20.4.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.4.1.ebuild b/dev-python/virtualenv/virtualenv-20.4.1.ebuild
deleted file mode 100644
index 2b78ff679af0..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-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/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' 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_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.4.2.ebuild b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
index 2b78ff679af0..c0da33fc038d 100644
--- a/dev-python/virtualenv/virtualenv-20.4.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index c3987c834450..b1b27464e589 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,5 +1,5 @@
-DIST Wand-0.6.3.tar.gz 10506834 BLAKE2B 65ba3d5719f7ad8d77a088d94344cc96f14ca45e95850494033a395cc8772d431653a16b2c3494268f351ee4187e5f5f0dbc22058266e9526cff2312e9a2c5b9 SHA512 9aef97434cc8cdef0880d1d1b2bbbdadba807543489d2c82725aa0b5287718f2a10f5508ca7d72a859e242e2b3e205e5f95649cb43be56d5eec8a83c272d0bac
 DIST Wand-0.6.5.tar.gz 11477141 BLAKE2B 7257dbee8642d619d69d773aa5e0f70c27e32eb5ca4168746efb191ce6d2a49b000aee07127aa51e1906e52e7bc7f2375f39482edf6a841933e4eb2711217fed SHA512 7355888da6ea604759d4af8548d4c2e08d529c88d2720400bbfc6a19bdb03049f3faa5abcd5f3a9c69b705754e86ad4f511a76a0a310d5dece5c2774d74e543b
-EBUILD wand-0.6.3.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
+DIST Wand-0.6.6.tar.gz 11477246 BLAKE2B e4e908da487994c50b02fb25c7a19a70865fc021e00a36170562dd546ac0d0b9c6eb6d622fc50e0160feb48d52828617d8cf83b1ef0f2f449fdc32f174880917 SHA512 618a8678031b57382d008062ffa21168aeb7afd7a5b82675020b11c756f1542f9a2d2d656d7d683cbf47e4d8be118bf0aac005b4aa1a6e5ae9dc417edea0bd79
 EBUILD wand-0.6.5.ebuild 732 BLAKE2B ee7f49fdfcf8bb9380c6f176e7c04798cf3f9684de9ed1808cf57e9a6cdd17df56085cfa12400ed7510137cdcd2e1dd037453defda17ea26c6f0a073f19b97a9 SHA512 fd9f0074f4235248f9dcc4e0ed16c74503d2bb4344e8ffbe9e5977282b0913faadf4a98aca85631591db723175dc4e7429622f9eaded227b414c3e766b378f1e
+EBUILD wand-0.6.6.ebuild 732 BLAKE2B 32388edb44e8e4cd459fe2d093aaba82c82d1742335136cba209edbfe2ff3a8bf4af812503be94568195d7c595b4d691def03ff577209a0a8ac965734c969878 SHA512 a016722ce02413a913e99d126aa298a1b4c1c6d4ac93034fa5b1df0b3b85c53239ba529ffc3ac39fed038c69e99a8e97e9c409230f28f38a0860bcc214e3ceea
 MISC metadata.xml 432 BLAKE2B b4cf502cb70ef3ca2d5077a491e37fa6d610504ca76e1381a2220e734c6dc435f42a9a260805114e4803dcb8f69871fcb57b92ec9085734c7d2a06f0d7f3a040 SHA512 d5253cbcab45e68901d7678652329552082f0d95a0d38d797ac351f4419a77116ae18cdfbbd8561bbde14c9d99c6ba0b5ce0a435d34c10b99eb14288275709b6
diff --git a/dev-python/wand/wand-0.6.3.ebuild b/dev-python/wand/wand-0.6.6.ebuild
index 094165125f7a..7c72b4e84647 100644
--- a/dev-python/wand/wand-0.6.3.ebuild
+++ b/dev-python/wand/wand-0.6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 
 inherit distutils-r1
 
@@ -16,18 +16,16 @@ 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
+distutils_enable_tests pytest
 
 python_test() {
 	# PDF support is blocked by the default ImageMagick security policy
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index b59612df8333..42f8ab0c0de6 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,9 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 DIST watchdog-2.0.0.tar.gz 95475 BLAKE2B 8955a1428d383ed78691274dc52e1e58b3ca4602eb89ab67a81796a685bf15948d77edd4a704b0fda7ea3a7472f3545389c99c4e0247f05df34372ac6ccaa8e8 SHA512 749c43524c21b45cf3422414ffdf38d595c6def66f164fdb77b0e1bc87dd1a971fed21b17036c3a96d64d3f28b7f3c0e018b26d4bcf7769c68f310101e5eeb61
+DIST watchdog-2.0.1.tar.gz 95093 BLAKE2B dd59b3be1ec1a33d3f015710c14f3d2ba6e652a36841e7405a879625d588a3ec4d18c4791e6d8808b0be75079588ced2fbc6ac103645520ab94f085ae8fdf3ad SHA512 25e93505daeb3d0d9947212099af3a975cd8c75a1cf93ea5fee59de50471becad2abdbbec8a44afe94b935599768f78605a48c196c3c3ed6123fedfb4768e3aa
+DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af7398ced73aa332e57472cba2f5ce2ce1b96a31d3f5f3a525cabf81d5de528d95d0c59148150f407abb8ebc64538e SHA512 6134ad22b350b7b2893b564c4f02bd35b1be515fa18dd7f7000b191994b5ba48c5bf573819d2f363de227481a6bb8a0a14973e7c6611de367df2a3f228656ed1
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.0.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
+EBUILD watchdog-2.0.1.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
+EBUILD watchdog-2.0.2.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.0.1.ebuild b/dev-python/watchdog/watchdog-2.0.1.ebuild
new file mode 100644
index 000000000000..31b479a03ebc
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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 optfeature
+
+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}]"
+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
+	# broken when django is installed
+	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+		tests/test_skip_repeats_queue.py || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-2.0.2.ebuild b/dev-python/watchdog/watchdog-2.0.2.ebuild
new file mode 100644
index 000000000000..31b479a03ebc
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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 optfeature
+
+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}]"
+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
+	# broken when django is installed
+	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+		tests/test_skip_repeats_queue.py || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 01312c48ac8f..0adc95a4aa3f 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,4 +1,6 @@
 AUX weasyprint-51-skip-useless-deps.patch 526 BLAKE2B 8e0fc794ffab3b9ba9d9c5992dba9f2ca5d88a3e79018f108558e81556f968498087a13aacd7030677e86000b7ad3f5ecab276dfe53b13b1fd0d3356c597cfd7 SHA512 dad97fd25f9f506aa7806a55b459eff051bb5592e28393733bb5c2c03473a8a93e78116339bd435f8d215e7f297772c9feae68cb84d5d1710bc72a6476cf608a
 DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8ce6b8ac99a08d86746677d40a86affe3c56dd3e3e6a0eb2fc915f77036271f049f6ccc644d508be51d01d97b7c SHA512 631038bece7ac0c15c6a668a7d06137e4bccc049eb80484a153ca9c4a996256de8647428b21ed1d0c1607af3893c747a1956a3d3f012b30105ba4f8613a96fcd
+DIST WeasyPrint-52.3.tar.gz 325076 BLAKE2B 2981a487938d4ceefe20da36262438a64c30beaff340be6bd48b0140f63ea3971ca80a36386dde2db270e1555b137a89480673c4fdc2fa49079efdf58e53029b SHA512 7db740dd8f7264f73efe6e2505c603cedb1f8e5c053447b03517bdb003b933e1ef58f15482d4ab316b04b6631f9102752670f8b56989983cab80f7bd110746c9
 EBUILD weasyprint-51.ebuild 1384 BLAKE2B 8c21b4f54af4c4cfa0d231a5ce02d911a6a8d53acdc7bc530be7e39235beb0f57d8a0c0dc8c399992c7e59af1a455ec39411ce9f85f5c6f731d8cc36e31c0a5e SHA512 d101e24e5f91982c8ca2b555ae44b4a8f40f9ca729ec460404b6e471f9bd3279aa934c136ea80a9af4a26c6cca81ea6cabb18477bc559cdfc85775adb0f6bf16
+EBUILD weasyprint-52.3.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-52.3.ebuild b/dev-python/weasyprint/weasyprint-52.3.ebuild
new file mode 100644
index 000000000000..db3c161e34a6
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-52.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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
+
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-2.4.0[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.15.4
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
+	x11-libs/pango:0/0
+"
+
+BDEPEND="
+	test? (
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/pytest-runner/d' \
+		-e 's:--flake8 --isort::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index 7f1eae92e50f..5e67558f44d2 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,3 +1,4 @@
+AUX webassets-2.0-python39.patch 898 BLAKE2B 7d350d5a7d35a49598229b3d559ecbf4a870f24de5f2aa2bb83f7d7e6374b150b6bdcdebfbba304b2ee74783c648f1dfa98dbb3044be966342c00cb16bcc943d SHA512 6e2073ed553fcb2523a26aeff30f36de68a45dbe032a207fe12906424021d0aae7bd6bc4934f79352644ceffb9147e39bc09d824a36f23093d8a2dc58d57e28f
 DIST webassets-2.0.tar.gz 185864 BLAKE2B 8aaa7091c27644c6c464d13d106218e28531415458e67696c0243943a92a3869e23c7ff0aa8461abb876a178e3ad44f4b47a5366edb885d308dd8ec0f17ad034 SHA512 6d62d4e5c1ed81a2d235c24776b632574f3670ae3d863c5f5a79d0e1afc7acfa7965e532b7975503df758dbe6c8dbd857b250a6ea8e4b414c8f1ae12fb8addd7
-EBUILD webassets-2.0.ebuild 1009 BLAKE2B 7dcb56b676bad12da6e749fc180174bb3852d4f81361e18f3259a6939109588106439d19e1a52cd930e3e5f2193fedea6fa2c043df83e8dd36578b5f5003965e SHA512 e319e6aa645e7cd8060f4452d622c95db2d0c71d7df8e1934e5fbb47017acf75f23303b51a6ebd2467fbfb585e543b6638a1a63c570ce3a64d565c6e5e60b132
+EBUILD webassets-2.0.ebuild 1065 BLAKE2B 526a3151f03604cbe32ef8e0256eecb11b6e5ed5aa70e6596ff9fafb3f596e679cfc4022a5a5fed47b8bb715615e0ecb32e1c8e1afd15f21bb5d0896bf135f91 SHA512 550d7e1e2e9e0a6a4d227047b893cb3890796c1aa7548bc9c7be9a08485ce20072564edb9039a1a09e32ad6fd9e63f33aad3246ad03f422e87541bba27aaf8dc
 MISC metadata.xml 371 BLAKE2B 3260dac0e6393121b015ee0df310bfeb80fba14867996ba1013e48166ce179c78733b6b75e54eba2ee6cbdeac7afaf2b3b2f9999e325046c5f54018c3d4fe35b SHA512 da5f90fbae45bfda3486665355b9901f0d6d19f38b7dd65adb1dc08f8ad3d5480860db6bf96ec1052652a69f9cc7f44436a941c0a1bf096ade0430579429d814
diff --git a/dev-python/webassets/files/webassets-2.0-python39.patch b/dev-python/webassets/files/webassets-2.0-python39.patch
new file mode 100644
index 000000000000..006c020469f4
--- /dev/null
+++ b/dev-python/webassets/files/webassets-2.0-python39.patch
@@ -0,0 +1,23 @@
+https://github.com/miracle2k/webassets/commit/a563935df6702ff5e38e5b84a262c295e4cdf455.patch
+From a563935df6702ff5e38e5b84a262c295e4cdf455 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Wed, 22 Jan 2020 00:49:31 +0530
+Subject: [PATCH] Use is_alive instead of isAlive for Python 3.9 compatibility.
+
+---
+ tests/test_script.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_script.py b/tests/test_script.py
+index a83bc07f..d17a83bb 100644
+--- a/tests/test_script.py
++++ b/tests/test_script.py
+@@ -192,7 +192,7 @@ def start_watching(self):
+ 
+     def stop_watching(self):
+         """Stop the watch command thread."""
+-        assert self.t.isAlive() # If it has already ended, something is wrong
++        assert self.t.is_alive() # If it has already ended, something is wrong
+         self.stopped = True
+         self.t.join(1)
+ 
diff --git a/dev-python/webassets/webassets-2.0.ebuild b/dev-python/webassets/webassets-2.0.ebuild
index 15cc85186663..c5a300af7a64 100644
--- a/dev-python/webassets/webassets-2.0.ebuild
+++ b/dev-python/webassets/webassets-2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -24,7 +24,12 @@ BDEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		!!dev-ruby/sass
-	)"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-python39.patch"
+)
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 8dfb35f02eb1..1536be4b33d5 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,3 +1,5 @@
 DIST WebOb-1.8.6.tar.gz 274606 BLAKE2B 0419e60faaefd4bb822387bf5624f77765c6ad528da791d54204b528b7c827d0cc506cbe260ccbfc7d23ffef73132254dcf133ffb1e0377d75ee5ae83d4deb84 SHA512 b9a3faac114c55f3e9a6eb71a78dd921d928da99a427dea05bc798bc1fe249f0f1cf8c9b9fcb1b73be2737b9132bbfe2250a8652e3a8a1199ac74fa62a59d44c
+DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
 EBUILD webob-1.8.6.ebuild 705 BLAKE2B c0d81ba813f51df4c25c4cdf9fe8abb6227792c962bf3dfc6391e3ec6d7ccbf0372254687bdf42a5558da75bef9a9b35a598589e3147d518ff7ce2057939b2cd SHA512 0c524e306330707378d8fa0bac5e8bc7da4c3da6d1aef3c75d1bd49f36854c8fb61e6ee8c3b59625b7bd7c9c444f1f716cae19299b7688261f57aa2bd1363acc
+EBUILD webob-1.8.7.ebuild 713 BLAKE2B 6473181fa745e8649218aaba1f08249ac28eb5e2e5b6f3e340e96ce3a0ee3d35afcc16bbc4e9cb110633918c0be4fa0bc3b13ca32a790999da61b8d9f4c4f78f SHA512 773e8528efe94aa72ce11a928e8c809718b57e5f261fd2e081d701b8027177b642efde6acf32286d4a3db38a800d83ac3d7d3b96d2dce2a5f155c513fa387244
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
new file mode 100644
index 000000000000..fb23458233c3
--- /dev/null
+++ b/dev-python/webob/webob-1.8.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+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"
+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"
+
+distutils_enable_sphinx docs 'dev-python/alabaster'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# py3.9
+	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 0e5ad1a6ed88..508502527f9c 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd69d368a7ff879ac7ab8e4b170ca356b0ea50aa0b6be845e76ecdd73dff9a2aa38c8cdefaa202627f9f9d272989114fe94b SHA512 8677b00abbdd995ef1c2254f73a01713eb0707ee2549031f410205af7bbbf57b4730b38a78d683a90605c1412863f57a3829d8be1c058f3e9bfb177bd49c4525
+DIST websocket_client-0.58.0.tar.gz 48216 BLAKE2B 5e559852385d95caffa73fdb4bfcddd3e00f7bdc9d23d07e7bd6b9e8de599742e153d31bb3a57bdf1aef02361f5dc0b13a443c21872c27576e068f246102d655 SHA512 c587945831427a9bddef96be53d20fec7f55ffd7efe2b676dac96b8078ba446ecda85379a4edfc49c36de936516d3994cbd0515decb9b615cd969bde1117167a
 EBUILD websocket-client-0.57.0.ebuild 756 BLAKE2B adc92d87c58d17958efdff82fe60054106b4cfbee41a8dd61d84fd80e9c81b4486a37540fe64c3082ded39e4be24417de60cc39ce902f3f7a5ee9acfe610f5e9 SHA512 bc028e9d85e2207db7ef924de5ab2f2220ae13e82eca34f047b17b46678065485cfe4b9d07f1e462bd6df62dbd6b9aa6e85467f6ea161dc07c7f91a305137dda
+EBUILD websocket-client-0.58.0.ebuild 724 BLAKE2B d833b7e0ef12f8c6d013544eb7d9f0272726cabc294d4e946ff77b9f89e0b21eb36971897fb837849b1e411cd07bbcc9d10a986e323f47ab0ae440754e6638b5 SHA512 0e1b56bc073243c72498c11dbbf3157554920742c22b4f834e1a14ef6a9d344ac425b611c018f7e3224765f2e61a8b4c05eb686fe89dab61403fa834035e6957
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.58.0.ebuild b/dev-python/websocket-client/websocket-client-0.58.0.ebuild
new file mode 100644
index 000000000000..cf64c39706c7
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-0.58.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 224dbb75707b..cb9b3b37c128 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
-EBUILD websockets-8.1.ebuild 472 BLAKE2B e105c964cfbf38c61a798c0751c127ba61bc45886a8b6ca0bdcf3e33ea542e9c5cf1eda4751c89a6c7f1a1a2c1286352759ae795e63c80f15fd630d9bccebf65 SHA512 abb091f45597da0211f7f866f75d64c814ca376d87ac1d78bcba406e2260794b3b808691fc0a15362f59a6fe08407b5798a742d353f46f4f20fddef1c158e18b
+EBUILD websockets-8.1.ebuild 469 BLAKE2B f726a691f5a392ddb087850b3476a5ae9d6495c182b670aa6287198abe06ecb6b82c57540ae58194252ffb89c90639a8e2e6c0f6bb15606667e2a0df0272ca1e SHA512 f23db3bee0f46176302d491c91d9b27c7e65f9f0e0ea855078fe358a0d36d73be836c8452b8df074733f5e09145ad38e91ab43f837baf38cd0f63b084c0d31f9
 MISC metadata.xml 386 BLAKE2B b7595dce278a7ae3d0f491ebef0abd2d9a84827b4ddbef8ab3ed16e21128713408f66295566b8fbae235b5446f5eba6ebc412e39bb37d86e19fc2fd2b2d34bad SHA512 e007ee258a91392d5fa3cec67a0e1efebb4f3a4a9e3a4ee40a0f76dcd8bf3b1b9089f2ddfb52939a76cad42dc63662e2c365406b867641d3503f6437c3213531
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 0e9ef5a25dea..d78c4008f605 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index 9e81056838b4..f3032bda3886 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,3 @@
 DIST whichcraft-0.6.1.tar.gz 8676 BLAKE2B c08dc453b1143da9c46f63d894526784724bff4861c1862a460f557c74e64bbde72c0127f9df0f6547a5c2183fe770e3ceaf417fed88ce70691ec28605f42e75 SHA512 3a8bf524437f3ee0b5b6ee16e4516ba1c75bee738edfef03316b1ef32a58d036734d75e626f113ad434acc29ccc0cce145668867148af7aa10de1fd5f739d5f6
-EBUILD whichcraft-0.6.1.ebuild 497 BLAKE2B ca0182bbdfaf492826d8b9ec3d7a176a587e3bcc33dbd940e5c24aaf1ffc9802ef3aaf38c1fc4028d040325218f98edb7928fe18422edd81a8e7d8bf6874a1e8 SHA512 475e1c653a3c351468f1238809ecfa6152dbab2117d12a49ea379182bda71ebe56484ea637210a88dee75c1826be0f103ab05d997140fb1c61c9707598d952cb
+EBUILD whichcraft-0.6.1.ebuild 499 BLAKE2B e7f07acb08e9faf16b8191145cf442fd8d63c9c026e0214f06a5d78993f6c15ad6c8a126f7ba2cb447fba3d9e7cbc6a78070f934b538b664f96f955ec261e7b2 SHA512 5dc17d1003d5a5f45051b8824ad732a9a3f6a4b9fbb2a900635caea3d4896c0ad4b914edada67433ffd7d4215180a15865a16e894469fdc10f647ad6347e2f41
 MISC metadata.xml 376 BLAKE2B 3cfa50c1e893538962db2fc182b980d7f55699accdf221a0f5e1de183953143fcbcee0e4597a9b2b986b38a6c66777aef83338adb2ed6f8ee906fd9d01d3c922 SHA512 d221f99186561f484a961b6f45282e64c4ed8a9f3153eeb55716f70478a5f720647f8306bd9df5fc375ba4d541571ea26a87e8a4cc38f70233d501d208623679
diff --git a/dev-python/whichcraft/whichcraft-0.6.1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
index 3d2307f84141..b2ec3df20692 100644
--- a/dev-python/whichcraft/whichcraft-0.6.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 4b6c77899dfa..b073f4d6b248 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,5 +1,5 @@
 AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d2a845daa0e9e932452ba34416b088531734013f1617901617d82804b32ec22026d50c27152b68fb548b0871a11ac20ffa21fc5b435b0 SHA512 3012d74e348f7965fee811c9b0e290dcefcc4f365159ecc0fc5bc9dc77ff0e5e6d1448b62b0ced1f9e87dc2bf29f9a831d110301257d260dcb3f2d1ee7ed4f80
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.5.1-r1.ebuild 1780 BLAKE2B 6e228f3dff0ca52c6027a115dd4cd89ac28edcf759cb14a4ebc3cfb26a550f025fd76c3449d627097ceaec34952cbc1dbecb0f4867b4aa9707211ce9ec5f04c8 SHA512 f38cb30a61459f796e17002d17bc5ac648daf0c45ee557eae637ac449e63da18f654d43f331feefacbf1c4ac25e7de52771908128765bb33620d1c1792865efb
-EBUILD ws4py-9999.ebuild 1782 BLAKE2B 80cf70fe7dee9b0b57a8b88877c37ce4f608cae500d06a41bbd3365a1560d970821bd798e5de1a98e11a74dd212254bbc68785b190a68c9153ef41ffb2d214e3 SHA512 756ffdb8c660aebc18f487453f1fd73b7034d80d7b65c9e45b9d774c161adc3b28cac6cc82d35f8c5f1de395574bb26a8aa60d8d149b39bd82c6c09d9ae12c13
+EBUILD ws4py-0.5.1-r1.ebuild 1786 BLAKE2B ea8be6aede0a3602fcfd41f066f06bd87f50bdc39016e4d378d5f77c5027c653c024cbed16a14a4404d7649f938bd90a9b6844cbc63e82231917cc4c80722c50 SHA512 ecdb19ee5104d10ef32d0101ca17e1206389ad935acfb3f9efab322fa2aa12c81e6e38a1010975994377118c49c227215ee74ea4d8d5b64a44ee4838bcad47ef
+EBUILD ws4py-9999.ebuild 1788 BLAKE2B 8f28b558ffa7494b52dbe6676b02bad4fdf4a064d47f1be19d4659d36f565f148f79118342f003ba51d94b3ece32ba4936c60ad27989593ea46439132b05bc6a SHA512 ff8c9974aab71564e8b20847d36ff795d8bc7456b4011146677124df23575fd327bdaa2c7534af65614c7fd475446300c4161fd56db74f11d27931f9d154530c
 MISC metadata.xml 507 BLAKE2B e068388bd7979e65aa1319f5f528003dc2d2e20f686d9f7fdc6b48d98b115ca156ac05866fc5004649edcc64448e5a24f4b05818fa803827fd0ee3d053eb1da4 SHA512 658be5099572b43e2a0f23cfcb05f3b1e7b9e3e42e7686759b956ef0ea5407d5f4af72995ba4360d4df097099cd3058b5f9783be27ebf953098a3bcd5cc66a89
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index 66d94c727f00..94d185d86706 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -7,12 +7,14 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+)?"
 
 MY_PN="WebSocket-for-Python"
 
 inherit distutils-r1
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git"
 	inherit git-r3
@@ -42,11 +44,13 @@ DEPEND="test? (
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch
+)
 
 python_test() {
 	# testsuite displays an issue with mock under py3 but is non fatal
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 3561e1388c9c..5d471f0ff142 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -7,12 +7,14 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+)?"
 
 MY_PN="WebSocket-for-Python"
 
 inherit distutils-r1
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git"
 	inherit git-r3
@@ -42,11 +44,13 @@ DEPEND="test? (
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch
+)
 
 python_test() {
 	# testsuite displays an issue with mock under py3 but is non fatal
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index e770ad50a3bc..fdbefd23b637 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 515 BLAKE2B 76a8d5ed2be516c241128a32c05c47ca42ff68cfda83026d7f060bbdc155491156ccf958111bb127acb32b92c5c72bfd2607976c6c7db1121350cf1bd265148f SHA512 46ef5806d9849dc1f74aa460629023446e8412b19eeab8e852210a9eabc385d1fab090a63bae66866cafcbab46b8255bcde8b72a1c616a51019183772ceccb5f
+EBUILD wsproto-1.0.0.ebuild 514 BLAKE2B 845bf77e713b04b67f9d91381759bf98fa9daef06f2dcf93767793c5f1e6c3bf831a98176681887466d4d9ea9a7c6706e9e711db77e7cdc2d2b65cb2d38e5063 SHA512 37fde19ac1bf9c1ff72f0a3559429f6aac98bd97d8b6fae824a4791aa575f10d3a44cfedcc445d6ba2a944ee3ffb04e349bbdb166652d53828aec23c22fbb38f
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index bb19e6600ea7..096ee40c39ab 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
index cdf4d0ebb679..33f2cf43b293 100644
--- a/dev-python/www-authenticate/Manifest
+++ b/dev-python/www-authenticate/Manifest
@@ -1,3 +1,3 @@
 DIST www-authenticate-0.9.2.tar.gz 2480 BLAKE2B 642640f29582983457134034d9d93ca20fb3d8992cbe3f5b3f9b35e3d95c154fb744dc8fbe35081d4af6b1b04ea37e27b35501bd783130d9e1bcf8aa6a0eeaba SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4
-EBUILD www-authenticate-0.9.2.ebuild 436 BLAKE2B 511ae205f3b43285389af7520903409997a6a31e8b55f9d52a790f7fe2718fd53421bd6c93d260d0a67840c4d65bba744f20d0b3c609a96997d12da2afc47fa7 SHA512 0cabf103346c580140974fc9c4ba4d74190e74f7648f9abb4fe6360d5c75d1082eeb98dd37d67ce21ddcd0093ce70c66c09b98dbb0d4bc349a43875ace402043
+EBUILD www-authenticate-0.9.2.ebuild 439 BLAKE2B de29a8c6b4d0cb948e4e706405b28573246cfc7f02cf7154db4cbacbb76b405e1d9baa6e5afb192d523cf4fa978e0053b90debf476ffa2616d5cfb789ba261e4 SHA512 dfe915ed0f99e99ed6ad3ed064b96cccb1df34c9106e2db6df7274ada4fbb5a2b57606c47f5c8aa3b051c896546d8c0b338009a4fc5e06d29471bb30b82800ac
 MISC metadata.xml 387 BLAKE2B 48442f1e88e03bf55104ba3f54f61a4f09cbd0fc3761b8e4b79497e7dc746f90b90359cb783faa1813cdc19318dbe66303379357006bdcfe30d42bfadff244bc SHA512 c6a7433f233618ec283e6ba0c0ed2730fb01d5f85a795e340bddc29435cea3c6399095d9fee2b1795cbe5b7949e8a79ecef5c979b502bed2162643426410273c
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
index ced0ca23b3df..d8e65f20dfe4 100644
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="WWW-Authenticate header parser"
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 39868fdcc28a..ca3069451d45 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
 DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
-EBUILD xapp-2.0.1.ebuild 555 BLAKE2B 879f4256af758305134e86c1f548e6b92fbcc8809472c4d26f9caf61e63ca09cd6b137eea0bd96b6287d4d3684f18a43b985f8e099bd710cee23329d9445c903 SHA512 e5086e31b231dfcbb64320787a82e795d654d208d3312471ce7afa10e10de0eae5d8af72960d66b567b2916cac076ac4a41a9639885f0ccd346aa3887c429d05
-EBUILD xapp-2.0.2.ebuild 563 BLAKE2B 6211f962244da11557035be989fb56f0eec0bd115b370dd10c27e2118f342ac0296a39a157f93cc2828b28660a83483fa64375961fec4c1af475442124113ebf SHA512 ca48e9fbf08b3baa6ca887a9a446fd874aeff4c181811ea2133c8a338a9af40026aed4e0b4289fda846f9ac839d978764fbf8d816f1992cc7a65f8bef48ac5cc
-MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
+EBUILD xapp-2.0.2.ebuild 561 BLAKE2B 1f414320c5c90b1327885ff87a7595981531624c770ff49a992be274a466c170ea6ae6c1c99cd71904bf3507e535bb74a47592a7d1c04c17055ac90025783125 SHA512 3a13b8c5a56f9c0099b13b0a5b6e3172e5c8b08e253ac5adfee0522e3a405648af543e18a925051052b438d2eb96e0183dac89af57923c6cfab40adedce39ff9
+MISC metadata.xml 608 BLAKE2B 6b8538c23ad6bf133bbafb9daa5309af7f815bf08b47b35e178a61fd39a2cde883f0ab20c69937485db814952faf764a2850a7e304e3f776c694feea4c982301 SHA512 5e06248d4f598550cbfb5bc3a29fd598d38c3a4d219554852a0b01626c0b28efa0b2238b6c866ec3850b6a55d6014ab1148e6ba7137e2c0da4ad9f31ec62e7ab
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
index 638807cf1f81..584d5f15ad46 100644
--- a/dev-python/xapp/metadata.xml
+++ b/dev-python/xapp/metadata.xml
@@ -13,6 +13,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">linuxmint/python3-xapp</remote-id>
 	</upstream>
diff --git a/dev-python/xapp/xapp-2.0.1.ebuild b/dev-python/xapp/xapp-2.0.1.ebuild
deleted file mode 100644
index 19f08777b146..000000000000
--- a/dev-python/xapp/xapp-2.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 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 bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="x11-libs/xapps[introspection]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/python3-xapp-${PV}"
diff --git a/dev-python/xapp/xapp-2.0.2.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
index 76fe92f6807b..32cca5c4e63e 100644
--- a/dev-python/xapp/xapp-2.0.2.ebuild
+++ b/dev-python/xapp/xapp-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 2cee37487b7c..2724f10dbd27 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,3 +1,5 @@
 DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
+DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
 EBUILD xarray-0.16.2.ebuild 934 BLAKE2B 4402d76bfb14c4090254bf12d8bb7a5dfc222d86d706e24ae6bcd6f31dcdb255a216145a45f15e86dee6540fda985ff22b9783cd5c05a39465ad013cadb9d946 SHA512 6e74373e5f62a76bae465b1d99c1ac5a130001901faf325194c0e078f0495ab31005df60e63bb7daa9d64475ea8adb0a50468d2d5837cfcdb8632cd935111382
+EBUILD xarray-0.17.0.ebuild 870 BLAKE2B b0f280da2d5c3724c8082abc030d4a878c027fb177ee395b069909561e2c0616e9074faca18a6c74511cbddc14708a0b2e633d1586ece6b0409d67390bd3e13c SHA512 bc2618907da939eae60bd5108ad42086cd77e877863aa1113b5e0238c50dd05e9881ac71294529c35e04656ed018e757c8d2d7f56428845d3442b33934a1f2c0
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.17.0.ebuild b/dev-python/xarray/xarray-0.17.0.ebuild
new file mode 100644
index 000000000000..894b1d80800a
--- /dev/null
+++ b/dev-python/xarray/xarray-0.17.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources use in code
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..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.17[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.0[${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}]
+		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
new file mode 100644
index 000000000000..8f575d8596f4
--- /dev/null
+++ b/dev-python/xdg/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-5.0.1.tar.gz 4120 BLAKE2B f80ca1ec0ac064d64a2603f101301d427e7b64133eede1ff0770db0b7ba4368c8640b2d2eea8f1d28a52874a6b632ce83d969c38a036c970e20c2abba3a1f98c SHA512 c6da757cf0fd11a03d97506f7b898b902f560cb74cd9a90ed55550d89bf60eef5e32abe2aca19816279621e6ad0ad7899c7326b126a777231c67cc6cb30b766f
+EBUILD xdg-5.0.1.ebuild 416 BLAKE2B a6b809952ed8d9f25bfdd4505b9b1484cd6e419ef009babc6dc9289771ccc9bee093f3c39f5f3505110c2c5651249c0b1525f558a4d19e2e34c51af85afede61 SHA512 a0e610ee6d7e9e1e847b7bd4ea7b78f792817eb482e54f4feab827aec33b23d66307e768520f278f0ff4b0a6d477a0a5a102ed2e08e3897551c8fa69bc997b92
+MISC metadata.xml 512 BLAKE2B 30af9ed234e57029ac520d0e0de3f5f819ad876d2b771d3e61dc7386f51de8e2456330b58df6c58ed66481e97b5af1065690ec016c9cfcd97e248d36cb97be36 SHA512 8e7a91ab41040620c24048a500c00b37b6808ea2605a6d544683f84045ee68d1d111ed60d94b0ad49937abc5ceaebe16db9a06d897763ba5e0df68677f01e994
diff --git a/dev-python/xdg/metadata.xml b/dev-python/xdg/metadata.xml
new file mode 100644
index 000000000000..bd98a9488610
--- /dev/null
+++ b/dev-python/xdg/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">
+		<name>Kalin KOZHUHAROV</name>
+		<email>kalin@thinrope.net</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">xdg</remote-id>
+		<remote-id type="github">srstevenson/xdg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xdg/xdg-5.0.1.ebuild b/dev-python/xdg/xdg-5.0.1.ebuild
new file mode 100644
index 000000000000..688a5a44d199
--- /dev/null
+++ b/dev-python/xdg/xdg-5.0.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Implementation of the XDG Base Directory Specification in Python"
+HOMEPAGE="https://github.com/srstevenson/xdg https://pypi.org/project/xdg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index a203f8801bcc..6a2163ebe872 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,9 +1,5 @@
-DIST xmlschema-1.4.1.tar.gz 329488 BLAKE2B 80125c6867facb8f94574f4aa210239057f6c8429ff52daac047457eaf6c836b051ccf8e0dec751c1bc57e4de7343781849fe88290117b8546ecd9b8ee99859a SHA512 935e4bffa5361e87fe0656c04b79fe50213098db86e18de38d82d9c04e45557b7ce9468379644c202ab25bdbd6f430bf85a639c3aa7636833d4bbe8533738e82
 DIST xmlschema-1.4.2.tar.gz 331747 BLAKE2B 013a74e7d929e46d497a55ad67888f0dd25b60097e390c3ad3b69c9a87d9e5a83bd68873336137805d755a47d0e5cb5b7347403ee38bcb7457e70803c6aca2ff SHA512 a490d1686f3e8cc7fd45bcb51f00ddf8b734e0c928f8690f9988232f8781fa070f7f03be7473ed5e8b3d1ab67bb08e123c79b408c3daaebfd2df0e94c8827888
-DIST xmlschema-1.5.0.tar.gz 345946 BLAKE2B 19e1eb3662d2e8d59b6b17e560923303a5370d0a936d3416ec02991af04f2f3e58f63be5304d5cbf314235b70e14565bfc232fd4be3503e2a1a2e121cdab1488 SHA512 07943e6de04cc7f4de4963a1d2d7ef85d4eaf3bb4bb52d3f632df4569f359481ca97f1cc7bca7fd59e14988795e4675c84e5a2d80f22514fb6499ff52d40a0c2
 DIST xmlschema-1.5.1.tar.gz 349788 BLAKE2B a46aa6619594de4db31158f26def3dc070629cc29112aa02555c2479f57883d7d5afb82cbc65e4193d607b2572049ff7da8cf3cb14850b0a6f3166ae87d86928 SHA512 5e8b3adbf8c5b4ac6a85a2d9b62212870cdc6639634f9adf9d16499d86b9cc73fd1fc6ba496f14d840ecefc60f175c62f077a62bab68bd057150889d5ae0a872
-EBUILD xmlschema-1.4.1.ebuild 772 BLAKE2B c75fc7fb25940ad7c5c6f3b80b44032fd75b2c4b765c8d95c524cbf1dbc4150e64a5b85c900bc4da87c6f007e4cf53b2a438938d26f5d5718cad9a13c1a71a59 SHA512 9c71fb1716261af48c9e19b7465a5adbc1b62dfd6bcb85d57d025d9737533e073a1a398c487d9aed326f6c881f8a48017c8f5e1ee67d1cc147cfa8d618733708
-EBUILD xmlschema-1.4.2.ebuild 780 BLAKE2B 8566eca2202f5bd04faf3f1e47ced9f043a7cbe76ae2a8d2fa1ed7500d6057d7b72fd467ff9ffc48597933df5131a03a845b083e200e77419acab9406e52b17f SHA512 737b422274b19a5a8e694c97aa19cc778999a9e309ec1005da9520c855621f9ddf738ba9a7183c8d543b063b157aee51f0c12f523a39480d231822ac5eeefb8d
-EBUILD xmlschema-1.5.0.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
+EBUILD xmlschema-1.4.2.ebuild 772 BLAKE2B 1593c3bfbe810a9e0008274d7448ae5b3f7136acef53029e0e573290356ad4bafefd2609fe9da0574c91f74e5e27b398e91a9abaebbaac470ac61c87635d0ea5 SHA512 4dc128cafdcf184f1d3ca3b8795b61e5d20ef9f3cded82bee83bed46e479c58b814c3158a763d3b6219acb9ab9889536f93cfe526915bca07241b3da0d79692f
 EBUILD xmlschema-1.5.1.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.4.1.ebuild b/dev-python/xmlschema/xmlschema-1.4.1.ebuild
deleted file mode 100644
index ca2b6553322b..000000000000
--- a/dev-python/xmlschema/xmlschema-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.2[${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.4.2.ebuild b/dev-python/xmlschema/xmlschema-1.4.2.ebuild
index 41bb9568be18..7b6ad7f7c18c 100644
--- a/dev-python/xmlschema/xmlschema-1.4.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.5.0.ebuild b/dev-python/xmlschema/xmlschema-1.5.0.ebuild
deleted file mode 100644
index bb3a6af5bf3d..000000000000
--- a/dev-python/xmlschema/xmlschema-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index e2fc9ecea39f..ab77fe31db77 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
-EBUILD xxhash-2.0.0.ebuild 658 BLAKE2B a8a0516ea2360d5c511e3883ed97b70e4dbf7d5b9b1eab3be2985af28d6f548b71eb0057c7030f4c4c352ddee872494382b8b6cbcd8a930368a90542391d70a6 SHA512 740ae5bf378531c295a9f58810477fe1a8a6d011542ac04276fcb41fa184bac5138b08ed30411e86ae5ec1b4a515e54daf82f0bffb81ef77058930d997919444
+EBUILD xxhash-2.0.0.ebuild 655 BLAKE2B 84d44524d4daf38bf3c1a0bdef7a629c154ef08427d5cac6dcdb235fbe164e9e3b56c7b214ff20c13383bc85c34244782b8b695ed5bec7db97032cc149e31b0b SHA512 6270c7a82a1aa383d4640724ba9302cb3fde4531f6ec68620e84be3f150f95d4f4d09bcf19ab8528ac54a74c0d630ac232b9aa11b7162e7bff0ab2ee17e8dca8
 MISC metadata.xml 459 BLAKE2B 6d21bb3d1d6c87afa60f906321f40e0cca071167ff256655a1d16357cf2104850305ed3fe3e4dbd9a3d8c40876e95f2e295f9519f159e2c3228eb492b9063094 SHA512 6ae6d99e9495dca1a0615d0ba908f01454fed46abfb8fee74bb8b00ea73d4f2ab335abaa729b42cd0beecfb61b0a1d123085d28642fbab50ddf031f8050a704c
diff --git a/dev-python/xxhash/xxhash-2.0.0.ebuild b/dev-python/xxhash/xxhash-2.0.0.ebuild
index 287ddf042f31..a27b42c102fa 100644
--- a/dev-python/xxhash/xxhash-2.0.0.ebuild
+++ b/dev-python/xxhash/xxhash-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..8})
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -15,7 +15,6 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="test"
 
 RDEPEND=">=dev-libs/xxhash-0.8.0"
 BDEPEND="${RDEPEND}"
@@ -27,6 +26,6 @@ python_configure_all() {
 }
 
 python_test() {
-	cd tests
+	cd tests || die
 	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 7a1c029a9f5a..6bf57a4b2d24 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,9 +1,5 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
 AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3ed8c7cf0878fab338996d386916db07fd82c4ce2e3eee32889e40a76f63b383b2a3ba4e2de9f7a9fa383cbdf1 SHA512 4f112e61bd3b38aa997b84af581d1926ae0b3078c59ec14979422a182a825a2e6e108c1066a67d7f6cdd4eff9d70b9f46f3e5c66a054b114eef9bd241a214865
-DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
-DIST yappi-1.3.0.gh.tar.gz 936160 BLAKE2B fcb7651a188e8442f9cac8dc680cc2c944f0f20d322982eaa3f75893f8575db45144f9fac51af58e4c75001603fce08c65d5ffd02b47cceb0d4db0af0ffb1b36 SHA512 ae7c27231721df1a705905c0270feb3e469d156fd8e62fe83a8387920662eb10c5262783b74e97fb01c8ea0dcdb6b78dcce3a87ab5472f1a8f6f03849480a523
 DIST yappi-1.3.2.tar.gz 936566 BLAKE2B 55f114b8ed8689944f8146cb283701b41f34e87f3e5104d7d8df239cd2afc24f1ca1bf86f99bf672735677005df6527c83c5306a7902ea45e335134a925d6e18 SHA512 7a555bf6db8d7b9d8b4e36ceda1a40319a3d0aa478c512fb0fbca678dd3966b1facffa7555dca1ffaf07461ed3ab81284bd643e331eb2e6d1ee9c99eab1acb55
-EBUILD yappi-1.2.5-r1.ebuild 974 BLAKE2B 7c70ef3099f6cfa6434eae60a8bc95a9e4f6fbabb6bc1e99f13e4548de88b32834979db7db282afa887cc7d64eda505a81d790cfbd16425ff6a04295b4bace5c SHA512 1678e578a083895ae47c751e201523f7fc71e0f6cba5a2793d2f0a1f1d97f2cdf5e6ac769825182f8ad2b7ad98a72aa277a4acb00a7727fed1fdc94b89839724
-EBUILD yappi-1.3.0-r1.ebuild 907 BLAKE2B 085da0e021cde0a91c56e56a7ea8b7f2a7bae0645fd479d637285e93647d35c7aff37e15ed71c9f4d0437546427f5f982426868fccae58f9128fbda41400a4a2 SHA512 6ae949544c357f187142b5022f41f4d9dc99cda46736887fc3428cf6cbc0fc898fc6110187a69590e4dfe94feb5171067b213339316fafcddef429f82250c1be
-EBUILD yappi-1.3.2.ebuild 909 BLAKE2B fb1416488d9d90e7c1bc8d009f9bf727249f8786cb12a100c9120a7f9fee8a3c02c12093106694f0513f1a7a46fa0a7c9b03dcedd16b375a51235a158aac887a SHA512 7171c05bb469a3116d4ada28fe9f313d92fb4e994e2231b9a19249cb697ffd26ef0b8e1fb3aec6b49a56208229fa14a3477399c4f9cfb39708e47a5f2aaf673b
+EBUILD yappi-1.3.2.ebuild 907 BLAKE2B a0b6a829db293ff3529a65789eea9060b5c280e71a0f972ba9601b111e442488324cd9aa109f8f2d596c79c07d798833636b320ab4547a32c0d783a9cea7a81c SHA512 de3a6f723cae4803b582be6703f04342eed9513a1dc3be4f175690a52b3454b08980f88ee4a31d2eb4ac11733f20475a11b837e2d880a4a51210bd6270010710
 MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.2.5-r1.ebuild b/dev-python/yappi/yappi-1.2.5-r1.ebuild
deleted file mode 100644
index dd5c0ab4dc19..000000000000
--- a/dev-python/yappi/yappi-1.2.5-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_{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.3.0-r1.ebuild b/dev-python/yappi/yappi-1.3.0-r1.ebuild
deleted file mode 100644
index 6e3a3a01455c..000000000000
--- a/dev-python/yappi/yappi-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-# no tags on github, no tests on pypi
-COMMIT_HASH="ade55478807aa957714e0ef3e228d0cf0c68949d"
-
-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}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}/yappi-1.2.5-warnings.patch"
-	"${FILESDIR}/yappi-1.3.0-tests.patch"
-)
-
-python_prepare_all() {
-	cp tests/utils.py "${S}" || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/yappi/yappi-1.3.2.ebuild b/dev-python/yappi/yappi-1.3.2.ebuild
index 8f845cead4df..69f27fb8f693 100644
--- a/dev-python/yappi/yappi-1.3.2.ebuild
+++ b/dev-python/yappi/yappi-1.3.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index e659f0a3ee6e..d3b209f2fb24 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,3 +1,3 @@
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
-EBUILD yapsy-1.12.2.ebuild 479 BLAKE2B 69e4d902ad175d2f21149d31eedf1bbae340a84c7e5ba28576d9867b87cef7a6278c89242b20c13a5c4e70a461daccfde472ec161754ac89deeaa64e3ffa968b SHA512 af8f12edaeb0f45005e9b91690a74b04b421a60091d00ddf0f9efa5e8bee1fe133363e43ddc3714b42e67b3f80c372b49e58609247dafb88d17b8fd3060c2de2
+EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 6e09894396112d17190cd36a31839a5ecf5f423840a6aa3cb1b67724d9d676d4ec6cd923784ed5a60b81855970dd38a05efe8cc8f0b7cffe0ab0f9be42fadd73 SHA512 a4d6c9628bd0023a3094032282f174a4257e3e1fdbfbb5dbdd9e790ea603cd9c368f2cc82f10d279192f0866cbe2bf9cd59b804ff1f45c0d298b47e6514ff159
 MISC metadata.xml 466 BLAKE2B f86d60766949f90d56dfb674db326574de8995470658e1d468365bda4fec5fa11e8a18215c31d5828f251d58fc8fb768d595d4a872218b3610cf9e156ac26853 SHA512 5b0bb85601ebb66d9cf1168e5564bda60c62d8f4088377d13b3997469a33c2bd50a15bdfc2f5c7756f9a229fac7f54294e636f6f31af86c72c9caa59f4437928
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
index 2b339ccbc0bd..08b75b8f43d7 100644
--- a/dev-python/yapsy/yapsy-1.12.2.ebuild
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index b9201c4d3c5d..800e6888d494 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,3 +1,4 @@
+AUX zconfig-3.5.0-py38.patch 4463 BLAKE2B 05d79cd68ba04ca55fb03f49ce5f2342e4806d921ea8e8a516a4d5ea841187be90a1a5a1a5ac4c14ed940f8c58773260a27d6617cb3e2c60b61f7764d1357ac7 SHA512 5ba6f4d6742d926bea2c19afa3ac130f6f6fd2527f3689b793a498e1a98e1f735216102ee49a5e4246af7f86b671b031a7b3b026001f4965f321f774a9590363
 DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558
-EBUILD zconfig-3.5.0.ebuild 917 BLAKE2B 8a1931b8674d9efdf39004fe2d82da2f18d9ce0315b9abbd6a0cf96cb4cbd63979334722e383c3016eaabf6209f17b52359eaec9c459300587d114e209c88151 SHA512 a5f16587fb4adfe7c6d8e18675ad585cbd3e3e0278405cb412f8df2b54cef7bd8276a60e9b42bac93b2eccbb19eb8c76521bd1c18d0c9b0fc34db644f1b6b6cc
-MISC metadata.xml 1493 BLAKE2B 2aa4b507ca0e016ab9b706913128984896622aa85904dd73bdb8e337339dcca8dab9df6153f275721081b9954d102bc6ef6645621f153243df9714c6d96984ef SHA512 81db84d822dca56d5e582bf22aa1b08b4b32b80143851ef890460ba39bc05179dd97ac5afc7bf0fdb839c1807783a4d9b1347d66f133effe6ffef90d801944e2
+EBUILD zconfig-3.5.0.ebuild 923 BLAKE2B cbd0d03bf0fac44fc514f12aa80447fa9cd583e203fae09785f4cf4330e8a7b92214e93fb8fea1f448dfd321279bc58dadb72bce6c726e8f7faee884d03fc89b SHA512 6954cfbf485c7acf8e076f8cbde95e1d8302dd9d19ae3dd4aa1ffb415b3ea102edd8b9169778c6de84d8dcc269e7e090abb9f122cdad903a194cf2c5b3ce77c9
+MISC metadata.xml 1517 BLAKE2B 171f2c7c76e86375f6d0bb0a50f17abe2e1dc7544a8989b3233c0fc54fa330af0b6f50a23a844988a4732d5879145c9fea78740ecee4bc1c8d87deeb7c45e740 SHA512 afcc2a2fbf0592562f726c4d2c5dac31cb401c12e06121b49d3f5c5c177fb90cb88ef9eba9a995e09c66341b948a8b5703bdf98da3e30addd1b288f5dfc2b4f0
diff --git a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch
new file mode 100644
index 000000000000..ea5e8db7642b
--- /dev/null
+++ b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch
@@ -0,0 +1,105 @@
+Required for python 3.8+ compatibility
+https://github.com/zopefoundation/ZConfig/pull/70
+--- a/ZConfig/components/logger/formatter.py
++++ b/ZConfig/components/logger/formatter.py
+@@ -248,8 +248,17 @@ def __call__(self):
+             else:
+                 # A formatter class that supports style, but our style is
+                 # non-standard, so we reach under the covers a bit.
++                #
++                # Python 3.8 adds a validate option, defaulting to True,
++                # which cases the format string to be checked.  Since
++                # safe-template is not a standard style, we want to
++                # suppress this.
++                #
++                kwargs = dict()
++                if sys.version_info >= (3, 8):
++                    kwargs['validate'] = False
+                 formatter = self.factory(self.format, self.dateformat,
+-                                         style='$')
++                                         style='$', **kwargs)
+                 assert formatter._style._fmt == self.format
+                 formatter._style = stylist
+         else:
+--- a/ZConfig/components/logger/tests/test_formatter.py
++++ b/ZConfig/components/logger/tests/test_formatter.py
+@@ -25,6 +25,17 @@
+ import ZConfig.components.logger.tests.support
+ 
+ 
++# In Python 3.8, a KeyError raised by string interpolation is re-written
++# into a ValueError reporting a reference to an undefined field.  We're
++# not masking the exception, but we want to check for the right one in
++# the tests below (without catching anything else).
++#
++if sys.version_info >= (3, 8):
++    MissingFieldError = ValueError
++else:
++    MissingFieldError = KeyError
++
++
+ class LogFormatStyleTestCase(unittest.TestCase):
+ 
+     def setUp(self):
+@@ -314,7 +325,10 @@ class CustomFormatterFactoryWithoutStyleParamTestCase(
+ class StylelessFormatter(logging.Formatter):
+ 
+     def __init__(self, fmt=None, datefmt=None):
+-        logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt)
++        kwargs = dict()
++        if sys.version_info >= (3, 8):
++            kwargs['validate'] = False
++        logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt, **kwargs)
+ 
+ 
+ def styleless_formatter(fmt=None, datefmt=None):
+@@ -552,9 +566,9 @@ def test_classic_arbitrary_field_missing(self):
+             arbitrary_fields=True)
+ 
+         # The formatter still breaks when it references an undefined field:
+-        with self.assertRaises(KeyError) as cm:
++        with self.assertRaises(MissingFieldError) as cm:
+             formatter.format(self.record)
+-        self.assertEqual(str(cm.exception), "'undefined_field'")
++        self.assertIn("'undefined_field'", str(cm.exception))
+ 
+     def test_classic_arbitrary_field_present(self):
+         formatter = self.get_formatter(
+@@ -574,9 +588,9 @@ def test_format_arbitrary_field_missing(self):
+             arbitrary_fields=True)
+ 
+         # The formatter still breaks when it references an undefined field:
+-        with self.assertRaises(KeyError) as cm:
++        with self.assertRaises(MissingFieldError) as cm:
+             formatter.format(self.record)
+-        self.assertEqual(str(cm.exception), "'undefined_field'")
++        self.assertIn("'undefined_field'", str(cm.exception))
+ 
+     def test_format_arbitrary_field_present(self):
+         formatter = self.get_formatter(
+@@ -596,9 +610,9 @@ def test_template_arbitrary_field_missing(self):
+             arbitrary_fields=True)
+ 
+         # The formatter still breaks when it references an undefined field:
+-        with self.assertRaises(KeyError) as cm:
++        with self.assertRaises(MissingFieldError) as cm:
+             formatter.format(self.record)
+-        self.assertEqual(str(cm.exception), "'undefined_field'")
++        self.assertIn("'undefined_field'", str(cm.exception))
+ 
+     def test_template_arbitrary_field_present(self):
+         formatter = self.get_formatter(
+
+--- a/ZConfig/components/logger/formatter.py
++++ b/ZConfig/components/logger/formatter.py
+@@ -250,7 +250,7 @@ def __call__(self):
+                 # non-standard, so we reach under the covers a bit.
+                 #
+                 # Python 3.8 adds a validate option, defaulting to True,
+-                # which cases the format string to be checked.  Since
++                # which causes the format string to be checked.  Since
+                 # safe-template is not a standard style, we want to
+                 # suppress this.
+                 #
+
+
diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml
index ed502c98fcf9..82055c0c5fe6 100644
--- a/dev-python/zconfig/metadata.xml
+++ b/dev-python/zconfig/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/ZConfig</remote-id>
 		<remote-id type="pypi">ZConfig</remote-id>
diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild
index a84e81f5ef88..174067f20aaa 100644
--- a/dev-python/zconfig/zconfig-3.5.0.ebuild
+++ b/dev-python/zconfig/zconfig-3.5.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 MY_PN="ZConfig"
@@ -13,27 +12,25 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model"
 HOMEPAGE="https://pypi.org/project/ZConfig/"
+S="${WORKDIR}/${MY_P}"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/manuel[${PYTHON_USEDEP}]
 		dev-python/zope-exceptions[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
 		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
+	)"
 
 DOCS=( CHANGES.rst README.rst )
 
+PATCHES=( "${FILESDIR}"/${P}-py38.patch )
+
 distutils_enable_tests nose
 distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 763df919dd41..1260977c33a5 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,3 @@
-DIST python-zeroconf-0.28.7.gh.tar.gz 60821 BLAKE2B e8c99505d1b149319552c808ee17bd3cd37a016c094d5f273f5d3545670ecf6f9cff58178293816e9cd671cf9e342b0a99641d6b9b3d32626dac4e72d983380e SHA512 8cc5c9b2e964c170c2aa53a3c07f2cd634cb113737fdf2e7a924b0b1c5ffb7c2d1e97b589cce36a4216f427e0e64dfba373f9f96b6117e835a9aa68a911edea0
 DIST python-zeroconf-0.28.8.gh.tar.gz 62107 BLAKE2B 94b910be9f95f8b50bfcd5fca102663713234d40a0cf90c5b94b2ab4e85ffd7363747a0fee2f7a72a3bfb74faa1cab703dfb8bfe3cef80a0495efe2c81d0c2af SHA512 ba599fdd44ecdf3da71ee2a155a47e6cf91c8f4fe3efac428f6e99feda052019423a8a3e775d6cc4624697fbfcbe207829a41ad76105082fe62e81eead2f7a34
-EBUILD zeroconf-0.28.7.ebuild 871 BLAKE2B 772550912df25c87816e8b876f67d30202412eea4cdc90e2d78145ae1f56569f86fc4b6d5b90f2994f843b9ed705eab59f9d0797811fbf522fe46ceaaba4eb59 SHA512 5fd62d1e49db89ad884b0484251e20940685ee1af8c26480caecff6fdf9ec10ad03d67fb92caabfcf6e79214de34b1a4709f318d297f0904823d87973f58aca4
-EBUILD zeroconf-0.28.8.ebuild 873 BLAKE2B 087c7c61550b688c286c33174073d5d5302046d46bd2ad92de9e38b4b0f6c255cd3c2d6fc28fb93400c1dbdc71c4844d1a1a7490bc2db9b4750f42f38565ce11 SHA512 9632727a1202495cb51a9428f947b9d1bfab294fb1c20d42f538f16aaf1f679e6db94edda16f6441c44e13198ba5eecfa43306eb28397da06ea7ada1e845ae04
+EBUILD zeroconf-0.28.8.ebuild 871 BLAKE2B 772550912df25c87816e8b876f67d30202412eea4cdc90e2d78145ae1f56569f86fc4b6d5b90f2994f843b9ed705eab59f9d0797811fbf522fe46ceaaba4eb59 SHA512 5fd62d1e49db89ad884b0484251e20940685ee1af8c26480caecff6fdf9ec10ad03d67fb92caabfcf6e79214de34b1a4709f318d297f0904823d87973f58aca4
 MISC metadata.xml 412 BLAKE2B 6a739488228910f36342ec3ad1eab50ca3c58c5bb1004d23e465009179dea3452558f3119f6c4e4a6b7b62bd0729fc3ace9a8c2be673ce6b1567181f7acf50db SHA512 86d45467ddb20b64dd7f868fabd1a8ff98469f8fa1cb99ac5f6ce1535e798da06bf78276d8d242b04056c07a195b8406bbc558c09aabb55c25cd875c44b96bd0
diff --git a/dev-python/zeroconf/zeroconf-0.28.7.ebuild b/dev-python/zeroconf/zeroconf-0.28.7.ebuild
deleted file mode 100644
index 195b07ed7412..000000000000
--- a/dev-python/zeroconf/zeroconf-0.28.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken in network-sandbox
-	sed -e 's:test_launch_and_close:_&:' \
-		-e 's:test_integration_with_listener_ipv6:_&:' \
-		-i zeroconf/test.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/zeroconf/zeroconf-0.28.8.ebuild b/dev-python/zeroconf/zeroconf-0.28.8.ebuild
index 435435da4bb7..195b07ed7412 100644
--- a/dev-python/zeroconf/zeroconf-0.28.8.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.28.8.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 1e4d981ce4d9..44722a1fd8fb 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 979 BLAKE2B 6b8182358b49bb3f1967081648343650e0be0c3800268dd3bbd95de1253bcd109b04854e2ec54b5d65365008d522994407bbb5192315dccde1f7a892ef442f7b SHA512 8622756c6ce2f929fade0776a1524a0814eec09f08fdb911282e00bb0a1a5a5f70fb1e25d839f38bba36a2e5e5db1f21f3feaa4a6dbc2f67a4b762cf95483f1f
-MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
+MISC metadata.xml 410 BLAKE2B 13b354ff6b4e8021277d42f4f7adf5710fba20cc1f2859c19f7bf19793109d5dc5d93aa033a6d83932b775dbed017b1646ab650eb4a76e87738471329b727e8a SHA512 4135d10ca2332108fd3cb15a826dbe7c8fddafba2215a2905cfeeb5bc8b64e91dbd82b7273e1056b2a2ca6358fb01a7a18fb37b572cd927428f4be1af5963037
diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
index 6684ed499efc..33a448f5b287 100644
--- a/dev-python/zope-component/metadata.xml
+++ b/dev-python/zope-component/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.component</remote-id>
 		<remote-id type="pypi">zope.component</remote-id>
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 9118f19f6022..62c23131a62e 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,3 @@
 DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
 EBUILD zope-configuration-4.4.0.ebuild 871 BLAKE2B ecd10d860abe3acf81185c337bad36e5bf9130c5ceedcdc392196b18267e1f07844b77054c9c3ecae25d2c0d85976e3a829716fb75a9a223c7c26f123d27a54d SHA512 aecaf445c6b422184641d4aba881000c7d986b4a8a15ef7447caa560ffa04d3d9921d01a77be2bc56b5237e73674ad093187f97737813059dfaa6027644d3e44
-MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
+MISC metadata.xml 670 BLAKE2B a27a5a3edde1c7352c7f13c4741527c46731a91ae645d4485734dbf3c7e60934c34f60c298ba41dae23703e0b88dd1cdb94121cabaacf78905e0305e39e00740 SHA512 d6edf151dc37648b4742c7f810695cfc38c88b5cba79465b6bd01c06ba1a5bae82fb55603115e7c7d241f75d7618e7c88bd22e73f0efe573026fcaabcc2b42f4
diff --git a/dev-python/zope-configuration/metadata.xml b/dev-python/zope-configuration/metadata.xml
index 3e47ce6bf270..e7ab5778b1da 100644
--- a/dev-python/zope-configuration/metadata.xml
+++ b/dev-python/zope-configuration/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.configuration</remote-id>
 		<remote-id type="pypi">zope.configuration</remote-id>
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index 149782e9c5f5..f65a82b7f42a 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.4.0.ebuild 673 BLAKE2B 1c41547e897498bffb0671d4b5e57785d0a311bab2f827e00c025832442c2dda77b5db8affe74e5954d93c2745e6ce7d0cc00feecb8fad36e7e798fdf4432be9 SHA512 edeaf71d622b3cdcddab479153120b8d229c45541b4b654d4bd88ef7a4ff25997c6da13c12ef022e3c512af5f53266d285f50fb9a7f09079c6d7adee3d01f272
-MISC metadata.xml 368 BLAKE2B c1ce605438814f19b09dff543b21baf02f65d922e12cca179a133ccd00b0f45abc38d7e4f8b328881630595250aa328420bc09209cefcd7e632740285992c7c4 SHA512 7fd7d1b36d207b8e91fa9d4f3f2c8e760e9705ab556bd8c6db12207958aa94469db6ce9353f6537a3ad0f5914a0b14ca3d8d8c90033a497870ee5856b8612c9e
+EBUILD zope-deprecation-4.4.0.ebuild 673 BLAKE2B 3431aaef34a7eb9097354234607481457be0f074865849d75aa5857f6507d02d74ca784d89851e0c2b49b44ee68adadd5d60349b843872db086fa82686a01705 SHA512 b58ef56bce3ad658d9b3f1c0b5a8953892df186aaab293ba5b3fc6903221b47ea765abec168ec1dab4d4fdf2ee16722c4106ed190270e816930606ffd38ef8ed
+MISC metadata.xml 392 BLAKE2B a04db77716b9193d942c3d45d09694b58577e279b162bdfab1487b3d45114623c93885a309697199e3b9c90f24fff75771575a2f1d371c79127c4712cd577727 SHA512 2089dea082d58ad23b2ffefe38d79b579f68392e7cbd1e191b60575766487a57bca369e386b25f777cc9434decfee06036dc42d12ef07cb0502f5c5dc517e4f1
diff --git a/dev-python/zope-deprecation/metadata.xml b/dev-python/zope-deprecation/metadata.xml
index ae35638ded39..e0ee54f191f0 100644
--- a/dev-python/zope-deprecation/metadata.xml
+++ b/dev-python/zope-deprecation/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zope.deprecation</remote-id>
 		<remote-id type="github">zopefoundation/zope.deprecation</remote-id>
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index cf10756b9567..14a895391a5e 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..8} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 2d737d650e98..d83588438dab 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
 EBUILD zope-exceptions-4.4.ebuild 925 BLAKE2B d16e983c9f01d1f44b8628f1e2276abc3ced84def799b18b1638ff71db55b4d077674bb88ba81e87b3cf2290a2b1faba2b82c684fad10593316210accbf4a4f1 SHA512 eeb1b39651165875e94023ab1c1f1b1e68affd3d1e04f862b3643f720e8926854383cfe2ce6e19fcb4080a3e345044d3c3a77407def32050cad50dbc0a1cc480
-MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
+MISC metadata.xml 412 BLAKE2B c10e47865e43c36b30c45f69202df2899e961f2b8ca11c4d6ee289e742cd82ab2708ed91042d042b9b41d977d8b7d13f3d3d1a96fa10a1d6b8beedf52f07ff33 SHA512 184a2a82c735cd77ada2afd4586bd0381c8333bdd604914de8538e941b8c5c2203eeb6c46064e9a41915c316b8399b1ceebcbbfd7f6ab00c480fe44a72726ac2
diff --git a/dev-python/zope-exceptions/metadata.xml b/dev-python/zope-exceptions/metadata.xml
index 828a7ab22002..bfb7cd4ee0a9 100644
--- a/dev-python/zope-exceptions/metadata.xml
+++ b/dev-python/zope-exceptions/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zope.exceptions</remote-id>
 		<remote-id type="github">zopefoundation/zope.exceptions</remote-id>
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 20b289d6bbd1..db48c849422b 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -4,4 +4,4 @@ DIST zope.schema-6.1.0.tar.gz 103042 BLAKE2B 1892e5724b6f947cda40567f0694821d49e
 EBUILD zope-schema-6.0.0.ebuild 994 BLAKE2B deaf6d56e6043deec37cc2e5148fcd6fc08c5c54fbe9c6b74a3090abf68ae1f24d7154ee44ad9b2fc7d17e7da61ee62e548df6bf82bd654b2c2410b506812f70 SHA512 8d4d3b26916730154b457e9be15fa07f84370477a0baf61b7a8e3bd5ac8d3858dd76eac83e3b1dd1c773e8da5a79d49cce6d2415196bcf22aaba526b1c2fcecf
 EBUILD zope-schema-6.0.1.ebuild 998 BLAKE2B 31e4fa5827804c58540197638a92f9a14dd2c85506a14c8b07f93338f8e4f49c9490ffc552a62b4072b18622089bdc1ecc856589274bba5e8f63d3c07c23f5d6 SHA512 0b7257381cabce43ca9eb848d4584ea8c519628fb13ede90e20a4aa32c97c5e02ac5678a1692df349b0d5252d744cd117de7e2f694cfa09086a8eab1bd9245bc
 EBUILD zope-schema-6.1.0.ebuild 998 BLAKE2B 31e4fa5827804c58540197638a92f9a14dd2c85506a14c8b07f93338f8e4f49c9490ffc552a62b4072b18622089bdc1ecc856589274bba5e8f63d3c07c23f5d6 SHA512 0b7257381cabce43ca9eb848d4584ea8c519628fb13ede90e20a4aa32c97c5e02ac5678a1692df349b0d5252d744cd117de7e2f694cfa09086a8eab1bd9245bc
-MISC metadata.xml 473 BLAKE2B 9d4475a1da73bc0330a977dc4943fe10a2b51465cc79413b2d8fc780a6b1afd73f77e54025fce33be258546fd991e1fd9ff9c37a2c9654065c67867255382a15 SHA512 6d2c6bc56197b18365bdb11a2986c614234aa1e57f37b93f95f6616a3674890f7f02a901d58dbac0d2d98ceb1cb8535d9c2e84969778108e1e8bcdecb89c4299
+MISC metadata.xml 497 BLAKE2B 97f6a446a1e6ac7ebd1526824992b11189c505e6942307f15d2d69479bd5d30e5ff8adcc214a8a77882db35f468c882f0db6d27ce292a879ab5b1cfc6504a24e SHA512 975c51cf597e6b88b45f8fe21a66481227b3e257165901986b6532e6e1632948728713d65d2cbe6b42a6598fbac6d78ea4d4af84a1593aea85e8f49eb8e7adc5
diff --git a/dev-python/zope-schema/metadata.xml b/dev-python/zope-schema/metadata.xml
index b32ba1f3328c..97cab3033d2c 100644
--- a/dev-python/zope-schema/metadata.xml
+++ b/dev-python/zope-schema/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.schema</remote-id>
 		<remote-id type="pypi">zope.schema</remote-id>
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 9b46b6a4eb37..3ef845988b0d 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,7 +1,3 @@
-DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-DIST zope.testing-4.8.tar.gz 63626 BLAKE2B 1e6910f3e6d0cbee8ea08f4af2c9ae8708183779749e02d9fe71b5726dfd6c0d94a2fca12a8b150044c29a75edf2cbd0783f83b735eecf061488b2e642ad4db9 SHA512 5f89a8babaa94d46d67c29f1f10b1b8dd4196093f6aea66668d93a5256539cc1bbf6ba689c592031df62e300db9cd1fedf9f38490c73355fb415a02e351bb92f
 DIST zope.testing-4.9.tar.gz 62294 BLAKE2B 34b2fc10e7220d88451b655d0e43f513d004779c496c824fa3e58b17c883a401f4707d5dbe7a547f1f97fe7db73b25cdf16997f2733b832ceabc37f1d5265397 SHA512 04b660aa93e120ae7e57bf637d99302d26912800ea3995a24c6d252ee4bd8e06fd8d4a24d980f591846d9bca93523373a92528ef492ff4d6990887ab6cf527d0
-EBUILD zope-testing-4.7-r2.ebuild 955 BLAKE2B ae5ec8d2ec37329215c89373aff9408dd6913f157f5db984f331ad7d4e95a751cc7adb585cd321a1e4166f9f00c7cfd0dd59046a79dd5ba623e4b0205c3a0b98 SHA512 ccef768dc7a27a6cd0ceed952963412ebedf233492022dbeae2829c1978a35c5d8763be76db879f8a5f380f5a9e037253933e9b9384f9dd26a80297d3ae1c664
-EBUILD zope-testing-4.8.ebuild 943 BLAKE2B 2ef6a4591908be658d26d89c58d21d9f70b4ad37b1f779bf44ab7022fdd0e630edc354161e0f12a5823dd25b96d0be58d1727071ab5b8369c50e25ba627da628 SHA512 6eb91d1ed9bc248a33618fde479f3c155c6e120881f4a9729baf663ad48490b3a487ae10ca195b8bba8f1c825bfc4cab6ce0b95df0c282ffde369819faaa1c80
-EBUILD zope-testing-4.9.ebuild 943 BLAKE2B 2ef6a4591908be658d26d89c58d21d9f70b4ad37b1f779bf44ab7022fdd0e630edc354161e0f12a5823dd25b96d0be58d1727071ab5b8369c50e25ba627da628 SHA512 6eb91d1ed9bc248a33618fde479f3c155c6e120881f4a9729baf663ad48490b3a487ae10ca195b8bba8f1c825bfc4cab6ce0b95df0c282ffde369819faaa1c80
-MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
+EBUILD zope-testing-4.9.ebuild 934 BLAKE2B aeb534e2b8ff8acdac77de288138119953c45ac90c1a33419a286293ce3507162561108232696a39778ea7a9ab6ddc4472fbfe2fcb15a683442bfce5319fc54a SHA512 84cfbfab7fe07bf60850726317a3146e19b8c894231a2b6ea85458751b308bb43b024412695de9110c93ca7c90ffb4acc6f8d7a5140880f95cd748a974ff5804
+MISC metadata.xml 406 BLAKE2B 3716e9dbf31f44ea27818f1a21db94db8d1d57dfca5952f3b47353d6e47b3b777d60deeda14feeccc3c422f0c6e50c55ed79bb3ae1928efe04493f98c3a6e74a SHA512 d65fca74f17c5d2c72ddd3e670b0773a27305ba7637c74126226e6db47b9d79310710027f3b536701f69ea06c8408230973e944294ba4d1ff9e54f7afbda0d1a
diff --git a/dev-python/zope-testing/metadata.xml b/dev-python/zope-testing/metadata.xml
index 6b2228bdfa3c..27101c8ce656 100644
--- a/dev-python/zope-testing/metadata.xml
+++ b/dev-python/zope-testing/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zope.testing</remote-id>
 		<remote-id type="github">zopefoundation/zope.testing</remote-id>
diff --git a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
deleted file mode 100644
index 2a0778e17f4b..000000000000
--- a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-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-testing/zope-testing-4.8.ebuild b/dev-python/zope-testing/zope-testing-4.8.ebuild
deleted file mode 100644
index 395e49e0ae32..000000000000
--- a/dev-python/zope-testing/zope-testing-4.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${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/zope-testing-4.9.ebuild b/dev-python/zope-testing/zope-testing-4.9.ebuild
index 395e49e0ae32..6fe6fefc7a00 100644
--- a/dev-python/zope-testing/zope-testing-4.9.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index cd8109d44979..ebdef6b29f93 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
 EBUILD zope-testrunner-5.2.ebuild 979 BLAKE2B d276c1fe01844f1c157def257119706ed0b241171f62b53deea2e70569f2d62fcdf6d754d274610a78c55020c670ca1797a61bc3b2ca3769aabf47abbb636c14 SHA512 89c2233d5caa6b8adf7eb5d4b909e554bc7d57e10051e53e18e97d3759cc5570423ec98fb6e6e381e1a6839fe45dc71799da443df4c01f73d22454ef9b211493
-MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
+MISC metadata.xml 412 BLAKE2B 2bad0bfc23c6d11a25bb7aca8590bcd9efc8cc181a7aea19583dfd0134ba45860c787ea557374d8477dd336d8c54ee8a2f6d0e9b638b3f6c0e717924656b8fb5 SHA512 c147c65955c3436f1668f2b295cb63db1ecfe93a36ff944cee7abb3e4e722198223f05d2187dd637274f906e729dacd73f8285c91bf0b462082f5260ae52810b
diff --git a/dev-python/zope-testrunner/metadata.xml b/dev-python/zope-testrunner/metadata.xml
index 52b412165e06..1b41cc45884b 100644
--- a/dev-python/zope-testrunner/metadata.xml
+++ b/dev-python/zope-testrunner/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zope.testrunner</remote-id>
 		<remote-id type="github">zopefoundation/zope.testrunner</remote-id>
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 74878ebbdfa3..472a137565bb 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -2,8 +2,10 @@ DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b84
 DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
 DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
 DIST zstandard-0.15.1.tar.gz 992126 BLAKE2B 7f6e987402bb5ddada70b56660d6e9d4eb5cd17dfa0041323ba2ef75bdb5362e7bc4fc8415132079a929e34fefdb654860088356b38dc0546b7c4f7108f93252 SHA512 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
+DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
 EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
 EBUILD zstandard-0.15.0.ebuild 783 BLAKE2B 89e7f68224ee060cca75e92bc1bc714b1163752204f9fbc9184463325847006ac516874eee2b5cbaac862cd0a9cd30767667843ed3b9b26edcf131643ff4e14d SHA512 f88092d3e344b66f42082d85880fb3ca6ff7c3856efbc662a660ecebaa765e05d8726210cea88dc50d4fb0a9725f639c763961ec7fc609854711ed98b4d5b118
-EBUILD zstandard-0.15.1.ebuild 906 BLAKE2B 93646f8eacc6ba7e5ae0294367d10d7d1cc0f758dffe6e0a7cd4a52d5fb078db46c5b9d2955d53293f155025b0be7f3e36cca1a2f4b2f537411ecd03c4e04b3e SHA512 6dbc74e5c4638f28ba49a216d50d68d7ebe3c13431c09271185b76cd1f86a3f43330967425f8725dbaee9014037a3bf82fcc97e9e65022c1130fbedf0a00fd76
+EBUILD zstandard-0.15.1.ebuild 941 BLAKE2B 2c85553683b281b0c3b0dfee4470fd744bf190abc68776ec50cb036af83d468848d2362a45223807b5ca78b79e2c396b94def1248bfe6937786eb7081a59bd17 SHA512 1bad138a1524b76d9be258e3e16572f693538a713d47a8fd61c940589a9ee6332df343bf428bdbd601efeea4aa362dbd05415fe02d698646faaa9329e56a145c
+EBUILD zstandard-0.15.2.ebuild 942 BLAKE2B d6fc0d52c313571d68b6c4a0b8c71af11d311f8dc0ec090757b40b25fd1b13aa0a5d48867fb90fe7da6882db7d83b81e902ae4c0425166cf93473b1a7b1110bb SHA512 6de2881097963a26b9c79282272190a2a6ca2bea90f891c43017d5b9acf9b6792c95615bd825b44a72556b6b38dbca157d60c092b86960caf117073af907baef
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.15.1.ebuild b/dev-python/zstandard/zstandard-0.15.1.ebuild
index ebdd50617be5..1bc00826f8c2 100644
--- a/dev-python/zstandard/zstandard-0.15.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.1.ebuild
@@ -13,9 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="
+DEPEND="
+	app-arch/zstd:="
+RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
 "
 BDEPEND="
diff --git a/dev-python/zstandard/zstandard-0.15.2.ebuild b/dev-python/zstandard/zstandard-0.15.2.ebuild
new file mode 100644
index 000000000000..605c6dd344ad
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.15.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+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 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:="
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
+"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile --system-zstd
+}
+
+python_install() {
+	distutils-r1_python_install --system-zstd
+}