gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /dev-python
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
533 files changed, 5174 insertions, 3163 deletions
diff --git a/dev-python/Faker/Faker-8.14.0.ebuild b/dev-python/Faker/Faker-8.14.0.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-8.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		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 fbaf3388bbc9..4c6746e03a4c 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,9 @@
 DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
 DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
 DIST Faker-8.13.2.tar.gz 1162423 BLAKE2B 595bac7a9a3031a46342ff19cfc1ef89bd7a5267dad3b1a18bda5cb3d96168eb0fda03adab940d35e499771ac1fc78e837631fe048fc374e0dcdcb62ac0a2002 SHA512 7da38c7bcf7b1b7364161092a38a2a9624ede6fed6e0bd9c8aec7acff83d4377bfef3e3ce2af48ea04d37eed0e880357bd40bca6eb81d19cdb876d66de249b04
+DIST Faker-8.14.0.tar.gz 1162580 BLAKE2B e0e5b7134d615b2cf64f9b995d28b931f56f421d6fe48117d78781f0fa03e3d32a9353cadfd27f216f116a30e3d3ef6b905ecdcd79d2630482b514b2841952f9 SHA512 4218a9e97bc3e72e59a2e5887fdeb8e38627cbb733ff270198acaf47fe993424e7819dcdd90856d0bf86f8dba77d7a73eed9bfe9c048f0962f671e2bd43a9c5d
 EBUILD Faker-8.12.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-8.12.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-8.13.2.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+EBUILD Faker-8.14.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/GitPython/GitPython-3.1.23.ebuild b/dev-python/GitPython/GitPython-3.1.24.ebuild
index 4cf458b0a12e..d4f0e168b8cf 100644
--- a/dev-python/GitPython/GitPython-3.1.23.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 30ffac433216..7ffe208f2a2f 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,9 +1,9 @@
 DIST GitPython-3.1.20.gitbundle 9511740 BLAKE2B 17d1aeec50a85ff5b8688a984ff41933bc8a3d91ec2e706053fcaae9298d9d469b7c816ac61f82934d454f6ebacdbce4d56ac8936ba89a7a694b59cca8b9e821 SHA512 d49e429b45f9edbee9419b94136762a75cf33b1693f9f8fb809b0bf63f0a763d501d9ca42f332d156ba7d79d07eed310763af51797adec4dac30f7c073c415b2
 DIST GitPython-3.1.20.tar.gz 188094 BLAKE2B 3741b6b2e6c77ea8464eb83abfc744e9c646d18368648f805a2aa2f6fdb1875ec61b7e4aa4e224a67bff49686268c86b2cd2b3faf19e9eaa4c9587aacb7fa3f4 SHA512 10dc9f154067eb79a98fbf3204e370e814ab00661ffd7c2e1a1dc8ba46475ed48ec8c355820deba609486c865301e13bd54797ab7da8fccf8cff9cc9efebb153
-DIST GitPython-3.1.23.gitbundle 9661389 BLAKE2B 2b70484d695fa723b436d51e843fe4d03b2754be5b079d9a13b34c129c9559fd728ed3cf4873c534fdb404a802a3d6984f032b797cc490eafa12b89979a97e27 SHA512 6f9b29c6ece3d497b262d9cb9c561bdd9be8d60a01df0a81acaf7a9ef71297968a90ccc712f45a898ec1d5a28c84121ccf427b9805dee37412d172efd0407be4
-DIST GitPython-3.1.23.tar.gz 189889 BLAKE2B 063ecfbb3820cc05f631b6dcaeabaec79e15041d47c5e39fa2364beba1a6db07cf74a6442517136cfe29d14d85efb1b08ac609c1468f9e7d86527037c57d67ac SHA512 06037303c4ce6fc1f9cc0ba7839196ece3721fd45840a10bbc31701d54a46591323b4fe7e2c459a2b3811d0d859170ec9b5b2cb4b52bb50a09897f6b8cb82676
+DIST GitPython-3.1.24.gitbundle 9658020 BLAKE2B 4ac2c1a238de1d6e5be9f2d65ec486a1a48b38695946889f8ba1c7f0474216e251d6385737d0576be9ece09d3751a305d756b58a21dc20a279609a35553de0f0 SHA512 9f05b4c92b85fa80e9b774380758c1a6e0d4ada81c170ddd6c542a31fae1a047844a481e8478afc3472e3a226f8eca1a37a3ef7a6b9c06787fd84543cd073b1e
+DIST GitPython-3.1.24.tar.gz 191249 BLAKE2B b60f5186aea33434d77b63997e5e9dc277b49a97934bfe250795af9c0ed92d00c478dd4475a00faa2f5867882f81161dcd21ed46c86883a48b8397266b5318de SHA512 af2aa85574287827e5d2b78f7a19776be57518aa0b8af7a3fb92bef0d97c6a27b3272ed39adf2080b39cd5a9eb114164de7a2a9bbf73cfe1fe2647e0b053b092
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.20.ebuild 2028 BLAKE2B 6bf6960d553d420e9479de6d0c9055d0ac63049beb4ba73915174a262a22e407d7402d63f2ded83267f297d00c0d4903dafc53619a4e6c7a18f148c2139fe68b SHA512 4c5e2b8bc642e8a7a501589ec8e722cf930a899141cb09eee8705f744097284b26ae0c303597de52f90c3e7f65ec3d28ea97d70db2712b5335eb2770f99a39f0
-EBUILD GitPython-3.1.23.ebuild 2031 BLAKE2B 9ef2b22a3c75cb89a2713164b5dc7d57af66a2fbfad5a4600796cc43223550ffd52fe7e1a14cbca6fb7de1f73eb4c2cedd6e626d3b3614b65f023c3a74abe2dd SHA512 981afb56abf8e9cb648772057d5ed7a47742d23284e7f4c7cc86dde771a0340998d7154a01ff7a5e54282b76a557b5dbb4e714f08f744ebadb77a4d407331885
+EBUILD GitPython-3.1.24.ebuild 2038 BLAKE2B c8f19219611853bccfb2134f93788b1410586719d97133258d4ebe17fd4cb19a95679d462a2a59f543a7b5f39cc11e11458d2e3e96fbfa827758c341871448e2 SHA512 8131a791c9571379fb16d3cc6e3aad649294bd8633b1772509b020f97e81ee4d4f79ddc44edafd902dc7e381620118f6f35d9fb97e9dcd3bb8a6768dc7f6518e
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d5a929e79c9b..ad990d3445b5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index d82aaabcf2ed..3df457590819 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,3 +1,3 @@
 DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
-EBUILD PyECLib-1.6.0.ebuild 638 BLAKE2B 32ea099cd1f6b171bac143a8ddc8a836b2920c5880cea5a8b3d42f2858f0b3b4ce2fcaf203b474f63a31268ba99bd9cd2907ae054af6302c7062b8c9e84e2aa2 SHA512 8dc42d22b383bd9940df3de1d72d03f17d789c35257e27fd0713b8a055005943e7933a34d430a911e50aab1043f5af2b2f825f7da4d35c7804aec0b172d02907
+EBUILD PyECLib-1.6.0-r1.ebuild 815 BLAKE2B 6ee050bd72705e682904163917bcc24059f47a19e84f55ec2e3b782680e983be9c8ac571faac87d08424a4182973eae6b78acf665e48330751927363ebbf8e78 SHA512 a0eb55eb3470a5a6fd60a2955e99f42ec3bfee28388a726aef8e67c52d64138871407a8870e7d39597d4137bcfc62994c83ce8d53caa88291affa33bb179c30e
 MISC metadata.xml 675 BLAKE2B e177da23dedafbcbcd1c749c2eff625cc03dbe5180d21dab2d4c6f9470e3584f4aae4616568f5502f51881c762f475bb9c1ef8a650b0308d0fe3625e68d57cca SHA512 9234d5dab10b3d71fb07d8fb7b24ff482f2866ddcb12cc790abe870fe1e357806e0fe6844d5bec48437ea3c0b536713a1316176ef0ed7f777262a2f52dfa4fe3
diff --git a/dev-python/PyECLib/PyECLib-1.6.0-r1.ebuild b/dev-python/PyECLib/PyECLib-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..487777ee0854
--- /dev/null
+++ b/dev-python/PyECLib/PyECLib-1.6.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/PyECLib/"
+SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
+S="${WORKDIR}/pyeclib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND="dev-libs/liberasurecode"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# https://review.opendev.org/c/openstack/pyeclib/+/798010
+	sed -e '/library_dirs/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "jerasure backend" dev-libs/jerasure
+}
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
deleted file mode 100644
index a333cdf73126..000000000000
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/PyECLib/"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index f39f66672640..729fa8e5d815 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 DIST aesara-rel-2.2.1.tar.gz 8166022 BLAKE2B af3c17029dacb3d365bf49eb01d4d03b5a4f770f66d3e5eba2c4576ef156056bc1aca3571442c1cb7352c358978b47faa7af70ca0da2a2168d8c9bfd47b17138 SHA512 f7bab8ca80e8d13ef7698c1efa56ff37c561786330bf756c7a00c54ae1f131810d68bfd6e328b0705d45788759bd984d42306d2c545d2de6b9a3592b5c021ad8
+DIST aesara-rel-2.2.2.tar.gz 8174668 BLAKE2B c95347e8b74f6600c3570177f86b7ebd7511899ed0ceb24a2d79a03a44ee498a8062b92fb79867f59b609f66315704ee92e28e12a5ab600d54d0d35ef799b66b SHA512 d5f62e42c36100b2fd25eba492590eb306b1394aa01bf2e90d43e84ac67701e5b756be6bc08d0e6b82fb1f37689dbbba1d7ef67c8525555a700a634d742056bb
 EBUILD aesara-2.1.3.ebuild 2111 BLAKE2B 938cf355ddd1157d3a085651bbd1c5766a395da540066341eb1c7c8d8f0559d934e1e5e5c285c2a4ccad7ea1a42e1bcc14619ac2ebc9d71a0b8d10bd6c87a160 SHA512 04edb20862110c8e25ee9c95b52207a904bc8333f8d0de06436e577654fa25eb2d01ca8b258cbe5ed32b3a96ef0611964df3315d7fc1c63e654295460f09372d
 EBUILD aesara-2.2.1.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
-MISC metadata.xml 405 BLAKE2B 5f24e428a99637a4a83f896924ce738183a9363ca83610cba6f16ed36c0dbbb8a057b70fb271f1594bec69239789858efced727f669b6d6b3a0282e02396f043 SHA512 c46d8761cea98d27a266f14371f544989fac1685321bb496e3f32559d9c28e984e0686140981e08d0c00245b9d31feb9ef5df5d47a032b7dbeaa4eb37c83a034
+EBUILD aesara-2.2.2.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
+MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.2.2.ebuild b/dev-python/aesara/aesara-2.2.2.ebuild
new file mode 100644
index 000000000000..3148f85f3cf9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+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/aesara/metadata.xml b/dev-python/aesara/metadata.xml
index 449c9ce70fd6..010f78c68d85 100644
--- a/dev-python/aesara/metadata.xml
+++ b/dev-python/aesara/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aesara</remote-id>
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index 3a201a859afc..8d56e5aef4e1 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,3 +1,3 @@
 DIST aioresponses-0.7.2.tar.gz 28135 BLAKE2B 300d06ed43ad81d61fe9cab4002b9e9bb062a48aabed8aed21e3a8e26d8e153546ed079e6dda6ef26c6df2e843663ed9e02b2855ac71e011b873da926923a72d SHA512 847c687990c38733c714cfd7b4f268406392aeea6764f084dae25f43246b7b5731f149067fb921864b1b22c9e7b2ca66254ff311d726333d0b23a5566ab18029
-EBUILD aioresponses-0.7.2.ebuild 917 BLAKE2B a622312cf2b739714959ecf35f395b9ddcacdaa72ab9fd9c8cd38cee84f0d3c1e3ea24c1347533eacac99394b6a0b219c95ccc6b1c947135a19a5920f38805c8 SHA512 d8740575e35dd6b940ed901cbd3607d9247dc5233a79fe04002e73ebce10309e4d0169bc82611fbe73ddb2f44d008bafb28add6498ce97694151f06cef8aed7b
+EBUILD aioresponses-0.7.2.ebuild 915 BLAKE2B 2e258f726f6ec36b16d4cdad04c9b0c87ea975b5b0da20916bf4004144fb7d64e9dba7af43b6a1232e4e877042df3205cb4ac3b6eac594471ac381268910ada5 SHA512 9cb963b8c5b37f4a08dd164713a4021ace76d48d4c1079c814889bd64e60af88f63badfb95b7efa82adc90ae58ae1c3d7b2209dc58a0852d21dc07feee78c003
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.2.ebuild b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
index c625c0e4446e..97031db4a060 100644
--- a/dev-python/aioresponses/aioresponses-0.7.2.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.2.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/aiohttp[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index c8f85fb4e3dd..26dd3d016aad 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,9 @@
 DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
 DIST alembic-1.7.0.tar.gz 1223858 BLAKE2B 1e0528030b153eddb2d5105d309cb611934939606cc91721e560a3fd74af76bff69ba00b0179a6d580a914634bf75f257aab094ed920298b43bbf98beec10ba6 SHA512 a2d2a6c0a6cab17bab4e66a7f8c2eff6481c0ababb836fae14d702301b1a186bf5eee84a95fcfa8501a1efaa262d61293e1dbba13b40270535068bff0449f4b5
 DIST alembic-1.7.1.tar.gz 1225157 BLAKE2B f107c1d787bf9025dc7c092a650449cb911e327fb501f6e4717285f627c455ad43765ca229522a605ac8345f754bbd6808485d77b99576b691ac04185263db51 SHA512 222a643363f89077b7d30068e0abeb8d8dc373778dd6e4364b559d8a63428f0fe3617505207f431c30a1bd43745dd95fd679dfb1401222f20068327805c2309c
+DIST alembic-1.7.3.tar.gz 1226799 BLAKE2B 209ccb03b5745eda2dd54a9a6376ab62dfd5902b497a86cde460c258c87917a534bbe5a028be58444fcbf3acb9c7d84ce5f26798a636089b5d869a238bc2f23b SHA512 cf6d6dd0913d1552ed82ceefc6254af3ef9aea46c08a2d0879a941e7807e5ed41195f5d0b98d108f77a2db5a3c502115af1ce4c9c76618f8c720255dbe58bcad
 EBUILD alembic-1.6.5.ebuild 738 BLAKE2B 021f7ad7fda002f0c8d0d40b044844f91e7151613f1b0e594823a456c00df4e178db9ec6756a10f60c24bf0b3886eb8b3cd8762f9e5995eaf84c571f816db958 SHA512 749dc26134dcb9ccecc769cfd1e8072182c3b4d319f2671d605ab02ce264470f36afb46d275aa7a814bf3dda0e75fbfea351cad88a1370ece6667981eb8295a4
 EBUILD alembic-1.7.0.ebuild 921 BLAKE2B fb76bdf6bbae67b9023a2dc614f1401ad6ef0015743691b00e6234cc9d24e834ea23b3e9506894193b0459068a86bea2a5dbe5f166eda871821b22b95539d684 SHA512 695beb9a442737726d59daf1470d4ea1bc03dc64d480aa3024bafd7cf976ae223b0020288176e750008d29bce344a09d655ede1dac7c3fbb74d1573eca8e4414
 EBUILD alembic-1.7.1.ebuild 921 BLAKE2B fb76bdf6bbae67b9023a2dc614f1401ad6ef0015743691b00e6234cc9d24e834ea23b3e9506894193b0459068a86bea2a5dbe5f166eda871821b22b95539d684 SHA512 695beb9a442737726d59daf1470d4ea1bc03dc64d480aa3024bafd7cf976ae223b0020288176e750008d29bce344a09d655ede1dac7c3fbb74d1573eca8e4414
+EBUILD alembic-1.7.3.ebuild 921 BLAKE2B fb76bdf6bbae67b9023a2dc614f1401ad6ef0015743691b00e6234cc9d24e834ea23b3e9506894193b0459068a86bea2a5dbe5f166eda871821b22b95539d684 SHA512 695beb9a442737726d59daf1470d4ea1bc03dc64d480aa3024bafd7cf976ae223b0020288176e750008d29bce344a09d655ede1dac7c3fbb74d1573eca8e4414
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.7.3.ebuild b/dev-python/alembic/alembic-1.7.3.ebuild
new file mode 100644
index 000000000000..08c9b69bc08a
--- /dev/null
+++ b/dev-python/alembic/alembic-1.7.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ament_package/Manifest b/dev-python/ament_package/Manifest
index b2267b3ce5e6..7f6bcecef220 100644
--- a/dev-python/ament_package/Manifest
+++ b/dev-python/ament_package/Manifest
@@ -1,3 +1,3 @@
 DIST ament_package-0.12.0.tar.gz 20119 BLAKE2B 98f013af8e17b2fcc0a516d90dbb517ae3ad292259665d188da1cf08aa5c863ab5f161f0a0e5d6ecf1bc85c1c5f7e050b9e29ffa65c2d8f9653d6619a5ba9c7c SHA512 d8e2984b7055fb796ddcfe2fad563da98d75e377c8d10ffa57a09e7636dfba92a81dc4580c35564fb8b749d123dc64138ed443561e7bce25b8785d0b980396cb
-EBUILD ament_package-0.12.0.ebuild 689 BLAKE2B deaaccfb13096d168ade85c43ddb370d04c1b36e9c17a00e0b55e659be8c2e42d3468319f10cd5e64485944644b62ea161a48c6632b46078830ed45eaad2b914 SHA512 5097f420fbb4d72d91721f54cb45fa97701e6eff5c5b21d922c89dca7cbf7c2b59249f1b6d57ecc676a81b88e2e21148442c4e58f7019bc520ece19075a388bc
+EBUILD ament_package-0.12.0.ebuild 511 BLAKE2B d38151adb958ccb0617f85dc29c7fdf9f54e7eb654f9e1dbaee0b9815d6a0623b09d0c30044413f370414f71abd91919125a4c491732c0a6d0968cb947c4cff3 SHA512 a3cb08dd49cf6716e153488ec75817ed651f67989f624089e37cdaeb93e16487f1ee0f1943884944e6cb64799be8a82a6950e91a16e426c6356266d070833279
 MISC metadata.xml 334 BLAKE2B 158b6f999da25babcc33a1d67f0be2ed6935fdabfad559ed76f9c3ff785af02adb6b2c002ebec00ac6150ea47fb936bc1aa5442825fc0e81f5206a6a4abb57c2 SHA512 9874b52eb41503321b06525c4b8746041d8f8260268b7c91d62995462b42ed865ada80e198da9eabc828b7728c0ed9f0a9310c4ba09e5bb5abc8b9aa2be1f4d3
diff --git a/dev-python/ament_package/ament_package-0.12.0.ebuild b/dev-python/ament_package/ament_package-0.12.0.ebuild
index 6027deba39c6..b4f7729e8a38 100644
--- a/dev-python/ament_package/ament_package-0.12.0.ebuild
+++ b/dev-python/ament_package/ament_package-0.12.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,19 +14,7 @@ SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+BDEPEND="test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
-python_test() {
-	py.test || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 71585a3f9820..7980d5f2a6fc 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -4,5 +4,5 @@ DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1108 BLAKE2B 9a25242f5d46d91505c141c290941e617fe87dad682d26380b88dcbd67a1e9d4c2497898884049556e0fb74ae158af8e43863b6e3a90712348513e5e94ff0a96 SHA512 cc3778451af7d934a26c879df049a2b0cb6215a1869d412b4c4122640a08168ec6f4ba6bb9698fa142db469db0fcf1cfb4c10cfe7a0c4af1c7e09335eb3fe465
+EBUILD anyio-3.2.1.ebuild 1107 BLAKE2B 9f5e4c6823511c20c26449787a707b9071ad78a60737a785dad9cc6942cc5c8098c06d5f479c0939f77596c66724305944b299efc5db9bb3225eca09308a8096 SHA512 cbc81c945fd6ffb9bda5894fc3a0584a39dae1e5de172849b1972c8935602b90a278577fcd86a0b5353f31b6f166a4d87ef7846ddbac4fa3f31377971366c9cc
 MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index b796b602d1c5..a0618bfa54af 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 79d0f87072fa..1f6410691736 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,6 +1,8 @@
 AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
+DIST apipkg-2.0.0.gh.tar.gz 11724 BLAKE2B 3ad0ab8915bef0632b522de662c9c2424e0ba9c13c0d9bb415d66112ccd0621a226b546c9d248939e83f16311069fbe8170224b8e2e373f194df8d6654671347 SHA512 d1c336f835d28a11640904a6ae63b15a01c3bde2e100eb2ed31877fc7037e538e0fe1d107556d48fb288c3b72a53586122c4ec17e089179aadc222ae80938c53
 DIST apipkg-2.0.0rc1.gh.tar.gz 11737 BLAKE2B 5c2c109dcab512f4154f275fb0bac42c626d753ca0b9f7c5bec91a0f7d0048c4ddadb8ea580626e51a2a879ac487ea9fcb06109d271a0b214dea3c5a1758126a SHA512 2bdfda86bb8d3a5d57868adf5e44de895f95d37b1928f4e24796bdde3a02eb9f8c51a017060c8b9c4a918c85d5d2d8348c634fc11f5eea9a9e333c14cabb1c23
 EBUILD apipkg-1.5-r1.ebuild 618 BLAKE2B 8e338e8165372297627850cd0e2cf02db600d2ecb336ecf6dcf2eb7b9f121f739e397cbc85deaa4a5dc94a0fe1e17cd59cf1e91a02732cc69953add572fe400f SHA512 9c9a07460a0282395802d5b6c1b6edef9d70042331c3916c22f710eeaa2a388e9f5f50518cbc1b43b8baee9b27dc8bc00b553c060d7a5d9fae86078b539c1671
+EBUILD apipkg-2.0.0.ebuild 663 BLAKE2B cb07cff0677a3cf0ed13bed0d610d7c1322e3dfc13abdf7bbe5226662bbd47cb48922597e148ceee8dc666ac5e66c99207ab7e8d0cd6c3d7644a7785a7e0cf32 SHA512 b8364b4957acad127efd8f180c0615775abe6bf0ebc71d59edaf18792d9abb6058f51bbcbee875354f26d0e97d063bd277717f1942b114ef7d3eaa1635e155a9
 EBUILD apipkg-2.0.0_rc1.ebuild 663 BLAKE2B 1807763151e977e3dc34bce13fb38358eb475b63d92eef52e9e434cbcb110fe5a29ca595b266a4514bf180a2f4cc9e9d93e2b46a7180ce95e96921bd01f3d764 SHA512 40c8981d4f05a7521f22516c4f653cba5111938ba49b196b8d0a3207412be6cec676b7083cdc6324ce0580f7c1cd34e3e68c9bca6f38418ca6532bcd769413ab
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-2.0.0.ebuild b/dev-python/apipkg/apipkg-2.0.0.ebuild
new file mode 100644
index 000000000000..521b20593649
--- /dev/null
+++ b/dev-python/apipkg/apipkg-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=${P/_/}
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="https://pypi.org/project/apipkg/"
+SRC_URI="
+	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
+		-> ${MY_P}.gh.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"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 7243efdc9869..f348d6b4f15b 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 534 BLAKE2B 48940e704b5644dd7559cbb5a0ee3f92be7c9b0f0e17f29d89d00d9bcd96e742a21c55d7a17118dd157239372bc91beca7e353cd8cae4ae0bb0942162e50d0c1 SHA512 3df8595c586f6387c90d2583de52a09a338ba582e85c3148178e38b2542fc82f004166235fae01849faeca4a46180ad67b750858267ef153379721e1e3b783b4
+EBUILD argh-0.26.2-r2.ebuild 540 BLAKE2B cf715bbe42f857ae18c5758bd6a6da3ab1270a597456617b5e998ae33953d07b9433fd02d678d25fb346d240e4bfa1b291818982d10c005fc3f4aba9ca10eb39 SHA512 81fdc41aa4426a47e8ced2bfd3bcd0aba73e5f6a72a175d1ba3b51642a5b49f6db40f250073004eb196aa0fef989508b810dc6aef3ecdd486084bfa04a53f43b
 MISC metadata.xml 332 BLAKE2B 2b08fb94a8115237b39a84d97b6d99ffaa5ea89e2c589a5e2a627740ca152c185e67c5f618881e38ac61676df76674dad117c2a8b0c13dc8152a9cbdf9b7d1cc SHA512 3fde7d7eea0c8dc79cbceae31b371881a5d87bed94f063665b5f50f9c194cc4964a6eb0df43eb23143b7b1d85ae9864acf51888442f4ff5355fc7574fc127835
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index f132c4a003c5..ee46c5400b12 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 66db417a1768..9c821ff62cfd 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -4,6 +4,6 @@ DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70
 DIST astroid-2.8.0.tar.gz 384821 BLAKE2B 74150d67fd883b2bd4356c49c9c1b148a5e98b4d219405e745474c536691276d029bf8a0bb9275ab9df3d09a9b3492a147c67676ab1f80c9c7d3ad10f240bec4 SHA512 0f14f094a6dc753f0171b462f856fb1bfb1b979a8853f76da14beb04a5b02662f6b4e63c3241ce2c9a37f63490a86300152cbe9509c43e0209d5ef536d693b08
 EBUILD astroid-2.6.6.ebuild 1230 BLAKE2B 31bd5783bba20a5c1851a2961a8ef2dc8485d24745dd3129b7138380d623a7a65447d6c84a60fc14911efb7b3731e38f266083d08661e1e032034ed9311feb86 SHA512 dfcfc505644d4049757ba68d4921214271ccacbfd4dd52d1321c8c4792fa4e1ac8f5552f412ab1495657bffcd8e0e47f1d376d2d2300b8cb9e03b39b06b0a9ef
 EBUILD astroid-2.7.2.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
-EBUILD astroid-2.7.3.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
-EBUILD astroid-2.8.0.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.7.3.ebuild 1243 BLAKE2B 3b2bbef11912391d9d190ffbf9b83bafef40aa4d71dc3857cefeb8b5115fccd0da20a26965e3659c45e4b16a441125f737272574b825003bacaec787b2e2907c SHA512 f73bd172d417849a4321facc465170f36e3a01879010d4ce3ffff7529194f17e223113e790236f98d4e7825f2ade7a8faa96698dca23316a86bb55c5697881b0
+EBUILD astroid-2.8.0.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.7.3.ebuild b/dev-python/astroid/astroid-2.7.3.ebuild
index cda705df7b1d..5e2be6d04fe7 100644
--- a/dev-python/astroid/astroid-2.7.3.ebuild
+++ b/dev-python/astroid/astroid-2.7.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.8.0.ebuild b/dev-python/astroid/astroid-2.8.0.ebuild
index cda705df7b1d..a5c9c9f43cf4 100644
--- a/dev-python/astroid/astroid-2.8.0.ebuild
+++ b/dev-python/astroid/astroid-2.8.0.ebuild
@@ -18,11 +18,12 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
 	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
 	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 6995b0fc0f54..2bb526897057 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 679 BLAKE2B 75d4ad79c67b1acc4c1ce003151479fb84c6779e66158c7f9d79d4d293dc435beae803957fd1367117b5910e37372048fea4d4ce8050923eedb8b252110e8a50 SHA512 c3bc59e188c962a63898bab1d4145aab29ad025d1fde7475956c819765ce1a2fbe7a185af49a40eee82c0948beb0e7b8df2fb4fd7e25d93e0ad09fac55824564
+EBUILD async_generator-1.10-r1.ebuild 710 BLAKE2B 4d969972e84172090a114099de18c4d4b278b1923e2c65cdb48fa12736a0be28bfc39f0e0fd83e2670b74d31fe7b21fc94a0d76bf08ebeb7ab8058f660333ce3 SHA512 e6d099f225d7aeb275459b84d68ca46589e5ddf21462b2827036eefe9eb2ee2677c2cff3ce916013aac5701a4b14a2ffb5b82180f76feb23571d052c06785c61
 MISC metadata.xml 467 BLAKE2B 15e6bd812ec1d295024c92b3b8ce29d38b04dfb727321bb21a709b2cc29be2ed92e50eb327b6acb90fb2f393531f1abe0bbcb632050aea5ee471e5b3cee6b526 SHA512 857311284927e0c1517174b0ded3fe800c42d6649d7c958044c97c72bf48d27ad2357c1b28682ae2c3c85e4ee7535b36a24f062ab0487ea07fbc9d00ac248135
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10-r1.ebuild
index b34be84f483f..1e7a3a023087 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,6 +17,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-maco
 
 DOCS=( README.rst )
 
+distutils_enable_tests pytest
+
 python_test() {
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	epytest
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 6b97c0e7b4b0..db8d24a0a748 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,4 @@
+AUX aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch 1533 BLAKE2B 709ffaa46c2934fda754745f918bd54444433d5d57c6bca65d8c9be5b940e7ec91f8de47e94a31262ecf7126bb2068ed453ad18a4d6a07fae42d2bf6e764a600 SHA512 fcea4f8e094d1c3354897349c8705e7268e264d9699ec61609796d451db865931b1c2fd4e273fb80427645c0968993756e685e688d303e7fbe7c0bdce88d968f
 DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
-EBUILD aws-xray-sdk-python-2.8.0.ebuild 1959 BLAKE2B 4cbfd1a75bfff81594827f5e30a620e2e77e79ff04e477c23dc9b12712b6a21d97fca09737a21125d4f276c5f735a7ea6b81ab03d9f479d393534ad2e59ce8a8 SHA512 801b8ce365aa8f8a8cd8027e58ad06d3e6bdaafdd1b552eded48769e6ad02ed41178e2cdb790a2aacdce9522dfd7cf1c438be5ee575dc88a307391bb972e4c27
+EBUILD aws-xray-sdk-python-2.8.0.ebuild 1889 BLAKE2B 24cda4c7475ce303afb3b03771940db8053f72a3b18b6f0925901df1605cd19fc23a7fc4f85cb0a5444c8e3460b54a939cadea95b6347a07ba941a0629247ce3 SHA512 22ec28c20ea51e9816a41a2c13230d9cfdabcf2d0d654732a39f5a416a716a0e387c262c0a3dc7434dde4c296675aaeb14737259401aba1a10334f3f00d3c35c
 MISC metadata.xml 478 BLAKE2B 963cbec10db90be7fe2d7beef8920049b56d349eea7cc5fe97f2d4f99499a270651639ed2fed053742bb158387039bf225138708ba42e0670e3e101844127415 SHA512 2d7c682a648cffc2d65d6a5f340cec835cd67bc1dc28395ca8ec87bcedc78b290f6101f0455b89260b9b7ab1eb208c56a1bd74d3feaba09845a834e1e2bc5bcb
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
index 560c3e416dac..d07a31c0dce9 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +16,6 @@ SRC_URI="
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
@@ -33,6 +33,10 @@ BDEPEND="
 		dev-python/webtest[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-loops.patch"
+)
+
 distutils_enable_tests pytest
 
 python_test() {
@@ -40,34 +44,28 @@ python_test() {
 	local -x AWS_SECRET_ACCESS_KEY=fake_key
 	local -x AWS_ACCESS_KEY_ID=fake_id
 
-	local args=(
-		# unpackaged deps
-		--ignore tests/ext/aiobotocore
-		--ignore tests/ext/pg8000
-		--ignore tests/ext/psycopg2
-		--ignore tests/ext/pymysql
-		--ignore tests/ext/pynamodb
-		--ignore tests/ext/sqlalchemy_core/test_postgres.py
-		--deselect tests/ext/django/test_db.py
-
+	local EPYTEST_DESELECT=(
 		# Internet access
-		--deselect
 		tests/test_patcher.py::test_external_file
-		--deselect
 		tests/test_patcher.py::test_external_module
-		--deselect
 		tests/test_patcher.py::test_external_submodules_full
-		--deselect
 		tests/test_patcher.py::test_external_submodules_ignores_file
-		--deselect
 		tests/test_patcher.py::test_external_submodules_ignores_module
-		--deselect
 		tests/ext/aiohttp/test_client.py
-		--ignore
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged deps
+		tests/ext/aiobotocore
+		tests/ext/pg8000
+		tests/ext/psycopg2
+		tests/ext/pymysql
+		tests/ext/pynamodb
+		tests/ext/sqlalchemy_core/test_postgres.py
+		tests/ext/django/test_db.py
+		# Internet access
 		tests/ext/httplib
-		--ignore
 		tests/ext/requests
 	)
 
-	epytest -p no:django "${args[@]}"
+	epytest -p no:django
 }
diff --git a/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch b/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
new file mode 100644
index 000000000000..cde91a8d0cda
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/files/aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/ext/aiohttp/test_middleware.py b/tests/ext/aiohttp/test_middleware.py
+index c8b2333..4f8cac6 100644
+--- a/tests/ext/aiohttp/test_middleware.py
++++ b/tests/ext/aiohttp/test_middleware.py
+@@ -279,8 +279,7 @@ async def test_concurrent(test_client, loop, recorder):
+ 
+     await asyncio.wait([get_delay(), get_delay(), get_delay(),
+                         get_delay(), get_delay(), get_delay(),
+-                        get_delay(), get_delay(), get_delay()],
+-                       loop=loop)
++                        get_delay(), get_delay(), get_delay()])
+ 
+     # Ensure all ID's are different
+     ids = [item.id for item in recorder.emitter.local]
+diff --git a/tests/test_async_local_storage.py b/tests/test_async_local_storage.py
+index b43cc0e..4b13ffd 100644
+--- a/tests/test_async_local_storage.py
++++ b/tests/test_async_local_storage.py
+@@ -19,7 +19,7 @@ def test_localstorage_isolation(loop):
+             random_int = random.random()
+             local_storage.randint = random_int
+ 
+-            await asyncio.sleep(0.0, loop=loop)
++            await asyncio.sleep(0.0)
+ 
+             current_random_int = local_storage.randint
+             assert random_int == current_random_int
+@@ -30,7 +30,7 @@ def test_localstorage_isolation(loop):
+ 
+     # Run loads of concurrent tasks
+     results = loop.run_until_complete(
+-        asyncio.wait([_test() for _ in range(0, 100)], loop=loop)
++        asyncio.wait([_test() for _ in range(0, 100)])
+     )
+     results = [item.result() for item in results[0]]
+ 
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index eac3df65fd5f..5aa47bacd824 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -2,6 +2,6 @@ AUX babelfish-0.5.5-py310.patch 1777 BLAKE2B 0d3871c4037f159a8e20f96e3005f5984fd
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
 DIST babelfish-0.6.0.gh.tar.gz 90886 BLAKE2B deee75aef23cbcb7c64f385c303310e5ce1ef0a3180729e47e59b8e85015ff36360a4be74ef32869421c6d90cf185ad427a7d55b9ef3cf20f551233dae3d425f SHA512 9d3309e67815c301578533fdaf8baae946ba87148b458f7b01315203d2d4356dd770c1a0b7a0ffbba14036b77f1463d67e3b5732efa6682cb6afdae1a8fd0a4b
 EBUILD babelfish-0.5.5-r1.ebuild 506 BLAKE2B 34c92e5aec893e8862ee9c9925b7cafeb72566c83ed6ed135a93ff29c002de913c9659d3494b2975c0e786cba84ef208d10eaa844b70e0eeca4fe7a10f190fbf SHA512 c5873af559df194d4eabdc5613c633799e4be5fac487e92eda693e808f252b39ed8ecf2d4fc36863c0c67507b7ed462dac571885643689bbff88dc1ffa3d2a0b
-EBUILD babelfish-0.6.0-r1.ebuild 607 BLAKE2B edd4b8bcace88ce608e478ce93abd1442770d071931ca3897784fc18639ccbc69baa14cd6afc7c4596799301ea9cf99bcf615ab10b8936c87d6744fff9830e2c SHA512 854da25f4a5c3cdd5e495ed0be940e00c3314b345fb8d4dfdc5354f1934b67c27f832957c1fe6cb9872a4a240a74b5655ad81a248d550ffb8f2e766612c85186
+EBUILD babelfish-0.6.0-r1.ebuild 605 BLAKE2B 4c4eab53a6b43ba273f635eb0638492e7fbce4a8c00ac56e5b236877b382579e5bf7d851e4aeb6ccd626dd43971683b26a6b2deb5a11fa10feebed127cc88810 SHA512 2dea366bc2cdef1042b83bc90fd30ec2d353df2cc40840b0b9e77e0aed825a03aac586b0d483d7de796456c604f08fe24db2f85eeecdc668cb742dd5949cd9cb
 EBUILD babelfish-9999.ebuild 538 BLAKE2B 932b02753c51a35bc7f58ac62922a037d5e60cca52f61e2c1bf2fdffd438147790a4354421a13f2bf4d5668e44b5b90fa3ecb252a4cb1b0e72120978fc9e5a28 SHA512 92a65e161e90509cc7ffe3612b1884955ca44fefd94f9bc5f37bc7c00f8b07512c4b312cfb2a465bd8fcbd1bc1c441e3c9af4a074253fa5a1ef69f5a1b826ee0
 MISC metadata.xml 392 BLAKE2B 8e9836a0468f33555090d4f599f315d74a16d2eae96be0b57c7f2da8eb8c25cb9a40c7955035ff762ee9f7724794bd152641a46644572d12f938ab91c84af900 SHA512 4e969379d2c11505a8a1b59b3d7fb0380bc512059e5051f676c046521693089cec76d13888d266a75ffb2915ddc69a63e7c8e66c2a0b9c1c0d49dc249cb598da
diff --git a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild b/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
index 69cb0c404508..8b07786003de 100644
--- a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	>=dev-python/pyproject2setuppy-20[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index 584007bf1d68..43dcaf0f297b 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 806 BLAKE2B 7db045c681a6aa6cfbb93ea54e7d39b8bc8d88107e1ff622081cada8803a0985dd1af02bdf2341c986e55c71948002314ea6902ff5d0cf8acf6dea1c834d32d5 SHA512 106a6bcb1de036eb802dc672957389b22fd97aa9d0ba5c5fd65de33af6203e0dc272bd1aec3e8a64dc38fdd7d24317688165499edbd4b611fe1ef75781004019
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 812 BLAKE2B 17473a2766a167831141b22b9609112faacc327849b6976d362a4afe5c712409db1bf531076cf024cd337165965e8c1853e58499ecf167e2cc8011c636249ea9 SHA512 e35b628499c61b0dd18b0839c45445aba512bfebf1f0d1fe3414652d5e6d2086406df60c22b3fc2b35e164e7885ebf01ff12f73b636087fce1439719bb6ad708
 MISC metadata.xml 395 BLAKE2B f7a6fc7aacb144be55af934b829dc87b5ebbb0c1048e45ad281b3ee49b49c6e7c852b866746916b83161e6970f39b04557ceade2177de047890063169aa64111 SHA512 604a1dec0428db8ceff5d231ce00cc4e24a2b8461df6a01e76b3b2347dd41c5f0eb15b2584ca6cd972f9e62f3b97bbb22082f0751c7c8dbee6a49133833b8477
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index e0542eddddcb..e2ef2070dcdd 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 6b6c23a29434..8b6ff19a0d07 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1,3 @@
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-EBUILD backrefs-5.0.1.ebuild 1162 BLAKE2B 43b8a0801c86cf3106064ab6d4fe24177940ca141a724f087c097e9648f048a11dec46388ae352b17c7836677014ed295a08ad34583523b8d7ad509926a4a024 SHA512 582076d72d202285abb02fe71f5e5fa2380e181a52ceb4c2406cbaa29cef758f38d630c8b3c201d8a3fe0163cb26f244d10948e196712aa92eebdca3000cb330
+EBUILD backrefs-5.0.1.ebuild 1169 BLAKE2B a17fb5a617d2bc7b1443d2da4cd37cc9d26f59846fc513f99e265055278b17bcc1b35e9b18df8dbdedae67336457aa793ecc796755de3c6d160f664dd74c4049 SHA512 845cb5731fc0a1e1a67dba5c7a039a413f69f9cd5190b8d0e1819ad689ea7e5fcdf4ad3465fb713db03c45bc9d505fb2d887a1eeea96182b87ae2662316651f5
 MISC metadata.xml 1128 BLAKE2B e1b795b1c9d935cd295c0008eaa06ec84d120535ceaa37533b2e94b77a56707244d86ce250295fcf2b1271e818e7e97811b351e7d2c1d94d0525135744954f37 SHA512 227c8c99acc6c8adcf26c681c004db2e992ace746a692e55622e88783332c9072afced044f058b54246112f0e741fe0151985391b94b4f23145b7c6bdda5b6c7
diff --git a/dev-python/backrefs/backrefs-5.0.1.ebuild b/dev-python/backrefs/backrefs-5.0.1.ebuild
index 6f53136ab0d4..a50dbf5d89aa 100644
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
new file mode 100644
index 000000000000..2c49bedfca8c
--- /dev/null
+++ b/dev-python/berkeleydb/Manifest
@@ -0,0 +1,3 @@
+DIST berkeleydb-18.1.4.tar.xz 137160 BLAKE2B c93e7707bf12199c8161112accfedc3b0180b8f6edcf5c928c03f373528bb9ccb23219865344d9ed29d30b0133a2161ba0325257b6f7a2d22a58e8d9b1f82ce2 SHA512 bac2848e82ba5fdd3ca8fbf3a02d04faf270132f4b9fe93096ea57ab99fcc7eba02ff8a9638ea8e028d8bd4f16eebbefb65f33ea67e95c0a14cced05d04b23b8
+EBUILD berkeleydb-18.1.4.ebuild 1714 BLAKE2B 5bc6f619b88304fa7331634a289902449f37ca9b7e47c49014e5aab6b5d4bab38536c4e6542c8fa05b569872cc607e032e6beca2689d62729afc12da4f518de7 SHA512 e02e4cede0719bd28f919112d3270007043ce407a06ef26c36337b28540b3b1af1d7723c066e0e802cef36b7492445b7b74bc2422da15fbe88e98222e723613c
+MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
new file mode 100644
index 000000000000..1a26deb5db93
--- /dev/null
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit db-use distutils-r1
+
+# Tests aren't included in PyPi tarballs, so just manually clone from upstream
+# at https://hg.jcea.es/pybsddb/ and prepare out tarball
+
+DESCRIPTION="Python bindings for Oracle Berkeley DB"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/"
+SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		sys-libs/db:6.2
+		sys-libs/db:5.3
+		sys-libs/db:4.8
+	)"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# This list should be kept in sync with setup3.py.
+	if [[ -z ${DB_VER} ]]; then
+		for DB_VER in 6.2 5.3 4.8; do
+			has_version "sys-libs/db:${DB_VER}" && break
+		done
+	fi
+
+	# Force version.
+	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		-i setup3.py || die
+
+	# rename to bypass name conflict with builtin test module
+	mv test.py test3.py || die
+
+	# Adjust test3.py to look in build/lib.
+	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" -i test3.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# These are needed for both build and install.
+	export BERKELEYDB_DIR="${EPREFIX}/usr"
+	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
+	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
+}
+
+python_test() {
+	"${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/berkeleydb/metadata.xml b/dev-python/berkeleydb/metadata.xml
new file mode 100644
index 000000000000..13dbb5909e0a
--- /dev/null
+++ b/dev-python/berkeleydb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">berkeleydb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bert/Manifest b/dev-python/bert/Manifest
index 63ec90a0402a..7893880c6451 100644
--- a/dev-python/bert/Manifest
+++ b/dev-python/bert/Manifest
@@ -1,4 +1,4 @@
 AUX bert-2.0.0-remove-basestring-fix.patch 647 BLAKE2B 19b7b65b41be9c3b929c0dc2c92d5f511017f093e924813d547e29a763a0fc23d557798be5542a2991fdb2a808afc087a8e5c40dc03d06d1864564ef6a566aa9 SHA512 e4554308cd81c9b7bd69cac3eed2bb65ce604bfbc494f644b7b0dccbad527af973cb7afb4589b602457ecccbc893f50acbd1031aff87ed30b06f2824ff20d548
 DIST bert-2.2.0.tar.gz 3541 BLAKE2B 3f1f87d5205e1098f7d170da5a4e331f9421151af536c106ce2de925082c48bc739df4bbe2294a2dbe8f65d2ccc24a1d5bb944ad90e80e558cb5032e4fd7c639 SHA512 417c9752362c6dc7ade8078f259d1674fcddd09b6af595694a9c31e886dbb523460413d4bf041db29afd4d67a9d639ef8f9254077c31d1593657ad52f8ef45a8
-EBUILD bert-2.2.0.ebuild 551 BLAKE2B 82b392012d5e8885f8d1c7e268a10af26ba5f1cbfaeea7efcc906567c868655c94856ea0d2fc6703bce08c6997c343df524898c1de979ca2a59fe8c0459d91cf SHA512 7fe3110024ddefe551e1920eb5e44633b9a1665398af74b0478c63ca972571c657c98acb26fbacb713855de0593f55bb90507b1a83b88479b502264577374bfc
+EBUILD bert-2.2.0.ebuild 573 BLAKE2B 3c14c0e133f844330cd8428ef05b4a2af9665375a8a4b92ad3fdb6ff25ecfa3f449bfc979de258bdd8d5ee715b7d97dd75dcdbcd2447c4cff2fc94fc5315d09a SHA512 9fdd7bd85a697b6423e9bca5579351eff172419f7bd983f1f9b4804c8f478873791bc4e3d3c312680c9c145c18dc88da42907d382d7cb0d280f62aedfabe836f
 MISC metadata.xml 390 BLAKE2B a4e19fdfa922722d9567edc7fa88c44214bf9a7d2944e8cb2932d425d621b17ddb35ad24fcbc6cd5ab38c117845596eb635dc415f510169ec687517f2f3b8fd9 SHA512 ba375d5d896b29c74a72bb34d2f34da958f4c2a29965e9052fc790d91d8667d96d539708afd51654dcc0dddb77663a3e29418603dd63213fe980ca441bd45c66
diff --git a/dev-python/bert/bert-2.2.0.ebuild b/dev-python/bert/bert-2.2.0.ebuild
index 45b89114f3c4..63617fa34a44 100644
--- a/dev-python/bert/bert-2.2.0.ebuild
+++ b/dev-python/bert/bert-2.2.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 python3_8 )
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 7c57bd2261f5..e08008e30c3e 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,7 +1,9 @@
 DIST blessed-1.17.12.tar.gz 6697754 BLAKE2B 0ae89a587a34936b31114e4bdf77effc51e0ad01b31f3b7e037fe96a44bbfecf1e2f64495d09e2627343f8021116ba1a2d6bccdaac7998b978aebc54e60a7a13 SHA512 134bba81793e8e0e33afcd9daa7453f11857b3207d0427f061ccfc0dd1caa17cff32f84883860f69e2a98ecbb5cc609f2a1091ab7ca8ff42322f6e8466ae06da
 DIST blessed-1.18.0.tar.gz 6651519 BLAKE2B e512ae49d19e3db09606e07b6a384683aada3de830e3a8f3e938e088607e4bc33f6b53b3d6477a2b0d4bdeb849fa4cea6eb3b0048294b3a567409a993f46b7dd SHA512 25b0c0c17e82ea975ace3415beb680e7ac917cdd4589ff11f0510067139d2f681316c35a59c7ef9bc5225291cebf6395f0dfc78da8845457ed7cc722ac708bbe
 DIST blessed-1.18.1.tar.gz 6651527 BLAKE2B 50667db4fff2eeeb1a238d0634ae3e67ab2323b988db4435174327a894d60fff4988c45cc55a633666d2ed88a8fae4e0844027a0bdc739e63f319ce19319142a SHA512 6b83ff2949ab3f7c5bf599897734092d305beaa21cb70583fcd1a26a42a7f16888813bd281a18905065a9989dbca29cd5a00cc4c75f4e360ab52209fc6d55a4f
+DIST blessed-1.19.0.tar.gz 6653907 BLAKE2B ba9c1247562baed398d6570fa97deeaefc325c502e0aed5907ffaf9802978933e9a5bd6c08b4d4c4a449533272005e3272f70dac5852da1c45c6c9644aee9a56 SHA512 a64d8d542a1a12b710375592c17d06f28a7c68d76952479738873fb956013f7c65820e797116b6151c2a338cd27cfe91b4ad1a318365357060f38d1ec0adf91e
 EBUILD blessed-1.17.12.ebuild 1314 BLAKE2B a1b546f406873f279efbdc04351e6521413645c5621344f222fa76ce1f90467e18c8465c0f43b90c7f0cb64b22afe30f2db3fa51b9a8ae9fcf45510de26bab8b SHA512 39e94e0eacef7bf98effc3e26eaa37bbf0400c594a33689b94af8b85c095795a3cd2ef01e6dc641a19d4cee3916b1ae5b63ba909edb4ccb285dd7d1ea17f89df
 EBUILD blessed-1.18.0.ebuild 1313 BLAKE2B 4eee722eb3cf629771b4f73ec4fd02431558b1e45b73960559ffd0f10bdb22672314b1ce7156fe9756ac16cdd2b96f182f853b68cc736f1026d272c1b4f61697 SHA512 c8eb2bcebba86762c266a1a64aec3b2b05181d904e95e1f45570cf82249f77c615f46f4bd03014a383b128c083e2ea73713ee23130c1ad455f53c9e5c9fb5d73
 EBUILD blessed-1.18.1.ebuild 1270 BLAKE2B b792310d87df833041eb0b3195197ac1fa447cbc3d5ad8e17df9d7bb29905eafd18f936032e098cf08f705477e3f2d6f635de8bb4b1074066e52a0ec720ca9c1 SHA512 e7aa218f7206b836c70cf5c7741b14737ac6b2da781f2250408d462dac31da005b8b8cb45289b9012ff57610395317d027cc3a24ed8a81b111d09f58a9d7d590
+EBUILD blessed-1.19.0.ebuild 1269 BLAKE2B 0bb8627844503b12f8c120ccbbaf97d2b9b4c9aa3cd5d040928b3aa266a9c559d4853575535afe60483522d0899e1879b875cfd1e011d6b1d774f32148a52bf5 SHA512 d3557b0de43478038aad4a5dd1f6f35a73a97341048880555d97bd0f2ffe0e32de54243420531ef331da718dd121d795337c2e9cfd761cbe051a0f43ea8e9a18
 MISC metadata.xml 432 BLAKE2B 3ef0823861c942f8f960311f194116e0d2fffed5d931c2379c8e51f2a76fd7c6d89e72e10bbebf7433ace63f9723090e3256f28a79a6b174485b920574c09ab2 SHA512 b8a8ff93344c6638b6ef7add15d92e7918802108cdb7191e5fdc54965ef5885c0c4379792dcc22b137f0fb2a0a86bfcee8588f49c462f19c8423a5d7a8c6f476
diff --git a/dev-python/blessed/blessed-1.19.0.ebuild b/dev-python/blessed/blessed-1.19.0.ebuild
new file mode 100644
index 000000000000..91051bcb02be
--- /dev/null
+++ b/dev-python/blessed/blessed-1.19.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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= epytest --override-ini="addopts="
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 14eb682eeeb7..af76c560439c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,21 @@ DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40
 DIST boto3-1.18.40.tar.gz 412065 BLAKE2B c548c6a1f5cfac3d304384b56882943201c45f3515bcd3804b90656966ba5ada0bfd5130fef34d8ad1466aad8a45166a9e35706d4ea53e9eb4ca1fcfae7172f4 SHA512 95e0c6ea5a9741657d801b1feab1ac813b653becba442d83673168d029635928e031386c7147ce28a9407acda4b593fc32b0a4f6ff1761f4b8d903b585220cd5
 DIST boto3-1.18.41.tar.gz 412328 BLAKE2B 134ec70addcb9748d255b86d9e12dd380094a6a82c1d79ea9772dcc59e6eaac95a4337a1980d4791f856bd9a4d84b2f0a79b00b8b7f5a2e57384eca95a4090f5 SHA512 a7d0093083a6dae9a9ee8ad183027adc5d1f4cde05f244f126af022c77df457c0810626fe9ce5baf6fbc9e8d9ec2f8086bf95587d4f80b63c47bf4ef210bf61a
 DIST boto3-1.18.42.tar.gz 412699 BLAKE2B d03c4afe357def827e9169ced8b17f92caf79b8291edd5045629e1b8ee697014764caf3135910d9a0862380a94fbaabd1863535c0aad21fd1eca2b0d3e306ac2 SHA512 aae080862a3b30e23407cde6ced8a48522421be40f9eb192647f6ed2693ce6655576dd0705a998469274ba9ef74d24d51c31003798fc4f0856c417491aeab30b
+DIST boto3-1.18.43.tar.gz 413685 BLAKE2B 1733a75e17fabdd9941874fd7dfec735cde8702e4df07e5f3c293a9cd83207ae26f7adfc7caeb4913d2fc0d114c4738870b93053ce3e2485f9b4bc3286dabad1 SHA512 5191276feff196503cbd21a44bfd205737ed2c150071037d76198b164c56549b34f36266768f3e5346add393d6c25ad13daf6f6daf74217841d27e305c20c3f1
+DIST boto3-1.18.44.tar.gz 413928 BLAKE2B 4cfa75b2dd99f70af521b4da6537cc527f2ab80352b6fb29460ef8759761536023ddb567ef5050d9fa43327542112494b48264bae73bbb95e701ae997e37787c SHA512 cbf142259bf84d0d8a1ba7f2e00d4dff2f66d3adf8fc838d7f3228ce5cc837337907e5351cdafa68fdf6497ce3c7db4543b1254cd6471a81a1ece47f713b1cfe
+DIST boto3-1.18.45.tar.gz 419575 BLAKE2B 27896cfc3bd11c13d21bc272b2648917e1f99be5cbb88fd7772388660846dc587d65f21ad22223a310ed1cb264b2a67f8abc3e176df9c7b26a8bab9c4484a386 SHA512 673d727d4b354fa0c790418569832db369215537159abe5343149b63705f3e9f7d9e8f660d26b174b4f2661411afef51b296ebcaef62a6746b7b7853c596216f
+DIST boto3-1.18.46.tar.gz 420373 BLAKE2B 9e354e4ba7b7361734dbfd0ef6296fa2f0c2deae9c42312ae2c6860b09e26acb338a5e06c342622b8384b1b49ff1518975723c6e1a3c988d42611f22f4daec24 SHA512 4bfa76936e7b1f7ddab3d9e4ff16dd59144f0c7acf2d595a3ccc6a186c52ce154f790e11f8c6bed72d0ea14f9c706d1af56a865ad6519e4fea7670f2f3176601
+DIST boto3-1.18.47.tar.gz 420701 BLAKE2B e58f528d876a29cd992a414e84a807a4fefdeb14b37e0c520f677d61270acd2bd534bd49ccb571d21f41a210946a1897f324a1c41a7e5fd9fe86a8689bc835da SHA512 67075c3d25a99bb3bda44f5108004a672b7f52f00f945f7643063d8c435854d14ffdc98d88d48e80caef850e4d765a7a9a894410398c56518a5cd30e32a7e481
+DIST boto3-1.18.48.tar.gz 420028 BLAKE2B d6bbf60141f2806519bdd0f4f364698ac7ab6e8a3987771df184ecfa69a43b235a9a21fb128d8f39d2015065d69ecd1e86978465223b220464044640f50d11ad SHA512 f0ef373396ad44e28f8707455ea16951bc4df23958734123ffcdca3efc1e668816b093d0a361a27286f19f129d02390fa36f196c5df0f589c05dc8b839d157bc
 EBUILD boto3-1.18.28.ebuild 1338 BLAKE2B a69e92de424ab1fa0084c97696548757d540cce9caf96a613b072b1932cf1420aafea0b870d1c09fbc597c804fd19faba2079ad018337658663bff714acef154 SHA512 6471431e033a9d8e2f88394b59444503d8c726f31fa550295f6954a5ac4a6ee69e967b6b07216e468c24a518e0f01d7244f9e99ad4ebed010979dec3199e2043
 EBUILD boto3-1.18.40.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.41.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.42.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.43.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.44.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.45.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.46.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.47.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.48.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 606 BLAKE2B 27dc89cb64cdbf3c994d9e8ec642ddc46f978199ed30dfafffe58ed37db4e5b8fa0da6666b5a9b55155867460dd1c3e30e4ef2862b782bcb2535a00b8d592fae SHA512 8f7ba8ae60177483c949f35e7e100aeb6006de9f1f86bd2535aa96a9fae4e0bd4b894f27af511530612a10f25203ea98a62c6c2ed740bb42e2320cf1f7590733
diff --git a/dev-python/boto3/boto3-1.18.43.ebuild b/dev-python/boto3/boto3-1.18.43.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.43.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.44.ebuild b/dev-python/boto3/boto3-1.18.44.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.44.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.45.ebuild b/dev-python/boto3/boto3-1.18.45.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.45.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.46.ebuild b/dev-python/boto3/boto3-1.18.46.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.46.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.47.ebuild b/dev-python/boto3/boto3-1.18.47.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.47.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.48.ebuild b/dev-python/boto3/boto3-1.18.48.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.48.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b7d3e8ee8210..c1da8be07e8b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,9 +3,21 @@ DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b
 DIST botocore-1.21.40.tar.gz 8149052 BLAKE2B 0554e2b9caa08b7518f1b51b5a980d98926782f0d4d523fa5c40dc66ecdf2db75719a36a2bf320c8d473119030693e0d1ab6bc7ea34c0574de7488bff5d7e411 SHA512 5466e15f8c09f3b4df13aee951d65219be86ccf1c0e73ed17e50fb7e2418f4694409676804bf6cf3ca638419512d903708e0994cff1f8105a19f0e26f0cabc31
 DIST botocore-1.21.41.tar.gz 8152451 BLAKE2B e236a8f0f64bd18c138dc168c74cefe7af598ad72def9e1faeba222b07f01a65fb7f74627afe470f2894794fd3a617aaa1d789a983606de9329db58c5db2d975 SHA512 540848ccb054340f22c20930a3f867754accd15c6f084dd20ca97184d1c5e390d68f21272d68087b99ae6676d05cbc187e61c88dd0df09cc033e01f1ac1af0ac
 DIST botocore-1.21.42.tar.gz 8156403 BLAKE2B 199d1eeae7b51fc59b8ca6ed3ea331178e94354841144f0055f02a9cd3d67e2bf52c358a7902090bc555c96e6876dcda1b4fe9b9c5c090ce07901af60b4ed116 SHA512 5be1b82f99ea310077bef3abbca6542a1787db38d5f2004107ff2c4b51a57e39e859116daf9451b23368347e05cded84a401476ca6e3fcd13683e4fc8ceb8554
+DIST botocore-1.21.43.tar.gz 8167256 BLAKE2B 525f0d1e7cacd34d81800abf5a120cdaff2a5ba91dfe7e7405d54d8b1768b45df4b1d36b287ab1db42ad68f17f1f2bfcd5c71c64a270824c69128fafea8ec113 SHA512 709f1792f855bb4178dd2d1e79f7b476e5b695a84684d9a5e6e57a36bd8f881f28cc4322a2e296c3935fad544d6adb4ede15a7cd532c7e5671350f0d96bee105
+DIST botocore-1.21.44.tar.gz 8168012 BLAKE2B c1fc1a2cb71c88365b18f578cde18633a7969b7d12c8162762fdc1ad9395ebf859a9d144870a751a1760f93bffd255bb8969b1fde812f9bf1d95e9973b61b202 SHA512 66b4c3ede4b23260a61309de7afcef2c5436516b3399c52438bae50b8714e3d8b0c86b271e0ac8f1214738ecee3e1677fa6ca7315a1bfaae5a49f2aa650a6806
+DIST botocore-1.21.45.tar.gz 8170610 BLAKE2B e55cc819188ae61c1427a3a7e3ff008d85c8590e37873940a2749fb7b07431f5ce828e403f294c53ccd7b7c6fa8ce82265773a5e2c1ca85b00449d77557aed7b SHA512 54d7a450777bba7db5633b5591c446533444f3d12704deaf4d039603c5bbf8c3cb5c0fa88cddaf58df21f3dc2fb1fdf9b90cc63e0ef5967f535b761b7c136d6d
+DIST botocore-1.21.46.tar.gz 8175719 BLAKE2B 8c171e07e5c68b1d3721c0d5052b09d2c5522f0ed899453441e72c744e117f7479995ff2fde222c2c1fdcfe382464b9bc0898367a3d79b1e53dbfc60d855e10c SHA512 3ec64d160ec682d287fc1cadeb5ef4ed50a3157f98cd18514d75ec9e60ea73b4dde5a419e7a07c490216d8d67c29d214b88ff9fa1ef3a8b0bf176f11fb9cfcab
+DIST botocore-1.21.47.tar.gz 8183951 BLAKE2B 930fdccd5d45fb1fb88fec2370e65bff5eb7241ea3a666f1f0bfeb11ee3e1e5bb715d658ac1f340c0565f16bbba48fa57c7460aef0e0595486303f62f79df244 SHA512 705fa363bdd4663f774e349e448666d7bfd47c77b57689d6cc12039419c8a4f820d7edd01de9689cd56fee3d59138ea9bd803b4402c8b5fac95cd2de76fb1558
+DIST botocore-1.21.48.tar.gz 8180642 BLAKE2B 9efa407e69caebd7a8c8f058c356b024ac5f7ad1675c099bef1f593b391aab5901853e4c0b0a9989ac190bdbc8e869a2f0dd2670ce483f14f1f2b993971c4652 SHA512 1319679897ec3ed07a489a52d0d3e6a9abc529bb1c1aa458f1b51d1035d7e8bc203ba830fef2354fd07f058b3bb4ba140af34cb1616b509ecda08f5a18b2ed49
 EBUILD botocore-1.21.28.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.21.40.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.41.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.42.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.21.43.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.44.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.45.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.46.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
+EBUILD botocore-1.21.47.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
+EBUILD botocore-1.21.48.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
+EBUILD botocore-9999.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
 MISC metadata.xml 612 BLAKE2B d63e3fc062deebe8e730b008f42f98fe05a6fcc8bc5631498b9c51838f922bd2b955490a65dd48ad969325583c661f6dc970cccc7a727aedacbc79ca213f7f63 SHA512 b8697f2375bb8bfe4dbe1cca24d2664a41a84dcf346e83c70471c53f1a57a1363babb75436a327cfb081269a4d519078a6f48940f21152ee1641481bd382081f
diff --git a/dev-python/botocore/botocore-1.21.43.ebuild b/dev-python/botocore/botocore-1.21.43.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.43.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.21.44.ebuild b/dev-python/botocore/botocore-1.21.44.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.44.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.21.45.ebuild b/dev-python/botocore/botocore-1.21.45.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.45.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.21.46.ebuild b/dev-python/botocore/botocore-1.21.46.ebuild
new file mode 100644
index 000000000000..cb37cb422ac5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.46.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/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.21.47.ebuild b/dev-python/botocore/botocore-1.21.47.ebuild
new file mode 100644
index 000000000000..cb37cb422ac5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.47.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/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.21.48.ebuild b/dev-python/botocore/botocore-1.21.48.ebuild
new file mode 100644
index 000000000000..cb37cb422ac5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.48.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/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-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 762144aabf71..cb37cb422ac5 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
@@ -27,7 +27,6 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 7ba2549927de..7a29d9e2d17c 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
-EBUILD bracex-2.1.1.ebuild 1047 BLAKE2B 8a3982def9da1bc47199e5b9a53f1c4cafaa8f90c817cead51977c64f476f557df777584717fc4cd77ab8e7bc4ff7525461c4f2e55631f0f1dcbfe2880135e6f SHA512 89ab3d7a6882a873bad4a3a32d5e021a74d2e2db2d59eb5751a97f5a10f75bc210026f1974b6fd6cf8212fa707fbae1c320de7bb59b0e3bf264f7577207c9e94
+EBUILD bracex-2.1.1.ebuild 1054 BLAKE2B c526e51d2454c8e45267b5a99b6c2140dd558ea9bfa99e4d543a798e994ce52cbb742a3b1c0590590e207fe895bb361f92df10504e732c7f3b7f01ec4f84c2c4 SHA512 417c99e3029645e444aa090006ff32cdf4f4eef524234f836afc70b8cd65461a8f6bda448ce400ca0b2b7063279a7b5494f1aa7f0d90bcf11cfebf76ededa814
 MISC metadata.xml 1252 BLAKE2B 4bb9a22d0a8a43a0c3ba1323ae61856d75f6457e14248f120ded6b26fa134ec9c74147944a8d313d7d4bfa0428c6bbd1f4ca954575f6feb50371eced46c80a70 SHA512 0ffdb28fc887afd29ab5c7948a41fb212d677413588bbc32343583ec31df042f75a5dda3c366ddfe78d4f42973bf2052e3226b118d71206d885d56cc5891ad0e
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
index 210344a4ca18..5e03b2f5a2e7 100644
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="test? ( dev-vcs/git )"
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 8cf193137cdd..d946c2795fab 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,3 +1,4 @@
+DIST bsddb3-6.2.9-fix-py3.10.patch.gz 3153 BLAKE2B dfdd00e90c683557bafe7d5f0d5c9a6f944fb8495bf1baef8857f6e771cef58c8e5feac9b3d345ebf6403ba73ceaa7f9077f221ad6bad9916b756e6605b30d3d SHA512 3c6157110c94b842811301f4e48c0f1690d9c75379abe7a04bf76f7136d25decbf79673ca2940c5dbb97802acc8c7a9312a24a79e7dfcc3971f9dc250353d732
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.9.ebuild 1667 BLAKE2B 933386dd8bf470125ea45a7896f6d507702cc7b86d3c3415cbc3fcd9ec58cc43682a9a1061102d38793e57636e6285571aac50e4dc6d44a88462ddf090b01a7c SHA512 706175d3f2815c6bc51a723986e803b22c1c359e01228e6b8cdca264c38475c045ddf6c293b07178f4c801248b867e27f7a735fe3e917d4035d77cd2f03bcc3d
+EBUILD bsddb3-6.2.9.ebuild 1769 BLAKE2B 7a048ba94336331e37ec46b3eefb6e6661e735834c6925f6fed9f8aee076d52b186a91f527148eda78625bfa28ac33557674d6af0e38730ac4630dc175296b7e SHA512 17fa15d27d9fa5c0a10bf5b5496a2700d938eb865d168b74ff661e536168e9afac80ed256a50b40dead94b3f6f819f05edd5fe7749e2a0b296e5f019a0159776
 MISC metadata.xml 310 BLAKE2B 060fc4b0a3a1821d830a1a5f8aa85e6c3485a8e9495f6dc53a9e0f79e2365249b84c2b5d3d92f9023c5ff6a6292d2a556cbf9706d652a7d33fddfc6cd929987d SHA512 4be1100a09d494b8ff85902a0352180ee978627cabd047c01a999b49f4ab2120050a9c4ce0e254df346dbb2ec78e2fce16b8664d755938a57e28bb16decaf5a6
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index 06f089aafd68..cbbd749168b9 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit db-use distutils-r1
 
 DESCRIPTION="Python bindings for Berkeley DB"
 HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~arthurzam/patches/dev-python/${P}-fix-py3.10.patch.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,6 +29,10 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${WORKDIR}/${P}-fix-py3.10.patch"
+)
+
 python_prepare_all() {
 	# This list should be kept in sync with setup.py.
 	if [[ -z ${DB_VER} ]]; then
@@ -58,5 +62,5 @@ python_configure_all() {
 }
 
 python_test() {
-	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 39980486b387..ab140be40829 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -3,6 +3,6 @@ AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1a
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 AUX summary_single_line.patch 886 BLAKE2B 0fb24b9297a5a65e891204cb02c1bc4d7d9ad3739fea95b27e4069a2007248c9cb481c226d0da08f9a3906bbb8e1591ddce3f3ef29a4db0428eee0a8c74dd8f6 SHA512 78f3e5180778dbfbe7f945f7dc33dab284267985564dab974c33d4998d2ff44f2a17c52b83925b8f9ced38c5c4731a1028ac28989ffe617d49f5954857d3c1e1
 DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
-EBUILD catkin_pkg-0.4.23-r1.ebuild 1320 BLAKE2B e84ce81e231cfcea67141348e49bfa2d15247a8a42fc58a79af2d88051c9ca9297da33ec260c19eb8558a8e39fbbf1889c2a3f0748f52d5f5c952319e4a8d1d4 SHA512 426df33b29845828be0f08b1ed41ba2d96efada5a5ff63c493b47a10be2799626fc58bd4509300c20c50058747e2c82e1607aff46967c11b23962f98c64c8246
-EBUILD catkin_pkg-9999.ebuild 1320 BLAKE2B e84ce81e231cfcea67141348e49bfa2d15247a8a42fc58a79af2d88051c9ca9297da33ec260c19eb8558a8e39fbbf1889c2a3f0748f52d5f5c952319e4a8d1d4 SHA512 426df33b29845828be0f08b1ed41ba2d96efada5a5ff63c493b47a10be2799626fc58bd4509300c20c50058747e2c82e1607aff46967c11b23962f98c64c8246
+EBUILD catkin_pkg-0.4.23-r1.ebuild 1079 BLAKE2B ab79ad486f2af818391a4399cb36499cd6e2d12d66ad2ca56d67f70f3cf5037058f4ecfd48f2090f3a3d3787c617feafab8dbdfc90623b3dce32d33d7af6d097 SHA512 be3fef6a69c97d8894c3db7e21af4fb7ba4934b73f32183d164a9ffeb63ff1e70b574d179df7b01dde86af7c9087f0d451695fbd129414952cccf8e1ff255270
+EBUILD catkin_pkg-9999.ebuild 1079 BLAKE2B ab79ad486f2af818391a4399cb36499cd6e2d12d66ad2ca56d67f70f3cf5037058f4ecfd48f2090f3a3d3787c617feafab8dbdfc90623b3dce32d33d7af6d097 SHA512 be3fef6a69c97d8894c3db7e21af4fb7ba4934b73f32183d164a9ffeb63ff1e70b574d179df7b01dde86af7c9087f0d451695fbd129414952cccf8e1ff255270
 MISC metadata.xml 392 BLAKE2B 120b8d0580c146c876c314b063eabb0992d6b4b70d597c57f2eaa29a4efdcab87d09348ce24d6298ac1d348ffeda508b82d3c74f8aa59723801f015f86c45f29 SHA512 9192fe46fb2a105f269cee2d7074d3b3c28ffec5fe43b1d3dc622840c37fe242423dc854c4bc7791ed86b255ce94f4ced318d4c245790848358bba17d9042b99
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
index 5a64a0e6f182..79e5eb6b91bf 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+	!<dev-util/catkin-0.7.14"
 BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
 		dev-python/flake8[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
+
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
 	"${FILESDIR}/summary_single_line.patch"
 )
 
-python_test() {
-	nosetests -s --tests test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 5a64a0e6f182..79e5eb6b91bf 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+	!<dev-util/catkin-0.7.14"
 BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
 		dev-python/flake8[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
+
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
 	"${FILESDIR}/summary_single_line.patch"
 )
 
-python_test() {
-	nosetests -s --tests test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 07cd057de0cb..0fc9a0a5751b 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,3 +1,3 @@
 DIST cattrs-1.7.1.gh.tar.gz 85853 BLAKE2B 36c411ffa92eb263b85d48c81daeea1deea10d5779c6cd1f57988792ef5ec68bedc20b59620077e6500c2e41bb91e83f110467083f90219be7e2419c3880ed94 SHA512 a72370541cbec8928f9e1ae0c130c94e71d826ac522eb39062840d4b78a7f6aacd13395b677f6ff1453e327af31a71af0e5f81893f57ba33edbb53b7683835b2
-EBUILD cattrs-1.7.1.ebuild 1124 BLAKE2B 7fcd16e46cf5851944b8782ef0891c1900c276e9f8d52f56729ae73c785d1328df922c80a3a14a8abad6840f010a3177cd94d8c9080b0ad44f50a9faa4ee66f4 SHA512 c8ded63b2752df6cd0d7e39c4c8f3f83bf2fbcd7fb2fbe7b00b084cd2b55652e9933270a02b7a1619a9589f3375f33895409b43339e790969c60ff8c390b1eb3
+EBUILD cattrs-1.7.1.ebuild 1123 BLAKE2B fd03053a94af87eb9501a845a6aa260f91c734951cf33c1314b7c9ce19fae4c53e392647a9129b7fdcc9731c4a3fc06d2cd8e81df4c1cade33e6d334fc13adda SHA512 8aef9a77da0c0d8b223a1bcc01e30471c29edf64e0678c514a38c8225af3d3e1ae77d353615eda39aa66d98ef5aba2062f20a3a1a838248c8574a606504d930f
 MISC metadata.xml 341 BLAKE2B cd5eed6e767a0b6c3d3b8b105a760022dfb00a6847b4b7d5f684c4b7bc852bd85b2878988e34a393b10232c7f6aeaf96c68ea4265de0fedf3be9f459fd03dee5 SHA512 a83dfdbf6d808cbebf7dd253f2a03245f6fb8a3554f883aaaa8273c26c31aa92e94e6f397528a74fb5646e31d80dd1c0da3dda8d5a535d783110f4f0b9670a27
diff --git a/dev-python/cattrs/cattrs-1.7.1.ebuild b/dev-python/cattrs/cattrs-1.7.1.ebuild
index 121366bb696e..f0f80e71252c 100644
--- a/dev-python/cattrs/cattrs-1.7.1.ebuild
+++ b/dev-python/cattrs/cattrs-1.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index e03e42d4a7d7..cf3dc2d10349 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,16 +1,8 @@
 AUX cfn-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
-DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
-DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
-DIST cfn-lint-0.53.0.tar.gz 7501025 BLAKE2B 0f979ff74e020aa192c040bcc633df8133ed77559afd2fa637af0b02f190f516dc7b3bd2154b9e5ecf3e2edcbf624879727ccbcaab81493f450305e6e1790002 SHA512 58d63e1b9ee7cd64ff30e938d98992dca6214945464c27d61b6d6c7e0daab27daa1feb7f2631de172e9cbf1b22699894b7fb7becd7a292b5efeeedd402db3374
 DIST cfn-lint-0.53.1.tar.gz 7561747 BLAKE2B 2561a04344c567cf9e1e62cdd65e6de0bf8efd17072b5562021055e65c140d8453062fb0019f56f1a8c520043e1215e7c5db894af53801dff26a6e2422688d4f SHA512 3832e6aac7b9a3e638dcf46103a83882fa0bd3778d95aa5837fb7bfe2c9dd10c13ac4434e371396e2f65fe39a36b3f7fb8c7cce52b628fe7dd3fc17ed313f8b6
-DIST cfn-lint-0.54.0.tar.gz 7597662 BLAKE2B 868ed762f807adeddf53624bfbfdcd4a61efff2daf3f745123899f5f397c2b4aa489e2637551707a9eb04272140bc94971b831c5bb0367d3bcf303ba22de7e8d SHA512 34c1b70d5a65b674dd259cf239eb243a4602a337fc1c83ccc9108c86a027bfcb682d09587598d3232f84a0e74716f5df260bbf15750fe1cda1a362f0a4faba43
 DIST cfn-lint-0.54.1.tar.gz 7605760 BLAKE2B 3ce3895ed67b50fab85cb13ab34c2f1a8339a7e68467a82be7c9dde67cef0c700d3d9fcf3cac18afc657abef81316d5c770b8fe97ebdcfc81ca5b97e17fbf011 SHA512 742059b42c3df5a50102d437a11b03890f1579bc5769ca72a033477c9335b5a5d4b5a02973615b98ba9b8ee4022b86c82edac3490a0ec8c9a3f241afe84a9d03
-EBUILD cfn-lint-0.50.0.ebuild 1451 BLAKE2B e055665720de265564794a6309ba2cd042797d62471c262eb1f1bb48de369dcac9abfb00ed07de9124e79831694481e405af64ff22020378e2ae41b6e713c018 SHA512 7f3869e15dd33af935d6dce124ccea29c99bdced01d6855128d828a5b43944327576bb8c2d462fdaf9afbf225b9b521bf04debed82a242f9882822f37cc09691
-EBUILD cfn-lint-0.51.0.ebuild 1453 BLAKE2B ebb332f93b787e6df28e7ce890661178cebc2c99d22578ea556602fbbb016dd9df67848742398049eab0906d81f36247b8529ee46cf8ec619bd21133a2ace25a SHA512 6f80299a580b5e0fd4b962f7b4f520caaa058858e8a034d5840b2b1a66e18a51eb6f45c118e7c564c71b7d6a9a2b1fb99e71bf382188891b4f895189e3f3f521
-EBUILD cfn-lint-0.52.0.ebuild 1453 BLAKE2B 81701267ac97f6b179fd608f459947de93cd6432c9a0e60cc362789a5c13824da09f3ff5001c5f4e9e9c9b902bd5c51397be046385c309edd933216e9a1fc386 SHA512 799aff218cb2a8aedf96e7068b164edade737f573ba93b8b672c41824585f61916a238e458d6d115acdd9e86474039e0eb1bcd203c4796f2ef9bc5c66ae08139
-EBUILD cfn-lint-0.53.0.ebuild 1453 BLAKE2B 6588ba21c229e2e549bde3dccd7cd426a209505da2b204bbfc1eef788a984fe3c838832fa716970f9b609fb4b9b41b83f7059e641bedb6d7d51a731f22d8f340 SHA512 a2618117b7c720b9e8f5065ddc845db8eaa158c06f1d4f818faa6cb889a4af593fbefc0155caefa03050eda8b1166a15cda4e06c3974bc6996c3fc83443cba6f
-EBUILD cfn-lint-0.53.1.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
-EBUILD cfn-lint-0.54.0.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
+DIST cfn-lint-0.54.2.tar.gz 7658613 BLAKE2B a29a55756bc4f3fa2ebecc02365025911af238938717c7fd42d5b0707f80ec4149b1986fa3bd66cd704c20468437ee25a47d23c0e551f8e0793eed15499a8361 SHA512 185e0231bb49521b33232678bbd610004821872a5ba4f29bf6c7a4b1df884ab216ce7b4b61af164da7ae31ec83bed066d045c743bc7687690fe542d6f7f6b71e
+EBUILD cfn-lint-0.53.1.ebuild 1362 BLAKE2B 92654cc8bdf1efa54c97778ca2dcb7b8c432a56664fef43a1a93f46c84ac6b1bd9e9beb34efda2ce753a04b2b93d191e5e83721aa138ae92a3d9b26d9f83c3bf SHA512 ee3b9639e4f863056e37211a45e3b129fdaa3a5177984e56d4e8a480bc4ad9d883ebbc15b6267c7d63b5b99a08be8ef5df5eeb1100baba5b575276731031e36d
 EBUILD cfn-lint-0.54.1.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
+EBUILD cfn-lint-0.54.2.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
deleted file mode 100644
index 827f630bb2ef..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.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-5.4[${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-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
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
deleted file mode 100644
index 6bfc86bbddae..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.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-5.4[${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-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
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
deleted file mode 100644
index 1213f702d34d..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.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-5.4[${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-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
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
deleted file mode 100644
index f483fd0763d2..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.38.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-5.4[${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-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
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
index beac470392cb..765144d99ea5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.2.ebuild
index beac470392cb..beac470392cb 100644
--- a/dev-python/cfn-lint/cfn-lint-0.54.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.54.2.ebuild
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 1b5bf2cdb3e4..d023f4580296 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,5 +1,7 @@
 DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
 DIST cftime-1.5.0.tar.gz 44972 BLAKE2B 515b5025987373499af4ce7f7e1b3001112c5ce1810a7a4a7825f57163815f7784682e3cfdb97a23507848e64689d2e6433be406ca217beda513050bbc66ea8c SHA512 8607d12ac1333e47de1976b0efc96f0f2a141cff19291974300c23b35ea9e389e698de0dc8fe5303b2686c77750e8d4017670c697de16d989c689391109ec510
+DIST cftime-1.5.1.tar.gz 46036 BLAKE2B 64a4af4bc8bf29624812ca24a8fe0cdc8885f6f46fc63a69587125c88b968f6ab5d40ad332dd6bd6881fbef8b2067c2ff436efb32876b77ab74037ae2900f7f3 SHA512 d75673526d5c831fe32f4b432c943a289491cc2c3af3258c8aa91f9633055d5fe36f4c7b7c2fdb5bbfb02f3a9138b020316fe53509d07116481dee0663e82de7
 EBUILD cftime-1.4.1.ebuild 640 BLAKE2B 210f22b81888505c817c4ce42144fffc9525f63be92b298b7c2a4df85068a8963cbad77eb9535446e0ec0061d1d75559577d09d9b905c3180ae7203e68f701b9 SHA512 a9e5653b73c8d4c931cd7d5909b41f0c6c04252e26ccffbe703a18541f5c38347ad002015ea67cbf71234e3bc9b8b7ea2df6cc895b15aee4792bce9884067d6c
 EBUILD cftime-1.5.0.ebuild 649 BLAKE2B 26555dd260d4e2f6dcc3bf07e77499a78a8ecb3e464021895b1b46e9410b368c660ddf2885049095862a7f822efc47b92baaf6503d6344c6eaa68a53e223f3de SHA512 34a76a7070bcb2f6d36f4e22ddb185e0d37b9248c13d08fb0e18c00c5b9bb3c0386ed9540fa10190f501478f976328d2957b9188a029cb13639262a542a04cac
+EBUILD cftime-1.5.1.ebuild 649 BLAKE2B afecf99fc55296d1c537d83716dcf67549f1ad13714bbdfd84c67cd6dbab7650af8db388d6726837dd44502a08c6ed695b284f83da899c8ed3f96a30f333dca3 SHA512 8cb1eaab3fbfc190ba6dd013a0b3f04d19b9cf841e9cfaf98c4c056ce9b9f6ad76d9f8b5ad8e499c38d390b2f958a8f503478fe7018d130bc5bd2647790e0492
 MISC metadata.xml 478 BLAKE2B 4999918d1667d93d5b8a38bc28b65255734bd11bcb9c56bcdd1920cfa7b3e1e9a5ce6751496e59dd914d1817bb3cf7fbb8a1c7a1a946c916f31dccb320c5a763 SHA512 af6b5275bb79ea316621108ce930d2a6aa3b7a42fa99b722573bcdae2c1488d3d2948c661dcf13cf50a35eb353ef125d47c387761ce1ea57cb6887349b5b0889
diff --git a/dev-python/cftime/cftime-1.5.1.ebuild b/dev-python/cftime/cftime-1.5.1.ebuild
new file mode 100644
index 000000000000..3626bb7335d3
--- /dev/null
+++ b/dev-python/cftime/cftime-1.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 40aec3c61dc0..15e08d3c4b16 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,7 +1,9 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
 DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
 DIST charset_normalizer-2.0.5.gh.tar.gz 368109 BLAKE2B 42e4cdeaf9a4e57c87e9813a6d1f31492aee29e37eb8c42721748b658064b16f0926dc6ffd794bf165718c4caf9484e139ca4024b89651d7ccdcbc6d907cf7f0 SHA512 5be0a72e51b9454e8a1ab670815526d54e03e42a0fd6de6ff5705000b3cb9af1ab2ad7f3457a898274d39c091603cdc8e2a925dd3c8e39a63910a5e480155b0d
+DIST charset_normalizer-2.0.6.gh.tar.gz 368270 BLAKE2B c80304b0e0f949d933fe210184d3892b7cbf52aeaf266834c4c358ee40abe14f660e2ad465aeecb76aebc8d3a12fe897b9cd7bd8ffa9e92fe0cbad07fe1526b2 SHA512 04ea17fb1d61b88b4036f33a4b03df824e246e57590a5b64ded8e44298bb1d07ebf276ed6a2dc189580d7563e267ccadb3280728f1e5ac5f29cedd5b84bd6dc7
 EBUILD charset_normalizer-2.0.3.ebuild 710 BLAKE2B 19d9dfe49c4fc71b3acf10183cc1644b4b349beb5e31c590569b69a39f13480887afa0c97ab2c5b10c4321f4bbcb854e51f8aa3d7a05d0c92e7ebb7dea8a89a1 SHA512 48cbe0bca1c62305ffde8daf2f195cb767fc3336ed1f52315b92030b082e41b196d611481b2fc4600731dd0c52e6f193d8bfc9e7b3c3556c3f7acf259bc842cc
 EBUILD charset_normalizer-2.0.4.ebuild 715 BLAKE2B 02c14b428a2565ff125388501c68a9017eaaa072f6a359f6b8277811ec8838be7ef16fa28f676c92ff6bdf7c33ceff47a0dc90bd3118e4ff7d1997026df249ef SHA512 619982fae47b3bad9066836fa4c1b68b87110bf3d29bc1aab7fb06bc9d98f75321b61c963522b5e74ba4a4b1d68cbd1cad8b3abea300ba369e680108fe66481e
 EBUILD charset_normalizer-2.0.5.ebuild 722 BLAKE2B 977797e4f8afdbeb4e147c9dc056a3b57b94ea1e222f901b14440f689d813416f424bd71a6fee1b2ff58e352ffca2a41903fe84c2b40c2718338dfb06d96b0cc SHA512 c5cd20c2c462dae34f91412d77621345bfb8e12e4e452b75943f5faa4ae7db25d9714ef5b4ddfd37e0cb833248038e2dcf8bc573e9bee9012808caab0fcde911
+EBUILD charset_normalizer-2.0.6.ebuild 722 BLAKE2B 977797e4f8afdbeb4e147c9dc056a3b57b94ea1e222f901b14440f689d813416f424bd71a6fee1b2ff58e352ffca2a41903fe84c2b40c2718338dfb06d96b0cc SHA512 c5cd20c2c462dae34f91412d77621345bfb8e12e4e452b75943f5faa4ae7db25d9714ef5b4ddfd37e0cb833248038e2dcf8bc573e9bee9012808caab0fcde911
 MISC metadata.xml 365 BLAKE2B 9b12ab039ab77e4914c6a7c6a54580d469f080783f43d10a988d0c073614e500570133a330d5312e51b47c9befabd9d993f1ebe8415810c0a4a150d96ba959f4 SHA512 76480c3c58cb1d5032b96a97e300089e419ad4c3ced784e08ddf69ed48af4fec8d0bcc9ebc4c86e39188d4651f70216d63851a7c106cb5b573a6e68ce68c79cc
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
new file mode 100644
index 000000000000..610269517031
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 4606ac670deb..0b8c6005bd9e 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,11 +3,13 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-13.0.0_rc2.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-13.0.0_rc3.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-13.0.0_rc4.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-13.0.0_rc4.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.0_rc4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+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/click/Manifest b/dev-python/click/Manifest
index 16ab8c231d5c..133d2f01700f 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -2,4 +2,4 @@ DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a7
 DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22
 EBUILD click-8.0.1.ebuild 939 BLAKE2B af16fe80f3184a3be54ef68bbde6fb6ce8c9b9b1874e15c70dac74df39c3e4a0d6b96d0ab431046983660f497b82e14986a4fe2e231a00e1f83188d7518924e5 SHA512 51ddc054c5bb96b99e282f5db6d448fc30d371d5e7c9fbf20d51ef0248370bbb8b7118291cc77f7a0c72c5e0d16f821fb8516a40c84c52027ce977b9ea5d5d01
-MISC metadata.xml 333 BLAKE2B e62682ae87a070f5e4d9b51df0b9eaa0024cd2c633da6a7c62661d4afa869ee0b05ad64631d1129481b75ca40b5ab7e8d2ef9c51d7196c8a1ccfda1c6ca91bb1 SHA512 722b9919f97c1bf246988f2313fd650639f062002977c24ecab7578a42b9485e2fd1e9b016cb1e616a8f6dab3b9dd5b0cf752fa4e999dfb8c7d4ef155e7166d7
+MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/metadata.xml b/dev-python/click/metadata.xml
index b66c78b623f0..ea38007e6bd8 100644
--- a/dev-python/click/metadata.xml
+++ b/dev-python/click/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">click</remote-id>
+		<remote-id type="github">pallets/click</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index cbd4f0024043..8045428b7f07 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 658 BLAKE2B 7d4c48b9770b83c0454e5ac7af8659cc893d2ebc0e9c51daa37a0aad5ad1032e340f4f18bbf67fcabeb6e5b15e64483bc97544b4d4a9bd187f39cadcf68bf8d4 SHA512 8ed70ae86ddc50e0c1944e5de13b3e96916fb7483a49a8b76fe474ce0163686644661735e21ea13e42be293c64614d33b4e2cdac5e76742bbd16e20e5e53adce
+EBUILD cookies-2.2.1-r1.ebuild 664 BLAKE2B 406ef791f4dc04d8048e414d4446d17b3b1f7ddfe9b9ef27917981fbeccd9074e045dbb4a4ce786568c9a53fd3fd7e463590640418ed294f9c79e3dfadfa8e5b SHA512 72f00a933df6e2f3055f161565850cfb09532ab3f8e3010dfadce86c3055f68677cfd932623bbf689c01593ae84b9206c23f51168b7dc82f757e5035ea5f99fa
 MISC metadata.xml 311 BLAKE2B 7a85df041493c4715edcf9edb7494bc2257b5e3a204e9ca178aea1b3a8b8eacaee001a4cab9e2f6aef626d0128ac4c46d4b60aba4c1323185de46e12c9bb667f SHA512 508ac189b85e2fee0aa4f54b5df1815f78ba64f13e2ab2e58de1c278e6317334f5e70f39463d362038c98cb999ca8aed921de724acb023b034b9eac0d664eb34
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 131a2797023e..447619a45da9 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index d8871ec3bf2c..ead5923ad6ef 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,3 +1,3 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
-EBUILD cov-core-1.15.0-r2.ebuild 584 BLAKE2B 3154490645db96afeed039b5992fd213c267986d7987eb6acc2d7dcc1abebd2a7da47315b3408cbe5ef8235541d07811e9bb7ef60d261ae4c3da1d06056bcd64 SHA512 4c12d350a1a8322ab812cedc7ba689a650d4f4a2e80f0d130f8c422899554790bc85b0b36b0dfc7e41a22d095cd84326eba18cc1754a4ff710bf2e1b072e86e4
+EBUILD cov-core-1.15.0-r2.ebuild 528 BLAKE2B e33315012368b053d1dbbeb4bcb4836af4e710afbb169e4bdd5914827e7871e7fe2b7d0836fc0c240d06bc8161861fd86b4313c601f5fbb56e5f3e65723eb697 SHA512 aced872a03cddb1e057e0238a3b0c986457295cee78ef552c1b65fea5f17adbcac19e0904d775d8c2b881db5f2057b6d68171a3193ae0eb747a31dfe0e65744b
 MISC metadata.xml 390 BLAKE2B aab827988dd06e159c90e046b5512e3f8c0e5a2fc4ebc151753d6275bcb61f152a27dd77140bca513a45dd99292faf177c57d84bd414fde2cabcbc42d00ce8f3 SHA512 e323cc6408f939b8f49d2ad24f56b96dcf08c01a27cf6aa8e636fe913aa7adfd38de727ea337a1c9498062afb6f5c8d1a5f4cd2d78aec41d14ccb167b8ad41db
diff --git a/dev-python/cov-core/cov-core-1.15.0-r2.ebuild b/dev-python/cov-core/cov-core-1.15.0-r2.ebuild
index 1e4defcec7f7..53aa9ff78d20 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r2.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-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..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
@@ -13,7 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index d41a14043a3b..2de78f075237 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,5 +1,7 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
 DIST cvxopt-1.2.6.tar.gz 4114036 BLAKE2B d7516c06c00907a42bbcfa99611febd87fa8480ddb812b7abc0a3b6c5a642c87756fa36d6434b4933797a03d4d94bb2838341da6f00143b9f058710e8f625447 SHA512 7b1c092d970e726b262bb5b07d9c8ca6a7081902707a812a6b196e7cb76523bd67b346024b96087622d39d564f4f095485d4f875c88dcc8921ec2185734b0969
+DIST cvxopt-1.2.7.tar.gz 4115486 BLAKE2B 6db890b271d99709f433269190461291702a95874dd13b218d1529e02da80eee43385397c5dcc31099666441b51207557bc0a91c403c75aa11f04334358eefd4 SHA512 09b92e33eb69dccd4ce1ff8f63eb81973cce15804bbdede91c1f81d146d9a643d8a29315f324774f02fa0f0fed2edfd698ba9a1a7345aeae1f5a25d24b776274
 EBUILD cvxopt-1.2.5-r1.ebuild 5521 BLAKE2B d6573a0b3fdbd74f5c1a8626c84cd6ea23f06c0ce06dd39fa3b0d1fbd9bd552f2d4520b492b791e988756313c42f149fe775c6fb975f8413231d11d4647375ba SHA512 1633d4064ce7d33ac2f52a89e690f9ec11376214c0e1e90bc9df22f04b046863ec1da4e4829b5e20f39e6b18432f12e946294699a54fe4a7435b04dedf572ad8
 EBUILD cvxopt-1.2.6.ebuild 5307 BLAKE2B 1cf25e4029b8dda5dc57cba8eaa4761136efb252c4867052acf4567a640e41be3b2e36d6f70f1b5759b5ecf7d6b3ff7a593fb8aa18b353dab0439ee2e6d90280 SHA512 705c4dde6aab2390827af2325fd2fb473f095ac78364954603211f0c24c9d62c281563330106e6c54b82d9ef94ec65c58ab3761dfc4f77a49b68d84fbd462e8d
+EBUILD cvxopt-1.2.7.ebuild 5308 BLAKE2B 57fdbf06dff84baeaa6b252aa03df34c9b492e0320d78197c481127d42423d990c775e5a596c82b593fc811e714c5e8bcd04d5523a7e361ff2fe617b056d9948 SHA512 86b7a57500849deb727507c0f7be457861f5d85f016bca4705bad0dba81470e680a8f816e2c50744b697ccbd078fd5e8aee1f330ab0d8fb87bbf53a726c017ce
 MISC metadata.xml 836 BLAKE2B fea994c2d1aefd2bef56407cb9a915820c11a118e7f876b016eb2b4e2c405030eeb7bdb20a6174e2144198f766757b321de042363931bd4216d04371431f6a66 SHA512 ce92cb1df5f4983953fd862e876970a39bbb2487d683868d3e9c9922238c53222e61e0f55376d332b33c61dd0d17ce272aa610c449155dd23263dbdffd3bf035
diff --git a/dev-python/cvxopt/cvxopt-1.2.7.ebuild b/dev-python/cvxopt/cvxopt-1.2.7.ebuild
new file mode 100644
index 000000000000..2f9c0c1b5b48
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.2.7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 763bcb7b1973..0a9ad2a27fc9 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,4 +1,4 @@
 AUX cx_Freeze-6.6-buildsystem.patch 502 BLAKE2B 83626d25800fbfbfedde676ed9889cdf3a4cb8ce6e6a4a11b88a645efd06609f2a2ef50d55c5502676631a57ad876f04b647023056e57574af28ba5d006f1d07 SHA512 e4cb8a9982c928982b3595491825ec5b97fc48b132efa5a0581647de86344d65b154f643a057554013b777fa3352c90be33f731b37fe511c127144c2d7cbf29f
 DIST cx_Freeze-6.6.tar.gz 120239 BLAKE2B f4ba5de3f4233ee5417d1e1dfb8ad23180d59bf7b2b2da4918c390d69e6f73cb814a1063951b2564bd4f8eabe8aff5faf9f731fe500bf90b4a5ef8cd081632a4 SHA512 24305f19c10d13ea58d995d80dc43c884898ae1e29a470d2885b6d7448806103bc7771874cc6dd064114c6e5e59f351dfec71c37ef3dddc0a136bb5a166cdb3a
-EBUILD cx_Freeze-6.6.ebuild 618 BLAKE2B 12aa7c4fdd9c22892ea02e6c2cbdf2fead56bb5359f9a772a20c1e9c4c5a7d231506f1f0184d552c73f7261cdb6cb497d539559e3c0c59aea3c28ee554a84556 SHA512 daa046787ffe7f519427c5d31b678dec426fb88bcf2d7818c9ecc8a288982716c3aee97f6134bd97eb084cc7343cd1cac706799f40c1d31fc428146b556f0fc2
+EBUILD cx_Freeze-6.6-r1.ebuild 618 BLAKE2B 12aa7c4fdd9c22892ea02e6c2cbdf2fead56bb5359f9a772a20c1e9c4c5a7d231506f1f0184d552c73f7261cdb6cb497d539559e3c0c59aea3c28ee554a84556 SHA512 daa046787ffe7f519427c5d31b678dec426fb88bcf2d7818c9ecc8a288982716c3aee97f6134bd97eb084cc7343cd1cac706799f40c1d31fc428146b556f0fc2
 MISC metadata.xml 384 BLAKE2B 3e1553ab02bce58de9d197935ff0fc6c709473af6b4a0d48c0ef8cd8eacf4b2134b8e725b633842f44a13705af6ab53893755b66e85e400c3e128e85625b6bcb SHA512 e93f9015b6c5097db33107455b92c2fe70f4bb8089ea29c5cf5b16788cd6096743203a4abc971bf97571eaed73a1428915988db72a8756eacdf26ef597a69abd
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.6-r1.ebuild
index 31d8f78ef905..31d8f78ef905 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.6-r1.ebuild
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 34830a910665..6c2de5654dfa 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,7 @@
-DIST dask-2021.7.2.tar.gz 3739041 BLAKE2B e32389a5d6a47a9c0f741a33d2f9aeb8887c951d4a53ad7e2bdc5d7007e2e7b8db9b639b95725bb70cfdf1f3568aa2541c7f46c5c87cbb50b5433866b7f0e870 SHA512 029832ea2db342cc63dcfc4e5a563e6e92f5d26298ca19d7815548acceb8098e94b53acb5df1a6923172e7014b6235ddb34921f2855701921556db83a9411afa
-DIST dask-2021.8.0.tar.gz 3742254 BLAKE2B a4f086181dc5dd36561d365ac929c0399d05fbb9d39e025ad06a609477cd4e257abb93760244032285812409c413a110f213ad2918ec1042e1526f847da1056f SHA512 b205c05965aec419650b9125193d96383ad9ffa96e8aef92ac15da339e0ba9d1c40ba6bc176e56aca0ef6f84d7a523d7157aba90e146317aef58fe34dc07e2bc
 DIST dask-2021.8.1.tar.gz 3786161 BLAKE2B cb47b900e4769113e28e1cea70cb65008debb25431c05792666ca1d9aef9143061d1b0c2ce825ff1a22312c4cc615a2878591fc93236521811c19a35e70446b1 SHA512 aff7b92b66ab5d8858eb28d416c3661e64400a8ddcc9135b74b1bf3cad195a4fc55a00365c5602cb0b66ef8506e73c0f6bd2d3972ce8744d2e77095cdf040d11
 DIST dask-2021.9.0.tar.gz 3792016 BLAKE2B f2538c9df5783f087f555945234b4d31c5f02a539eaf14bffdc05e4d3f62d5ef309289e216434e477a728837e9556b2f50a0aadf8a943380496168c62577c356 SHA512 b821c38faf9cdf6574eab8014d4acb95f37cc260c9c3ad2c19fbdf24c3ed9fa5c9cfa35fdaf53f7b640b3c8a86eb6b60c2e5e9bcb7760870023451c6c383545f
-EBUILD dask-2021.7.2.ebuild 1244 BLAKE2B 1dc099954bac2a601ab4495910cb3872391e163d6aae2650b9f795b0c9f14e1feb3143b15ee2b0864e2109b5d1b568ccb751216cbaa39c4de8fe939bd47f3948 SHA512 5e51964457d4d80d7f9dc25f06e6ea18b776e8412bc8dbc2ea0bb0c939032794b52ee7f89ab0c3a6addb314c311b7d8875405029b86aa41eea3b506673ccca20
-EBUILD dask-2021.8.0.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
-EBUILD dask-2021.8.1.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
-EBUILD dask-2021.9.0.ebuild 1225 BLAKE2B ac27aa7cbd84c49a1fb049c401b17cfbaaae86d9fdba65df84a1bf4b7ead8e5e4f58ae45ae73091d6413ffa9cf87680da8ea959e897ed3a03a29afe8e9329445 SHA512 7593d23198759c5edfb5a35fa96fac594c5e98b84ca87f0a630b0f97c4c9f9dcd5f8acc447eb54d45122d2f36f14cdefb4a583918cbd9831c29880600e423049
+DIST dask-2021.9.1.tar.gz 3794819 BLAKE2B c3ed5050581f41c4ea82ad9d1d233205f105434e5e6dcc654ba2e999b8cf105033d58ecf045d2063dabcb701cb2af6f092ecfd8435d24e5949ed2d39b54ae19e SHA512 20beca3f68c2e21d54c941049a1f352e19fcce7b5f7ecf84abf60cfb9979551a3e83938ca5439b662d35c0b64b26d726f6fea85641e737d0060c56a2e879755e
+EBUILD dask-2021.8.1.ebuild 1244 BLAKE2B 1dc099954bac2a601ab4495910cb3872391e163d6aae2650b9f795b0c9f14e1feb3143b15ee2b0864e2109b5d1b568ccb751216cbaa39c4de8fe939bd47f3948 SHA512 5e51964457d4d80d7f9dc25f06e6ea18b776e8412bc8dbc2ea0bb0c939032794b52ee7f89ab0c3a6addb314c311b7d8875405029b86aa41eea3b506673ccca20
+EBUILD dask-2021.9.0.ebuild 1378 BLAKE2B d8c6af4f1f46bbf81d02919163cbf2918d1b8cb686c3d28a2f1753f1a3f0c8d79cb7cd897fc5f42cee1d115d27aa14c2d01d703a2992d2fd83c345abad403794 SHA512 512ab2ba1820505b811af7b613a739238ff6b05c4a98e402c0a220572982ecc6c5919d9fc19f922bb7df0f93e3c2792ccc8133848a60d7f99dc0c81814b91b7e
+EBUILD dask-2021.9.1.ebuild 1130 BLAKE2B f536def3a57832e06bfd7a7708e58d80d951b3aa6dea2d3b6b79bbeff6dd1b2e65afbae8b311d22e7cdaf9e1404ee222b5a2b24f7185f4824c8a0e5b50d7b97b SHA512 80e7015fba5d176e8fab978da4c64607a47a22ae3064171f2ab2399b62684ce600b1fef77e462b8ba7114c8ef69ba8f8ff33491a26d5ef64da19288153547403
 MISC metadata.xml 671 BLAKE2B 9445727611bd11837dbca3520feb00892d112b88fc694eced24573c93eb025a9702b2de84232cc00f53182f5ee4b30c5768b296fb3673bb6a8b4db7d0a093c40 SHA512 90cbb67c807023481b2203b1811f062edabf54cc28e59a37e8ad4db1dffa932b3e82a8ddd35e3daef83c8229352ca69777150c562d823add42b75800f3d5fe4b
diff --git a/dev-python/dask/dask-2021.7.2.ebuild b/dev-python/dask/dask-2021.7.2.ebuild
deleted file mode 100644
index 3389d3987162..000000000000
--- a/dev-python/dask/dask-2021.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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/packaging-20.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/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require old sqlalchemy
-		dask/dataframe/io/tests/test_sql.py
-	)
-
-	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/dask/dask-2021.8.1.ebuild b/dev-python/dask/dask-2021.8.1.ebuild
index a7f474643d23..3389d3987162 100644
--- a/dev-python/dask/dask-2021.8.1.ebuild
+++ b/dev-python/dask/dask-2021.8.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/dask/dask-2021.9.0.ebuild b/dev-python/dask/dask-2021.9.0.ebuild
index cfcfdebbdedb..2b2b9d4c403f 100644
--- a/dev-python/dask/dask-2021.9.0.ebuild
+++ b/dev-python/dask/dask-2021.9.0.ebuild
@@ -41,6 +41,9 @@ python_test() {
 	local EPYTEST_DESELECT=(
 		# require old sqlalchemy
 		dask/dataframe/io/tests/test_sql.py
+		# https://github.com/dask/dask/issues/8137
+		# https://github.com/dask/dask/pull/8139
+		dask/dataframe/tests/test_groupby.py::test_groupby_index_array
 	)
 
 	epytest -p no:flaky -m "not network"
diff --git a/dev-python/dask/dask-2021.8.0.ebuild b/dev-python/dask/dask-2021.9.1.ebuild
index a7f474643d23..a4142fe932b3 100644
--- a/dev-python/dask/dask-2021.8.0.ebuild
+++ b/dev-python/dask/dask-2021.9.1.ebuild
@@ -38,10 +38,5 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	local deselect=(
-		# require old sqlalchemy
-		dask/dataframe/io/tests/test_sql.py
-	)
-
-	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
+	epytest -p no:flaky -m "not network"
 }
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index f204b85e8725..9eead8660757 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
-EBUILD ddt-1.4.2.ebuild 624 BLAKE2B 960dbcf2843cdf3ac14808b575de87426b3a8216c4032992f36e3cb0df0143153839c478da5122d68dfff9d4e43b7402b9113020810f5982989243b4128139a3 SHA512 a8c513d53dcef4a433203a0c2340fca8b2e4a1288d7c4da579444977c1d9f94edf02630cda02c1b690c334a993c5abe2a02de77c8e51f15b62adbe7bda6eb27f
+EBUILD ddt-1.4.2.ebuild 631 BLAKE2B c361cc9f54311a3f19c5dfc132c03504205f0dfdd414ea83cee13da91ad0c9e3b8746aba17eeab617df649855df953038e71ad8442ff65c64f39f7b789b5f9ef SHA512 5983870725993973e85cad65c92c81fea7dbf663fc38b7029c55e93d2093db74561ef18aa5cb81e1e73f94da73db570adfa79bf417317bb7ea9d30c630131319
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index 5bacf3958a97..8690f281511f 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 0e334316d45b..f80683ad8ef4 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,3 @@
 DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
-EBUILD dictdiffer-0.9.0.ebuild 940 BLAKE2B 72172f24eb52151d7ae7456bc40264c44beb601d7cc90abdb3b68609c118ce76d0c5e72537d6e1802adeb7b448917afb629ce2518e5e370bb000355cc704ec83 SHA512 da8fb516e8cb63149310e79dfe0a64137b03cfded04590cf9a51aff099b4dc522066fcfc165d7af981ca4d7f20d1a4df2401c23883aaf12e1ab64baf7906a1ae
+EBUILD dictdiffer-0.9.0.ebuild 939 BLAKE2B c500bbb2de5d0b213e4e190de551c40e6e4171ccf74584378b64de7f6543bb50cd4eab7f71f990df131b74b5531230999d773b317f5b2ab6129691794c1fbe5e SHA512 3b71c37c73f04e5214246b5498f4d6359147f072f375aa0d169ba470d9716cb57c0cd3d91d23ed64ab10ecdd6c40d298545e6d94e914c176664dcba3822b57b6
 MISC metadata.xml 524 BLAKE2B 7ead1ecf64224d0d27ff4540f6042de5b61d423e826774ee954aa0134f2b7fa9e8823e93a57d02c9daebbab270e667423cb144d26041baf87decd7a8e5da6985 SHA512 bf6dea2186276619f0ff29b8f62b69609c3abf295f3fdefa7228ef3018d2d58dc279a1d70efcfc657b62c6b7a80b8b76935adbc040531a6bdb10803310c345bb
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
index dadbe0e70c97..278023007c8b 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index b9ccc93e853e..f16ba458558a 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,5 +1,5 @@
 AUX distlib-0.3.2-py310.patch 1131 BLAKE2B d5f7dde9f3a23756d926ce39061ab1d168e3dcf1161b63eadcc2f639f58cb58d9e3dc4bf4738cd32a148fc649abd236230ea57353d851c1fd536c5fd2964c56e SHA512 d96f9ed3e023084103025650d34448cbddd301f7d43d65f565427e00976809d813730f5208dcae53969cfbe8f5eff054cd538141ff1e988dcb4396f8c94cd5ae
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
 DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
-EBUILD distlib-0.3.2.ebuild 1533 BLAKE2B cd0de8e590780513724b7ea0eaa435f96fdc98cb100e1dcfd4db7a4d4491b4af8f3a7d0e6cb3b68c86598a4764f0ddbae70453e89c5dbfda55ae83674343c95e SHA512 ebeee4a11e1a99559a1efe4d1891d0fb95d3c4b2a1c721940c72a7b36ee95a2de86127c7add7cf89d074299a5e997c32586dbec883e17b53efee82e68cfce0d0
+EBUILD distlib-0.3.2.ebuild 1539 BLAKE2B 7b2b33f76a6c609150f5c5db91193682cac586ab03fcb62f067bdb786978671b0c7996f70d0c1385dd4b36043c8507911641f00b5693c61be9aec290b8c97ab3 SHA512 45076c88450a8dd40f02badc60b7d10084485fbadfc6a5596a165e930ec1c64c6afde009fe6bc31704057038dfdc713ad68abb72fbca6006501286e224f880b9
 MISC metadata.xml 289 BLAKE2B 013504330142232b0a1343e0a85d0b29ded52c98dede7dbdd59c7f76dc20f0d0790c34c9cd0f0fca6ac1375bb2895908a9b9be001e1f067f5270241c72d85cc7 SHA512 482e8a6d8f38c56dca30257c1565667370eea4e5dc24ceea2c627566d620d9491ac4ffa4fbf8493d759c9d51064962f77bd74ed904cf58a1d4d3fee30825f9cc
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
index 1f5679c4c7f4..fa54b57e602c 100644
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ b/dev-python/distlib/distlib-0.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 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 ~m68k ~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-filter/Manifest b/dev-python/django-filter/Manifest
index 70128e310378..7bcbd8151c0a 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,6 @@
+AUX django-filter-21.1-test-skipIf.patch 1054 BLAKE2B 96b9c5bfd9cb5f530dab0ad8bb5b80507596a5ce28f694a1f84bc954ca9de596063bf9c88850e6c5db2758b362463de0f9ae451d34023918d313617fdf2b2715 SHA512 bb0d05b7ee78ef8e4b95f51ceddde7bb3068688bb4fc6805f73787c6a23b38c4230fef5cbf591738b6069eb897840d791b6f414b1a74ad21f776226ef2bfda38
 DIST django-filter-2.4.0.tar.gz 146904 BLAKE2B 994b07c0f5e511451964f4f1e007ff9906975600d0bc8a02dcbeb86f91bf906490ca394ca95c23c57c1fff25a447f50a40054c0abfe385300f9db87645753978 SHA512 0584222b46add89aa7dd1dfd334fdd19903e0119d455a2c46644c501a66df224f9f51c33394d130bcd1fc0f28c6ede6d6853b9790430040ec7228f9a1dc55264
+DIST django-filter-21.1.tar.gz 154188 BLAKE2B f0ae3119a1dfa466e6630f7da44db1531172991b137fe9420ed533a7b3d4177f689f07fed115566854bd40e5e23f4e9f2f73be32188af2c067a81a95fbccc5a3 SHA512 df2b02bfa93874d9684a26394778203b827c6459ab8cc8c581677e6ccfeedf1323085f53fb52cfc3e0e0a3d27f86de655366bcd4be361502ce86e65b4a4e84d0
 EBUILD django-filter-2.4.0.ebuild 534 BLAKE2B b1f3032964c78d6722f05f711b62ad10a1a871c1e46f3e6ccaa7caf697a11661a60b7832f3b04737a4cf1c424a0b68ebc8b71408c9c518d3eb26ee09f8e59e48 SHA512 32160f83365c53b49991335dfbb4420f943f849354832e38ab914d25434b72cd46beac326aafbea6cab995ac1a7ff530bc07fb6501e6d0e063eaeb7e92d85010
-MISC metadata.xml 244 BLAKE2B 07fb8b3f9b519727bab4c5273673efc0d495dc6170f7c778b6b1fc3c3ac472427f387f458df46138eab4091a8d47dd0cab6c7e0d9a113a50837a5bc140db2b52 SHA512 71fc78414133f82f9b0dcd53c97a0ca3840c01c726b027e317512c71d0480fce9c52a16a16f84c1bca674f96b25abbabdba0799da2a27fcc7cdfd164da553f5f
+EBUILD django-filter-21.1-r2.ebuild 817 BLAKE2B d08cb66a3af23d3e6aa72e541b80e453fb47ab7021e13d86b9f345239508968593e69c0cfe05572e035e61e96db2a3263d62dc85fc902f6e26cca26bb50b4d75 SHA512 63f33f5b37eea71c4add1d596b325a6a999e0b14bd8ed7bc7ff23e97859c0a35b9af90b7051435e726a680c0391496312443e049880884039b04ccbf18218ef7
+MISC metadata.xml 384 BLAKE2B d1de931c4e164f99bc55c099b97a44887f5907fa487bb165d5c386458ecca7f18a13803e7be0180cddbc17195c5d5fe3219524f49b30e6c81303d221d6f764b9 SHA512 c316163f5ef1a02754589764a5a585fefc60b9921775d56a558ffcc87896071764d55c6c5cb4dd436eee17b0fee87330a4cca38884cca76521f8098e9fe2e60b
diff --git a/dev-python/django-filter/django-filter-21.1-r2.ebuild b/dev-python/django-filter/django-filter-21.1-r2.ebuild
new file mode 100644
index 000000000000..23b5fd509266
--- /dev/null
+++ b/dev-python/django-filter/django-filter-21.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="https://github.com/carltongibson/django-filter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/coreapi[${PYTHON_USEDEP}]
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-skipIf.patch
+)
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
new file mode 100644
index 000000000000..adaf8ba428d1
--- /dev/null
+++ b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
@@ -0,0 +1,27 @@
+From db97686a9950cc1a372d27dfbb90b19ceece3f65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 24 Sep 2021 21:22:41 +0200
+Subject: [PATCH] Fix inverted skipIf for CrispyFormsCompatTests tests
+
+The test is being wrongly skipped when crispy_forms are installed
+rather than the other way around.
+---
+ tests/rest_framework/test_filterset.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/rest_framework/test_filterset.py b/tests/rest_framework/test_filterset.py
+index f8b5aae..b6a658d 100644
+--- a/tests/rest_framework/test_filterset.py
++++ b/tests/rest_framework/test_filterset.py
+@@ -38,7 +38,7 @@ class FilterSetFilterForFieldTests(TestCase):
+         self.assertEqual(result.extra['widget'], BooleanWidget)
+ 
+ 
+-@skipIf(is_crispy(), 'django_crispy_forms must be installed')
++@skipIf(not is_crispy(), 'django_crispy_forms must be installed')
+ @override_settings(INSTALLED_APPS=settings.INSTALLED_APPS + ('crispy_forms', ))
+ class CrispyFormsCompatTests(TestCase):
+ 
+-- 
+2.33.0
+
diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index 7b48ab146c6f..ee17f6d46218 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-filter</remote-id>
+		<remote-id type="github">carltongibson/django-filter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 236d041ae5f5..942a59c46906 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,5 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
+DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
 EBUILD doc8-0.6.0.ebuild 863 BLAKE2B 7ffbb2689708c46229de6ec69695fc0ea466eee173e23a3b38183ca1af8e0948ed0e9459f23ec551b5f61b2c3bef60141c8ce4e732aaa79fdab029d6ec8973bd SHA512 ed9a8c5ddb1727ccccba2982b4e34b58dca4c64cda05e7474aed7d07379ab20823b48a448c8d20a9e3fdc6952bf97b0477b36d8d88f3f6bd5c2c896443cfe2ab
+EBUILD doc8-0.9.0.ebuild 959 BLAKE2B d0399a298bd7a9b80f0180d1db0c5fcc42bed563b073f96fcf4a78af5a7f9b1973bfb41e77a5a7d32f445c3db5e43f605ffad95544a39560146e7864ad184915 SHA512 2fa37711347cc9743a2f847363e02898409f79aaac96d7d4947db0e8d58057641738cfc54982cd3fe9008654ba731e17943857756ef5aff3e7b094fdd15138b3
 MISC metadata.xml 322 BLAKE2B 0dc9c91cdb78ef3c143f7e45ac3ee3754643c676c249a685fdc73ee8f7468e19eecd6463fcb873b4a242789aa6c8f65ef92c45a1a5dc61c21bb070ae055f6553 SHA512 a417cd533ae3ef3b64cd170caa7e84fdf761be3b9b35178357134bcd5ca487fd5d4286cdff4718b345afef06cd63d5e9511431483ff7ba3ce5b5aca4ebe8ef41
diff --git a/dev-python/doc8/doc8-0.9.0.ebuild b/dev-python/doc8/doc8-0.9.0.ebuild
new file mode 100644
index 000000000000..e7f37e7f4c45
--- /dev/null
+++ b/dev-python/doc8/doc8-0.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+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/pbr[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/restructuredtext-lint[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "checking pyproject.toml projects" dev-python/toml
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 0ac1a6fa3947..bfb3db711eb7 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,7 +1,9 @@
 DIST elementpath-2.2.3.gh.tar.gz 234094 BLAKE2B e3e56469250f3fd2135d9173d68cd93af2a6e03830859d03872967d72a6b7a39f4bb9288c341cc47c406ad55d764ad65a16169eb78598eeded48c424245064e8 SHA512 75178c12f42582a391aeb8198a45c732601251655e381cf8961dac2f6467217e5a18effcadcaa7e7206b18f358a70e1e4b170b9e02ba9b25108b1721da50ee4e
 DIST elementpath-2.3.0.gh.tar.gz 237865 BLAKE2B 969a98403ff87bc205cd73372414f81efa0612a3647625c32a2823ffd721c31c59cd6f931d547c18f4b3001417216c26f03ee769792543af9d4e15ae49538594 SHA512 636337f96bb5acbcae06fcde922cf2ca4cd788d5302c8bdf5fd403f7de9ae5569f78b57bcf57c60e941ce876f69894b4c2c9d1d11555825bf574230b086b3aa0
 DIST elementpath-2.3.1.gh.tar.gz 238431 BLAKE2B b4ddb651bd1d934d5830fa9f6a4166deed447c1d5ffb3bcbe00e01bde1b8dcc6d473b47139f8afb942abb24ff5a8b15e5fbf7e2fbc8cca132f248aea31bab4b2 SHA512 c62ff7a05815d2acb296785ac5733e2a24ebea6fe04053f7addeef0c84dd5c3bac8f03b5c0183f7ec9d6a394e94e6abe76d80ba5b5dc461cf8d3adeb27ddedc4
+DIST elementpath-2.3.2.gh.tar.gz 239680 BLAKE2B 8e30a24dfbf2e1981ff0a199728d16c89214b70dfa195e8df338c762ba4ddda28936de30546809226bd080234185d44f6f45902e9ff561a12d56748c4500cd82 SHA512 4bedb2da3a139c35d12b0a41983ca50fabc2f653824c3dbc18cbc3024e666405586fdd8788ba7ecdcd55c70e75eb8bec9623839f015930d0f0a65fec10986b23
 EBUILD elementpath-2.2.3.ebuild 694 BLAKE2B 37b2cb347e483973c75fee0c52382afffbabb2048a3bfe4e3a3c357b3cd42fe3989831e55fd63f09e647c5e3d064bbc4c282c062ec4df5d483c6b295ffdec16c SHA512 22608d2ce56ac5abc70163fc326c6020fa7685016b4be55b427b8e2937938ee585291bb8107951092dcf41cfc4699831c804658891a8beb188755561ea5a2608
 EBUILD elementpath-2.3.0.ebuild 702 BLAKE2B 58a832a3025aa634ce2cf12097a617a932012f03974b3b118a660a5c59c5fe328df20a34ecdfcb6dd5bc635cad5e714fe87ff0d59d929edc9cf0c359b2d484a5 SHA512 08383ab6be430cecde8bb128fb8afeaa59cb7b8b418483f4d125d336ed2856e7832175d09f60b132359d128cb53f01fd5a6dc7bd686b0902cb9861014df10524
 EBUILD elementpath-2.3.1.ebuild 702 BLAKE2B 58a832a3025aa634ce2cf12097a617a932012f03974b3b118a660a5c59c5fe328df20a34ecdfcb6dd5bc635cad5e714fe87ff0d59d929edc9cf0c359b2d484a5 SHA512 08383ab6be430cecde8bb128fb8afeaa59cb7b8b418483f4d125d336ed2856e7832175d09f60b132359d128cb53f01fd5a6dc7bd686b0902cb9861014df10524
+EBUILD elementpath-2.3.2.ebuild 702 BLAKE2B 58a832a3025aa634ce2cf12097a617a932012f03974b3b118a660a5c59c5fe328df20a34ecdfcb6dd5bc635cad5e714fe87ff0d59d929edc9cf0c359b2d484a5 SHA512 08383ab6be430cecde8bb128fb8afeaa59cb7b8b418483f4d125d336ed2856e7832175d09f60b132359d128cb53f01fd5a6dc7bd686b0902cb9861014df10524
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-2.3.2.ebuild b/dev-python/elementpath/elementpath-2.3.2.ebuild
new file mode 100644
index 000000000000..a236efdff839
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.3.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} 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="
+	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 93c092fa390a..229fd8e89ab4 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,3 +1,5 @@
 DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
+DIST emoji-1.5.0.tar.gz 222904 BLAKE2B ea4f057f94ba06306d87b102598da5cd0d87038d61a45e7a44db1af107effb912040e9f2e318d7f8ebaa1ac854ef827af7703f0de72174689b5ca5c3c909b597 SHA512 9dc85a0e6ac2cb7e4156d54063380cce3048ad8ab38993a6d6f2608502299a3e5681afac8780cd14c44f7127c7e1805f69c9bb95460620ec0fe2fb0d52d2d87c
 EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
+EBUILD emoji-1.5.0.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
 MISC metadata.xml 396 BLAKE2B 65f441554017bf19380e2309b4fa34926968ae4734961ec9c0f551d64e801c2ff05ccf89a35125870df499b63dfb4d04d092f2f236bc91f01eecadc7d0a90f72 SHA512 0c4f1b15a3f1aa4394f7f5d6ee12e48fa10344fe9b97b6253437556e95bb9b938bcf3158e07193fd66d722d38c927cc2013eed4da0a7ea2d50076edbf439bb38
diff --git a/dev-python/emoji/emoji-1.5.0.ebuild b/dev-python/emoji/emoji-1.5.0.ebuild
new file mode 100644
index 000000000000..d9c3bbe594f7
--- /dev/null
+++ b/dev-python/emoji/emoji-1.5.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="https://github.com/carpedm20/emoji/"
+SRC_URI="https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest
index bcb2eed91d7c..bc976fa807d3 100644
--- a/dev-python/enrich/Manifest
+++ b/dev-python/enrich/Manifest
@@ -1,3 +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
+EBUILD enrich-1.2.6.ebuild 581 BLAKE2B 82013d3ef7084cef8489da437d394de4f36d673271b90e776d533d5e3bd64fb7b7a99084c4471d83a3a8220944c0b6d8fa1ea878fd5bb37d1e298e849e52fd34 SHA512 1b3592afb20a80916c06299d87c10d0169e51b0c1b6c54d632fe2cf5ebf7a9778c7146aa7a302e26921be9331a97eacba2e37d8a37c002177532ce23f7bee374
 MISC metadata.xml 497 BLAKE2B 1ff82ce3199a3d67d53f9e724aa7b23eecf1625fc3cff0f971df8a7266fd3ce3f13347ef654cdb45c609e077f7ca9f73642fcc33eacfe8cf6d7748d3d302e7ca SHA512 cfbefa42e286d667291011efe9a843a80d927b680c3dc97f64c7e83bb58199bad1b2be4388eea182e634028eee04200481b9cc4ddb88071940ab89c1e4797097
diff --git a/dev-python/enrich/enrich-1.2.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild
index 57f3ea8d5536..aec4657d33c4 100644
--- a/dev-python/enrich/enrich-1.2.6.ebuild
+++ b/dev-python/enrich/enrich-1.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 6b31ddde394a..bba0f89daa98 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,5 +1,3 @@
-DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
 DIST feedgenerator-1.9.2.tar.gz 28076 BLAKE2B 18c1db7de23efa79aae7b1d92aeda4d41921e673da7be883099b3c00f54aa4602370caebb02913607644b8cf1d887e8141b8fc71ecd52e4720bb23c645ec5242 SHA512 3f9799a8008cf456635bacce87699c3fa00ac990ed675a92dbdccf898fd189c8908109a27bb393e9f25bda7f880c66c40fc3d1179d09e579be8125c70bf1b7a9
-EBUILD feedgenerator-1.9.1-r1.ebuild 502 BLAKE2B 1a1683bde7c920327395023b883a1322ad9734448e6911bd26412646af9805025fe143bd3f3eff518d92ad96edd1bf54314859fcde4b81524ae6c36b20d6940c SHA512 8ed911f3af61d125e1a0377a19f72fda63257f618b01886f8c4ab8cc9b9555d0c5dc821c8d27999e6ff96f81e8d93be494f35a2325f2ebc28a4e65a8773775e5
-EBUILD feedgenerator-1.9.2.ebuild 503 BLAKE2B ab2c1bd562f94839cbfc014c43e2e75b6aec5d35be4ea09c27a5748867818368d427b735fe99a4d0de443ad311dd343c96474642b0cc98036f8a57ef5774d3e9 SHA512 9c1e87918b982c417b83fb3db60546ca2e263b07369a00fb6b669cc851f12d4aedba605fe74cc04d92cc0901712c96848d0b8d06da217489bfb1c9b52d44d547
+EBUILD feedgenerator-1.9.2.ebuild 501 BLAKE2B a45541308ef2bbe6e27412140d52c1756371b3759a9082a415ce3cf5fe791159310aef8366f63821e75179ee2bb8e5ebe7ad36ac7b9cc1b3dcbe725240ff4669 SHA512 8c3fdfafdcc8511315684ed2210b5a8142f54f75151b1b12aec3656ecbb0036a40bd01bd176aaaf31c1ac73d2627e58753cc03b62414b14678cb9b334c7ec06b
 MISC metadata.xml 477 BLAKE2B d167790f82aef2a2aec5ef6d351ef3e003d0c5db5e69a2ae78aa108ae4c8ec006f0983eda0d6855ccb11b91218b2dbe7abeebd1bc2428b8a79464eb96c9ba5d8 SHA512 2fa5b9046cb30943e4c511c220a302250355bd60b0285be7de6342cc7bd271df824e3fa73a62efa2998ee9cbbd08e45b2071214e56de053bd583f6d85c41460e
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
deleted file mode 100644
index 4b1f0c831b01..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.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=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
index f2d1ecdd832b..a4069dac5be0 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.2.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"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 51d83aa59cfc..1100440f682a 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,6 +1,7 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
+AUX feedparser-6.0.8-fix-py3.10.patch 555 BLAKE2B 20ff9ae0e540bc2dfbb2d336a12804c444f99f9249e4a4f4aff241cdb3e927aeb8c64ac5eb410b273f7628f5fa4bebd19dc26776ca0ad65a591e493197884c25 SHA512 6a663180a185e5ff915bf5f45220e08ef58c2bc8253e7d943cbb065c202b611dcd1cd6baeef26d9ea6487679d69b3449d2c5f7d6dcc6044e19df52650190c1f9
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
 EBUILD feedparser-5.2.1-r1.ebuild 1133 BLAKE2B de711d5a8a89583536f614de0a692c4f65bd0592bfc8ebc0556913c5104ef46c781a32fc8fd58efbebafaf44874279d180668242b4f2c74344bb137b566ebfaa SHA512 56e5dc52b253e94c5effcdbaa00915d5e0d993e39490e98f05e2eabfac93c32d48d815314acbb1255f80f408508f75dac68d173f56a73a78a1c70cb19ad19972
-EBUILD feedparser-6.0.8.ebuild 894 BLAKE2B 54f55e37aab56f5fc470d7e1a69c837631cafd9b26decfd87490960b394d92df63bd0162b8b5865cd8f6a226f88bbbbf195ed9b8aac0313b1547f30e57010a63 SHA512 f953cdd621792a97f3f9dcb16a5fa87c0568fa10fac7e3e3296e561946e927568ed4409b3ed2150023903af230d51ea6808ad5c8204a36749f04126f1b64050a
+EBUILD feedparser-6.0.8.ebuild 976 BLAKE2B 92ebb3d9104bc21a423c121b0a1698183fefdd345566a036efb09f374515d09edf3f35c68597e86dfd29da61108b2cc9b07a61c52a80166a7f7b3dd39cc44179 SHA512 581e945bd95d3172c24d37e42726bdee8f12db85f7f87d348392586ca097a6f364588bc53408c9e80b4e0250f80f2bb1deb1f93c9a5f33780648b5d4671eb02d
 MISC metadata.xml 468 BLAKE2B a0ae044ea5e9b15c43bea0cd38f3641522a2e911193fa8452cb2919e299b40d4410bc23f056a2070e23929610d3c4dedc2b20828e018a031e079281ced62f753 SHA512 a03a6e5a92cf9e18552c9c3a753f4560add583579c6c8bc912732f4c0679a417b195db56e5224927b086f84d9c7eacd8e16ee58f4017dc014f8a902d1a1ea2e7
diff --git a/dev-python/feedparser/feedparser-6.0.8.ebuild b/dev-python/feedparser/feedparser-6.0.8.ebuild
index dceae5fe0cae..4b502ad69319 100644
--- a/dev-python/feedparser/feedparser-6.0.8.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -23,6 +23,10 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests unittest
 
 src_prepare() {
@@ -34,5 +38,5 @@ src_prepare() {
 }
 
 python_test() {
-	"${EPYTHON}" tests/runtests.py || die
+	"${EPYTHON}" tests/runtests.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch b/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch
new file mode 100644
index 000000000000..8f835f37207e
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch
@@ -0,0 +1,15 @@
+From: Kurt McKee <contactme@kurtmckee.org>
+Date: Sat, 12 Jun 2021 15:32:05 -0500
+Subject: [PATCH] Fix a crash that occurs with Python 3.10.0b2
+
+--- a/feedparser/html.py
++++ b/feedparser/html.py
+@@ -337,7 +337,7 @@ def parse_declaration(self, i):
+
+         try:
+             return sgmllib.SGMLParser.parse_declaration(self, i)
+-        except sgmllib.SGMLParseError:
++        except (AssertionError, sgmllib.SGMLParseError):
+             # Escape the doctype declaration and continue parsing.
+             self.handle_data('&lt;')
+             return i+1
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 870aabf22b67..36ed530b2470 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 813 BLAKE2B e991c9d835eb2a2a16083cc12164fe6830e5eaae66fe950d48073af4437c59e0289d0e091a7e250f19ee83fd200d46a80e4eb8712b7829359d34504258a6dfc8 SHA512 184474698f1482220c243426f01c9f28e73b29d8117b1c8dcf6fbbbb0c188d9eef144b6f82e8944cccdb6bcf7d102a8225630cb26be96dbf49a5784d377ad8cc
+EBUILD fields-5.0.0-r2.ebuild 819 BLAKE2B a5534fee27f9ef1403dd11b542ea785d513264d7aa33ca7f6a905330a0bcbe1ef0a735a2a631624578619afdf484314fbb245c4103e755152ece82755fd4f274 SHA512 e6eca03fdebb1855871159d1d0bcb74e62da45b05f802eee0fbb539d08425dc1d2cbc990e508ec9ba569114bf6610df57d39655fe9d871292dbfce4fbbf5b13e
 MISC metadata.xml 395 BLAKE2B 8c4172bfb3d5f625120ba446c998d4641bc8e6177c4fa91c6efd141facdc9a6f5519ebb991eb571946f51156b7095333a8262fcf12b2401108c8ef3e1f0aac9b SHA512 388901683dda3121cdbcabac4370d7b45d50ae5b8c64bd282855953c111e1f10aa8099a95007bf7e6f0a3d03ff26dbc20e1233b8741863f23057d62f8853fd36
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 6beb01064bcc..c31892fdbb2b 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index cf79f0cc225a..d248e82f6acd 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,6 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
+DIST filetype-1.0.8.tar.gz 804082 BLAKE2B f636e9fdddd93dc8972c434666b82d97fd9572ce94f0c3b617add2ecaec2e1bfeaa267bb5ceaa07a6ed76d0b0ef0736451f9e4395353ce795e1a61e7cce5d543 SHA512 5ab87ec277781d27bdd7a4245f406d230724b0f0a7ab26e879cb78893262fbdff7088bb306203fb1fce38723b5d1c2a998fb8ae113509502755e995a1f81993b
 EBUILD filetype-1.0.7.ebuild 535 BLAKE2B 85c921509c386714f9a1af19688f485a4679aa2da6778c3adafbb7ee3d9e963c063092a611fc4635cebc371fcf780b7a22cdef705ef68f12baad7800f42a4d9f SHA512 c4ed42b9e698ab22bb29afc30f18153b0c518a2040e0c365affd6655062b210e024c26cb9970465ac7d32b2ceb5ab39b60ce72a4d9fa048cbed39423e8d849cd
+EBUILD filetype-1.0.8.ebuild 493 BLAKE2B 02729acc49e3826f9d2b033814125afc639ee08dbc21cdb4737d4af68e0abde9a0cb9eb121a8dbb15ef57e24cef76103757fb99cc89d20c559d72d7947af337c SHA512 89e5b2838f98615a2ac42c86af7bd2836530f3955f1b9b619d1d15f3d1830a5898118b58b98fc4f40aa909e1a2c285a85728c2f8cbaaa400905ebb71cb371011
 MISC metadata.xml 478 BLAKE2B 90bbd2432c69c85eb34fccdf6c8e73d7f226d8005d04136a1043a3a0e561a6cf12db5393720e2192c2ae39cb501f4db741d7b41d1c0c3d217e4f84e1d846200b SHA512 18f363a259cafd46ffd3e5bf943d38efea4ce39385af6976b1681088c75fe7b2748752b6f68e9e8fe120786d0fafe9e1c2599dff40951bb28442d9542c422c41
diff --git a/dev-python/filetype/filetype-1.0.8.ebuild b/dev-python/filetype/filetype-1.0.8.ebuild
new file mode 100644
index 000000000000..d13aeb5a02d6
--- /dev/null
+++ b/dev-python/filetype/filetype-1.0.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
+HOMEPAGE="https://github.com/h2non/filetype.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 6e74d43176b0..8091f3e164b4 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,5 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
-EBUILD flake8-3.9.2.ebuild 1148 BLAKE2B 0f56a21c4bdebe4c23f18fac7fd9a975b11f996ccb42a0a4ef0a03d333e9d8a73c48e796a657b49cc6ec5fc6e97387d6d2ff4f8ee2f6ea23a62e8b6d8a5b0767 SHA512 645946b1cdca2b4425d42a4f95843b6296813227596512b43eabb7d6d73676f40cd15c2c5cf05bdb0af8665e3463449b56ddc5266a9e3048fa6d416504c8f05d
+EBUILD flake8-3.9.2.ebuild 1154 BLAKE2B 496c734bb728f0fca9ddda1323c70a469a910c48907524e2a4f5cb7a59187392fead2d5389bdd5e6afaed83d3e9940dce5fb8c6b2dc80d27a5815f8c4c52f7b7 SHA512 c1aeea77b0c046eb74b5cc8c4b6328cbb6e9037f9c78cfae92a4db7370701505163ea40dd4644de6e22f3035510155c48df818104b202ee5ad6471e17e71aaa8
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-3.9.2.ebuild b/dev-python/flake8/flake8-3.9.2.ebuild
index d7e46d253cc6..4919eb6d71cf 100644
--- a/dev-python/flake8/flake8-3.9.2.ebuild
+++ b/dev-python/flake8/flake8-3.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index 51da15b5898e..4f691e33532b 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,4 +1,6 @@
 AUX flask-api-2.0-fix-pypy-tests.patch 1150 BLAKE2B 571b48be64f135706a010648b667032132d38fafad20fa86220766c3c4a2a4953260cdeb1933936cf0369886f171736b0a55415b73086c2f4492679f3a091b9f SHA512 df0ab5fb20ef9d79ba1c1c3aa9b33b5b7a426039dbd18743297d1c6de484ea94047edd6b4a8b6a18060b8ed494c283f1091f622c11060170a67bd4480e640453
 DIST flask-api-2.0.tar.gz 235593 BLAKE2B fadd746d91cc2c797a2e40ee6b11532eb0184a1289a692f8de844501a6656eaa1e87d10811119f267344185b22ed5c12bca43198d64d50ca8055ce95d0f62f19 SHA512 631e69e5a786598e6b5ef7e02c5c4f293eadd84d86fdf0155771d04fb6e87be5686756db90ab265cc097ae3d623c31dcebf5096a62c660d6f7d6fb1c3f3d4e3f
+DIST flask-api-3.0.tar.gz 249620 BLAKE2B 63ce0ce6a2d4755caf40c020fc6b88f3b585b0c30f5800df62c8e442f629b8b489917ff0f0d1266d941478336f38aa0560c144620f6c11d60cbd9e31870bf984 SHA512 c86b919f8681a73be166ddc50022faecb376b1b6f99bd0d78b2f2fc8b64f82bf82779dbdcfbcaa1c5e321ea2d286b95f1a1aab32864e6c3923417d7828c7c79a
 EBUILD flask-api-2.0.ebuild 760 BLAKE2B 887d1cc647103e5de7db20c092d915c94728e2f06df720344c9115cb292c0282abc8ef63e3f7fb93656524f5aa296e00307460ec198b6f37e361b0fe61f62844 SHA512 9541d4fd66f21049d9588ad72b538b7ad2d9a5361919c14035f60d04fe230f7ec69b478ebf169ebdcff344f450550ddd98c7f239b0bbc3c581a09ace52215c8e
+EBUILD flask-api-3.0.ebuild 681 BLAKE2B 0e9309c4d87138939e05a3ab36b08d9e259ca8ffb1c3a41c016999fd19199039ee5aae5c8e7c47b6975e7c8eb67a9a80774bac1755c808f7b6eb082937892f4d SHA512 b6f3bbe8f8ab7bbc21ac2631c122cf066b40f4f9a1102a11099d84d154d7c4d3ced9b7b06fd54ac8c1dae804d433d8e30241008e8b0b1acfff480c703bc0e927
 MISC metadata.xml 728 BLAKE2B 54f369da75822026ef30c2f16efac1a478b1f42b8bde27710c73fb7b974cf70b5c266c182f6efc6096f4efc0c11645a74fd19ca30ab2dfd48af4e65a731983e6 SHA512 a009d75f162e2775ec5fb1eda9c12af46c76094d64952effe1dd9aa74ae3bfcd3dc40e4523cda464c8cc14eed150d8cef2175acd294574752d79f0ff8c97e8e7
diff --git a/dev-python/flask-api/flask-api-3.0.ebuild b/dev-python/flask-api/flask-api-3.0.ebuild
new file mode 100644
index 000000000000..0d56985e7d61
--- /dev/null
+++ b/dev-python/flask-api/flask-api-3.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=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browsable web APIs for Flask"
+HOMEPAGE="https://www.flaskapi.org/"
+# pypi mirror don't have docs folder
+SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( docs/about/release-notes.md docs/api-guide/* docs/index.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 5a5a5c65842f..c30c75c775b8 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -2,7 +2,9 @@ AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e088885
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.1.0.gh.tar.gz 406508 BLAKE2B 84da1a563630e4935fecd616ccb51b2421854b502ce9e5b1c328fef358a2c80946ec1308199cf4dffa4fd07ac65ba104bfb9cdb8956916c5ec3fc39da79472a0 SHA512 b31a48abd2f1ccbc79707b377799adcc8f5530a045437d49d28fa5b47187c98993339a05fac35e4677e46ded99df40b8d8a379f9d36c2b2020456520e99b8de6
 DIST flask-security-4.1.1.gh.tar.gz 407794 BLAKE2B 579d3c9086655c2af9bbecb70cbc33c832ba0765859a1cc32beb5aede3ef17b69eff61251235eddd8f1fb6c5a03a33d0a56c376bdf5b5e0b0d33a03147e385f0 SHA512 41f9511d735e6b80af1b1499fb310414036a644414a8093fe81c429fd9aab20b1b494de55d506325def7bb68ab14a3b53031ad7c136af2ed3e8bd406f93c878f
+DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b7404adf4a985067fca79e574726efc7cd78f9b713360c7d9d53a29ef6dd2ec7d23b64e50893fd75259a00c2b549a4b2a821936 SHA512 8fd3a0561ccc8dd815483fc8d2863a13fa83dea4cf308972778f99c29f0f7496f95cfac483f1a4cf2f77cd2a728eb09a5f8e8b4147d2749aa0b75f98b752ba36
 EBUILD flask-security-3.4.5.ebuild 2270 BLAKE2B b5e24c6713976774778e8c268b9967614676acdf1d906520889c9245ccd9d2a2960c02130c0135e4a891d3ae5859f20cc076be1fc6df5920df9925d39e5e9a59 SHA512 a07e3396fd9a886dd55b246da398939048e150e28bad6fb0399d2c877ecef399a4a470e603ff084fccd1707cde5c965f1420aa4107064603ad7d8c30f29a5c3e
 EBUILD flask-security-4.1.0.ebuild 2043 BLAKE2B 404e5fbba36b21358c834a845d29d8b290b21d0f1a4d5b2669a5a9a3babd6bb4cdfe9a7b030e3793535a816e1d1984a6535e253d3ff70c4c7e4cffc77553b8f8 SHA512 fac0563f8db3ad719a8ed38694293ddd91f8c9e28f98576e3a59eb8c5105f8cb656196b91ca420500c2934ace5c2ca918847a669ae056b57a7fceb9ba0d5fe77
 EBUILD flask-security-4.1.1.ebuild 2045 BLAKE2B 6d12fc33df38331b60ea7c1707f00aa08516209fd950364ae782205f05034283c20d7f08dce0c732057d17a2941a961ae363f66738b9df11249d46dffcc18f5d SHA512 c8558efc74e7339474beb6af6766da868d493af26e30fa635628993576524aaca5efe87beb914de3bcd7aaaf4864cd1a0ec0c024d3974596d83b8f18bd82825a
+EBUILD flask-security-4.1.2.ebuild 2045 BLAKE2B 6d12fc33df38331b60ea7c1707f00aa08516209fd950364ae782205f05034283c20d7f08dce0c732057d17a2941a961ae363f66738b9df11249d46dffcc18f5d SHA512 c8558efc74e7339474beb6af6766da868d493af26e30fa635628993576524aaca5efe87beb914de3bcd7aaaf4864cd1a0ec0c024d3974596d83b8f18bd82825a
 MISC metadata.xml 417 BLAKE2B d2c9497a88d513e360256445b7d144ab969c40cb11726477e2d9a3b850a7bcda909ba0a5d844a6079ddd597056b4628a6eb309bca8756e15864d151a54f1d1c0 SHA512 3aecbb252d4b6e3675ee221eb485fd80dbe52eabda6c4a6831dfb95110feab3284a6b6f4ea0d42aa6d6d7ced8ff0895ab40529ccabcdb5144481243b2bdf1653
diff --git a/dev-python/flask-security/flask-security-4.1.2.ebuild b/dev-python/flask-security/flask-security-4.1.2.ebuild
new file mode 100644
index 000000000000..b9bc75feb4f9
--- /dev/null
+++ b/dev-python/flask-security/flask-security-4.1.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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/blinker-1.4[${PYTHON_USEDEP}]
+	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.3[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.1.1[${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/bleach[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pony-0.7.11[${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}]
+		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 0bf681521a7a..1bc49686eaca 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,8 +1,10 @@
 AUX flexmock-0.10.6-fix-with_args-sys.stdout.write.patch 2707 BLAKE2B 9848593b70aca7e118c4a787c2e153e15982eb5f403b1883d484bdd2d22efd8b6d9ff2d9e1bb3e4699215e9c15cb0d5cff8ac2b571e6d87aa0186fa416981cd9 SHA512 3ba7f4ae532670e9576e9e060e0e4a1d0530ae7ab4f0e40e6e20e103e64030d2e5a0900e412d3006e7864e6d67976ee22f2067af7611f21f9400dd7c421b0ebb
+DIST flexmock-0.10.10.tar.gz 49201 BLAKE2B f5d77398ac14a002f78790d4e03f93bcd00c016e6a5eb0be45ce3b59a223159656ab694a1dd1124cbac351680fef25084d69e9533d668177ea73b9e458df5b6f SHA512 211939bf40ecb25981a70d5bfe897ef8127ef38d5adf6a48b086c4b6f49b05e1a04f09afb73f428e3eb21a8090ba33ca86e605c2c1ac70d9fc269fdd640ccb73
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
 DIST flexmock-0.10.6.tar.gz 46740 BLAKE2B b5c8083694e8787e85ff0f41265ad9f716a4c82d274ca5c793b6d93bf8bf28f3e57afd33f7ba59149e75f7bffbebd3843901dfa75caaefc6f76f3eef0c603314 SHA512 2ebaed78926f01bd4d886a509d978d0de04629f7d96c48f846b8ccf7906bb2303e7cbeab8226c6eb98d058f940434144cc2d6300d6aa2533f1f217788211490e
 DIST flexmock-0.10.8.tar.gz 46905 BLAKE2B d5f28e012edf9678fd5f72ec1d99e4e98b00dbb36536877cb393c16563097e0e3f18ab24243f7090bfa306f8be194243d201d9aaf5d64491bb594cff82b60e1e SHA512 cac327b3e3c4c6ccbcd6c7f71863b67fdd5454c13bbd5403b3ba521e3ae945ba453152df623eef08b2b60210ba626447a9e6bad76c2215281d43ae0f42ebf1a9
 DIST flexmock-0.10.9.tar.gz 48466 BLAKE2B b6c73fdb6d281870806db7b34d43d8f116c29ff28a3753e7873868e66df9a34f8f4cfa0c1a7f1fd620a58a46b4376538a8a64994ed82d500a850f86c24fe54d2 SHA512 6e39e5a88b1d744d348f834f4664fc477412f6f09dd2500ef35a52126ce14f9e8d24a04c1ceb16c24b31bc40c3d8276f2efa75a701ecf284bb2cb5388513a75f
+EBUILD flexmock-0.10.10.ebuild 533 BLAKE2B 6b4cb39684e9e1b6d384edb5387b8d31412867ed389a15fc5ef793e1764001ab08aed4b82b2ad647f9b9d94940a416940d3e8db09f333d01fe5f39049ed33122 SHA512 0495922974681c9690532746384032c30779299b37538ad32f125a6d71a00ff154c5a1294faeb3863285263f3d7a07e920f58e4624a82e9ba437787e9b3d41dc
 EBUILD flexmock-0.10.4.ebuild 489 BLAKE2B f22dc9131f02343a598a8b61546184bee128d54de48acd2de913f6ef48121438323a0c7c169ad9c8761628f44923147403761e46c59bc5f302c48ec32ddb1be9 SHA512 e389dd36a35931b8d2a7354b32ab3155e3475f92332aee2040576ade042cf9b30310292e0d0925e61cc647993ab857d3e4ad7ccc12198c080f95e11cf2f1a217
 EBUILD flexmock-0.10.6.ebuild 600 BLAKE2B a7e911d052d43c11540d8abfbc90f9d1b5099455bb4efdfb28652d7c017163730d4a282f7af7a824dd9d961b4defb7bc27a77fbf147ff4bc96d01dc5f38944f7 SHA512 df9f8c7b191d71c69978c19e40d300505c8d4d43712db7af15d3ac9dd12f0b76c83e84ce89112492ae78544fa3c4aa914c1701f7a1515869f4e68b77ca44af70
 EBUILD flexmock-0.10.8.ebuild 530 BLAKE2B bea43bb268613fc8d5f415a867f832173edaca8b14241171db7f2fe9f83678e07fbdffa9d045eac859691a83d0bfa355cae22cb7de9bf57c452054364b737f62 SHA512 e280d71065576bf12e5148cec79257a4c5d8b09ad1449f0cea15243772186288aabd8d14d37f928acda25eaea7b0e03576846967c1f1778563cbf5e232cd1f3e
diff --git a/dev-python/flexmock/flexmock-0.10.10.ebuild b/dev-python/flexmock/flexmock-0.10.10.ebuild
new file mode 100644
index 000000000000..e1cb6fdc9cfd
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.10.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Testing library to create mocks, stubs and fakes"
+HOMEPAGE="https://flexmock.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 96d908103de4..16522185d465 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -3,5 +3,5 @@ DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e292
 DIST flit_core-3.3.0.tar.gz 26424 BLAKE2B a7237b51f16ed4158d5f09cbe92ccee7cbb3b19e67937028e86f4e1c9d58c9fe9244ea6337bc7c7c5bb29e204d011ee95a6d3fbe596d728ce66f1e00a830fb0c SHA512 5d7b1a43a9d9a7c0cf30b1f73d208963ae51247aec2b9a91aad6412afe781ee927ddd82ecea6057d36ec18af917938500f518845206ec150dd6b604905a1f2f4
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
 EBUILD flit_core-3.2.0.ebuild 673 BLAKE2B 3c799620fe55ed46b8b19bf00201e00eab3cba5b0397d69d046f5682a4c0981a13f2af1668c004af0eec880fda9d113762a9112eb1bc9385ce9611c4ef59d95e SHA512 648bfac710570cc6ae09156999db5ceb71dae0701ba38ec529fe62334b8e1f589a2d747c6c89d3ed6c01eee454a6bafc5b038ad63ba16421156fa8b9aedb6eab
-EBUILD flit_core-3.3.0.ebuild 663 BLAKE2B e24dd502b2f08cee31d9cdab16f94ae2036920d5f6d68dcb3d65e3e840b402ccc86b9f500f01c4142710b5e5ed8755dd93c2d2cf55039ad3869951d881b446dc SHA512 a6387142fb8af6a19ab59e24270b2b4785a4833e7d920b47ae72ee10e68766b4dc00d428ac0f734aff001629cc435dc0ded41ca85357c6ab0a4433a43f998da4
+EBUILD flit_core-3.3.0.ebuild 670 BLAKE2B 40d18af5f94b3fa15c204f56e7c93f289f45ca80722c5a18f0623c7c5443441bfd6328b3b4f1f8d4d9c83eacc6f729380633c2e74716174181055c09691b2c2e SHA512 ecbf9b20ef1568027fb848df46a0e8e9ae997494900c3bded9286a57fae8ac851665b44e605c34a9f0a3768f344f5e5f5d9742a6ca63685c79f58c4cfd6cd62d
 MISC metadata.xml 495 BLAKE2B cdf16a7db7af0f0bda628d564547e06546ea68e2bddc36d7303d97c6ae9d7c27ea7a3e8a46350dd72b328b10072f901bda9f5a9bc295d69acbd2ca57c6c38a72 SHA512 803dfd60f870dc3e248b3f992d33577061ddc9f29f2bc1652e69e5715fd2b8d31d1528b9d9b055e98659ca29cacc27a94ae89796ff8b82227810c40522803b46
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
index 444e5c0b4fd4..32cf63a81fa0 100644
--- a/dev-python/flit_core/flit_core-3.3.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.3.0.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 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/intreehooks[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 677c0ffda328..1176c375abc8 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,8 +2,10 @@ DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4ad
 DIST fonttools-4.26.1.tar.gz 2579211 BLAKE2B 886a803f6214658423c98bd347db6e2cc0baea5e2619ce18ba2a96589785a1b93228f5b35dd7f6c819b81ca471d6ea1a09d12ad6de04c75388ab6cb5003f5bf5 SHA512 226338cd1c3f71662080c69b0786a6a945b5a75d3a4b7ee6fcf6d7e2e089407d11b4a43950c7aebdaeccad1819e5c6e0b947938fbfbaa3caa9747b7b4a1bd5f6
 DIST fonttools-4.26.2.tar.gz 2579391 BLAKE2B 35a2533a336498aa1d5b9c2a61c1de6af03e6a7a1932a1ad71522f7f73e52590c347fe3e7d60b93b013389023792e6e6b91d6b4bfb92e007062dc2ac494adbb6 SHA512 2caa52a48574e6bdf418fe57fb4ca69686eeae65cb1f44c0cb16c64400ea666530dfcca9e8a619859cf553435f93b38f63e422c315206ecec467eed6339a5987
 DIST fonttools-4.27.0.tar.gz 2645014 BLAKE2B f08178c0fba90d4a44bf00bea054a1d4ae368a823bd30d11d152d3edbe6ea4bf0fc816620333f4ccdd3c9b43de85fce1367c09fda4a8a1dd8178826245c89416 SHA512 65602f13ecaff2881d78075ed6a9774ec8afd1c958ef75f09d146b4699e8341ada90a1fff9176e302e07d77d36a9466096fdda259025c5938e81dd0816269874
+DIST fonttools-4.27.1.tar.gz 2645747 BLAKE2B aea6b8c13f29f460945f2d075176960f0f994fc262af06b493d2c34a0e4e6d37263f642e6ebb44b4a7c082bdcd7d4f1fa88e40e82760cf8a9b90cab8735f005a SHA512 76371a1244cb1c681b90f31ce67de3aff5e732477aea02c046a45a838ed49f097707edd359c7427e2643b357c12f6516d667d6b1a61e942a8e3b57eae1d6df70
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
 EBUILD fonttools-4.26.1-r1.ebuild 1427 BLAKE2B c62b3b17b4516545f4bee4b397cc820ae8e26c961a36c629bd2d2a441c4a009771a3e4ede7a6b001edcaf334ff559625ade032b9ad0fba4503d0888ce48979a7 SHA512 3dcb2fb10e9d2242ae4692f3fb546f505d082be6196500fa3cbafe2ca3649f7b52377014a4ab47ed3ffb6a82b0d8cf21fa87842d782f1c7bc38ccaa0063d6b63
 EBUILD fonttools-4.26.2.ebuild 1420 BLAKE2B d5a6cc59110e2f54e574548d7bdc0fcf5562cdc96995a3de925936caa21e0a880b68a26af44621c663f0752e9de50ecb3d01a5c955b2815227031dce15b9eb7a SHA512 6b2e16bef894169a40621bdc29fccbd11c5e177e0ae6435dfdcb7fc27d59136700f0fef2f2f39d84dc88be1e5b4efbe0b312c5449427bfd9d881353dbedaf65f
 EBUILD fonttools-4.27.0.ebuild 1427 BLAKE2B 8d730ded280eb850ea0f612179938de25fdec4131c9e22e76f97288d4f87fdb1b72e3d76eb7bbd77b444931dae16e323c012d118774559c64ce290fadcf27f39 SHA512 56c2e4a315ed59e7ed2473504ce725eea14b893abfe8d3e500d06a8d2068e4fda8eca05ef2d12a865355f51b98b3bb74a92a26e005b6d0b31e4b0deede8c927c
+EBUILD fonttools-4.27.1.ebuild 1427 BLAKE2B 8d730ded280eb850ea0f612179938de25fdec4131c9e22e76f97288d4f87fdb1b72e3d76eb7bbd77b444931dae16e323c012d118774559c64ce290fadcf27f39 SHA512 56c2e4a315ed59e7ed2473504ce725eea14b893abfe8d3e500d06a8d2068e4fda8eca05ef2d12a865355f51b98b3bb74a92a26e005b6d0b31e4b0deede8c927c
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.27.1.ebuild b/dev-python/fonttools/fonttools-4.27.1.ebuild
new file mode 100644
index 000000000000..925c4733a1ac
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.27.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+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_configure() {
+	DISTUTILS_ARGS=( --with-cython )
+}
+
+python_test() {
+	distutils_install_for_testing
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 12b7e1998968..7a9ed2cd3d91 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,7 @@
 DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
 DIST filesystem_spec-2021.08.1.tar.gz 303969 BLAKE2B bc67e980cb7d5def227feec16d984630703e817fb696fafd53db7c56634e8e101ac8a68ad6d3ea3b0cbed475f431b5847e3e0612cd1f5abc2bd753ef4f6004e0 SHA512 7757480ff8f113715bdf4be400af9b9c5a3f8b52abc8cc8ccc608f2fea0f3c77f074db1aa5e7ce5d0462ae86a702af8058f8a8935b99617e6803bc7344801b8e
+DIST filesystem_spec-2021.09.0.tar.gz 311338 BLAKE2B e448c0e8a0f24f2374bf6b701bb72b10c91b0058b81947fb538ad96412170e6b71ae5e49fb0f679f0a7031f1206f706bbf4f90ecc118d89da621c5cb4f8f4875 SHA512 65ee4f7f7d1dd235dcb6dc6933bb2eb62c91cb50d08703becb0b84640c40efed09cf326478c84316f4edb3cd08650ff1d93e222083463c868e8ca2b8a9fb5f91
 EBUILD fsspec-2021.07.0.ebuild 1194 BLAKE2B 86eb9b6315ee7880e7a6eae31016ce27368015355f58b73f90a7a8a6edc48159b8922724194b90f0974d054cdd4bd49501acf190599f8b58db2889ab0524c9c6 SHA512 8c670917ecbebf5bdfd90ec50b35145eb74bf1599867991382036b981d171de1e9b380d276d260aec636fa1d73a501bc72ac60909d3032f52ad2d3697b320e74
 EBUILD fsspec-2021.08.1.ebuild 1161 BLAKE2B c55f5125daa45f12d9c5e33367d7c95822247ab32bb7f2238accdddeaccd94f31f4ded47df151a6eac64a4aa856fcc35e609353dffe974783a1274382d3c03ba SHA512 6424636313181eca15182bc994c67bc82dd4054fda31adb745268edfdf5c0d071d494f257ac3fd4c2a86ce140b3070f25cbfd19f8212874bcd8f405269c39a60
+EBUILD fsspec-2021.09.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
 MISC metadata.xml 374 BLAKE2B e3c4cc3d3081e0ca2b3d6745d1920f128bae3d07a4bf47d29eaa2143024a9272e4837ee95e2f2829baa000250afde46279e71b031ef7c283fb47753e7e0a9c91 SHA512 c1ef25f5dbc85cad1bc5dec8efd5e0d8b56587d123464fe37f834a30eff03fbf5d605050322f88bfe3e4a2f1179577f63c2bd8b0257202d20f4a40cffe317537
diff --git a/dev-python/fsspec/fsspec-2021.09.0.ebuild b/dev-python/fsspec/fsspec-2021.09.0.ebuild
new file mode 100644
index 000000000000..2f83ce072601
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.09.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+)
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 446eaab4657c..16fe9a0d55ce 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 547 BLAKE2B 0c4e1f9f376725844cebb604bf34df5f639abec600cdb1919c4bbb038ec3f1f79afe23f04b4e19248bc495cd964f2fd6c81eafdabd21a0c8cad0a8a28c2fe5ff SHA512 9f4cf8270270058948ab23eeae0eac0773c0bb46c2ccc5f2a0b675aecfb0bee94313d3666cc92507d861bbd41c12ba5f4b439eda24fcf46a69f9aea348276201
+EBUILD fuzzywuzzy-0.18.0.ebuild 546 BLAKE2B 96d3669223d467fd0682545a981a67ed76e31fb54f4ac2cbbf86245b74e5f7297ca6e03f6b47102b15321767bd7b3af7dbabb77fe3f3901ba39246987f4427c2 SHA512 3135823284adad089bed704d3498b6172e04bab5c6b65359e781f7630162b4825bbaf522ef7dcfd3e4e09f725c8ba7bdec17d7f4f2d3def2ef3cc7cbbfe808cc
 MISC metadata.xml 397 BLAKE2B 7d156fc2db4d42258707bbdd93f09ee48ad139d237413b3ef80e4618f614c1e1da4e4a60bfde43976e9cd8fb06bb38f15db086571b93f8eb0cd7c9e4a2d932a4 SHA512 fee9f0884d1a8b2d66e799d5f58402951be0d99c0660e4d378f31dc76fc7384f73d6600dea1270882ce23d35cb45248f123f2ecd91eaba04a63bfa0cf73c0127
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 32eacf9c2851..c8c368b69e08 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index b9bdfb94d81c..6ad06a2dd437 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,4 @@
+AUX genshi-0.7.5-fix-py3.10.patch 6996 BLAKE2B 835c83e1f3f33d2066b4e4acb81d2ec71958a8a7cbb98abc482d1cdb4b570ac76f8087a7f1df6e1a06fe3e0ef010139ac0e3f2a5ab0ec10ef8aafcd680dc38ab SHA512 ad3c657bf9844159340cbebe1a10ff8ec65cc9764d9c5085b31b1a223ed1ba117281fe4bdfd51bdb778b6ff6344ccd0d1d23e9de50093ff0936d34aa27814425
 DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.5.ebuild 836 BLAKE2B 43630c37164a79841db2a3925e4e56b7d4107b5cf25b705be4d5746ead797b5153c922c6579e606a4b477ed24b7c2d81765a524ae3830e5fc95d5b95fb595699 SHA512 d3b97d03d6d483d09adb54224a99fe9f611e39538a09de4ff79a55ebd4f175060fa3ed31b748d268718daebdc6a877a3ff89bbaac28913c2d3d848ca85664e65
+EBUILD genshi-0.7.5.ebuild 887 BLAKE2B 75c2c720f780dc77b02630bd134bfc38e3a3596c437d6f9d96fb111af32f7cf2b4ce5fb7d04d257569fac8e97a9d0900c7ee2a4e5b18de1f17b8c9c170f7f2ff SHA512 8b6d8f82af0b84690d651e0e83f98e077f22616bf2046762b496d9e73b0e40af3ebb3f58db77cfdd22af9476762fa7417501e182beea972f80f70d389eb9b924
 MISC metadata.xml 389 BLAKE2B 9d92c761c148cb904ea6098935fcbf2cf8d4cabab5a78a4648e6d8cdd3eb9e60373804c082094e4054b34f5014c0e44d0db22d90b7cff36a160423c494e04e76 SHA512 56d8d92964a3320a392c3f45973bbe73d40e5220b173bfc183ecd3c10c7e7e115aaa2bc7721eef83dadc88c2be78be5beabbfdc15a74a9b7c4a580c1d5978a5a
diff --git a/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch b/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
new file mode 100644
index 000000000000..fea4e6434b26
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
@@ -0,0 +1,233 @@
+From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
+https://github.com/edgewall/genshi/pull/49
+
+--- a/genshi/util.py
++++ b/genshi/util.py
+@@ -119,7 +119,6 @@ def _insert_item(self, item):
+ 
+     def _manage_size(self):
+         while len(self._dict) > self.capacity:
+-            olditem = self._dict[self.tail.key]
+             del self._dict[self.tail.key]
+             if self.tail != self.head:
+                 self.tail = self.tail.prv
+
+--- a/genshi/core.py
++++ b/genshi/core.py
+@@ -20,7 +20,8 @@
+ 
+ import six
+ 
+-from genshi.util import plaintext, stripentities, striptags, stringrepr
++from genshi.compat import stringrepr
++from genshi.util import stripentities, striptags
+ 
+ __all__ = ['Stream', 'Markup', 'escape', 'unescape', 'Attrs', 'Namespace',
+            'QName']
+--- a/genshi/filters/tests/i18n.py
++++ b/genshi/filters/tests/i18n.py
+@@ -12,7 +12,6 @@
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+ from datetime import datetime
+-import doctest
+ from gettext import NullTranslations
+ import unittest
+ 
+--- a/genshi/filters/tests/test_html.py
++++ b/genshi/filters/tests/test_html.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ import six
+--- a/genshi/filters/tests/transform.py
++++ b/genshi/filters/tests/transform.py
+@@ -12,7 +12,6 @@
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+ import doctest
+-from pprint import pprint
+ import unittest
+ 
+ import six
+--- a/genshi/input.py
++++ b/genshi/input.py
+@@ -22,8 +22,6 @@
+ import six
+ from six.moves import html_entities as entities, html_parser as html
+ 
+-import six
+-
+ from genshi.core import Attrs, QName, Stream, stripentities
+ from genshi.core import START, END, XML_DECL, DOCTYPE, TEXT, START_NS, \
+                         END_NS, START_CDATA, END_CDATA, PI, COMMENT
+--- a/genshi/output.py
++++ b/genshi/output.py
+@@ -20,7 +20,7 @@
+ 
+ import six
+ 
+-from genshi.core import escape, Attrs, Markup, Namespace, QName, StreamEventKind
++from genshi.core import escape, Attrs, Markup, QName, StreamEventKind
+ from genshi.core import START, END, TEXT, XML_DECL, DOCTYPE, START_NS, END_NS, \
+                         START_CDATA, END_CDATA, PI, COMMENT, XML_NAMESPACE
+ 
+--- a/genshi/template/base.py
++++ b/genshi/template/base.py
+@@ -15,7 +15,6 @@
+ 
+ from collections import deque
+ import os
+-import sys
+ 
+ import six
+ 
+--- a/genshi/template/directives.py
++++ b/genshi/template/directives.py
+@@ -19,8 +19,7 @@
+ from genshi.path import Path
+ from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \
+                                  EXPR, _apply_directives, _eval_expr
+-from genshi.template.eval import Expression, ExpressionASTTransformer, \
+-                                 _ast, _parse
++from genshi.template.eval import Expression, _ast, _parse
+ 
+ __all__ = ['AttrsDirective', 'ChooseDirective', 'ContentDirective',
+            'DefDirective', 'ForDirective', 'IfDirective', 'MatchDirective',
+--- a/genshi/template/interpolation.py
++++ b/genshi/template/interpolation.py
+@@ -16,7 +16,6 @@
+ """
+ 
+ from itertools import chain
+-import os
+ import re
+ from tokenize import PseudoToken
+ 
+--- a/genshi/template/markup.py
++++ b/genshi/template/markup.py
+@@ -15,7 +15,7 @@
+ 
+ from itertools import chain
+ 
+-from genshi.core import Attrs, Markup, Namespace, Stream, StreamEventKind
++from genshi.core import Attrs, Markup, Namespace, Stream
+ from genshi.core import START, END, START_NS, END_NS, TEXT, PI, COMMENT
+ from genshi.input import XMLParser
+ from genshi.template.base import BadDirectiveError, Template, \
+--- a/genshi/template/text.py
++++ b/genshi/template/text.py
+@@ -35,7 +35,6 @@
+                                  TemplateSyntaxError, EXEC, INCLUDE, SUB
+ from genshi.template.eval import Suite
+ from genshi.template.directives import *
+-from genshi.template.directives import Directive
+ from genshi.template.interpolation import interpolate
+ 
+ __all__ = ['NewTextTemplate', 'OldTextTemplate', 'TextTemplate']
+--- a/genshi/tests/core.py
++++ b/genshi/tests/core.py
+@@ -11,13 +11,12 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import pickle
+ import unittest
+ 
+ from genshi import core
+ from genshi.core import Markup, Attrs, Namespace, QName, escape, unescape
+-from genshi.input import XML, ParseError
++from genshi.input import XML
+ from genshi.compat import StringIO, BytesIO, IS_PYTHON2
+ from genshi.tests.test_utils import doctest_suite
+ 
+--- a/genshi/tests/input.py
++++ b/genshi/tests/input.py
+@@ -11,8 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+-import sys
+ import unittest
+ 
+ from genshi.core import Attrs, Stream
+--- a/genshi/tests/output.py
++++ b/genshi/tests/output.py
+@@ -11,9 +11,7 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+-import sys
+ 
+ from genshi.core import Attrs, Markup, QName, Stream
+ from genshi.input import HTML, XML
+--- a/genshi/tests/path.py
++++ b/genshi/tests/path.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ from genshi.core import Attrs, QName
+--- a/genshi/tests/util.py
++++ b/genshi/tests/util.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ from genshi import util
+--- a/genshi/util.py
++++ b/genshi/util.py
+@@ -19,8 +19,6 @@
+ 
+ import six
+ 
+-from .compat import stringrepr
+-
+ __docformat__ = 'restructuredtext en'
+ 
+ 
+--- a/setup.py
++++ b/setup.py
+@@ -12,11 +12,8 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-from distutils.cmd import Command
+ from distutils.command.build_ext import build_ext
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+-import doctest
+-from glob import glob
+ import os
+ try:
+     from setuptools import setup, Extension
+
+--- a/genshi/compat.py
++++ b/genshi/compat.py
+@@ -99,6 +99,13 @@ def get_code_params(code):
+ 
+ 
+     def build_code_chunk(code, filename, name, lineno):
++        if hasattr(code, 'replace'):
++            # Python 3.8+
++            return code.replace(
++                co_filename=filename,
++                co_name=name,
++                co_firstlineno=lineno,
++            )
+         params =  [0, code.co_nlocals, code.co_kwonlyargcount,
+                   code.co_stacksize, code.co_flags | 0x0040,
+                   code.co_code, code.co_consts, code.co_names,
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.5.ebuild
index 63016f30c154..113fce0e118e 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
@@ -22,6 +22,10 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 python_install_all() {
 	if use doc; then
 		dodoc doc/*.txt
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 6c1fdbb27bd2..f1f00347f039 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,5 @@
 DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
+DIST gevent-21.8.0.tar.gz 6162938 BLAKE2B f24770cdbf229d4a4ebe7e6c102c43ab0c89a52389ada40c8abaf032eada323333ca9ac965c65d335d96d69c97cdc239e193dd5a38076c81a2f3c80daa13b339 SHA512 dae95f986530e79b07a0006f6fb4cbd3911ac0bf2e58c4896ee5fa6d2e2a9ed5785c346958ee23cd57c2dcafb0a34c585b1f6375a29fd653e061a382482fc9fb
 EBUILD gevent-21.1.2.ebuild 2271 BLAKE2B 3d96ee912aa7b79f935987dfe9dae52567222a33b82eec9df5fba45a607bbb9981dc0d77ec91184a06b3cbf94d2d5f61fd9ea1cbc88aa6cd0d06c113f8f400b5 SHA512 b2fe8541bb779b288e36e67da2f4e9f969233164ae9f70359babf77564493702b31822dfb297ceb7ac84161fea9973a48d01350e20a3a59a773a1aafe1386b04
+EBUILD gevent-21.8.0.ebuild 2178 BLAKE2B ac0aa9c4d375f54984398356e19f76c9c5906d49b89c3314525f6c5f3462e3fb1c3c6850808f0eb99a5f2d524efe923c323b9779674929cee4c5a53e3cd39469 SHA512 1140f200f0901a4b719a06b2380ee698b7d99b3ac13b6a0dbad88f5f671017d3067cb77946154e39911693b59a896523631130f5f6938d8ad55f6d7c513eedd6
 MISC metadata.xml 629 BLAKE2B b4a1ad17a1d7d49d0f31c4036c006b249fec64fd1a6afaf029b2ef4e55423f9ad6bc2d1e591e6f371a1e68fb2f71814cb67339f9a8e1b88e3f009a1b05cb1107 SHA512 a57967c30534a865532adac766a49f46daed9e940409f9f2c6f91ff85e535d4eaa10012db6e26a82591a2897042b1c0fb8d6e9d82464a8dfcfa4dbb2680e7a45
diff --git a/dev-python/gevent/gevent-21.8.0.ebuild b/dev-python/gevent/gevent-21.8.0.ebuild
new file mode 100644
index 000000000000..58a9248de6be
--- /dev/null
+++ b/dev-python/gevent/gevent-21.8.0.ebuild
@@ -0,0 +1,88 @@
+# 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_{8..10} )
+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 )"
+
+DEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+"
+RDEPEND="${DEPEND}
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	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/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 0733412c3caa..94d12040fc40 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,5 @@
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
 DIST geventhttpclient-1.5.1.tar.gz 58398 BLAKE2B 9995e14c635b06f729d342b19187d4c4b935f903038950fc05e8d9260a341d3a551750c1cd46798ac2d97603d1dba449d4db3a51a44e49a1720ec23b1526edf8 SHA512 46fa5333149b86f5c4b5d06adfe5d49402d0220266c27507da1645f1da8a50562e142e37435a029bb4184c417e8a4123301a7dfc8769ce419e841afebc11247c
 EBUILD geventhttpclient-1.4.5.ebuild 1477 BLAKE2B 35bfeb29334f743c0bd7ee2ed476f51c056606f14caeaa149ea4d0cae6e66a5868b804528fc60cc542b07474b5598f30e6b007985255e1bc9b2798ab0497cb91 SHA512 68b9ef7dd73a8aa1da5fff02fec0edbce304bd0d3c26dc1be96f06ec3cce39f16a98e636673034d78cbead3a578c7a81fe1350876908bfdf0c23543147813fcf
-EBUILD geventhttpclient-1.5.1.ebuild 1491 BLAKE2B 1f31f42a9b960abdecd37fddce4fbe7bd40c6def9e09e01c279d38df18cd4967a00e235a743c575d387e9c8d353024cff6f0a5f132b394d59ed82abbc7c97602 SHA512 a020482da4732d2fb91d0a22928236b906af6edf8a35a4744f2b08d1031bdcd5f079425723b6864645a66df771ecf26af7be2ae1dd4db1e42bc095131d21048a
+EBUILD geventhttpclient-1.5.1.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
 MISC metadata.xml 556 BLAKE2B b8a8f2fd8ff23ea4bf828d0dbf673da0345f832124a526f533e4beb36ca168acb13bd4fd92e7842a5361c38d9437960322a0c29f4c11a79696ede0544148d2da SHA512 c7bec846363a0fb54edeb145718d0acf56e6c2d0c1b2eed68f24412a9f328dac86f78e39d636e0b234cd556c334fd413b810bb1e5689651a17e2cd31cae7bd8d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild
index 6595b2fc1c19..39d7cf97389c 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~pp
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[events,${PYTHON_USEDEP}]
+	dev-python/gevent[events(+),${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index ada64667a8b4..7d5ebb2b18c3 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.7.tar.gz 394664 BLAKE2B 4a4586ac276c719110e7ad9ddccca8c0f45cca42f6740d990a974b043a749148088c495ad1939794382ff4094afa712cfa7f17619f371423f1b7a10e65ce72d2 SHA512 db63a613ee59249a3fccbd09fc0eca5747b166180bb5885737f849e339e81dfacd04f65e438fef241cf013cde33fe8c99a569c1599b2b5defd37b50e87dbdb0a
-EBUILD gitdb-4.0.7.ebuild 1355 BLAKE2B f65247f47ee43c0358c543291657b27e42d6cdb0849203ece90b5c519135c1b359d1e95d610199c2e11423035956f65bb1c168a1e3c85c3f2e9ec085c8996a37 SHA512 01a2055c408de9cc7e447b04c43767b3e63e1a6047b91a8664c3e60d398431926ae686a6d5b691d70512f7a42dd409faecc598795943cf661949682d29a832dc
+EBUILD gitdb-4.0.7.ebuild 1362 BLAKE2B 429c66c0c1650384fbdba80ca77ed431089506101926d4ac52e8d889dbce6cf0bb881b723b37381787d7d65572bc68d998109e2244e25a1777eb23db87e884f3 SHA512 2124141bf42ddc0dcc4780cf69f8510ecce1a1f63b115ac0db2d97400e9a4f8a16c8bd2315b569ea5188fc005d775d08b08ac4533a14a0d3df9b07edafdeb117
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.7.ebuild b/dev-python/gitdb/gitdb-4.0.7.ebuild
index 27d30441f9a7..908e5834607d 100644
--- a/dev-python/gitdb/gitdb-4.0.7.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 7ed9243078c5..679f3d8b5cbb 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,9 +3,11 @@ DIST google-api-python-client-2.18.0.tar.gz 26442309 BLAKE2B 84f0cadeed015e9e0ca
 DIST google-api-python-client-2.19.1.tar.gz 26659303 BLAKE2B b1b5064c39b7e0d31e7ee01a7556a9ea6feaac1782d6714e50a32f0dfafedcab59628a1ff32774c426136d7ab796a1a6baf1f9ce7fbd1d233149c3a62648f280 SHA512 85272cd0741caed6ff76b930a69a67f1683886df82681b49f3069243dd40ef3f12febc7c1004ecf230d96bae005a8725d502032a9c85eb1bf9e4ee37af7018b9
 DIST google-api-python-client-2.20.0.tar.gz 26723285 BLAKE2B 3c0cb64ea8c58fe20356cd097676bc7741ea454e61d9dc8807689fe2296c3ddd0da1cb208a639e8b47a981437dea39de9a7c26b669c7dc27a79a0c5ca4a6c463 SHA512 bed0b1a0e0c5384c80e337339e9c5526e0cd5b2d39a3bd69fec1c65a3fed5bf26e6f4f983daed7663d2cd6c47b8a2a7ad54395f8e5dada2b49c15d98a9ff04dd
 DIST google-api-python-client-2.21.0.tar.gz 26754841 BLAKE2B e09b48d80d72e56656b366bd60972cde91d0c705ffe94b61d168e808e575a42f1dbbefdaf21ead1e57bab54a1b2453ba39ed5ae1d2ee616a5ba1418acc9f7534 SHA512 c572e5eab313e01ae94b026e32cf40fb479154942168cc09f2b74f184383ff5fc27cc5c0ae48c34d8ddbd8abe8840520a62a43708bd601341d5b32460f5f07df
+DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
 EBUILD google-api-python-client-2.14.1.ebuild 1520 BLAKE2B ad43947e10809f1a66ada6b8052a17c94f7c6190300cafc9060c01b83e9fd5e99a5f55e7e06f39357e9b4b266f0d605bc7e6566e67c712072d025b6ba9b45f8a SHA512 f0c1426f204dfa81a0c2a6bb013cba52747e72d56f63259092f2473ec4fffd0ea4e490272321246f50826cd6e3a647be575cf58147cee662194407df66810492
 EBUILD google-api-python-client-2.18.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.19.1.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.20.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.21.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.22.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
new file mode 100644
index 000000000000..2bf8009bdc63
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 9155bab1a3b7..55fec784b5a3 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,3 @@
 DIST greenlet-1.1.0.tar.gz 85043 BLAKE2B d9f5eccfe2dda528e5bc90bdc9c3992517b42c7d5f9d5549590b8f94003f715921585fa01219eea0348d6204b0109c4e342657fdf8150f09cabd2d6179e6e9f2 SHA512 13547917860d9a19f2fab519380121805d8f7801ad47b1584003833a5de66eb703373c71e67b32f13b770d429bcee6856b35bc6fc8afb7be598c2bf509bede03
-EBUILD greenlet-1.1.0.ebuild 629 BLAKE2B fcaf199b1d8b9657639b45b0fed5f04cbca8a1a2f24aee2be3a49ada6d6583ff748693284724b1be2d1d16bc0a7bf3403cc555a81bc809ceb5f0a811266f21fb SHA512 8a4bc923718a42262bc49e2d230ef159df4d78f72de9d6f85188d14f9c6d5fc0c54ddc02d2e7cc90b1a342045956c090dfbab03e47c20315109c7b089f21a56c
+EBUILD greenlet-1.1.0.ebuild 635 BLAKE2B 6e1685014cb2cdb60d1f86174678ce1611085b202bb8328ccffd67cff793a5aac3147ce18ab6b53a0907effe0e76fccfc7b879e3b50b34bfd271f5fbc1df5f53 SHA512 87d324a03b09e67eda60f51059ad537d2f05d88f9bf42eb110da9eeefdb61dd49b43e0a676c5daad956e600348fb51f65e2aac234d06eef6a167aff82f100067
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
index 1ea6eba1fd3b..edf429fc6b2c 100644
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.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 ~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_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 69fb7103360a..52553573154a 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-python-1.14.1.tar.gz 89865 BLAKE2B 962c24488681ed31d91d2f94b589de2c6192f3397831b482e3f0939224705344671467708266f1ce9ddf2ba767a0eaccaf4ac7516e1a9e27b5a5331fb009ab5c SHA512 bc4fdae97daf41ec8b84bf4069c07d75674b5bab8e74861a28e124343135e6c90fbdef232c6950d612778ffb9ba194bc9bd1a432df2336664e9fef87e28f9210
 DIST hcloud-python-1.16.0.tar.gz 93731 BLAKE2B d94881550dbd08281226b9869008ea6c4a10bc544a21a5aa17e48d4862808baa92b4805dc101ea970bf66baca1f5a971912601c4b934fe47614351029ece9f04 SHA512 282d1accb3c387caefe9dce7ab70dccfe2ff830c6ec3cd665326ad79076d7f9e58ab2f3061fa262208731c9d1e09e6c52d13075adf119f8b19d6af50e0374556
-EBUILD hcloud-python-1.14.1.ebuild 991 BLAKE2B 5f0ab9e8af78e6317c1088c50aa648cf73b82e625465401a208c55b3ff8b7cf52ad6e8a6181f2bff3eccb27dbec1dfda42769ac8f9480960d2b2c0f913d8a79a SHA512 e670783bcd812118edcbc460af7dd004bdf2430f4ab101d17265aff26f8beaf0ca62d7091486182f28c26bae0e2c8793e38a6323650e350a4c96b7e43c2a9def
-EBUILD hcloud-python-1.16.0.ebuild 993 BLAKE2B b6ae0b468cd44f429dca12e7de89f5152febf9904dffc8d0be247bc13d334c3c855346d2d5ecb49efc6a1b7aeeb5abd0a7e069b98e0bbacf81687db2d0f3877c SHA512 7f5187ad590ba0486651e704d161be9e8e0151225f10d2e364e5492a439bbebfc762754921db899346e08555d6b130a0ff38520620ab6ee1899d590dbc3da7db
+EBUILD hcloud-python-1.16.0.ebuild 992 BLAKE2B 3dd0917dec46e69ef727bc7624377ee988f2e0c81e55686441c9acb379089c68c4f24c8d672688fcc4f01cf081784e6f9062f3e468e7a867d0df2e06be0fe38b SHA512 1d84e62018caae9fc8f55e1f4af7c4eedc5061d3dd718e64189c5507036621909429e0cd5b08ef11866f3b647b2effd37ac7b887ab80e83822faa3d2ccbcaf7f
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
deleted file mode 100644
index 07d94fd6bc71..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	epytest --ignore tests/integration
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
index 34f63e80ab2f..d7f1238b07b8 100644
--- a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 93ec5dadb78d..5d0483b00a1c 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,5 @@
+DIST html5-parser-0.4.10.tar.gz 272814 BLAKE2B 5759c872e65080ea059b81e632ed70a94e6677ef01af1e50ab1822128cc75ccbd3361c9d4e5e94fc4cc78996b3dbde97ffe435f083c492df2815c67d929cabc7 SHA512 45accb891261e1b82185de1cb0e06915e0ff487fe2cfc81b79f5653c8e9d7b9848349ab94657f8fb5eb116311b1d2b0d19f504f841ee8af0cf4a23601a5000aa
 DIST html5-parser-0.4.9.tar.gz 274597 BLAKE2B 7744798d74db1d591490c75eabae5333e90f053a8ba1c5517f08c1b9c253042796e42618ae0a674e1b1cfa97390448ffc595e861234f5b980a1f7c0b9056cc88 SHA512 0fce4b1a18b29a9fa94e3769e2443601a502158056be1c93c1c1ddd5fe84d11d5d6dcae6338ac0a21aae7972625f28c0ba66099fc51081f504cb596626de990e
+EBUILD html5-parser-0.4.10.ebuild 828 BLAKE2B f0020c6115dfb5d6ce009f2e5a0358889ca5ef3acc0fd26c386b873f8a642ffe91fdb6577aded53e07992ea1c80cf4e2cb90ba7eedefee95d654b7a47f286c99 SHA512 644f079a2f949c5e6da97a43ce42761445e2419e0110f092dfd3302f1206d273cad03772301004e42fd3ef0aa2e3051e0d79a525b30bc19f7e4e520c7ac70600
 EBUILD html5-parser-0.4.9.ebuild 823 BLAKE2B 86454568f2efd4bd74b952b91a287fe90636469b4eb5b7fa54b95134aef4b07bd07cd7d565386c34f446b088c5df83f65a5a7f2b5070996f39b8c1fb561cac9b SHA512 de290fc47bcd52954e9c3fa1db1541f58cc56a78d1c9a752c36276920147b36098e573d6ed6a45043e6acac9f9752af632ebe7bb7e4769cc263b6233b1ac148b
 MISC metadata.xml 357 BLAKE2B 38bab117178aaaad1f63bd54054fa936d888f533dc4c7b0c765ec5549ae6daf7637d33d7b6f6b68272f48b566c33c07655f76eefad12650900276d6eec4bf1c7 SHA512 9dfba23fc0aeca1ddaa1cae84a40b552671c517d8901661dead4f5b1e48f6394322718dcabcac9be06414d291332e7f78be173df1894eb26416c87522f40ded6
diff --git a/dev-python/html5-parser/html5-parser-0.4.10.ebuild b/dev-python/html5-parser/html5-parser-0.4.10.ebuild
new file mode 100644
index 000000000000..b51af758c589
--- /dev/null
+++ b/dev-python/html5-parser/html5-parser-0.4.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Fast C based HTML 5 parsing for python"
+HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="dev-libs/libxml2:="
+RDEPEND="${DEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# Soup is not used when lxml is available.
+	rm test/soup.py || die
+	sed -i -e 's:-O3::' setup.py build.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 8b8e6f8dac5d..ac2eb3af4c38 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -10,6 +10,6 @@ EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be92
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.3.ebuild 2200 BLAKE2B bd8054b48aea11fa7cfa3838bc747860982e903a7d56bd7c4f5cae60c50c618fbaf0afe46a0d5d2876b05a91f35132a5237043d56faac472b5e1c681dd07d101 SHA512 8cd8925a97ada21fe17ba3744e755ca1b231f73955ad4138115c8346d790629f9156dad4e3778f743d483cd8fdca21d044f229d139c90af4944510e440f944f3
-EBUILD httpcore-0.13.6.ebuild 2314 BLAKE2B 4d4570069c846005d933bd9ce31282d7742c218d70511db36f8724198087a4c33d110227be51128d012c8cf0531c1b5d16bc083b699c989a8880a5f08832d877 SHA512 e6ccf3784cd33cc557913a5ba17dd34c125142358c7fec8e574ae690ef823dabf0a376c67eb45f817712944abd77447ffeaadf19932ab65fd87bc74ec5e20b7c
+EBUILD httpcore-0.13.6.ebuild 2313 BLAKE2B bec729a55a448e66108301a4a633e714d4677dee633827d5bb11b2088105115656b91be5738d62e83f77c6f719c1c27876bf7ca5feb23cf7b5221f5b9ab3e928 SHA512 6510c2444ce791da1fc7b625721ea86d02fc429a3bfd84b6faec30322ba4a65edd6cf8c51f1315bbafbc8ebb5c0420a37bce36f4a00211a716e00afbc720f0b6
 EBUILD httpcore-0.13.7.ebuild 2314 BLAKE2B 351d9fd827e9b131b8727dd6f545c464d276f95ceadb1bae3a8c351f122f9ad6e2978a15a8f97dc1ebe6b0ef6f4ae1c6fa69d7e310d12380bac660b0434e582c SHA512 b620e5517121b03b9ec30677b59f6a93303cb7f551b1f6018b144874dbc9c504d98f8502660c8120272c92a81767bec0a509ebd9c01501222b5ae126c434b86c
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index c4917dd84414..03948f3d96f1 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index dab4b90c3af7..7e13d1c1cfbe 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,3 @@
-DIST httpretty-1.1.3.tar.gz 441309 BLAKE2B 9c8138bd83fd93602d4ab72e9ee2ff27605a851ee4e7e61f5fbe0d1423041479311315cf0168acb2474c2b579401c6817f4713f61707e21faad076968b2aa1f5 SHA512 3bac68ecb78efc7592f9ab314ca9ef570c8193fb7c2ab3d3fa003b0ff623ac57d6a74f8f0e7b6c2ed45f30e520d157345db56837212d9acd4ec6259570a43dfe
 DIST httpretty-1.1.4.tar.gz 442389 BLAKE2B 020a9fd2b5dc9790b53009caac37a3cf5a0e47102b9be05f4df255880f5daf5e7689714e0c0a8f223155d191c471cb5ff4f9b0d0d34b07bd5f377311ed56ba25 SHA512 4daceea4f30ce181e871167d304bd7af9d504364f55d42f8025770f2efe7e833d018aed681c8733d653d4de90db3433e999c56bccd4675f81e66d1cc4023e418
-EBUILD httpretty-1.1.3.ebuild 1285 BLAKE2B f6d88ce2a636d9acde7f7c31bb17f2e99bffee6003ffd275591327c3402fee481c226c569b8c88d10c7e87d9d4ee3d2365c296364753937d91d583943cc8ca93 SHA512 f1a50a51fd1896cd46dcbb077f286da93e8f200ded752a9129942ae1b6fd725b5cb1344cae57974fa18cf63f128063b08e6a40f066f85c2251da78d4a6fb17fb
-EBUILD httpretty-1.1.4.ebuild 1137 BLAKE2B c9605537e6ba4c957a6ba299dfb45cd026732e9bffbdbc0726caaca69b1ff623f09cfa8ead0f5ff5ad65d729447d0f6904c00da98ecec7ea6e5c5736cd0717e7 SHA512 8fa43e90da2b23d1c228a431f997c85f7a54ec8aa529a035438b77e752f9631db20a9d2979524f50c858bf7fb5e6489d35afb1ff22ee130d3e8fe6ce8497aa06
+EBUILD httpretty-1.1.4.ebuild 1130 BLAKE2B 85ffd2dd1b7c3a5fd170b138d61f8e64725febce25932e6cb54b6aec705164bbecaf99ef150db4276321f26a1db6a7c70303a054e6e3b166ad8dcbee54ec8c33 SHA512 779f704d9cb618ce57e21ae81aafb23b35479ef542943087bb4571ba8fcc7302b6b24ae45da8ae330a6d4b07c9833992a5b84e296cec720503bd640775a4fa1e
 MISC metadata.xml 616 BLAKE2B 65eeaf117de44f4d836a207f29728912c57ea62ca6102334ab183beb5e48e4f9fe683b3356f39a8456e3981e7c9470f312d516f47a2b14b6c08befdbd777a778 SHA512 2ba0ba780ad8dba7c193d0c10eb4b993f93c8ca0e4c99d22a70d3bf86588e9b9df20f560a91edbaa72a95beead383386dfc96ae16299ef03936257d4e03a4b77
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
deleted file mode 100644
index 2f421089dfc7..000000000000
--- a/dev-python/httpretty/httpretty-1.1.3.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="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"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${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}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -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
-}
diff --git a/dev-python/httpretty/httpretty-1.1.4.ebuild b/dev-python/httpretty/httpretty-1.1.4.ebuild
index 3d137d5066a1..ad5c1142034d 100644
--- a/dev-python/httpretty/httpretty-1.1.4.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4.ebuild
@@ -12,7 +12,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"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 01c7a28667b0..2ae842e2a363 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,6 +1,3 @@
-AUX httpx-0.18.2-big-endian.patch 2009 BLAKE2B 889f4636c88029778fc7f56b6635543794de81c60b3ef704e577a62ef8d8a1d3eccd19c80c3f6a9870f6b6aca98f4e3692e5ac31be800c707ad5bf91d73b6ece SHA512 3cc62f6b5a039f1c7c79854a95991e750162419d9c5f21a8fdf4d009f19a0694c711bec4aba7cfcfe17c08d98e8fabbe2ab4531ea58a4f5050867cf4f440c836
-DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-EBUILD httpx-0.18.2.ebuild 1685 BLAKE2B 090ca06828527429791ca9f9a05a5ba585ead7c8653def22c18d3d83b555656f36f97e9dced4e94540eca083da0a10a8248ff710b768e9fec0a24d9a156f56c4 SHA512 9c9130ccf7927018c39a34dc9e9d8903c1132ddfb7805b68e7e5987a6384681c75e8a34181d5529860834c7b659b08d8966fd0371864d88974ffd3b07d15ed1d
-EBUILD httpx-0.19.0.ebuild 1641 BLAKE2B 6cf13505d6bfeae48533408a9ca0affc69878f4dba2eeae9075b96d078415575eee95eef54e4b91daaf8c2dc88417e1b1b57a132359aa5c68ffeb1ebf6a30a71 SHA512 3de4c68898b2b6ab881dfefdddacc827a28f775d51c6da83eebfa598b024c06633e06cb020b49c68537309376a8dab17b8a1c6ff0cf5a83411b53ee45a7e800a
+EBUILD httpx-0.19.0.ebuild 1634 BLAKE2B f94f2c428f6c516651c66b4ae37e65d5b34c0f548dee88a984a9eb716c97c89b6fa540a3b3a3e894f9ddc3a9ff83eda37bbbaee640bab5684b621cedfc15de1d SHA512 3b084ac8cfeb5cfdd63880925b3413e5604e0387724288780ba9a23ca5963c4d8ccbc2c7ba1d3f64af4d5c0813b991dbb06315bb682e81f02439d08fb38d6a60
 MISC metadata.xml 445 BLAKE2B ad37f769e6ead3490624a9a4ce9eab3ba0c040adcb11c52e306fa13dcae8e3ae779efae6b5b3528890de6a9d440657d3bd3fce2004a1774ae88920a7cd05c66b SHA512 73af0d42f1735eecd27559c58514a20d85d775f59500cfc6e7b87d759a4b9951317c62eae2a990df63b80747255510bf970f05295c4548d1a81cd1cc7b7c2b81
diff --git a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
deleted file mode 100644
index 794609d86a50..000000000000
--- a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88a0a85ff795d8c23d5cd2cd113eeac957cc818a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 5 Aug 2021 17:35:54 +0200
-Subject: [PATCH] Fix JSON wrong encoding tests on big endian platforms
-
-Fix test_json_without_specified_encoding_*_error tests on big endian
-platforms.  The tests wrongly assume that data encoded as "utf-32-be"
-can not be decoded as "utf-32".  This is true on little endian platforms
-but on big endian platforms "utf-32" is equivalent to "utf-32-be".
-To avoid the problem, explicitly decode as "utf-32-le", as this should
-trigger the expected exception independently of platform's endianness.
----
- tests/models/test_responses.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/models/test_responses.py b/tests/models/test_responses.py
-index f1815dc..b7c2d57 100644
---- a/tests/models/test_responses.py
-+++ b/tests/models/test_responses.py
-@@ -735,7 +735,7 @@ def test_json_without_specified_encoding_decode_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(
-             200,
-             content=content,
-@@ -750,7 +750,7 @@ def test_json_without_specified_encoding_value_error():
-     content = json.dumps(data).encode("utf-32-be")
-     headers = {"Content-Type": "application/json"}
-     # force incorrect guess from `guess_json_utf` to trigger error
--    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
-+    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
-         response = httpx.Response(200, content=content, headers=headers)
-         with pytest.raises(json.decoder.JSONDecodeError):
-             response.json()
--- 
-2.32.0
-
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
deleted file mode 100644
index a91225037d51..000000000000
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 # docs
-
-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 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.13*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${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/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/encode/httpx/pull/1781
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
-python_prepare_all() {
-	# trio is not currently in the tree
-	sed -i '/^import trio/d' tests/concurrency.py || die
-	sed -i '/pytest.param("trio", marks=pytest.mark.trio)/d' tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
index 72dc4fb1f17f..37c507397757 100644
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ b/dev-python/httpx/httpx-0.19.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index b6965517cd78..a6c9b58e1271 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,7 @@
 DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
+DIST huawei-lte-api-1.5.2.tar.gz 31969 BLAKE2B ced0afc9c1b878d30ac4d3fb731cdebd6c2a658a7ace7d74f5e3641c049d5eaeab5fe1edd4678b791da0ebd22c78c4c7b10f56e2bb4f224788d1f1cdd8f31c6a SHA512 7d7b8b0248ef6080aa990ce06e196653f315605d771c312c490976cd950dfa962affe47f8df3366a645e0d499606514618e1e24976f434258ca22bd9ccf34237
+DIST huawei-lte-api-1.5.tar.gz 31741 BLAKE2B eded2f2ba04dfa8973a5ccd627996770b93e2509aeb2d0ff40dafc9a5ee0f6d242d032d310102297a1f56ee255b10f0e6e02c3a0ad687b6006e31ad8b53fb32e SHA512 f235664464abc23da85a36b17f356c7be65e686e06bbaba9aa06c728fa04ae5ab4fa32168c4fb2914a22472564d8f3365f9fe47f33e1892f923e6934dbd692b0
 EBUILD huawei-lte-api-1.4.18.ebuild 727 BLAKE2B 60256ea1a5c5a1b3df80900537f46c5db2c2708a58ae5e73a1682c7a548fbe6bbc2b390e2d67d9036ffda63880b78f6a9e049f8a8ec73ad9b92d26ad64ac006a SHA512 f92c89bd54dd7c9fd7dbd3c2ff1498f9930dcfa5afb4baea9895c21574fce444ee937b33cf9c6aa8ae696bfe43e5a453fe36ebe5add4c22da5318f40abd46e9d
+EBUILD huawei-lte-api-1.5.2.ebuild 731 BLAKE2B abda1f70d37413686993f5c5f62439cb4f9485ec58be630024d2743b6c0a2d75bf600cf72b6e2656cac6a6ff0b8bcccedcdd870ad1e0c95ea71966d258a741f7 SHA512 02d27058c175b4f1bb6fad1eda0636540a2907fe231a2342426b5ec99ba4f17882730ea775afb9c3c1169684c082680df4cbf9e197a6e6f00837961a4974ee5d
+EBUILD huawei-lte-api-1.5.ebuild 833 BLAKE2B 8e4496bc1a7e4f5c27e9e2d398dcb72fbd6b3ca0c1770a809dc42205f1669ef0700bdc620177ac2ed6bb55d121116b01bdcb1113b39575cfacae1cac7d6468f7 SHA512 418c879eade8acc0e0d909b2499c12f68a910a9727bc3d767f2d100c7a39dc5cc5678eb1b8c16887ce6aae42d0d267db336632781345085b09bb0112c596a919
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild
new file mode 100644
index 000000000000..9f84cd2c71a0
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.5.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.5.ebuild
new file mode 100644
index 000000000000..70850fbcf204
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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/pycryptodome[${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
+
+	# make cryptodome-friendly
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index a74ba20cb0d4..770c0b339876 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,6 +1,8 @@
+DIST humanfriendly-10.0.tar.gz 360702 BLAKE2B 6db7f2f11bafcdc087c078eae6123046610594b17899678e445baa18c25b2210cc1d84363d858ab7c57fce6d6b7a189be69dea08c1891d3f5b11ff9900c9bef9 SHA512 496700bcea1dabf003c938558bf807fabb41b71192f69622979dd9e243dda9b4b06c5ac8f65cef217df85ebadf99099dc22b50d63216791a569be11081d267d6
 DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
 DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
 DIST humanfriendly-9.2.tar.gz 360080 BLAKE2B 39aa17315a87938468f2d6e94b0287f07864476c4179c40504126c65f7042c96113a9d60f481a6a03913ae5c8cfde2c87476e0d403c964aa65abceb0f55633f1 SHA512 2abb8d7d4dfb84d625e82f3475bea5045c32f548a45999dca97d39e5bc0cd704a9ab45e0b6b87c0d419b447680a3e71e2d9c8cb14ba19117c7ac9b2f56297f00
+EBUILD humanfriendly-10.0.ebuild 843 BLAKE2B 859b2c5a28fc7cad99077df64e66fcdd60455778f7305038502dea8ac6fb22c2d58b6b93eb42f0e759c6dba11cb42573692aad42f6e7364579f85495bf82d2ee SHA512 0c9d22a5bb5070e2a01596e53ba2191938e2d4c38f63a5eec324e36ce60f2c52b7af51760042d31d4968454f578be6b25312c89ecd15ad9391b3395c80948928
 EBUILD humanfriendly-8.2.ebuild 898 BLAKE2B 7685970c808a965f3cc87d1d457110b1eba2c6707647299195ac6b8589d4baf1e48a497ad4717b2c3209028157a68211dd413361603eef4b1c39deddff0bd320 SHA512 2c814d9819ea87316a9eb16ad020eb8db578ea715a6927a1840ed07e8b603b083fe8f09cd47637699b10298d43dc63ad9954630c5914e1e7645268ffb80793f6
 EBUILD humanfriendly-9.1.ebuild 897 BLAKE2B aa4f3a4dc7956bbf09e4e3c44e9a697a94e9f9e216440d36c780658dd729a211881dde7cd8a84b602924393605e4b7facfabf0e8e975e0b0e4092115bf8aca94 SHA512 5c68cd3fa187c9107ba02c5120a2af7d8bb8d576472ac518f2098286c4b4525310acee68113a60f4de4a439681582da3efa9bd2dbcda889bcc1aea0233ba680f
 EBUILD humanfriendly-9.2.ebuild 843 BLAKE2B d31dbc387ed7719457d8dd7291b255c563b5c16d66e11e677f9c2be34b2e6a6d65ebbb66fcab9b3e0fa234efef055d520035c168e810e7b89d745e881d278af8 SHA512 284631ad88e6469d54bc217e8ac2834cd68dd158206ce0f82d8d75f1a3c15e0cc52b53f2ba2c0cfc4ab438ce2be9b1f08ef5055158c021e7ad4d7b04c9e6d2bf
diff --git a/dev-python/humanfriendly/humanfriendly-10.0.ebuild b/dev-python/humanfriendly/humanfriendly-10.0.ebuild
new file mode 100644
index 000000000000..be4024978948
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		>=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	epytest humanfriendly/tests.py
+}
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index dbc2ac4e223c..664479169fe6 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,15 +1,3 @@
-DIST hvac-0.10.11.tar.gz 297146 BLAKE2B 279cd53d6aff18d8b393214c3370bf8a5a0e8f597cefc739269086db66fe4f43a931062c18d76815d777d12ffdfd431ed2174d77afb58669572e6e0e8ed9e43a SHA512 6b68bd19d5621758637ec257992e03da6b1746e5ac1d1b8d63098b6c0c1dc0c0f92fb6bd653b5458e8c55060a48619eb4d09ec4d0529cc2b3f4b91745bd2095c
-DIST hvac-0.10.12.tar.gz 301534 BLAKE2B 3d60bc428faa2e66f5c3b1e7d4aa0df7777e76f996c6d49bd9429e6a69f43580067a0de396ecc4234ed416a304f6e017f35b60b4655eafa6335666c6c00b88e2 SHA512 a52791bee2eedf488fabb488971f84f357e94812b14de36b45360690d3d018c9162dba9b8a54a719f1fe45b5f526fb729c08c8ece4f3c093f8a8f50a37731260
-DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363bef206eb34f148f2d8b6a6fa69765e2ce35048dbd0b5f802160fd81cb8fd287da698a74c0c87b2ba4a25c5b498 SHA512 d4f4c3935fcf4a15d2f12f01dee1c267cf9c242642037b816e669c004269cd0b98d90e97774408e70c325b4449f2aa35f6158d0f6d4125226eafe353fe0c7471
-DIST hvac-0.10.14.tar.gz 301617 BLAKE2B b3d721b245b9f7b0e8aa5404599da8f3fde3fe10a5b3d70cf1831faeaecc6e1c42f0228c2511eb8d24ef56fbb2a971487b0707a1640e3a48bf01d3e4811992e8 SHA512 3b3b5c64df5c57679a35e09cd61d29090c950dfaa11f64b4c3f8442a3ccf6512cc2d792f60e035815e4c4857813ba49612e0f52c5da3670bd692116a6bd28469
-DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
-DIST hvac-0.10.9.tar.gz 291045 BLAKE2B 63c48b21e402a1af3f73e5b295061a2f82040cedd412fab69e8759e290a46eb67d1aa0ddaeb40c1638eefbc492441e238cbe4be114093015af6eabd99a0c0a75 SHA512 4af23583110ca4c2c9714f5234daf21ee199c2ac97cde01a220db6f5d89957b95c1e8b84904104e5a96ec39b54cea567973427a73ed7cae5806e794d37403a8d
-DIST hvac-0.11.0.tar.gz 306753 BLAKE2B 0300705044f6575ffeb9fa3dc28d6ee1139b6ce84f52b89920606b603355530823a1f2ec8ac251423c5a0305f3ea1ae15933e84dddb2e09c5d7880b5c0508ec8 SHA512 47226ba5113a4df48f115d02d2fb1fa7ab8b42895d38f7fad37c84814db71a57f4e455a9b46134bb577fbded1881e6272464b9f1d1d74142dc089bde03b0eba9
-EBUILD hvac-0.10.11.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
-EBUILD hvac-0.10.12.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
-EBUILD hvac-0.10.13.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
-EBUILD hvac-0.10.14.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
-EBUILD hvac-0.10.8.ebuild 1337 BLAKE2B 54e332ea5a21dab765c2da086cd35ae0ecb03f65db484e35cd84b0eb686f823f7d0ede10903e65b5ce824067c12a55ff22b62b6c8f9df7d5ad7238dc87c3da45 SHA512 cd9d8f51940498aa1749bee33833fcb1edae278abf764a87da4bdd01ce25ab944af827381b6ef232eb416ee878699711e1488875fca0b8ab29804bd1a29d7125
-EBUILD hvac-0.10.9.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
-EBUILD hvac-0.11.0.ebuild 1302 BLAKE2B 1e5f47e6b752cd39671ebe6212291872159e6a115069d5426088de090f3cf25a4a04884ea89a703b0e89b76d88f02dac50f034b805476e2d1915e065da0d6e0d SHA512 d8807072db9681d9778f56f3c3c0e49304fb14991d5fb14536b48aac01449aefa80a8ee2a79b2d4bb7ecd37b16916a62490ccecaaed06ee842a39922f61e6c49
+DIST hvac-0.11.2.tar.gz 308694 BLAKE2B 090c6ea3eb4175618087486f67d44c608f164820f6e5ebeb0f82d468123693af5ad4c181721087b9fc4ee8789bc86eb11c16c186c5ca669c6575d83c2ae2d835 SHA512 7a3cb82e17e7ceef04173c8682b33d35457675eae7b402ba36c3a21026ebf551a2731ecbd6dc0d00bb727e98a29f0a0f5bf427d7429b55b922247b4ccfb79794
+EBUILD hvac-0.11.2.ebuild 1261 BLAKE2B 729651b9c8f474e89cc07585d98a8c9928cfd9aa0b79fae5c743331d0a6e2f70568cb13a86c18ee1f4eece4a9793167dbfe488a29b0e61e0a683bd0c141c90d8 SHA512 f6b7784235ef3f80336a7699bd297258039d562eb67b2406ca3e89664fbf699860e7dc5f40520840dd8b09245a01a09625bd10e9b2eaca19b3c823cb94618f28
 MISC metadata.xml 600 BLAKE2B 476b3248fc61afcdc6e5c2db811f27218a7fe070744226289706412ae895c46224d179fc5dd3883d5ff08b1b5c21c86fb649641d4a7fe5edfcebf7ae58c75c7f SHA512 f2136ab711c25905347a774cb63471f3308267d102cd2dbae0a69ba50ef2728bb3cb3b4d0dfdc5d079d40e712332f4e62ef014eeaac5523cf47ad03133d02f1b
diff --git a/dev-python/hvac/hvac-0.10.11.ebuild b/dev-python/hvac/hvac-0.10.11.ebuild
deleted file mode 100644
index a9529bd22ad2..000000000000
--- a/dev-python/hvac/hvac-0.10.11.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_{8..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_test() {
-	local ignore=(
-		# ldap_test is not packaged.
-		tests/integration_tests/api/auth_methods/test_ldap.py
-		# https://github.com/lepture/authlib is not packaged.
-		tests/integration_tests/api/auth_methods/test_oidc.py
-	)
-
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/hvac/hvac-0.10.12.ebuild b/dev-python/hvac/hvac-0.10.12.ebuild
deleted file mode 100644
index a9529bd22ad2..000000000000
--- a/dev-python/hvac/hvac-0.10.12.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_{8..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_test() {
-	local ignore=(
-		# ldap_test is not packaged.
-		tests/integration_tests/api/auth_methods/test_ldap.py
-		# https://github.com/lepture/authlib is not packaged.
-		tests/integration_tests/api/auth_methods/test_oidc.py
-	)
-
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/hvac/hvac-0.10.13.ebuild b/dev-python/hvac/hvac-0.10.13.ebuild
deleted file mode 100644
index a9529bd22ad2..000000000000
--- a/dev-python/hvac/hvac-0.10.13.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_{8..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_test() {
-	local ignore=(
-		# ldap_test is not packaged.
-		tests/integration_tests/api/auth_methods/test_ldap.py
-		# https://github.com/lepture/authlib is not packaged.
-		tests/integration_tests/api/auth_methods/test_oidc.py
-	)
-
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/hvac/hvac-0.10.14.ebuild b/dev-python/hvac/hvac-0.10.14.ebuild
deleted file mode 100644
index a9529bd22ad2..000000000000
--- a/dev-python/hvac/hvac-0.10.14.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_{8..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_test() {
-	local ignore=(
-		# ldap_test is not packaged.
-		tests/integration_tests/api/auth_methods/test_ldap.py
-		# https://github.com/lepture/authlib is not packaged.
-		tests/integration_tests/api/auth_methods/test_oidc.py
-	)
-
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/hvac/hvac-0.10.8.ebuild b/dev-python/hvac/hvac-0.10.8.ebuild
deleted file mode 100644
index 0f2858e5609b..000000000000
--- a/dev-python/hvac/hvac-0.10.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/hvac-0.10.9.ebuild b/dev-python/hvac/hvac-0.10.9.ebuild
deleted file mode 100644
index a9529bd22ad2..000000000000
--- a/dev-python/hvac/hvac-0.10.9.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_{8..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_test() {
-	local ignore=(
-		# ldap_test is not packaged.
-		tests/integration_tests/api/auth_methods/test_ldap.py
-		# https://github.com/lepture/authlib is not packaged.
-		tests/integration_tests/api/auth_methods/test_oidc.py
-	)
-
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/hvac/hvac-0.11.0.ebuild b/dev-python/hvac/hvac-0.11.2.ebuild
index 18c424443e15..8ac0902d11d1 100644
--- a/dev-python/hvac/hvac-0.11.0.ebuild
+++ b/dev-python/hvac/hvac-0.11.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="hashicorp vault client in python"
@@ -25,7 +25,6 @@ BDEPEND="
 		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}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2ab163a13ad7..d922d6699669 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,23 +1,11 @@
 DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
 DIST hypothesis-python-6.14.9.tar.gz 9138640 BLAKE2B 3cda0edace7b3a1c373bdd61267013874fe78ae18aa7fda02759ac451f7e576614a61c3ce1d588e24afe4333f61680d89eb30f6f055e41fee91312c791b1af5d SHA512 a32d4f09ae6a44354d136164a517ea53c653fccb3e21a39ac63df78ebdf695c887f13749d2f310ac67863b6645a85dca73ef0bfab077aefe0486e445f6a85dce
 DIST hypothesis-python-6.17.4.tar.gz 9144209 BLAKE2B b110e355b34f386c51e9edeb2589bf11e5d0b574ee7e97437f9eba9ec7d8e823e68ad1e4f5911a1e78f3d5a316f59056301b0238c4b6a8cdcb21e46ea434686c SHA512 95eeadc1655d249008897035660af54f66e8ea78fea78d1069dbddb979505e003d1bdb971371769e90af4a7bc5f96ee0c42a6c14bc42e56677d4f89f39985d41
-DIST hypothesis-python-6.18.0.tar.gz 9145660 BLAKE2B 6fb47aeb134363e50944d08f0658245d9cc5190260e56cc16c394499df0bcf3739fd69c22bcfce6f3b290a1ecd9bdc8ac6bfd7c5f2efd4b00694b81d7dba062d SHA512 069deaa91b7dc7244c8fccb046e384c60009365418dfb7f76ed75428446a731ec860613201d0657c2c8b3b29e4fce3c403a93aa082f48b072471f919b7a1af5a
-DIST hypothesis-python-6.19.0.tar.gz 9146087 BLAKE2B 11cf1e76735f2d57ee793c131a055c0e349bf7a39b072ac33914bcc371d44a607866ec617d2f955779fe99922f968b8da571fea87c45db72583e3ea2026000a5 SHA512 b641938c6f9b5603bb7b72ba1106da16bdcd0528de34317afdc4099bbfa1bfec90e76fbf14dc7cfc773fb02c3fa3b4bcfeea7f3788884cbefb51751f02879f9c
-DIST hypothesis-python-6.20.0.tar.gz 9146238 BLAKE2B 88009c7369209f8781644a975587d757ecf83e9e84e650fd2f8e88b5e4e1d078dd0639e49a9055c4390c0aba96a661561ff5858bf628036d097c614b7d9fc45a SHA512 6c139c78b75c5b8408345d654e6d638f4f2b0f1567bcb05c430e396d3dbf40fde7e3f6a6af4eea75b2387d395e8ee2a5eb11eabd3183c4eff0a35979aed1bcba
-DIST hypothesis-python-6.20.1.tar.gz 9146416 BLAKE2B ae3e10ffe2853009b8d698e0eae391e05632ba1a3d889dbfb498b8f46c18ec16477daefa9052dc6711f3239f9e83ffc7d52c6ad0c554492a00a55417b583afe7 SHA512 8d23bd0311cd8e81d7fd3851f4a72cc92bea4a07943475d8be9bac9dc9d5096f0d7d5e8ed8b14e64dbdb3c49b7d2c7ecc8d85dfe30d5e6f9f0ed96570ce4ddb0
-DIST hypothesis-python-6.21.0.tar.gz 9162663 BLAKE2B a5a2fbb7b377e6cf769c3454ca89615551164e1b0dae24abee15191fcdff2eb1f01b9462c7aff68a7ea801477105bdfe5f6a33f098eb506325031d3511914ae5 SHA512 7d91d83580403da3afac0f4e0a72935c63d7da2ff28429423a3001b0a19a1b6216fe36eb526e91fe9e7f0cae481aa3f446695f7407ec2201c5f8abc6e3ea19a8
-DIST hypothesis-python-6.21.1.tar.gz 9162836 BLAKE2B af52db17d51801d03496036f14b9b1e79667de64b4d5df925bffe00f67e11fb652f0e027bf250d3f4286e113052b3413b75fcd6c8922702924ca0eb9c46849dd SHA512 4e9d994e1323ee90cd4555ae3f310bcf4661079b287e000a65fbda7771e02c265c387df3bbbd0425d54b342de4fb20632b6a35842bc7a66affbdda159048359b
-DIST hypothesis-python-6.21.3.tar.gz 9165503 BLAKE2B ee57b10021d5a8fd4731563e41e2583c879efd602779f5dfaa21a549b34bece29ebdd8386bcb637039b1c679a634f61ff68128c7d1e427ef4ca5ff571197b401 SHA512 0446df21f467cbabc6918a68b8a678db458ac798adaaf57090a756ff3a9b749dee550e77e1f78292d4bfe6f24caac175b104b4f4f1607521776c497649ac9c66
-DIST hypothesis-python-6.21.4.tar.gz 9165577 BLAKE2B f2bf805d1ff1d469b2f62aa7095183a6eef2fa6f0e1cbd611a7e62dd978456ae199f64479ac43a7d34ffa7f3ae6b35c4aa1691dc863e6cc509914a23aa767f89 SHA512 7fd8a4c6a35417ac14999cfa668b9976314e022bc432a20387ef82b97021b626fe8a25e43ae92e5ecfdba8ab9cee0f182621132287c82511d64231272365fd06
+DIST hypothesis-python-6.21.6.tar.gz 9166313 BLAKE2B 19ac66c1674be30e14d54faa61244ac6da5b67678da4c5dbc728fefcac2e5f0a99c31f7cbe6fc4bc8738e1b072b4accba6f97863e6d601303d4fd69d4ccbd96a SHA512 454434f37dfc3f171d1865ac72d58821173654fabdd880c1b699ea0ff281405644bb1b370129843d35368cd9b6eb06fa00458e0aa41b2b7dc0b7e05e7f659a5d
+DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f25743793de4de9f2676cf7c36c16519f5fef007f6b677bd5ef84fa975389c5fea9989dffffc8a18923699c05fecc23ef2e4dc5e6 SHA512 92352a7ba13d8a06532c6fcdb965f156c43369f18ba7c46808d9b6dde1ccdd5b4f938c1ce575d5651835bfe981d22e7a68189c93a368420c915f5d1ce9b8a205
 EBUILD hypothesis-6.14.5.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
 EBUILD hypothesis-6.14.9.ebuild 1975 BLAKE2B d95fd7586f9e56b1278f919599dfe53d6cd8c334ceb0c85e518fc217aa49179c8861817619c6a8fa87d9190103823a77b5dca4da80d88ddb80d4d317a4550861 SHA512 ee896bf82cad50a865d0d479fc23870e05a6dea0b61d077193c22ac25d91543fcb63f1363a1d43db0b79c1444bf2963eeee79047ba02474d215b3cc81dd54e22
 EBUILD hypothesis-6.17.4.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.18.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.19.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.20.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.20.1.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.21.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.21.1.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.21.3.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
-EBUILD hypothesis-6.21.4.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.21.6.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.22.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.20.0.ebuild b/dev-python/hypothesis/hypothesis-6.20.0.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.20.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.20.1.ebuild b/dev-python/hypothesis/hypothesis-6.20.1.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.20.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.21.0.ebuild b/dev-python/hypothesis/hypothesis-6.21.0.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.21.1.ebuild b/dev-python/hypothesis/hypothesis-6.21.1.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.21.3.ebuild b/dev-python/hypothesis/hypothesis-6.21.3.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.21.4.ebuild b/dev-python/hypothesis/hypothesis-6.21.4.ebuild
deleted file mode 100644
index 119bf66a0917..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-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_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${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 || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.18.0.ebuild b/dev-python/hypothesis/hypothesis-6.21.6.ebuild
index 119bf66a0917..119bf66a0917 100644
--- a/dev-python/hypothesis/hypothesis-6.18.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.21.6.ebuild
diff --git a/dev-python/hypothesis/hypothesis-6.19.0.ebuild b/dev-python/hypothesis/hypothesis-6.22.0.ebuild
index 119bf66a0917..119bf66a0917 100644
--- a/dev-python/hypothesis/hypothesis-6.19.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.22.0.ebuild
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index ad93b4f9a599..426b1093771e 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.2.13.tar.gz 101136 BLAKE2B b1835ca6b576a15be16de124554cfaf7b6dc55a1dfee70021613d35251135c295c3acf141eb645823add4c260bec9fdcde4799f0b72fbd57bc7a2e8659e416bd SHA512 37764325268c164028b7719f91571c006c9c6db3f4bba5a93d20f3d9ea30712cfe7e5710b175266a3d74f3f85485f16ebf7d21486d4329050b55e5835e8b4197
 DIST identify-2.2.14.tar.gz 101144 BLAKE2B 9a23595173ab2ebfcbbcfc503e9750ef1e9c0c068e9d1a1b2f47dd2e08787f734541a79ae65b4a72a7de076b8f7ab4f877f3bb049560f33b38698729b9d5f3ab SHA512 9dc27e745f30fc1e6ee5135cdb82de004a5c60f17c47ab3e1deffe1c3c04adc47211bde161216be202db2171711a7dfea5f0ba60a56fea0cbc75ec6d55c6203f
+DIST identify-2.2.15.tar.gz 101146 BLAKE2B 1855598314c191a9e4d2f73c2c7a424957a76177df1daf32b4c7de6ddbda4439fac0860ed105e4a2ca4aef0555843157499e9840cbbccf42cf728aef93b13607 SHA512 5b85c07603381174fb4265ad8fc411645dc0cecb68b3fc9b2afa7111f18eae7cf39d5cf1000eda8ded256f441a4bf05d9ded11f31c9aa80f55efaf2dc6745697
 EBUILD identify-2.2.13.ebuild 522 BLAKE2B 8de988dc140b50cfcd1785f6f44c56aa850f442f96b2461c7379d211c26c266ac81eec594634ce9ec21c034f437d0c7aca68e54849fb311030d0d5d77fddb8aa SHA512 a6cb99f66cae025edc98afffb8158145597943415210704ea7638275a331b448bc0018e6f2ff1d0598acb50da1a33edfd617381801f6cbbcc9d186103cd3fb42
 EBUILD identify-2.2.14.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.2.15.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.2.15.ebuild b/dev-python/identify/identify-2.2.15.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.2.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 30ed74c26158..b19e1abaae6f 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,7 +1,7 @@
 AUX immutables-0.15-32bit-hash.patch 2439 BLAKE2B 353f5452dbff85a3b08786174a69068b0a9081ddbc8f88ba03b8c73ba5ab753c2e463cb9ab3af3d61604c23f3b58fe9226efda8119cd1420d3b27871ceb8f1e7 SHA512 add8e68ce6be057889a075c2ba1e58e522ade9e49513118e5e2acfd688b2f1ca20634aee546c0ed5e92181d5c777af4cf312368510c65f8267a465bc90a063b2
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
 DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
-EBUILD immutables-0.15-r1.ebuild 628 BLAKE2B 286b77d6ccbada5d4418d1847d750d1eed5affd8f9abe924bba314dc4947982340b520cc531e08a79fdf48c7d1a52c25143d7142fe53029a86e73183ccf8f2dc SHA512 f583eb3980682391cc288b160dfcb5db995beccf8133339ac929b80aba3dc928e089a22d0eaf2b9ff9087f02bc250027a9ea5a466f1945c23f8c5ceb55635f2d
+EBUILD immutables-0.15-r1.ebuild 627 BLAKE2B 6c92546290668c7e174b01d59c9c5519b0661cb80a925e534988a83c2447fc819e0c8bd7fc94e0ec9b1c144d7326b95c50a487bc6bd826fdea3c4b4c84518da9 SHA512 e2b4e3df9e5546c9591ee15ab2eaa21d75d88b9b2e9c17e8f3896c225a5843139d92baa55e44f60bc99c761a22aae680a843601c4e987cb2fa4cf6b0895ada3b
 EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 EBUILD immutables-0.16.ebuild 799 BLAKE2B 1fba989be6ce9b41b288ced7287bd46ce84877ba6b2831cc466b9ef927e6838af7bbd7c61cd598b639b26fde016bad2e38ca880dad00214d56939ce9002c6657 SHA512 3a23a6cb325515388f4bc41a0118590c64343fa5544a7d95dd5b3befb1a209a75b12210e2375f39f236fca62e8afad4f945d70dd3e9e87efc69d132a6320f591
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
index 3df909a6ee38..25e5896535f7 100644
--- a/dev-python/immutables/immutables-0.15-r1.ebuild
+++ b/dev-python/immutables/immutables-0.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 PATCHES=(
 	# https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index d736bb48a22e..36b40c5e8bc8 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 804 BLAKE2B 17318626fc22b1b96f32d360c520c97ec9d55a7deabf13ee534e5a8c01b36134c0da1d14566c95d86939bbcf78e415eea478f8f4e04a6aac33770f8415f5a466 SHA512 e49688f664dda8573d819595130abaf45f219a7197f4f1181f89c72ed45db0cc4672b20cd8806f1d19b564262756988cfb612ce926ce71c1efe0994b2e308e7a
+EBUILD intreehooks-1.0.ebuild 811 BLAKE2B 02ffcd28706a811a4b9f125023c64b266d88c334cd06e7dbadfeb92ac927075bb2b6466a65a5dfe7056c66c9db7c8eeabe5e3036448167e36e6b819bcfc89370 SHA512 eb8cd122cdc862cdc9b4b793370775215d7f226a1120055ccaea9b616baefc55ba2ce71c2f64d9a1ee4a37d99d6f49b94f6f089a872ecfa7a64aa3d39a956e78
 MISC metadata.xml 504 BLAKE2B 2e9e74ef321c3ddcb614c1f4a3d7870448fca8f407d82ab5a26936df27f367d9203ef00e90f5739cffe200c63ccb1e4814f67d74bf513888a9fd29224988be4a SHA512 a9b8e2c94fa4b4d978a4efcd702ea360aee95a4f4c859bc6e0147b2ae52adf705166e9f052c819f48920abf01c532d2b5cb28d95b9e0623f41c9ccea0021f145
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index de53a841ed6d..1b079e153662 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.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 ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index e7ac1379b5f2..24062114c0d1 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 536 BLAKE2B 78d4756d1c22006af5d1635676f5966a7d17bb7025f65caef756a56d908d59cbd7b19e0eb63653a7e78670a956720151bea264ac820a3dda5fb869aace9714b6 SHA512 7948894db08f8019554e179d4190659351f480a36a5dc49246a9ca693c8c6f050907d978f403ac7e3a0f24c6087460af855d169ac6f236b503c13284e751cf83
+EBUILD iocapture-0.1.2-r2.ebuild 542 BLAKE2B 85d44f2e067c201c7c169d216a092f6fdc61d59b288295e9f4114cd5664ad0a136a4a4c03afe03f63c1a65f7ada2c7441069deb4998b16234c14d3f8d6a463f8 SHA512 5f0e95fa6b2a837966960d8629c831189aabc6639dbe79d476f754fb99502ad8a5707da7fab75f863b7cb9dddd936d469888f341996a7807724f76e1263e9864
 MISC metadata.xml 369 BLAKE2B 3d8c8ffbf2ca6798456ef628458a4a9a550ded64a7f17aed95cc560acba2fda973929ff2495e27b11d383a45504aa3668db68295f1c2fdd224342f36ce8b3784 SHA512 2e040dc739a9ee317cf46c0fcafccf7862e98564b351b3d46b88ba4a53bd9e808907882a9a0a76987e1a872fa818a74c219ad14e41fea74932d548df299b6758
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 48ae3ecf998f..52f355e160d5 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ba4da05b549b..96d8a2e126e0 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.26.0.tar.gz 5147847 BLAKE2B c0cb45550387e47bba6ea67656bbb4561a2250bf9c39b4560b26a8a9e380061f79c5fa663f90df166af1fa49811cb59953fb367b2fea5f07d44ba3f9dae3de44 SHA512 142ff8ebddd61640e6ebff01d16b1310b6370643aa8cf4c7fd076872ad342949a1778c5ad74eccbafdc6b4d31a1849e096d75a28eafc555d629948db523b4776
+DIST ipython-7.28.0.tar.gz 5150515 BLAKE2B e69b2ca9b788d8bcc12fb1b82c2e3f198ba4cf1918c8d8d30aea9a1ee3c7cea99ba3ade8ac7171466f1ffc8771dafcf5980766ecca7b985e07890e229cd1575d SHA512 227645ab2cc698f6f7141bb3712b254d75beaf3f227065530f25f988ac76b5a741752ddfa6bb2816b625eaa4972d434f9e73dbe465654e4efc5420b5d80650cb
 EBUILD ipython-7.26.0.ebuild 4215 BLAKE2B ebb124ad9c69acc70e1359d435b867dfce9987833a97e34026c449ac2d384e425ace3e326e2caa9cac66044cb0a3d6346feb8a07a4ec190315754aec493a3c93 SHA512 59abde0994606ed611145d415b4f3474f571f47bc969d35eec3d88c6e27efe4df1babfccbf1ea3f7a7f95facf6e5de0876a6198972a37032180ef43c84a2f06f
+EBUILD ipython-7.28.0.ebuild 4465 BLAKE2B 7d3389f0febcdc41f95b299ee8f8879a60a5388bbbaa4616d6e5a562cff671e3118220f46508e9872e005b7f465fbdd7ae82c468008db9ccc4cd093bc3ddc2d7 SHA512 58a51548a7d45ceca17581bbde4586af37c3f851ccaafe2ea90b862ee225cfffadb9714b34f35a88447614528e11f26c1c4e86599aeb03be49aa2ee225673599
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.28.0.ebuild b/dev-python/ipython/ipython-7.28.0.ebuild
new file mode 100644
index 000000000000..c9a468dda532
--- /dev/null
+++ b/dev-python/ipython/ipython-7.28.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	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}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${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}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${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
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
+		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
+		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest
+}
+
+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/isort/Manifest b/dev-python/isort/Manifest
index 512cfd331900..ad3b6e382c98 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,5 @@
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
 DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
 EBUILD isort-5.9.2.ebuild 1356 BLAKE2B ad23c12a74419ed0d6d0e886213bf976fb825c21cb063b3959e8e1d1b31af7820f9e743ff4629c5a54689ecf070ca1adf910598ca08e43b0ef410944fe7cc111 SHA512 d80ef7ded1a89f1b6f7fe12ee223e5dd287c2d7470819fb65d1bafaebdba9b9ee0fbacc64bb3a397a691f1ce69233a4820e3a9dce884f8fbf9107d4f54b45322
-EBUILD isort-5.9.3.ebuild 1341 BLAKE2B c3a7b14326c5f7370827633ca37b2d12a772bd9332bae4308b1f69793ac71c42edda24f80c50ff9443315961811dc646b57217ca62b7f0fa2072052e538a08c0 SHA512 51cc52f3a2f0e96459c76b8205122902fbcb15138b67ab078c509c6e14b3c323709a2ed6c7e82bf79c2ab0ec6a8a6172dd87a5fb056d20f6b2263aa7624e8da7
+EBUILD isort-5.9.3.ebuild 1347 BLAKE2B 1fcb810e290289fd1c6594cb104842e9fe9211bf615d3501600a79ec225d24724c71c056a3a6c5b6f24dbfa64fc27d5b93639c76fe89146fc9297b1f49b8d515 SHA512 326129dececfe48fa4df8fd22be6ae54de956a0c2d386cadddb4234fb2e64ea2c98137179ba2d8de0401d452b44c19417ec06dda0e3e4f512e30637a7abd6eff
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.9.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
index 31f30cb1538a..caee88d384f0 100644
--- a/dev-python/isort/isort-5.9.3.ebuild
+++ b/dev-python/isort/isort-5.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 94622386b289..f2e5707e6508 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.itertools-6.0.1.tar.gz 20096 BLAKE2B 19240d015cc2cb628193c1da6f8ac8eca2c79c9b7ddf1eac909a27bcd80c6b06ea8f7f2fcc435071ff7e9c602d9d8131c258deb910eea0d5ae0f8de69f4901b1 SHA512 60a4bf4335bd159b1b2ed532f4b72c47984a8e2afc03bafb7ccb53095da787cecbcb6207bb2c521266285bd5bf0550f1a78dd5323266bde6e00937481599a506
+DIST jaraco.itertools-6.0.3.tar.gz 16383 BLAKE2B aaa70b40baae4fdba617ecded0376c557a7f227cb52d79e982c06ec125c70056a6773b0c974eca16f12eb1d358bbc190d4f43819374e353836ea2a0dac373367 SHA512 5ceb11c6a5f1c88fa6191f1153b5450614d9fc87ae08acbe4a417d8bf6089f5dae747b1cee95a29763ffc595c291ab02198cf94b48eca34ce766735c6dc44e30
 EBUILD jaraco-itertools-6.0.1.ebuild 1218 BLAKE2B 8764343556ba6f35dfb6bfe24d35161215e3976057457afe346c2380498a5d67a6e034c80ee9f729ff008911c0f1d9013c9ec8cd4ea38779658b8f8e1f8d318a SHA512 9e7af1edebb4acd4ead5fd0c1ac7c568bb5e345c7485110ae5a9e05193ee5f748fdd4f3ee5da2a89c022594d4847c1fd181dd71af53aed6a69df55aaf0065518
+EBUILD jaraco-itertools-6.0.3.ebuild 1019 BLAKE2B ffdb2f339c96245172b994524a4715c93ace56f5760c81efbac866b0df628d13af2a7801c8966534e83cc7a4d11adaaa5281cd19927b708ffb39a5a246f819d5 SHA512 b00e877cea82b8378b389853347cc949228025d73b866ba380c76fd6acc4784634772df79c26b287b5d20109e6726d045f057378db6d5d7cbf04dc9adc9d5941
 MISC metadata.xml 575 BLAKE2B 74a98f6408c4a5f629a48c6e64f126733f3d004108491bf8c4a8e9868aa29b8357843cf6ec9be104fd3a8fd492e4b074b0827fd5f91ff0400cdf3f40d60e9cba SHA512 7f3b7b7e149dfe7dce422ac7932aa212ef3f5cd76309bf740399788e24da5b3e7f971c2bf0a06b8135b97797c9e59fd56628f4c8451b51ce5bdf36c3f7ea83f4
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
new file mode 100644
index 000000000000..e31797faf4c6
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/inflect[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${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
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# needed for doctests to work
+	> jaraco/__init__.py || die
+	epytest --doctest-modules
+}
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index a5dda41c1abf..b4f8d21d2529 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -3,5 +3,5 @@ DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4
 DIST jeepney-0.7.1.tar.gz 61833 BLAKE2B 626d4c921d0548ea898197ac5459f20b4c73fd52d3579c5b74f257158c82803011655c1d418d7d10afe8ba803100530bc08dbcce41e12727888de5be5995adb3 SHA512 f0af5a18a669f1a6322925201cad83ee01bc5a1b91577565042fd8a18b506a3650ff67b0ba333c8fb3b179f43ef243d16b07a9a1f7a7e5baec825dda0e6b0571
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
 EBUILD jeepney-0.7.0.ebuild 1229 BLAKE2B e9f888c7e6ccbd40721c32c5da71726a2a17a3ac60f8737a12dc1b0ff6e71796eab0bf4d79796efe2f1634916206904d7a721fbc1efb8c45530f114758bb45a7 SHA512 55bea6c4be689fa66cda7ad9ebaff5a7d8dfb86232305dceafa8f728c3c7aa22d6234deaa0320e97785dfd2728cbc4b8d329696009c617cf05db348a21a74583
-EBUILD jeepney-0.7.1.ebuild 1277 BLAKE2B 8bb801a877940a27873462e14c3b72e72943196142cce792081eebd609d0bbe4a6c46383dd3520681603efcb9efb48a771b910fb2cdfc65f912956dbeb896162 SHA512 07b7654bea603edc66f238dde7cb230ceeab18b970d8d4e624a2938b46fd2f01b6b1a3b9ee604832b837ff001cd0ce26b0fd5dd2d7fbae31b65d6e9c6c1c3976
+EBUILD jeepney-0.7.1.ebuild 1276 BLAKE2B ec701f0554d6ea283bbeae964c4ebd643ce1c94f0b9c2330cb2302ae398efdbaaa074bb4865eb50798e012f85d57808c22eba3cdebfbd6cb6fb05541b0bd48d9 SHA512 3a6b93325af0a2906352564047aafdf5f2e5d5782303a623d9fa4518e6bebc97e3dd66d4f14718defdce5c5363ea2a5c3f21bb804b1d54a60486fb9962ecd5e5
 MISC metadata.xml 457 BLAKE2B 8128c212049aa1ed733a297b9b0d36ada9bf76f6e88fdd87207f3f8c7b71b96733bc080746795088e30a8238f6381951e0be72af28ce82bf4b99e41275c71d7b SHA512 2ce1e347f419b0047615eed4be61962c18b325c75a7ee98feac55b8372ffbc04a9290ca7d1426b5fdf8286f3130ac9712277d510b1a4a35471e3b6542bd5c2b9
diff --git a/dev-python/jeepney/jeepney-0.7.1.ebuild b/dev-python/jeepney/jeepney-0.7.1.ebuild
index a29a290b40ad..522dddfceff1 100644
--- a/dev-python/jeepney/jeepney-0.7.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 9540fbf1a649..e7c7469e5169 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,5 +1,3 @@
-DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
 DIST jellyfish-0.8.8.tar.gz 134461 BLAKE2B 29a4da13d248ab7916a4c9a6bd16da28bb9b4409bbc2e14660ac2a2bfad2563c7ddafb51c58968f5cac56c238de2786a5e1e64ee8d47cc668b0ab83e881b15f5 SHA512 d78f997a12ea2531e2621b3858f89a00c6c0620974a141fea6fdf6695860fa50ff4b5c21799de898944474563e6043e4d391448061501fbec078923dae21ae7c
-EBUILD jellyfish-0.8.4.ebuild 691 BLAKE2B e7e83bcde2d00f7e2dcda70fc8bdc46e717a282a88b0596bebf325ae4f3670318c9bf982cf6e83bbc29b13e4cc46b7ddad78441c50fc1f8850763ef0ea229186 SHA512 46224db9ec41b1ced1ccd185fc029d0ea62690b5ebe3a1fe3400816e2b3b6c94982e1756f25be141bbb3cf8f333d7953b22439134282ef257245b78f66d6f17e
-EBUILD jellyfish-0.8.8.ebuild 693 BLAKE2B 697b1970d46a46e328ff5c5f8151d917bc3c4419e0f2dc6a8cfe79a33b58205bfd886f6f94e6011c37d61114ea8b399c2e012572b841d0467338e7be771b256d SHA512 82b5ed0dbf454b537fff0ef268393c844faa03f4d94a035223570fa141ba683ccb2340de9a4319db9d172b9c40266388867b99a20e1fc850c29a0a5e14bced4d
+EBUILD jellyfish-0.8.8.ebuild 691 BLAKE2B e7e83bcde2d00f7e2dcda70fc8bdc46e717a282a88b0596bebf325ae4f3670318c9bf982cf6e83bbc29b13e4cc46b7ddad78441c50fc1f8850763ef0ea229186 SHA512 46224db9ec41b1ced1ccd185fc029d0ea62690b5ebe3a1fe3400816e2b3b6c94982e1756f25be141bbb3cf8f333d7953b22439134282ef257245b78f66d6f17e
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-0.8.4.ebuild b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
deleted file mode 100644
index b608fb0c4876..000000000000
--- a/dev-python/jellyfish/jellyfish-0.8.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	cp -r testdata "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest lib/jellyfish/test.py
-}
diff --git a/dev-python/jellyfish/jellyfish-0.8.8.ebuild b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
index 837b3652da80..b608fb0c4876 100644
--- a/dev-python/jellyfish/jellyfish-0.8.8.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 4312ce4e2670..12066a0dfd34 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,5 @@
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
+DIST jsmin-3.0.0.tar.gz 11519 BLAKE2B 192a3c8e325e9c3f56b39be983272a7f5d0c6e241bfff41ce3b064cfb60541d150041ee58e7c033b0afb56252573c3a6f10ff6e74658a9e7647e06672308c86f SHA512 46c42d1306fbda1d37324b514650e1ede50db40219dcb54b9b845bc91c23eeb865b2fcfec70cb44ade61439d1c4f96d35bfb15279ec25e0e39ab6023ef58c4cf
 EBUILD jsmin-2.2.2.ebuild 465 BLAKE2B 9ff8a27d8975c53020f8e5365b960ad933c0f6e6f787c79663245358c48f6529dbfbf1b7b78dd0b925d92a0356cd61c7215a198213c0341b71392845f3a827ec SHA512 8fce447422b0b2e0424d615c02c9cadc37bacbd878a5b0c71c9805761df906a86a0179f37a7300846bf029909fc86eac1615c5d5be03b7bd426a0670d25f041b
-MISC metadata.xml 373 BLAKE2B 1a63e415082f69accf549c865042c39cae3850b70522d47e2f93165d97ae8dc4dcd13d4d9d8454c7d43a809ed9bf26e62485c4b07bf2bd33692ac02a6da398f7 SHA512 1d4d00ce18526997eb57ad4afb1da4f40287b39fe9093ab1b636e31d9e3cfadf1d4914b5714599a8d47851164fb438f7041f5804ce6578d81af898642f95d8d1
+EBUILD jsmin-3.0.0.ebuild 517 BLAKE2B 0e905c0d4f13060ef7c94988bd4c8e72898876d43b22764de39f6c975be8ec56c65442919ee6022318939a83193c53f9e96a44f4c98a20daa88460ac97c0cdb2 SHA512 89143d6f9709312147fa85100788d10beca76aaa0e4fa6857f83f747afb3e1058f3ba5005399387e687a6b5c5276d699b20f2ae3e2816b3c311dc69fb896a78f
+MISC metadata.xml 398 BLAKE2B 93a4b03ba0d137ea56bec7154a9313bca465b2ea839a446d1d6ec2a9e9b2254d5dc832374438edcebfe211c7579050319acb9552633c4de82432c760ecb91100 SHA512 dae9577169fcbea94ed427a6218e0b41a8abe17f01e5870e246760381b3d355b75b4985728cce4d88474bef222ca2fb6dd30b84264f7e10fbe077736698e30cd
diff --git a/dev-python/jsmin/jsmin-3.0.0.ebuild b/dev-python/jsmin/jsmin-3.0.0.ebuild
new file mode 100644
index 000000000000..90a584faa51b
--- /dev/null
+++ b/dev-python/jsmin/jsmin-3.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's/jsmin.is_3/True/' -i jsmin/test.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
index 6dac05b65443..e1b12ff21005 100644
--- a/dev-python/jsmin/metadata.xml
+++ b/dev-python/jsmin/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsmin</remote-id>
     <remote-id type="github">tikitu/jsmin</remote-id>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 8fd5ffa87eef..bec52613f30b 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,7 +1,9 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
 DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
 DIST jupyter_client-7.0.2.tar.gz 317686 BLAKE2B f837d60c1013d6f7db7185112820bc40fe55707403dd179c72c93d7f5a9c752436b8454e0ffb0a133c77a4a11e87ea310d86706145d0501a0ed83d36652cc278 SHA512 24684df13947077add0931fe9e8a2c2b629db120c1554123f36b7c9e736f502f9553c63813de93ff84733eb4a47eb0f5dd48961e3c18527fbd8fece23fbe6440
+DIST jupyter_client-7.0.3.tar.gz 318420 BLAKE2B 151cac17dd965f5a151e0de90cffda35d06943ef7548518f6bac9e977fa3efd02cceb30fc23b252c440541ac74a84396dc7a8787fffbbade8d91dcbc2d51781a SHA512 eae57dd9c2fdd0301cdb53204dfc043a228fa606236ee1eca9e37f4d9d213efd080ec1292567431e24d73899db0833984ed4db933998817d03aff1f674217362
 EBUILD jupyter_client-6.1.12.ebuild 1196 BLAKE2B 914a94f6fec91368fa2c6bf084b0cf32d3314a5e804f7ef3e3ccbd0be8880cf22427764a2b3bb06fc5d34b0bebc46751598879f93d2b90787c7b165e6feb2862 SHA512 c87a355fe762fc537fbaa14f76cb61b0e860cbfdecf60acea9918dccb83d0837be2a9cbd137aa7162ee2918ef3a9d0f9079375e147f68b8c1d359abab881a5ea
 EBUILD jupyter_client-7.0.1.ebuild 1344 BLAKE2B 5e51ddf361d64fe3e36259b11fd8e27b31a32569ac33c095f6c5b9e3443be3a6f4dd2e77f7a71e0ad3e9f0c81290c2cd2f129d0a75778eb1328ce207d2014cc7 SHA512 68642247b38a3b421a7ed92af36f85704bd39145c006d0627e674709fe90a4817da598382f06f921137c4f2b9746fe2f23ff69a2586859f19eb431c27d4545cc
 EBUILD jupyter_client-7.0.2.ebuild 1350 BLAKE2B b5b5eb8f9292009e6a9e4aeb1909f056dc8ce03163555388a8e2768b188d324b19eac787b85b6a91b16fef0e64732f30c0a3a4ddd91465fe009eddb992359ba8 SHA512 efc5f8370d5184149ed5c3b4ff45d291c08daff87dbffff464434b6476567b2fa5e33ed6cf9b5daaa9983b6e9a2cb9ffb41fe586e757d557941176c058789dec
+EBUILD jupyter_client-7.0.3.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
new file mode 100644
index 000000000000..737c392b7525
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
+)
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index b10222aec1cf..2e90329f4a8d 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_core-4.7.1.tar.gz 68886 BLAKE2B aa89351845c669474c03a307934a5d84b6357679bc99f2fc7da4f93ff347766d52ce3551780803b73941d6457f7004306e795398fd390c81e9180193a2119225 SHA512 bc190abd000566dbd097dcb14acf1926c92bb265f2cfbbd14dac6a9cf7d6a02f924ba89fa957ca30c2af57433e9187e288bb8e80d039a3d3a583c6e488a9c80e
+DIST jupyter_core-4.8.1.tar.gz 73579 BLAKE2B d5dcc89d948fa52f4a1b7c210585e9e5657004a431a4d177d7393d8283a9be86117e2c2452e4381399d1f479ae7b9ec4c5f891d09dd99c81768a64b69d8b182a SHA512 774612652537f46f486c0ae4157053463debcdc079d5e732865c729ef7fbab5f0d1b8da5d4e7cc1eda3a80250b43877d8f75889fa86330f951c61e3f8a7a29e2
 EBUILD jupyter_core-4.7.1.ebuild 1040 BLAKE2B 9c739b46fca155c8bde5e8f4c01ee170c734a91866091a6147b39f7c5a5fe43fa193b5bf89b096499e5d73cc5c31247bd43191d1b053a06d6aad1f69c2d5b09c SHA512 9053102e0a723538839d34e55e75e2933b2fc24017716962c960df73d4865765fc3eecbb64c7ac67d870c0fef7b3cfce88cb540f93a49ceb521ab4ce0f766225
+EBUILD jupyter_core-4.8.1.ebuild 939 BLAKE2B 0bcb0db874a15b03d7cb033be0e66a9e0cced43365a608ee5094e4a32f5aee1b87d42c87f0ca673bc55db394ce78775bc30fddafacae3e5002a10530d69c70ad SHA512 63fe5994cfed2434f87bbd399dd4123f44900a578fa1ec5838f7f7a5a4443827537040be8fdfb20803158e2a6fb8cfc816210f6f03113a4b3c02df8082078c99
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild
new file mode 100644
index 000000000000..7d5e4f475698
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fails if jupyter is not in system sitedir
+	# (PYTHONPATH is insufficient)
+	jupyter_core/tests/test_command.py::test_not_on_path
+	jupyter_core/tests/test_command.py::test_path_priority
+	# TODO
+	jupyter_core/tests/test_paths.py::test_jupyter_path_prefer_env
+)
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index f11aad0e7803..65824f3d07a1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,5 @@
-DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
 DIST keyring-23.1.0.tar.gz 43668 BLAKE2B 7ef9a8858568ef8d0889b693cab55f7d2e61ebc3e6116b1f936c6b841ef3a50838b80d6315e5a04bee44a71b1e3bd1112d627603c8b9d113b12173d3442af776 SHA512 d3bd6c6c224a00f2d2aa0c22ec05a5e78707db37c62ed0e03d444ed94e2eee053f7eb1e4c387073753ca5c9b76a9f51d0bda8294f9ba2a326c84afd913a14293
-DIST keyring-23.2.0.tar.gz 44489 BLAKE2B 8d3321b71bdee6f61c3e33866d9612c2ef249613063af58767658d33975275fce72fb9c8b83cdff5881c3e20738a679f50b84c4e8979ac9f282df3331c718a88 SHA512 10aa3debfcdb8b4a7632cfdaae71d2fb5993192bb25f3acb428f23fb830b262fc69a91f5a3c936e6828182436e999b7aeab4b6510ef0b36881eab44476ddcb8d
 DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
-EBUILD keyring-23.0.1.ebuild 1183 BLAKE2B 10f561a5fe7733894a9c18e03b6d463b71757f860636d32b7b0b77ef5b4a19ee8be01d93f36a3f7496ae10fb664a24917303fcb6bcf7cc3ede3fce7399ce98f6 SHA512 7c0ecea87bb0c1454fef5418ccac2817396d8513b515e756b0eaface1b51454dd4fee9c48f448779198a4b49359d52c604841144fb1c4e28043935a57d7cec27
-EBUILD keyring-23.1.0.ebuild 1191 BLAKE2B 85bc01ef8ba4c8bc0bf59b6f7b006412b70bba05aa37894cd176c730886fbb11df43a70dc2731155fc93d2be20d708397ff1630295f6062177b1154b6d95d73f SHA512 aa9f4be2343a15757781ba7b5976745da0b09c690c759d1e8e5f352d488b496acc7ff25e3a832b857a72f719535811a52b8918d148f1609af54e268e3342339d
-EBUILD keyring-23.2.0.ebuild 1187 BLAKE2B 4fc4ed01d8e2e37f51402e99cc9677dba6e5327fd7127ef7dfb6a24b59f625e3c1c3ac21f5bbb4ae7a86976b1ed7ee46c21eee603ffc4a08333ca9ae41ad801f SHA512 8d2d9a54582886ee2fdf83bdb621c6d7458cf1b4d6ce91eab4f3b34ce1b7e888fa7cb9ca49ce127f6875fcc27252c1725cbd5d3debfc30fde273ad587f280953
+EBUILD keyring-23.1.0.ebuild 1183 BLAKE2B cb3e159c70bff82170068e461bcabc774eb8d6ae4bac0b8c525ee5d9af0b15f3418fef41aaeb3ac5ad5c90ca57264e3418903a1b5763e53876b2f338dba4025b SHA512 6b6a934fa0b979a87533cd0818ea34ed01e5072f770025b01830550d4c507dfaeacd75a5efd9a1149128bbf160847b44054a8ab11472b4789b9b4da69c198f0c
 EBUILD keyring-23.2.1.ebuild 1238 BLAKE2B e20171b43584911da4ef3ebf3f83a682746ec01ed7dddf8443943496f663e134075ac7f66e31c906452f51b50788da435e2eebba1361a9b7879346f05e485a49 SHA512 48f09195bd1eb57f3d4d543333e73740b228588954d2842ee6654197f498c63f989d367c6e05eceb9fb553fc72f6fbf62ea6ed7f7ee0cfdf7aec796b32cbef97
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
deleted file mode 100644
index 4e13723b2dd4..000000000000
--- a/dev-python/keyring/keyring-23.0.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=( pypy3 python3_{7..10} )
-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 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-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
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	epytest --ignore tests/backends/test_kwallet.py ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/keyring/keyring-23.1.0.ebuild b/dev-python/keyring/keyring-23.1.0.ebuild
index f815a958a2ce..e3b5d94fb8c4 100644
--- a/dev-python/keyring/keyring-23.1.0.ebuild
+++ b/dev-python/keyring/keyring-23.1.0.ebuild
@@ -12,7 +12,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 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.2.0.ebuild b/dev-python/keyring/keyring-23.2.0.ebuild
deleted file mode 100644
index 065e420f45f4..000000000000
--- a/dev-python/keyring/keyring-23.2.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=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-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 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-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
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# hangs
-	tests/backends/test_libsecret.py
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 06d13d6d6afc..947072d1c5ce 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,3 +1,5 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
+DIST keystoneauth1-4.4.0.tar.gz 266308 BLAKE2B 471b6662c27b5cc36dfde76e17f6855d5e840280a05c5c23bbda97b2e75b8fbc44e815994de514a475424476ed4d627930f993ed5fc7109fa3a2a99acf42dde2 SHA512 208b02c8df8a5cbdad1ca66c665d547b375eac2fa0d3aeb6dea3f9ed7ba0e799568e4407b8771df5a362d4275fb6a9b2fe2e3a9287b3817da43463356bc593a3
 EBUILD keystoneauth-4.2.1-r1.ebuild 1714 BLAKE2B 57d84c384ff9331dd952ac01b30934f1d250d3408f9529efe39eb2e3a484ee5d717cec3f7577fde2c57c6fa01ca67a87f14f1ba7ed5b2d3a6a82190e859e2f34 SHA512 03d877b70ce1843b7ce62c64fcd4fd069829cf8c82211fe56bf6d798e89b3a249492a1e0df7b0d3db00baa7d42cbeab2ef52c4c189e63477847a3245f346fbfe
+EBUILD keystoneauth-4.4.0.ebuild 1717 BLAKE2B ddf0f97f5c51762ceac7d80c8adacd5c082a3d9cf193dca0132a6109919a70e087eaa43793b4d5bbdc329c6bfc39eb2848e1947d4418681a77e18efd71217b84 SHA512 5a2486852f33413b04e86ec2306c0aa76324f8992db8cb4a78e846aa65772530e3f69804e09cf18b8a23dea275d9473b62b1176b02a89fe0218a4d41e68f6b1d
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
new file mode 100644
index 000000000000..5746cf0d3982
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index ac1abdcbf22d..49e61d61e2b1 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 949 BLAKE2B 0b2767bd8364ae226f4be7821f47f4e538addc23bd88677917fd6a4b4f5027a1d5ecae35209e3af53f8bfc9d16b399044c07917c59ff906ed456e1e229c4b874 SHA512 b6fbabd893404234a12e09f6c85164e6a64b59ee64b491c38e61a9b0ede9a728c059457ac0cea8746e8cd195cf77b044b93a5e64538b715efd53a970debacd55
+EBUILD lazy-object-proxy-1.5.0.ebuild 955 BLAKE2B 207926cd237b3da45210421b20d2c0d425bf062ed0a95e3cb56fb815d0a14c85e07435edc70d1932e52c0e241412d5962573fb4235261c05cbeae398f7fedb51 SHA512 f2e0fd97600740af549d941b071541febe529d8850b4704f341755c82391037c21344d31c5d4ea63b34cec33b690f23d15178012e6d1569be39ee4b67d55a0f2
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
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 087f95941deb..7be3d866612a 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 hppa ~ia64 ~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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 683f0ae87a60..718e99bf3d7b 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,12 +1,5 @@
-AUX line_profiler-3.0.2-python3_9.patch 1058 BLAKE2B 0d0bb5c9e845d8d30ebec532108fdd0241710494ac22e675f36f1ffed2ef2736d3adf35b32f9efabe1f6e70d986a332507283ba22dede99182573ce158809082 SHA512 448d629790b934f3edc7a3e40d18d880f289d77fe9530cbe252b8b01e8473effd75eaf3ae1c0c26427c27c7193176932e83a69fbc64c2d6107366a5ba974dc87
-DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
-DIST line_profiler-3.2.1.gh.tar.gz 54639 BLAKE2B 8840ac41397aa5d5c0cb94dec5f673a021a9bad18a7d67d73a2d90bf59745c5e35f205d67d28edd3ceade075320c6fe00426d5cf536b9b2953fbbf90539a5e9a SHA512 6e4e0fcb44df6a4eeafa66e8254e511ef0a0c616e9c2bb4bac6bc29df5efa1849f9e75e998770ec6fbe62916a22b17465cdc6eeee6c61ffa52658a9bdb773490
-DIST line_profiler-3.2.2.gh.tar.gz 50780 BLAKE2B 79c5f7f73adaf940e34f96ef799faf08e7a6218cd9346dc3aa86211d04f0cdfe309de23d11f43292aaca121e78df27d0d07ec3efd129e1cc6778b6f8ae83cbbf SHA512 a7279db406adfdae08d375fa18869fdc2276fe360ffb791aa65b13a028470504cd45acfbaa7ccb1c44fb1a5622d9400c5a889f13230514b9d392f09b439af0fd
-DIST line_profiler-3.2.5.gh.tar.gz 50934 BLAKE2B 2124fcb5cba9b0eebe81da6f966eb12e17f1a44db8beddab6903dc7ec79441cfe1d207786083f96100e2394cc2f0274460353d7aa6ce75a6f301500332acbb47 SHA512 ee72df835b55a26c0cd150356da19f8051013e5ffc1a18a31899c9da06f40e97175368204dc23ed21722a237612c1089cb18628715151ab07ba5827e460befeb
 DIST line_profiler-3.3.0.gh.tar.gz 52791 BLAKE2B e3499f5274045d158620fa890df6e725a99c3df019bb4515434213d2c60d52d400d7a7dfce64b153422722ea388f73318818485c9747e6eace2d81c457f93a7f SHA512 37680c55a551c73aed7a3ee2333c523f0617e01cda6db98060f15fe36990c8c8bc08bd5848e569f269bf11590776290ee0980046cce745df8e54268d7991559b
-EBUILD line_profiler-3.0.2.ebuild 1200 BLAKE2B 1949ae0c2051ece27545485b1a4386c21e60e777bc857f7ca6bfa7a222b5a39759ccfc0e3d73bf7cdc8b2d14800e3cea7317f321902814913371e68f46eedb11 SHA512 86e3c9df28b8715539d3a6e2de1c79657fbc754a5831f25bcba5280f302092c799c82ec1114d82460b636a74983d7d85d18f57a937a4c7b0ff9e06c3a030eeea
-EBUILD line_profiler-3.2.1.ebuild 1104 BLAKE2B 1fa42fc95ce52fddf76ba7a15f63803d2ce9eb714579427b3ed60dcdfb2be4feff5f7f85a2ec8b4fe486a410a5acad59033bf6324dfbe14823afc0e887d46dd2 SHA512 8e0d41543752019d7191132cb720ec2d0cf5a230a44946da26143bb4b7131b8070f6409170f154196784e8cbe6bc0913dbf604438bdeae28d099ce2983b57489
-EBUILD line_profiler-3.2.2.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
-EBUILD line_profiler-3.2.5.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
+DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
 EBUILD line_profiler-3.3.0.ebuild 1072 BLAKE2B 29ce0340d810abcda5eecf530928180a50223ac4f724a328ff8d477f4ba6a621d67c90d95960d373a643e6c2fb75a61fe2ff5330ca35f318c75a917fe490ef7b SHA512 5ac63f08cbd550a37e99f98bd2df06579a2cf507187b1ec7ca2a1e0bc738443351dcb680a022b083f692570d6300b57a418198c73ea41fda6e7029cecd230cb1
+EBUILD line_profiler-3.3.1.ebuild 1072 BLAKE2B 6b412fbfd938cf1a646c17aed4cf97a308e8d5af97791ffed24ecdabb3b93e3fdf5f7da2b866cb2023dda6bfeddada7bbf79c9f7d408f5369f383b4924926f48 SHA512 12d0eb3477bd386b3394ad9acb65c5dd120fa67fc8928072aa5da84758a72dd4e11e2c7e3dd69873d6a45a2748709cadcd875c7b92747997d8ca18e7367b8a62
 MISC metadata.xml 775 BLAKE2B 6d817146b4f2379141f3def2ab8cb2d69f40e1e7645e714c09ad30a425d14c85c50749ffe2c4d6dec9bf146e294caaf8a1647d2a15d672667932ca7543d0df59 SHA512 745e91051af76df1a7344923dfdfad748fc11bf663c60f3c83a5d434ebfeb218ccc91a314244008bf6a39a4be77b3b3c5457739e1102ba188ddf7c8203b75695
diff --git a/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch b/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
deleted file mode 100644
index 74b0677bc70a..000000000000
--- a/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f40a6e102d3c4808155af601ddba7733e597e604 Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefano@rivera.za.net>
-Date: Thu, 15 Oct 2020 22:44:50 -0700
-Subject: [PATCH] Python 3.9 dropped gettimeofday configure checks
-
-Upstream status: Accepted [https://github.com/pyutils/line_profiler/pull/31}
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
-
-diff --git a/line_profiler/timers.c b/line_profiler/timers.c
-index ae01060..e8ee6c6 100644
---- a/line_profiler/timers.c
-+++ b/line_profiler/timers.c
-@@ -32,10 +32,6 @@ hpTimerUnit(void)
- 
- #else  /* !MS_WINDOWS */
- 
--#ifndef HAVE_GETTIMEOFDAY
--#error "This module requires gettimeofday() on non-Windows platforms!"
--#endif
--
- #if (defined(PYOS_OS2) && defined(PYCC_GCC))
- #include <sys/time.h>
- #else
-@@ -48,11 +44,7 @@ hpTimer(void)
- {
-         struct timeval tv;
-         PY_LONG_LONG ret;
--#ifdef GETTIMEOFDAY_NO_TZ
--        gettimeofday(&tv);
--#else
-         gettimeofday(&tv, (struct timezone *)NULL);
--#endif
-         ret = tv.tv_sec;
-         ret = ret * 1000000 + tv.tv_usec;
-         return ret;
diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
deleted file mode 100644
index 0494a9138255..000000000000
--- a/dev-python/line_profiler/line_profiler-3.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/ubelt[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3_9.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	# tests fail if not already installed
-	# to fix this, source files should be in PYTHONPATH
-	# also, tests call kernprof, so we have to move that
-	# back to the source files and make it executable
-	cp "${BUILD_DIR}/lib/kernprof.py" "${WORKDIR}/${P}/kernprof" || die
-	chmod +x "${WORKDIR}/${P}/kernprof" || die
-	cp "${BUILD_DIR}/lib/${PN}" -r "${WORKDIR}/${P}" || die
-	PYTHONPATH="${WORKDIR}/${P}"
-	PATH="${PATH}:${WORKDIR}/${P}"
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.1.ebuild b/dev-python/line_profiler/line_profiler-3.2.1.ebuild
deleted file mode 100644
index e2044a220db4..000000000000
--- a/dev-python/line_profiler/line_profiler-3.2.1.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=rdepend
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.2.ebuild b/dev-python/line_profiler/line_profiler-3.2.2.ebuild
deleted file mode 100644
index d9613ca310d6..000000000000
--- a/dev-python/line_profiler/line_profiler-3.2.2.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} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.5.ebuild b/dev-python/line_profiler/line_profiler-3.3.1.ebuild
index d9613ca310d6..5bbfce251694 100644
--- a/dev-python/line_profiler/line_profiler-3.2.5.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # force it to match scikit-build
 CMAKE_MAKEFILE_GENERATOR=ninja
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 254e0c0517c2..b64c28391a66 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,11 +3,13 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-13.0.0_rc2.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-13.0.0_rc3.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.0_rc4.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-13.0.0_rc4.ebuild b/dev-python/lit/lit-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-13.0.0_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/markdown/Manifest b/dev-python/markdown/Manifest
index acbb289b1e07..279f11b966d5 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,5 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
-EBUILD markdown-3.3.4.ebuild 1049 BLAKE2B 5f10947ebe4acfb905781760aeedac3260a5cc0d9ad9dfa14ca99f4aae342bb05ea8af1caf061917bf04a2a28bd02746be43d83b5b1c5d8980b7543a905ee7c6 SHA512 a17b96ac96eec530a8ecb969e03212c32043c19bf6046ca16cfc0e84ca10b7dc1cd6d82f922d9d219d23bd9fc3350c58c3312e2c5fd4437ef3bd24d22b0768e2
+EBUILD markdown-3.3.4.ebuild 1055 BLAKE2B 1f8447367154aeb53389922fe48d5a03a7c022a6584642bc13c84ab7a8fd02becc0c114da6c53fab32794b228ca8c94544ea8e840c497290be33c3446cb2947c SHA512 13a5b46a701e8debf9d4964389db799c210b2e5e7314b9bfec2f0b7788409e2ba5ae8a96033eefa7d2d6d396a45d15604e6bd6bdd50cbbf844df51179ca22c12
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
index 16284fb9fa25..8d7873f6b58b 100644
--- a/dev-python/markdown/markdown-3.3.4.ebuild
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 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
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 5d52fe56364f..06da2717c499 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,5 +1,3 @@
-DIST markdown2-2.4.0.tar.gz 96596 BLAKE2B 23fa2b05e7f26bd76b38b2c7f4fb5b3b36694b0e30ab3f168b64754f62d7d2742c5e0bfbed774a198527ad226bfe411e0ba11ddf6d0b2002670e5937750070a2 SHA512 ed523116e01121e471ee1a8ea9e8dde42a04c4c7c5170c56eed852268881f18b7b5062c43f1548fad3a84e2fbddc19c26fbf88084f6affdd11fd4d493a480cdf
 DIST markdown2-2.4.1.tar.gz 97089 BLAKE2B 62506be323a0c05060e5922b4eafbe1d0f6c2d9f81348fe5e35af8a577e0d7c26ba56cfa727fc1bb13dc3d08e7a8fe183d9ad91746dfc7a0034d025ff91c1bb9 SHA512 fa62640a135bb01b2dc82f658089c5880a3183c3b6e498ce76a27075d3045d70d7e00b9d497180a63c00cbd9ece83ebabaa8cd31ee326160d891fb422f43528e
-EBUILD markdown2-2.4.0.ebuild 658 BLAKE2B 66837205579c0987d60aceb745913eebed988d8c3cf9d1874a3728bfdce41d4c4728f60b3f8124ac488f2b2b4dab63a043068567f0937926e0ac3225adc6dc6d SHA512 d6ec4fd4db6ee7a961ef8a7dc5992fbcc28312d06555b2b60396f48200f63f6482f1f49a3f8ce2840641fdffac43a50c6c5ccb8aa6c75b48ab3073560c140e6e
-EBUILD markdown2-2.4.1.ebuild 661 BLAKE2B eabc6c05de1f7ce9a56896392333577379c7696a0be3e50f2bf3c3d3f51ba584f9be5085d84dde7bacb93cf75690de19acddbb38ed048ebb1310f21944e47397 SHA512 69740c9c5d89ca38ee62c983c7a0c69c2b6c7ec182952b04078631c9e0ef7b0cb07ef5c56451ebbcb996aa87359d020ac5284f5362f6913959a3c887a661f312
+EBUILD markdown2-2.4.1.ebuild 657 BLAKE2B e98cf6a720af82dba5b58fc157bb23068d29f2e9c53e5bbd58cf0d219d4507765f833461f7a8c4a3be3bce2c2b985a6398dfb00f1a7df6a96144a63387cb6518 SHA512 0985726470e92ba923c86613253615571fad519905ae09cfb2d1a0d6e9f22948239294ed18fc1d4457d2def7dd9eb6042794fb2b148702b38b334bb817ca4001
 MISC metadata.xml 551 BLAKE2B 293046752073df3a0fe72acea3165d62ae78297f82aa72e40edeaab6bb6021ccbeaa8cc145341aa05dd3fe87c2f89e88f2281ca95ead33d99bbfc5ba53573ca1 SHA512 9d30d896754f1379f4fae79f86bec966cc3639a42e5e7bcc7e8d2e94881ee8a75b7e3ddedbc1573f1eb3c429aea636512efdb887f2827dc1b1aaa4caaa44e413
diff --git a/dev-python/markdown2/markdown2-2.4.0.ebuild b/dev-python/markdown2/markdown2-2.4.0.ebuild
deleted file mode 100644
index bed62d568244..000000000000
--- a/dev-python/markdown2/markdown2-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.1.ebuild b/dev-python/markdown2/markdown2-2.4.1.ebuild
index 8d0e570a4c21..08b6ceab23ac 100644
--- a/dev-python/markdown2/markdown2-2.4.1.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 3587da909d9c..4cfee7ccc4a0 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,3 +1,3 @@
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.6.1-r2.ebuild 711 BLAKE2B 10b7727fc2d49fc17352ba32fefeed9b51e182ae18d45f3ab3740865b40d833075765c1da7134dce5c67f11935162e9ac424daeb4cadf51791f47d84cd42a7df SHA512 775167e5d9dcb3c8ce06b2507cb189fb32e97393f9a4b6b723cbfc10df95c7553032e297704690de6ad597bcff831517c580c7db7d6eb3f66df265c3cf47705a
+EBUILD mccabe-0.6.1-r2.ebuild 717 BLAKE2B 0c10e83fec11417765cc1f63fdbb61fae140682c5cbaa38d1a8009769288cd305f790e02d4139f085ca05d57b53c526fc8217ab3f4ebfa794b3a7269f33e760e SHA512 03ed2ab6f4cfd84f6987a15a9952ad11e611bb72a188140e7256530b39603b0f874373f9f1319dbc4556c92feaa5fbe73f660b8ef718694c6a932af446fa3342
 MISC metadata.xml 399 BLAKE2B 4abb33f734bea7c7f0e42b4840bf818ee190d83c264a623e4a3f45eb1578e4f49384976efd205234821d60d0982f5ab4abfa6885e958bc75bedc064a16d14f75 SHA512 52255fe16006844729a51af6ebd3501e1365cca9470e6cfa029c74ebd86252c4dcbf3f250876fdd0ea7b6380a51ec975370db464dfb42fbef8d4880cf5336322
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index e5d8377da940..1ec7397ee657 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index e7db6c7e971d..dbe28fad83f2 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,6 +1,8 @@
 AUX mechanize-0.4.5-py310.patch 900 BLAKE2B 48fcf7baed04e4a2aa32bef01cfab4f8246abace61364fd26d4c90231f6e2ab5924d89b377e6c3a0f5086bcd916e9789a61a5b2aa585665711b97726ecd4b5fa SHA512 1e4262f24ba5ae7238bcf261dfce7cbb851b72fd5daacc37cee570d2172d57d9700802a8c6b8186d7dcdc0cfba583cc136b81fe759513436f393f27159e266c0
 DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
 DIST mechanize-0.4.6.tar.gz 217254 BLAKE2B 0adc7e0bcbef93051412d0d22e9f426984e197791b43b007087d70d3b15d4fce2f4868e8ad520e8621d35890d6454bd9bfc0910dc5af3d640e2620de4f536e16 SHA512 c28ba59529d2a1d4454467c1e034fc583952fd152c8f889bf9b4c496ad4567e9ca5f8b133eb6eb081bc1e811f54c508e47f8a2c5ccdd8f04c709dafeedf05820
+DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
 EBUILD mechanize-0.4.5-r1.ebuild 897 BLAKE2B 7465d7954ee7ae92eaa44a556197c73fee14a437c0afe25b8a75e699ebb32562a790469abe5557f3c7ae45cc270bba601d8a00e69bbdad9ad588217410090a61 SHA512 7681220882b31d7ff082b1c87ffd620e27f75add1facc4576232ae2fc1ea94b21050cbe75cb2ae4815524acd4ad38f1c0fe5e431deec5a09614d284af3c639ed
 EBUILD mechanize-0.4.6.ebuild 659 BLAKE2B cfb0509985470050037963c450def21be228e137ed4b09789321be7880be20b2d4178e1aa1a54715e341a36d9c0352de85340d3de629d322a18255e8379b2b0e SHA512 489c62c7ce671c06fed7b007b2f76982e33856e7edb60367219cd1af978c434932ac711f4eb468bdd5861240aacd746969ad714cd54bbd13a48592bcb532e725
+EBUILD mechanize-0.4.7.ebuild 659 BLAKE2B cfb0509985470050037963c450def21be228e137ed4b09789321be7880be20b2d4178e1aa1a54715e341a36d9c0352de85340d3de629d322a18255e8379b2b0e SHA512 489c62c7ce671c06fed7b007b2f76982e33856e7edb60367219cd1af978c434932ac711f4eb468bdd5861240aacd746969ad714cd54bbd13a48592bcb532e725
 MISC metadata.xml 979 BLAKE2B fc6a5b62fc6fad0dda94209699a03801aee4f759085a8c0f66766f80ef2b3c0036b0694934e9f7d55fa7ffe8d2cfffc8660a2f4df047b2bd37f10c9381a9d423 SHA512 76190d47696d3c999bf6a3788985b42a0ed99ef737a42c495a85e6de209a96eaa61ad8ba641a34f21dec49c8d55a8f0ba46fa325bf1001e1d43ce8bac1189979
diff --git a/dev-python/mechanize/mechanize-0.4.7.ebuild b/dev-python/mechanize/mechanize-0.4.7.ebuild
new file mode 100644
index 000000000000..02ef35521fce
--- /dev/null
+++ b/dev-python/mechanize/mechanize-0.4.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Stateful programmatic web browsing in Python"
+HOMEPAGE="https://github.com/python-mechanize/mechanize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( BSD ZPL )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	"${EPYTHON}" run_tests.py || die
+}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 947cf66659bb..bb4cbd953b4c 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,7 +1,7 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344
 DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d69117dea856a209d144e452cf408ee3d111eaa8a9825602b9f8d604a79143e96a51e67b74e430eecc6ee33335161e409149220a8b216f3b47f22e7a49f12 SHA512 11714323a6e300d0d8d05198f617019158dc48ba43e8a685f52702da7f52558f1358dfce294dcd421ba9d59131c17e4d6ea6ff483397055dee62dffb76032d4c
 DIST mkdocs-git-revision-date-localized-plugin-0.9.3.tar.gz 367885 BLAKE2B 3c7aa4a5cfcb585c022c9a652ff0b5be8c309298f69c69973a9442913ac4d12f14a3f5783627d9574cffc9c438e98678641d58e77f6712e0ddf68ac77ee098fa SHA512 8a345770a6f40bacc0899a7fcf3d056874f3a947ffbd001bd5885ef88e813e4d405ab7d7a06be3adb5ef34d5ef1f449432b0e9594b79a9d4a9350901c692cc10
-EBUILD mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild 1273 BLAKE2B 807578a8fcaddb8321172fa5f9a02eb2029b5e5fde8f8b2287c515364ab99f772dde9e7b1e85215ecbdcae272f4bc119110189802b89e75eb9249a2b15f90625 SHA512 a7fc75e61e7b568249846092f9e80e0a92b84ff7a19f3425d30c25393f43211c46c74823ced2908ac589a5360380a8fe06b17568e0d044236f36036480a41585
+EBUILD mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild 1280 BLAKE2B 4e1334db9a2a00f3adcf20ed06d10cd338a5a7b5bc8d8179b9cba2a3336d4f8bcd8b36d82176fb0da54e7105142d608d8cd8a51004d25beba9414361a5d2490b SHA512 5f01f874e002967197e3ce44c6087f9e81682a2247c731a3ec1130faf35924c80ff2809563ae0eb66cf9f5c7942cdc2f9a7d51a8fbb6f8f198a738f87c02281b
 EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1416 BLAKE2B 8a1f5230ee1befd6ee7faa3b867f4bddd1de2b0d387c5d4875d95b93ab79f1c7a2211a735bdf6f7881d8095ecded6e8b226bab60ab90603ccffc587e7a88b00f SHA512 8ae55c9b5a36010a1918b316f83b9506e722bc4d52c8be57bb6983cb0ec381359dce554f94769206504f6ea6498c90a8a8c08dff5fe373dd64daf06b54321223
 EBUILD mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild 1273 BLAKE2B 807578a8fcaddb8321172fa5f9a02eb2029b5e5fde8f8b2287c515364ab99f772dde9e7b1e85215ecbdcae272f4bc119110189802b89e75eb9249a2b15f90625 SHA512 a7fc75e61e7b568249846092f9e80e0a92b84ff7a19f3425d30c25393f43211c46c74823ced2908ac589a5360380a8fe06b17568e0d044236f36036480a41585
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
index 4a3ee1f62f98..eed444ab0237 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index f92f4619276e..b0254794c4a2 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
 DIST mkdocs-material-extensions-1.0.3.tar.gz 11983 BLAKE2B 0a9594c85df0782543275598368497bc5bd902c2e96dd75628b94eefc2f7998b948cc659577db6b27fe2787fe2a6547bdecac823f4a9533bb6b8d781922f9a6a SHA512 af6ec96db5628527d6dbdeb6557276cdf297ab5926cebf5508d6e5c4c5b8493b9f55b967230e2853d28bcbb17129a32778936ccd0264ab75c870be2eecf2e8ef
 EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B b0995abe000be9ed652c8506070c2f82806bc5fe7451bc3217d7b43f25e68ae32cf665f16cd89f032e71e9f93430d81775d52ea5fc1185a57221b96f07d5b6ba SHA512 b9842cd2c791675d5da3093ee7f79b0860a558804c0253e5a69104567ea6ce01cecf8b4e95f5869c818a61a16fc0ed14e7f48f26d90331836745b58037881f9e
-EBUILD mkdocs-material-extensions-1.0.3.ebuild 839 BLAKE2B b0477beac0fb0dec993bd22c79561527a0f3294e3c3af738f4ad8305156f617050dbd8cfd94f5aac86f2dd0fc3e77753151608e539db53b25c384d300f929db0 SHA512 123f9854cca39e8e39e7ee66ecb06bf1e30c9571daf95b212dbc2f451279baa0ad806f0d375aee60c2c98fc1ac11d288e11719641be11b36483024648b68ec0e
+EBUILD mkdocs-material-extensions-1.0.3.ebuild 846 BLAKE2B a9dc49dee0d2073c8589a7e6f1b686cfc7481390cd6e7ea7cb1e9ec2a55d102f10fda454e939e9da067372bdeb2cd0b920ec303f141a232fe6c6eec6a35a3ba2 SHA512 087bf4534baeb81038ea58f3b2477fb133af7227e8d8267634ef338e8c12a10a83f2153bc39479c3fdc8caf91898f3c0aa278c8b78197c10256d45ec9999d2c4
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index b8e6a9a88656..a6e4f2529612 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 # mkdocs-material depends on this package creating a circular dep
 PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 934797768fed..6d082f55cf54 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,5 +3,5 @@ DIST mkdocs-material-7.2.4.tar.gz 6803091 BLAKE2B 377adcdaa2d24248f0430327a2a4b2
 DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
 EBUILD mkdocs-material-7.2.2.ebuild 815 BLAKE2B e569e3d6db88f9dcf46137796ffca1e56c362d5bf4bffe9238c7e67ab5c99e2f06c55ce4080313164c7bba4269866068d5722d5636daf2c7a0ca9e44d1d51e90 SHA512 764be13848db96b3da3f4c695e68721e9aa20129a79a637d621f31fa5e43a5af142a9e634d55507af163d9fc0cb51fab88be07a41255241f1921bb5676a956e5
 EBUILD mkdocs-material-7.2.4.ebuild 817 BLAKE2B 541ba90c73ce9a7a3c7e52664f7f73a569001a6e644c81b5e452c2c041ef745473987580491e1f4fa67e918d0019d22d10824ae9f4ba3738060e5133aa7c6f3e SHA512 2b09409640d0dc8fc45e0336544517f92c3aad66c450f93632b6f57eefa20c7ae446906d707cd01c207be5fa9c36746eafe22a8d8c4f4f795567e629d7713518
-EBUILD mkdocs-material-7.2.6.ebuild 820 BLAKE2B 8ab7b41d32f6a452b3bf7bede0934d216c327c1f5d80b7958d7f8d807d11199e216c7e99233d95c1b3252cf3e84db2a0b1f96af8bd92499826f24949e027b090 SHA512 5e1b209bfd5c5d14cb03beda0c4494af439684637f5fbae95a991b99a61c450d281a8b2bb260504f0b64508a5824befad81c992f415ec28dac1635f5ea5bbfb4
+EBUILD mkdocs-material-7.2.6.ebuild 827 BLAKE2B 3e9dbb3b33685644b10f1d9ab8f5fcba80125f5e3d8250d799866553d746f02c52c6d82f939fda7a0577148683e18e7fc5daa94fcd13936c24934d5d1dfe4dcb SHA512 16cec7ae4ed6ee0c41eb479dfedc44b00f44ce97f1b160663e54c37b62c23ee5cdc0374e99f7484249b561cf9d0aef7be04565cfd0ee57c946bbdd7a84f92775
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
index c8d2a847011b..489883a278a4 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 621ffec0a341..607f8efa1dfe 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
-EBUILD mkdocs-minify-plugin-0.4.0.ebuild 619 BLAKE2B dae7bce54193beb0028e6b970e5ec51722ddfe2f1e912cf91065cbb05bced03b96cf29c55308e306bac76d6aa42e01bbf09e43b3538ba88eb2cfc9f66be8bca2 SHA512 a802b61563af97474fb66aa1b33c823bdf5d6b7736bd8ab6332e87aaadc856a49a6ff43e04271c7ee6cdcd24572f628f437783abeb6caba3cf0075b705cb6a62
+EBUILD mkdocs-minify-plugin-0.4.0.ebuild 626 BLAKE2B d2ce86f45235d5e40007822589d2c1a578b4b56e6104b5d9209f9bba295fe9c8a0959ad9a8c3def7ce045cd2a4b2b06b844fce62b1413d74dad5c062560ab693 SHA512 355393603d426ddb423750b348f58baa7619b9a023eba1c1c01e37e0aeee1a7aa40a15135f062eb5747530d3dfbd08745702b9fe9792ca6ebcd20677a21706e3
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
index f6de8e1e29dd..e8b4eee64598 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index c3f4c1dec844..ea7a17ea70ec 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -3,5 +3,5 @@ DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5
 DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
-EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 559 BLAKE2B ae5999ec6d421aacfc2bcf8afdcbfa57af6831a9c924f8a3d3a5c99213cc7b2741ef8b545fca61b8e71eb87fc0d841f8d4594ff5a2c248c8a250c18c6bee6d8d SHA512 5180ef75e49ec579b2b57c81719ed30c7cc73a7f42c3fe2503fe43985adff98aa95a4aef98f6409d6f7498b5a735df4b53714c8986f01fea65e7ca9032ddb31c
+EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 566 BLAKE2B 4ae7757a0be823d972ff1c0c72396b677844b30ca087619f1b86c62e9217a714a73413ccfdb9c61e3eda39852038ef50d900e7f26a8ab11f1e9b2190becee133 SHA512 ceb5c396d88910a6f5d2f2ef44dd3bffa4ee4b28835078c162e614077a7eca5237f221d3c995128e801774db6307716cb36a36a40c412a087b41805070be5d80
 MISC metadata.xml 1167 BLAKE2B a4efd99b0128f99bb7a8da17fde37695cff1f9e50ddec9d3b71e5eae4a09b8ba6646259c724220ee5905faa420efcdaf4be1d0828c8cc4d9e7040ebf1398bd0e SHA512 37d5b8e942796e54f31d0a2d592157d7a50d8fe5bdedf6f0e57305d60b4d7fd99f649e2604bb53cba5cf457227c3c1debfd607b3f5b97fcaee7e8209fbc900ec
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
index ec8a666803b0..f01d8f96313f 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 2d42d64e601d..eaca163db9a1 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,7 @@
+DIST more-itertools-8.10.0.tar.gz 102929 BLAKE2B ab98e0f94ea50bd4bd1d147bc81947259e77cdcadbbf365d1b3b0a02e97fbcff8712637721b82bdbf8d1f8ced7bea57c2c8b6249b07ecdcd179fd1316dee055e SHA512 a666710426a825e5aca10b52439a973e08ac6ec09fb5375426194d1342af055a8b6aee48b4e3fa17c4606d6d9cc3673afdd789dbbaf373258be6a71bd63178f7
 DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
 DIST more-itertools-8.9.0.tar.gz 98238 BLAKE2B 16b89c6d1ea4f43afdd69f2c2f0912aa828f5af63ff391efb0c6e05cec190970244800a207804fe03dce0cf87ec4835ab21f05e7fdde4ea826d172399f21fb01 SHA512 7e6480ec594703cb13282a0e81cdcc9513e972433442b9c7fa68fa4e17ea25e523cf8f4b1d16242f2a77b55eeaaae1d428b48c6297a25bb9f36b4f70b96ed7fb
+EBUILD more-itertools-8.10.0.ebuild 636 BLAKE2B 42aab6457961e3f49539cd1d36ef52c0a0257f34264f00830fce170bcc47b632c39b3de134ab3aeb68b8d615d12ab55d7d0afaafd0616b505037114b0dd587eb SHA512 e722cf173031bf75feb5ea42f66ff11a8b147063ac3cd0106bda196667c3118c81013fe38260b729e9c8b59085ca3fe0f140d42dfd96f4aa11acfde42beea868
 EBUILD more-itertools-8.8.0.ebuild 629 BLAKE2B 92e23e9e38a4577c6df424b0716ae99f07df1b83a8f522e44730aa9cc7cc659935757dd52065613fbc29119d0810d13781167438a5d62764f8acd5a6a7009047 SHA512 c2b99fbdd94b9d823cff83f191440232af7cff11a2340e7cbcc032fb8362eec7306b96a1cf4e59d59e7aeb13ae8fe0e02c6d0fbcf246fb38f904b26a2ba8e556
 EBUILD more-itertools-8.9.0.ebuild 636 BLAKE2B 42aab6457961e3f49539cd1d36ef52c0a0257f34264f00830fce170bcc47b632c39b3de134ab3aeb68b8d615d12ab55d7d0afaafd0616b505037114b0dd587eb SHA512 e722cf173031bf75feb5ea42f66ff11a8b147063ac3cd0106bda196667c3118c81013fe38260b729e9c8b59085ca3fe0f140d42dfd96f4aa11acfde42beea868
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-8.10.0.ebuild b/dev-python/more-itertools/more-itertools-8.10.0.ebuild
new file mode 100644
index 000000000000..bd17f3f88b05
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.10.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 0a896bd74d9c..b41f9374bdae 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,5 @@
 DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
+DIST nbconvert-6.2.0.tar.gz 898501 BLAKE2B 6dfcd33c4bf625a2f68dd4b89cc15d100a2b036e08f3918731f019d171224c218f669e07fd7d6aed712c52448dbf71e6173a49b560faa7d5f13e3cce62df0fff SHA512 ed67cafd23dbe9d8e08292877cae9c889518218659f2ca615fe52fe937f70cdca3e300a28dbda81578ede7784458443bb9fa1994e05c154dd5473015b91c9af3
 EBUILD nbconvert-6.0.7.ebuild 2031 BLAKE2B c84d1e34378401aa950e5fafc01adc04c18681e67b85b9d81c2df703254dc57c714324bb4e132918f89e2eacd368806b6f1ae10f17c9d78a3025b7423841ad4d SHA512 d4c0a034088b69de1b0ff1ec979f9fa0082d0005ac9eb0e6f486bcf4fa2e29786620efe40c6c1a5c6d15b836412ed8cf3c3484534ead9edc6ad4ffd5ba6be350
+EBUILD nbconvert-6.2.0.ebuild 1959 BLAKE2B d5f277d45c70fe80b5f30cc81a4e04bee251ad54d3c4740a5229f989e57584d9b16b2f6ec4c81fb12e749ae106d4f17f8976e5277e9edb94454852778f201d53 SHA512 23f680184368969e6377a95bbecdb27055a354cbe3939e9316917583269bc998163da8524a8cb54162f5d367bba45cf16d4094c5f2badab1dfaba17122b650e8
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.2.0.ebuild b/dev-python/nbconvert/nbconvert-6.2.0.ebuild
new file mode 100644
index 000000000000..7278542508d5
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		media-gfx/inkscape
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 9e672c82df20..d75777d3cea3 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,5 @@
 DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219
 DIST networkx-2.6.3.tar.gz 1844862 BLAKE2B 408f97e334c3e0cec6d40d15d6ba8dc3c07cbd162fb31b301696c53ff1d924fd12f60d34df3f1b56fd036f2a344933a3b5c41a1aa2f91e5d5ca39f922cdfc41b SHA512 709b5126039c4b34a9b2ed60723e8bab3f591203f3ae8d87474e0f49f52b94b9c15568c78cc9e05e2bf997bc65a6177762bc41b0a44093ee59f6eaa0087d0f34
 EBUILD networkx-2.6.2.ebuild 1230 BLAKE2B f1a8c22e8e56a61b57378b3517d30460abaf0fb5db50947028f2a35c116d9d0010130a15a7d25d4478eddadcb22ff1d7a4f23d0fecb0799202eb50deb0f075ca SHA512 a455b0a1e09ed160352a89b38dca4d063b241d763aa59b0f917c1eeedc184085c9043762fd3574291609bce39b436dde1a01447e376fcbf9d0a5d252b2849229
-EBUILD networkx-2.6.3.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
+EBUILD networkx-2.6.3.ebuild 1341 BLAKE2B a2ffdfc539b5f46272c4de1a23253904c3f087327aceaef84edf7d2ebe7765355579d9cbb1b88048f440d94680961f352c320b9f33e69b05b88ee10986ea6c77 SHA512 0bf9843cedd1bbd3f8125445ac2524aaeb1e0ba028789616fb367e91d5bba3157de874109e7d62b9fb39cc98b120f33d3e1ea066eb288a404144a21c5040c419
 MISC metadata.xml 1304 BLAKE2B 006e40e7b37efdddf137d1a1326300d0bbcb71b48d038ff5c8c4818cfa6252c63412c4d8ef9be05d2b5cffb050b2b9cf180e252aa8273368cc054529e3807535 SHA512 251933e83f7b95ea5323d94bfe3b513c69631aa5646095d7d8e52dcff80dd223bcadc1055dba05de6eb9fd9505c5684a1eb7e1c059ad9d4d28a775eb83b61e7a
diff --git a/dev-python/networkx/networkx-2.6.3.ebuild b/dev-python/networkx/networkx-2.6.3.ebuild
index 51a49fc1b85c..bf19c4bb996d 100644
--- a/dev-python/networkx/networkx-2.6.3.ebuild
+++ b/dev-python/networkx/networkx-2.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
 HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
@@ -13,32 +13,32 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples extras xml yaml"
-
-RDEPEND="
-	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{8..9})
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
 	)
-	xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
+"
 
 distutils_enable_tests pytest
 
 python_test() {
-	local deselect=()
-	virtx epytest -p no:django ${deselect[@]/#/--deselect }
+	virtx epytest -p no:django
 }
 
-python_install_all() {
-	use examples && dodoc -r examples
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
 
-	distutils-r1_python_install_all
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
 }
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 4c6e1555cf47..00e1b056bbfa 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,4 +1,6 @@
 AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
+DIST nltk-3.6.3.tar.gz 2824924 BLAKE2B fcab6647f43f4bf139857e9f4202aee688f564851976ed6a183e47361451fae771318346724e41f198b82cebdd5a47f151aaf932099143ef6faa2a77430fbfb4 SHA512 fe7244967df018670501304d1a8aa50a0f4d42bb0c73cc5e202eeab6a0f5da1eaed9b961f6026e3b8ae4b0393d788bcb58b263ba22a3ce6f5644022736035f98
 EBUILD nltk-3.6.2-r1.ebuild 1634 BLAKE2B 85e25a760e7c94b0b4cf463d7ab89eb34a7d235a984dbed139da6cc0f151449f670a46edd3831e7866c16a37aa3fd569aac82317ec5b07bea00712f35c83038c SHA512 02a73f3ec7e43072b6200f9b65e28a1bbdc63efa23ee79508c8eb3caa25aa7f265562561ae54bf9e35dcc92e52ba98b698e89f82303949da016186c1fafb9602
+EBUILD nltk-3.6.3.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.6.3.ebuild b/dev-python/nltk/nltk-3.6.3.ebuild
new file mode 100644
index 000000000000..11dd1a3283d2
--- /dev/null
+++ b/dev-python/nltk/nltk-3.6.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		>=dev-python/nltk-data-20200312-r1
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 2d58f7370f32..425d68c78599 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r2.ebuild 726 BLAKE2B df82bcc43b12585b69c230fe96a9972a844942529aa9e60203f6e7df0722c3ece0dd19160d575557a0bcd6590398349270e8c9801dff9088783e8d7de6c355c6 SHA512 09204dfd6ac52dc9c9c02c52f53da93a48c66460f6cd5dc90a4ccdbfba64c651ea1914dc45f06d352807e915b56c473d1db3e040ff18570bcdf0e885bf317fae
+EBUILD notify2-0.3.1-r2.ebuild 858 BLAKE2B 334db2c0fb768c754debbd7b4723384db1bace49e44ae798029263a30c6808b98a58bd283b44e95d84193214c7859b5ad74f274aa990c2464427167ccc8ef124 SHA512 7739d87f8438ca05bf1d52313e9a15187609d017262288dcdd0792ead3e669cf5351dba6a284c15d4ae5a164743c39aacf784b3ac618fef30d515611a528b488
 MISC metadata.xml 490 BLAKE2B 7627e5eb7c44257e2d495d2fc86e455e88eebe9a6d9a02491580b558224549bb9f93cfcb2f623375006537826599e81e8a2c5bb844930dee2381c40182cb3fcf SHA512 159eb84765ef2e160b602cb8725364c0e15efd3f42f6939643e38f271d1a5bc3ff610b24bc775cbd8a189faa796cda4652537ee19ab4678c805c7a90b11e1478
diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild
index 707efcbff8b2..d21b0ee686bf 100644
--- a/dev-python/notify2/notify2-0.3.1-r2.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
@@ -18,10 +18,17 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="test? ( sys-apps/dbus[X] )"
+BDEPEND="test? (
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	sys-apps/dbus[X]
+	x11-libs/gdk-pixbuf[introspection]
+	virtual/notification-daemon
+)"
 
-python_test() {
-	virtx ${EPYTHON} test_notify2.py
+distutils_enable_tests unittest
+
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_install_all() {
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 7b35ccdb896f..d376c7e9d58e 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46-r1.ebuild 593 BLAKE2B 08f4fb9c1e48003a1d3e2d599c7f2c3a45f6e543ad44cacb14b348d5d9e074aaebd2ecc9921daf871ee79ade7c31d95a1e6f5078b5d070104fe78f355bb6d228 SHA512 c80d09d18de06dc97c191480083b3d032cc10df212754ccbefc4b67470e0e425737e3e5dc83d37f32b4932663b4a3ba9ffc1973868ceaf08e9ef9d7f9983ea25
+EBUILD olefile-0.46-r1.ebuild 592 BLAKE2B faa7909db88ff9e4e415c61ae3fb4fbd5a354b61fd4a94ecaedc80f30764c412447066d1bcfcccf7c012cbd9e7e13f07a726920e46f496be6dadfc19e29335cb SHA512 73f92df9ae312e35fb75747bc7a44557833b16eef441c851d4127bcbcc57af15a0ef83aca16c010e20463266b55b1b12bb2780b701d06f3495cb47a2b735f31c
 MISC metadata.xml 405 BLAKE2B 0624bf86d3688ac305571048b0dd8229d8789c7c28cd8d3e5536a7e653390400a2aa7615da7b2b32dc54eb11762d9c72db9d3b5cd19518fb52c4ec479a42f15d SHA512 2dfba1b0cb3bd235952c0ecad910354a1589243f66a2d04ff93a9975aa3395e50cea3230947e8db884442951a8871c1457c1a9b99e8657a04432185b3e9acaaa
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index b53151d214f4..be4a231cb844 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index ebead92d8247..2337f0f51d29 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,8 @@
 AUX openpyxl-3.0.7-metadata.patch 361 BLAKE2B 7a5322e9fd568124bc2271f015fa284300ca7004d286b4f3c4dec35446948941e69c3d0b43d7cd4af59c05a633b73071290d65cc1e83bbaa28eef39cf9f03d58 SHA512 1926f83469f6b869ff5a923b1bfb112b0674b86aadaade6005f3921e6cc67118c771b36cd04af49447e99bbadfbfa0a03d56f1d6ffaa3fd27deb40b4ff2eb5ee
 DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
 DIST openpyxl-3.0.8.tar.bz2 2514689 BLAKE2B a640104c4afcafa5dad8615986a0d3acdac563c60c0ae4b6301978f2257dfbf64eb9413cfdea690600d6c267cc104e3667f51e1ebb23a2c8e74908c1aaeb62ed SHA512 921ee6e37a7242bf807cda3a86ba224edc80c64623b6cf0d3f344217485b53bcddbdd2a81a35bd8e80fe0dc9637d6c08988c191fb4a905287a8af340b97fadf3
+DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
 EBUILD openpyxl-3.0.7-r1.ebuild 798 BLAKE2B 6461de0ea8dc4e2f611edb6baa49931be0254feedc75eeabd1e43c45ce1f84f7c3ae3a23b9139bdb162689e9ee1bb27040864df56896ed822864ed6d845262eb SHA512 e38e78ab91253a791cfc388939edcc9af6d91da017427811c05ce2478ca5a8a12d2619cd60cb72451b3368afad55dea37e0e07e9684c4c560ba0a1a0ae498617
 EBUILD openpyxl-3.0.8.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
+EBUILD openpyxl-3.0.9.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
 MISC metadata.xml 536 BLAKE2B b7f2485954fdce3ea5f40c3354cfd8775a0b098714ce3f3d8a0aacdd9a8676d00e6f07548438235aed65091cb57a4860579e3761e1f82b9bf5df2209456a7c3a SHA512 2435e40e7b8366195d1a7fc5e5bd0a759157920253a752211d3225b078d1b26313ecea475c5481db4955a4619331bc97fccb7911ed72b9a0aad479f952675427
diff --git a/dev-python/openpyxl/openpyxl-3.0.9.ebuild b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
new file mode 100644
index 000000000000..23c8e219fb65
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	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/oslotest/Manifest b/dev-python/oslotest/Manifest
index 11b6de9cd899..d6d10238ed96 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
 DIST oslotest-4.5.0.tar.gz 38233 BLAKE2B 73fbf056467c5d86c647b0ff49ce2e75654c8a2ffbcda78f8ea49edddb55a4c5e0f065c7a95291468b2d5d73ec5f5152d16a2129ab17fc5e6d457284e684ec31 SHA512 2dc0644365621fe271e09f2f7be631f697749c9d343f1ce9b635986df41ec5be8787350b3f2eb6b6501f4baac1ec597b2f0ecada7936db967075ebce837e1517
 EBUILD oslotest-4.4.1.ebuild 658 BLAKE2B 5bdb57aab28a40f330c5446e72b8a5e5e60ff213995533dcb3246f41478cb35c79ed0fea59d7eb29141efc9b8a6a41eb8817577e8c36005840f65cf96b666c87 SHA512 67062d9036c40e30dfd6fa983b28f5a7e1289f5f8bcdf3901cd257a981b28d627c6c1c1c070eafd1140417ad34f9bb50375dc90edebc4ebb633b0113bd6eb277
-EBUILD oslotest-4.5.0.ebuild 661 BLAKE2B c2fc3331367b1da933afca440eba22ec0d30eff032461e5239dc02511b12e77e64aa3530c5c65dad8e0b044f7a3d2b78bc602b65cae4523e02530f0cfcb2e8d2 SHA512 a63c24600bca9d8bf15dbf4cdcc7ff6fa5d022d891d63870acc5b800ea0401619586ce77e7709a292677785b76661beb15a7a6d3f9409f0125f285536a5c7029
+EBUILD oslotest-4.5.0.ebuild 668 BLAKE2B 9e4b3fd987d6b178b7e2fec41246fed00a8b8e1240dbacc34cd837a0aab72ea15c194894f5d4534dfcfbde4b2b917cd10f9e5ad3ded0f7bf54a646e19c066055 SHA512 6d82c9c1fc965783bd4155dfc602ce09ff10181deabd1f8306402012ebd42ca570def06ac94c4718c5f45dda492830c1541059f83130db8a79005c91cf083009
 MISC metadata.xml 877 BLAKE2B a57743a820054d45f61574e3176bf0b32125fa3228a6bc70e6f9ec018100958e4197d33a8d0c612d568fbddbe1dd3486bfce7b78f4d93fd2b7774cbc6816d820 SHA512 6f21bda141de902fe33c9281b870a5637261537828327efe316a4d9029a72bad65cfb0c1066a9d22e4b1fa1603137d7f827cdd219e557c40af1b6a5d3114a68e
diff --git a/dev-python/oslotest/oslotest-4.5.0.ebuild b/dev-python/oslotest/oslotest-4.5.0.ebuild
index 0265b8b318b7..d54ffc620182 100644
--- a/dev-python/oslotest/oslotest-4.5.0.ebuild
+++ b/dev-python/oslotest/oslotest-4.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index f789fb2e4894..7bbd973c58bf 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,6 @@
 AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07
-EBUILD owslib-0.20.0.ebuild 1014 BLAKE2B 3231eadc30c7c7e1be365b1e3b6363053fb6a7487c6936f846dd6f363227c12521d28797bd226260682feb43b735559e03cf348e0fadee54233a0d8872136e96 SHA512 8ed3c9897ceb5d8cbaf43a90cd6c3a732a4a4187facbba6c90b5908d6c9d1fdd78ffd9334587c5f8ea86d0feee0d04054b79ea4b68a99f09e5827c3eb758d2e9
+DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
+EBUILD owslib-0.20.0.ebuild 1215 BLAKE2B db4ada787d23f0ed22d1464b059214f24321a063e7b9471fbc200fe7af58002097e272b39466462bed241e447b18709ce5ebfe1f206249b000f89d4ddfdd4332 SHA512 f3113321818159c0ec73c9fb6f89fc19d525566e423e102898489758018b3d60ed6e3220923754f9bbec9f3e458c464e0f1f24ef182a805807de19565c0a7991
+EBUILD owslib-0.25.0.ebuild 1009 BLAKE2B 9d5fbe2d6c9efe057e908031012cef689f63dc580412fafa26f0dc28f9a7e162871dca634617bb1fb2ed1d102bbfa93be01fa1d4ed1e3f7778a11ab75104985b SHA512 3deb83a78ec54b679c43d82a18c8c842b8e9d6410e0d9477fd792be580db5c869fe87224cfbb59b4b418fa9c2c923ebdb640426acd0e3631e281282697e7e7b0
 MISC metadata.xml 496 BLAKE2B 811407d4cd3ccc73043d31a65b45df685388e853ee89c58fb9202ef2d3589e3240139c242d1c020bd04af8ec161fb7d2f59a095b695c8d913937f8238582e61d SHA512 e5d01c5465033c270d95e97d91d23315b7228e9b8aa82617a7cc86960c1fd001c8f5853e0b9c676c6fb044e32107028db2b21ce0fe08a9ea4e95b7d7fb86e4a9
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index 7349839b7ad3..a5f26d6321dc 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.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,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
@@ -34,9 +34,16 @@ DEPEND="
 "
 
 RESTRICT="test" # tests require WAN access
+PROPERTIES="test_network"
 
 PATCHES=( "${FILESDIR}/${P}-no-privacybreach.patch" )
 
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
+	epytest  --tb=native --ignore=setup.py --doctest-modules --doctest-glob 'tests/**/*.txt'
+	#"${EPYTHON}" "${S}/setup.py" test || die
 }
diff --git a/dev-python/owslib/owslib-0.25.0.ebuild b/dev-python/owslib/owslib-0.25.0.ebuild
new file mode 100644
index 000000000000..0ff537b66057
--- /dev/null
+++ b/dev-python/owslib/owslib-0.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib/"
+SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OWSLib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+EPYTEST_DESELECT=(
+	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/patiencediff/Manifest b/dev-python/patiencediff/Manifest
new file mode 100644
index 000000000000..c9fb6a7bf25f
--- /dev/null
+++ b/dev-python/patiencediff/Manifest
@@ -0,0 +1,3 @@
+DIST patiencediff-0.2.2.tar.gz 28799 BLAKE2B 28d8ef1bca5091e6b92167e7d48bbf1ebcc5b7a42c24c23ba82b4a29700e852170cdbc8019d197936c0e3ce0b406ea5d8b2189f7f9482b361feddbf8379bc4a6 SHA512 9b1e058604e114cc4ac6e5855d51cb1f9599fd692a48a1d68ff56f4e82cf568fa4d3858fe7bf233b784b07bf2825f7fd1d1ba0ca71371242ae46820ef469ebd6
+EBUILD patiencediff-0.2.2.ebuild 465 BLAKE2B 478affb069fcb91ca6e41a43c4975a68a1c2b6f5950c77f9e99e7a7e2a088404768cdc53dc15dc38b4c642278448688ddb750307402312f611a66f0bbb60f5b4 SHA512 ebcbb4ada19e4d306cb70d078ca0b5cf9c3edbc8695c8fa0c3c2eca8ebd5b536c79cfdecf89b0e7c743fd3cec64407b94da1c3a59453ef344f057fc5bbc43c50
+MISC metadata.xml 390 BLAKE2B aaea1a09690a00af50f8fca6b053080e866292c2a177ef4364443685c49037f3b50f8b7f30e7695eca0aa8585cc5d5073b55e4ee4bedbb8f78899abcbef836a3 SHA512 7115fe5a184d42478b35d60438180370365eaacebbc3829748af86839652957870f5cebe2e0e1443496888437f37b8d49e90ead9fac39ad9bee4323b7c271b34
diff --git a/dev-python/patiencediff/metadata.xml b/dev-python/patiencediff/metadata.xml
new file mode 100644
index 000000000000..ca46e2601ba6
--- /dev/null
+++ b/dev-python/patiencediff/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">patiencediff</remote-id>
+		<remote-id type="github">breezy-team/patiencediff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/patiencediff/patiencediff-0.2.2.ebuild b/dev-python/patiencediff/patiencediff-0.2.2.ebuild
new file mode 100644
index 000000000000..917b4b785ddb
--- /dev/null
+++ b/dev-python/patiencediff/patiencediff-0.2.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the patiencediff algorithm"
+HOMEPAGE="https://pypi.org/project/patiencediff/ https://github.com/breezy-team/patiencediff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 74e99c723d42..98f3e2ffea04 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
 DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
+DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
 EBUILD phonenumbers-8.12.29.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.31.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.33.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index ca24bf4fbd87..0f3b1a8f99fe 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,5 @@
 DIST pikepdf-2.16.1.tar.gz 2312177 BLAKE2B a7695ecc71621c1e64ab919e76dabd3a94ff16d401861fe50f29f00832dda8be01f3e67c811756ef89573345b49ec6c880635309f859624b9df42cf6eff7b43b SHA512 d2c73a0a69c6cf0ed22dc2dc949187464abd4194a5d917e5681de033d6a8ce4c089efd49eb110c9fa11f9dead292aa6ab7ed71a01f7cbaadc51d1f37a773c936
+DIST pikepdf-3.1.0.tar.gz 2334496 BLAKE2B f92385a9317e88b00586f6900b4ef2a296e6960e8a587d2b6bf7f12e5354d9de48b537cb5cdd220187860c852e0ee538d533902311d70c7d44e6fe700fc10ca8 SHA512 c3ef18f287ba873d6e35114137228028a81af8ba4d59ffe5c486716b298757fe6f5b5d3d67dcc4230ed10543849a8d6370e43d99527d7cfd1decd4a84b59781f
 EBUILD pikepdf-2.16.1.ebuild 1540 BLAKE2B fd8b5c1985b0971583ce83b0400719c33fa87cb7a9d3e3d3321a4c07baddfb681d406ddd579ee17d3ea41fce780d4d291c0977c006ab98fd7b0ab8ea1aad52e7 SHA512 8f9c2b0c5cec84cfd95c331d19d8fc43df526aa37e7e8d4ecb8bf85d91707d66089b3c05428e627b61685bac85426c3c768bd2956e3f69f08bc3f523c5cf5881
+EBUILD pikepdf-3.1.0.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-3.1.0.ebuild b/dev-python/pikepdf/pikepdf-3.1.0.ebuild
new file mode 100644
index 000000000000..80dd3fd26a41
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-3.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+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/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-text/qpdf-10.3.1:0="
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-7[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.7.1[${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 '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3253c6e7f692..e4ec080ba5e2 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -5,5 +5,5 @@ DIST pillow-8.3.2.tar.gz 48783084 BLAKE2B c63930df3af0270bb092841b3c39a1ea75343e
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
 EBUILD pillow-8.3.0.ebuild 2626 BLAKE2B f30f0079e2d884bb8b8d450d085037feed17d03ce1f481fc3d58d39e05535dfed6134ce2bd13093f139e0d15b044c7e250cb1f0019c99ead4c5dd1e186fdcdcd SHA512 7b7c6c37719d3e09f80f3f5e434cbaceae64b6dd1321a79f884dbfb31fc9978f85ebf06064e305b6ae674f7c9cd22637b6a39c0d70b84e21c8fb1dae1d699fbb
 EBUILD pillow-8.3.1.ebuild 2626 BLAKE2B f30f0079e2d884bb8b8d450d085037feed17d03ce1f481fc3d58d39e05535dfed6134ce2bd13093f139e0d15b044c7e250cb1f0019c99ead4c5dd1e186fdcdcd SHA512 7b7c6c37719d3e09f80f3f5e434cbaceae64b6dd1321a79f884dbfb31fc9978f85ebf06064e305b6ae674f7c9cd22637b6a39c0d70b84e21c8fb1dae1d699fbb
-EBUILD pillow-8.3.2.ebuild 2634 BLAKE2B 00b6b802d4bf47e0726e13db2cb31298ba52e4b9f15902116c4f3064bfa2e4a81c9f903c1ff3e3a0d6900563a35af3ef564f4135ed54dae3069a65bf2d80a090 SHA512 5c66370044052746084dc21c28f844478ba5ee55c5bef3c4f8166443d2910d82055c805cd24bf01ce16ee6132283d7b4f0395da65cb8824f2f135202a025f8b8
+EBUILD pillow-8.3.2.ebuild 2633 BLAKE2B 63932c919cdfbf5094e4ef05ab07a1ece2dd9ad455ebc497093e40cc8540260b8e4e202ae2589f7e7be2d6251a53df70f872b8cb480d28741a101910a27d0822 SHA512 7a0ffdd1fcf2ac5f5b3ecad6ee0cd9db2c8eedb9651da56bcf23f7eaac249dacbbd6860e1be84716e6d363c4d2efeb2f172e3081c86ec42d37caab7159bf2d95
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-8.3.2.ebuild b/dev-python/pillow/pillow-8.3.2.ebuild
index e6cd3ecbabeb..b43b3eb235de 100644
--- a/dev-python/pillow/pillow-8.3.2.ebuild
+++ b/dev-python/pillow/pillow-8.3.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 2084ffb85409..f41e9061b7da 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,5 +4,5 @@ DIST pip-21.2.4.tar.gz 8786693 BLAKE2B 02d4cdd3d9feda2d4daaf7552bf86e068d2f040ef
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.2.4.ebuild 4253 BLAKE2B 0c9d20349844b278ffe198baf860d1e8aaaee187705b7d1c070093607959eeaaddc7f1a44447203b6615253cccbf6857501a23d1de12c6898b40278485414121 SHA512 c042aa5236052d5de092d043b4e51f5a342497942d4c12cec08048ba7a35a52d9eca23128bc745c59b4dc371b47af64c2edc24dc977dc8e47886a4c952ac6da2
+EBUILD pip-21.2.4.ebuild 4259 BLAKE2B d02c6560081fff5ebc816230070cbcb809bab306ba6ec532311a722a0b1238f56f8660e140c0b0b3b029f27d9aa8bb80cc9594d0579b53c4c4d745e32a1e72e0 SHA512 9f6652ebddd0e5529adf527d3fc4946745fe77197ad9385b41a9ca519212bd6b97361250f7b711f619053ca43453f8c58d518280674794c945dc80606293a64a
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-21.2.4.ebuild b/dev-python/pip/pip-21.2.4.ebuild
index e35288523f43..791ed303685d 100644
--- a/dev-python/pip/pip-21.2.4.ebuild
+++ b/dev-python/pip/pip-21.2.4.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 8dad55fb9a18..47d3489b6767 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -3,5 +3,5 @@ DIST platformdirs-2.2.0.gh.tar.gz 17674 BLAKE2B 1b8e31033194f5682fb8c06be8268cc1
 DIST platformdirs-2.3.0.gh.tar.gz 18338 BLAKE2B c7d2b1b7ea65794507153b5c8d4d2e5a0668e4f9ef78024ab08c724e5cc5e91d0b6d7ec115a1ddab8a6fd7d34b4cb84cf3ebec64079d866344d2a7d18ca617e6 SHA512 3d20476d5064b6e300cddb5dcc9ba15346b1a8c3f5bfad869edda05cdd123a00a0c6c18b15af49a74f55fded5e11d69112b77239fe6f8f7da97c9a43ff442d8a
 EBUILD platformdirs-2.0.2.ebuild 644 BLAKE2B 25e8794d977290db4ead470cadb65c4b864074434723b2096585cfec3d0b265e6594e36f102220193b42aee7018b747c5c5bc75aa733ab5968de6c96d56f13b3 SHA512 a2d4bf191a3bd78ce299101d5ff0cfdb7baf434fe39535733b3448e43f4d3b4d6a0a80a1f9b6aee76f1126e20d647d15b2c06ffec06348823500acb309e96b99
 EBUILD platformdirs-2.2.0.ebuild 785 BLAKE2B 684d0310c09f107334ef902e4c3eac28bf9e5eb32b972430573643ee8b38216db0af16a2c5121ab84929887d95e746d235afe42a8d526fab95e5c1f2264d07c2 SHA512 f4a317c329777d239cd41950f1884400005322ca8461bd362ca9c03b52bb3b748f1081b491260484c4824b24e8c18eb0ce27c156bedf057863fd21ec079a4aba
-EBUILD platformdirs-2.3.0.ebuild 797 BLAKE2B 1808b8a0e84de241af080924183f9c146754fd78077c5c49a8bc7c58644a22559359ab06207e03fb89b55981860384e96bea07c3c93c2e6a4ce68f5cee739188 SHA512 9c810140dab66cd3bd7ace868dbf10d56470a69c82a6f063283f5b5735400df429e00dc0c6ca1740c5a4c593ff0383313a051b137c5b597555cbbe8aed4a1d83
-MISC metadata.xml 359 BLAKE2B 9e7423e4859cad2e7d4ade966c7375e7946eb7d4cf0570d8b8f739f6aacbcaabae8d41e35891d0a5694d0cb1db670195f253f7a950f0e125cab8180fb01ed01d SHA512 3028a5d9635a3e069b8b923c309cfb52660baae8c27eaae727742210f5c4d4ffd2cc39fbb8b55da82dbe346ffc8a9e0f01c11782547e02e91b8a6f9c57dc5172
+EBUILD platformdirs-2.3.0.ebuild 803 BLAKE2B c767e7b83c0df2330bacbd45fca203c331d4abd71d54231fa40af88ad15ba7ab5b1ba787daa9fd7950137f0b77917aa711ca4cbd7c1a2318e37798296acb5809 SHA512 fec658124062fe60fa5d7ba8d92b68774506b88f49fb3f8bd8c988439b2a1a0a8ba3f3cedef4f5abf4ba65be9a8a1cf864264d9225c78d09560c034abddd1fae
+MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/metadata.xml b/dev-python/platformdirs/metadata.xml
index a919e3d2da83..f801eabb6b23 100644
--- a/dev-python/platformdirs/metadata.xml
+++ b/dev-python/platformdirs/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">platformdirs/platformdirs</remote-id>
 		<remote-id type="pypi">platformdirs</remote-id>
diff --git a/dev-python/platformdirs/platformdirs-2.3.0.ebuild b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
index fda4f61c74b5..39dce3345f62 100644
--- a/dev-python/platformdirs/platformdirs-2.3.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index b6fb7b4c03fe..15572fd7cc85 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -2,4 +2,4 @@ DIST pockets-0.9.1.gh.tar.gz 42077 BLAKE2B 0cdc5a63389b7c01df9a2e63fc1e18edfb847
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
 EBUILD pockets-0.9.1-r1.ebuild 595 BLAKE2B 05dbea40222ecd161b81ef971a96486119fe3e539766b5836df97a951280bdbd2326e8456504d9b27427c624b3e14d72d1e9fc5010886d71c14fb9df55020b33 SHA512 b01b2a6a5886a4de0937de8a47c0266546ab0922a065013f440c3f20ab7a7131a808fb0a873fb45a5e34749ae9b9c095d2cb38f7101fb95728b4dc52d298df02
 EBUILD pockets-0.9.1-r2.ebuild 846 BLAKE2B ffc2816c5237773c9126885c6890914c9f9912d89ee12e74dd0c4bd6192f301b90a70e93ed38b231c585729ea3d74fac54091ac3cc652a6c19f82abc9acb1068 SHA512 cda0a83a7a3e3ffe40f91087453398f8d61aba6f200c65b6c97ddc09e6fd3a305ab3e90786f3a09b7630744788020cdf53d8ecc4bb67ba684dabef69aea09f96
-MISC metadata.xml 390 BLAKE2B 3578be4b9521edf56d5aca65b5dbc8af4fd6e565afa7637444fd4128b548c47bd8ede5ed37a706a32c43c62bacb468e2452973fab077776ae61c3e8f7980dbe7 SHA512 4cbd0b3999a5347f3cd69f4987b7f380b50493a7c55c114e5760eed6f6c6ef5921162f6999c022d9cf1266eedf42d9719e87219833877b652ca8ca7173feab7b
+MISC metadata.xml 415 BLAKE2B 437322971edca427c00ea9d96eb88611ba29f1549197fa15846efdb8961a5c294d1bddc2076ac998dd69a9bb6b56310ea9f8d54470e83d3f54755bcf1970d6c5 SHA512 276f4ef504941dd7cb7c3cf314ed7faf41ff071c36c5ee53b658990828368b25ab0f53b9ad833827a97ffef4e25eb0c1caea28a361d7ad076938d8e61bd61908
diff --git a/dev-python/pockets/metadata.xml b/dev-python/pockets/metadata.xml
index f04f71103db0..67e2a07cbc2f 100644
--- a/dev-python/pockets/metadata.xml
+++ b/dev-python/pockets/metadata.xml
@@ -5,6 +5,7 @@
     <email>klausman@gentoo.org</email>
     <name>Tobias Klausmann</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pockets</remote-id>
     <remote-id type="github">RobRuana/pockets</remote-id>
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 200a4f9dac12..78e153d8a370 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,5 +1,5 @@
-DIST podcastparser-0.6.6.tar.gz 23482 BLAKE2B 3bdfefe0eafb7d89dfc0063b0fd61c1f5634e381ec6cba634cd9b054dc51476cd0c37267fc40db317ee3d192ea52b4da18e8efc387ad81c6edac25caf7c94147 SHA512 aee6cb72157242afe9f4d9bd201b9538051cce1fc6a153a03206ad041fbff7c99b69659ee4a9c8cbf5583c1a027a9d171943882cb3a48e4ff7f84602cccf2d74
 DIST podcastparser-0.6.7.tar.gz 27671 BLAKE2B 03d55fb17622c24084346b0872ff501192e4232df35104ce6af0e90c9ba58528073ad6367d52985524cab01e1dc9de2f47bb66a267bae43208d74b61d4881380 SHA512 e020e4a729f8ed021aee1a91fde9eb70255cd3f98ef2edae98824789448065c75cfe9e0b35e9872bbbfd7a38ae4f9daf01a9945c4a50a4f6a61b498f5544b86d
-EBUILD podcastparser-0.6.6.ebuild 430 BLAKE2B ce82fff8a33adee3fb7ba3c7efd2d274c92f048a93456d728544b6e6c9c2e8eab9fdc7736d816eed340a5dc5fdf9006f9002683086369d4c8c44137f9a099c16 SHA512 77a236c2c473d61a37eee5b603b9839c5086e10f176c05a3f369b8a160cea93d70db4b8ee417b9e0e57086ad023909a7e89dd7933afb27d2ddd5e301d75ebbd6
-EBUILD podcastparser-0.6.7.ebuild 435 BLAKE2B ec970d2ba92c04283d8162dd1563d92f5d2d96fa6d146a0ec6e98559929a3679d9dba0025c28b1ee208a8d090febacac785348d59b6324b01ab7bfcb441f3953 SHA512 b137ca89ec9cfb64965148c242b4dd47c40e1c0eefad9b8c46cd01239df4e2aa8a701e06b22ae384b9ed0ba66a387b5e6e22455bcd5564f5bd15cc455a580fd4
+DIST podcastparser-0.6.8.tar.gz 29809 BLAKE2B 19eda892dcc83f5371d23147a9044bd1249c05885aa7e72edc868e05744bf691336ceb8b445dca4c51612846bc7e8c087fa0c36fa44568a4f95b0e8f3eb155cf SHA512 8c1152c6d7229faf375af5c3f02642debd081915dcb55ba706863620af6039eb710648bf970d1cd8018d43dd36ba579a456e3db0e82c7efcb6ac94a5cd23b1e8
+EBUILD podcastparser-0.6.7.ebuild 433 BLAKE2B 8018fc3b2e2ac88bd3ed7ce49e8c38a8f06456139ed979657b344f62ffc0d7136d87b9b5655803ca2db46e68b5e6e5e2634e134d8ce604ae7aeb645315fd006f SHA512 d9f6d1deac35ff04f1b00f27faf00692e701c49ee8b18fd61adf115a7ce9457d227fe1fb8ecd2f695e004651495fcb2c58f183e2600d86b58874ecd78d2b53d9
+EBUILD podcastparser-0.6.8.ebuild 432 BLAKE2B 5c53400e4d8391b2cb3ac410bd6b9755566f63214f5adae4603bcd5b6946925e874518fedd4e18089d4940ec1e131a88047c0fd1fcd310c59da193dc25027ac7 SHA512 dc00fb4aa0bfb8ec930de12766a9d428e44c432a3ff5dd990f6220dba16b43b42cf9a5686f362af409695f5c1dc7b5bdbac3af7523df555ac4957b60224c003d
 MISC metadata.xml 455 BLAKE2B 041490b1b7d06df15950ac851b6ff6848068e0e6a3bf793eb11c51143d0324a69188d4e6d7fbcf1f93d68191417b5ed659490718804ecb08d7f67386763edd99 SHA512 d3fd0f12693e6b80925ae4fd9f00964e664039c17b973b778eb98dca08dd9ebb5237ca4235b5178488a18839eead5b4a80d362ed53d8eeeda58bccfd84f65a46
diff --git a/dev-python/podcastparser/podcastparser-0.6.7.ebuild b/dev-python/podcastparser/podcastparser-0.6.7.ebuild
index 969853ef4692..e48c32517b49 100644
--- a/dev-python/podcastparser/podcastparser-0.6.7.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.7.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/podcastparser/podcastparser-0.6.6.ebuild b/dev-python/podcastparser/podcastparser-0.6.8.ebuild
index 8209019e00e2..0c2941652713 100644
--- a/dev-python/podcastparser/podcastparser-0.6.6.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/podman-py/Manifest b/dev-python/podman-py/Manifest
index f7d9038c3cee..282ef5117cd7 100644
--- a/dev-python/podman-py/Manifest
+++ b/dev-python/podman-py/Manifest
@@ -1,3 +1,5 @@
 DIST podman-py-3.2.0.tar.gz 165514 BLAKE2B 7e25d160b98e45cc147069249d850b3a3d6dac5227942d90ed99b8313befd9db04a6423015ae56959a53eeeb49958d9067eb6fb7127ee55bf50ebfcea617a220 SHA512 8ef165847de5fecd81e7b5564baeaa0298efd4d2e6f12e1dfe958eed77f945d9375d90ba93a8ebab4b090b228d451e96ce49d08288dc3daae1255a05127b25c7
+DIST podman-py-3.2.1.tar.gz 181095 BLAKE2B 5075a37d3ef20004424536bc1f9e6e08c842248fcb8d8235ebc354e832e78125fb19bd0001f7fd237ebc642e348368da90b634f0db8c84e23ef77e8cf99b71ad SHA512 656a5e61d9809e2866a071ff5b4792fb71fbe0f8cc05467b498718b74898acc39a970ba64fc08ffe70d9c34a9caeabc3d8ea07dcce856fec308b6ebd268b2fb0
 EBUILD podman-py-3.2.0.ebuild 999 BLAKE2B 5a1830cbb64f6a9347c23dbba167a95c31c9325fd8ccb09d5acaac8111ef457f4e2cf509358341e57470d2fe73bebbafe5f89a968255685c21f4d6a0aa347737 SHA512 ab6d6c50cd59da65c9c2d41b45d988c91a8001c8c857291e26c2929ef00f896bcb34b28a83b16a703e9c1da27c6f820ebaa3ea37bc4c331c4f5f4a5405ab74df
+EBUILD podman-py-3.2.1.ebuild 1010 BLAKE2B 51c9140975adf5ff1058d8c202a79eb0d3ef276bc200a147485a6a24d4b6e1ad41b4e1f5e27c9591dbd62ebbb3c511f06afbc34e8f511353cfd315a7bd127186 SHA512 63e850654d60e3e7d5c42a1dd11ea1d5a6f0cc3aaecea552c7897828a2be184c975c3a840b6715d7de527a45cc5669c469e30a5f5e8704fbe822f4a8e6e95291
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman-py/podman-py-3.2.1.ebuild b/dev-python/podman-py/podman-py-3.2.1.ebuild
new file mode 100644
index 000000000000..c0d18e6cc5dc
--- /dev/null
+++ b/dev-python/podman-py/podman-py-3.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A library to interact with a Podman server"
+HOMEPAGE="
+	https://github.com/containers/podman-py/
+	https://pypi.org/project/podman/"
+SRC_URI="
+	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
+	)
+
+	# integration tests require a workable podman server,
+	# and it doesn't seem to work in ebuild env
+	epytest podman/tests/unit
+}
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
new file mode 100644
index 000000000000..767e222a3a24
--- /dev/null
+++ b/dev-python/puremagic/Manifest
@@ -0,0 +1,3 @@
+DIST puremagic-1.11.tar.gz 295026 BLAKE2B 4d210807d9f5eb0c2eb88b0c18aa5cdf56170b347de4f95b92c08492d5f038759b39c1aa2d6ed4bc91e96e036e6f4d0891449af8aee3beac65c4d692fa295ec0 SHA512 4d4c9a93cd56a02aefb7090c92b41048f33923bef14022158f39c39ac93326b7180b8cc97495ad5ed3eec7d9f1379a5508829ee779aaba9b8aa8f975e787b1f5
+EBUILD puremagic-1.11.ebuild 480 BLAKE2B d5eb484485a5d2193635909950a7b754c1fa2c5d5fa2c1364b314f444a0f32b00cf1a76957256f437e0b8e49e9cc913831dc7ce002ea7c799a6f86d59d9953b3 SHA512 c56f66d813b60dabd602328dedf6f79d47d46484382dab26fac82595f805f5b46a0846d6337458ce4b0f547797360c455caabb0f74df9ec224e8c5833ee31554
+MISC metadata.xml 452 BLAKE2B 3a92e247697a9b50d0ee083b1f4b9b89d7c01759fcf93f13deafc4f2ffb3798f6daa22fd1c2ef642becbc8f03b7ede86348e51cbe0d8fa06c940f99c9523b41d SHA512 ff07bf3513774e077100c43df3ca20f8330e91a855b54c2a1a47da8584b057c32efdbfca07ef5d8c1378b61d0bdd974a9144fd07f0abbc71b1340b811832a02f
diff --git a/dev-python/puremagic/metadata.xml b/dev-python/puremagic/metadata.xml
new file mode 100644
index 000000000000..9f2ecb2e4c49
--- /dev/null
+++ b/dev-python/puremagic/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/cdgriffith/puremagic/issues</bugs-to>
+		<remote-id type="github">cdgriffith/puremagic</remote-id>
+		<remote-id type="pypi">puremagic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/puremagic/puremagic-1.11.ebuild b/dev-python/puremagic/puremagic-1.11.ebuild
new file mode 100644
index 000000000000..7f02fc5c206e
--- /dev/null
+++ b/dev-python/puremagic/puremagic-1.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python implementation of magic file detection"
+HOMEPAGE="https://github.com/cdgriffith/puremagic"
+SRC_URI="https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( CHANGELOG.md README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 417457c88e8e..105ddeb40718 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
 DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
 EBUILD pycodestyle-2.6.0.ebuild 864 BLAKE2B 97507cc28662b2cab48505c4036c79a45c1b56b17a059bb78b74c4f9e04a8296f7dd8d5f7d877f48916ec9f27c9c866e5015252efccfcb73ad262392b5e50309 SHA512 33ed296fb2e286f8dc79845f416b3a9e309f908a2eccec959746301deedd0dd8dd3cfd7f3dae705386bd1325b207fd222ac890dfb20ab2154f1d7bcaa5d85ce9
-EBUILD pycodestyle-2.7.0.ebuild 838 BLAKE2B 52001ecf3a5d9879e82707f11f46ae1beedbd13fd6ee4e903004498a0bbe7dfcbc4bd984fd65bed12d40355c98ee483506c7d7e7a2a77b3e64964f3dfd7fc1c4 SHA512 73f325ce298d025836ca5e9d4e1f9a035b5c027f933e2b8bcc4cd1b513d4aac108cf67b1353f4eba784509ad950bc5d00c5efc1146e859414913c272b58216b5
+EBUILD pycodestyle-2.7.0.ebuild 844 BLAKE2B 3892da1bf698b18ee7e58228b73853bc28adde65ffed6cbe02c61276992acf62cbe9580dcf08155276af526aade2d3558b3694c2b786a1fba161dab23f96e863 SHA512 0474dedb6169e5971dbb3a01343657c4c48ede5a49a532bc77efa9834fa7c4026f08a8e063553123031ae327bf843ab85b5f321474372312dfdd16dfe47974ce
 MISC metadata.xml 361 BLAKE2B b3f0256eba2adb55c6ea6945ebb2d8e6989895de1f733aff02ffec03812451cbb5684d9fa365d5a79675c7eee165501ea473f776dd99c3c6380aa4e8d1bc43c0 SHA512 2fa3d38366696d19479f11a443fa488e95a9805a1663e112d518d4f84cd7cd00e06cb06dabc5760b41478199b767ad3165cabec6907c5037effa70b623e0c5b7
diff --git a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
index 83ce4fd2dc67..bb8b29e28d75 100644
--- a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 distutils_enable_sphinx docs
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 6eea3090948d..55e068163e1f 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,5 +1,7 @@
 AUX pycryptodome-3.10.1-parallel-make.patch 837 BLAKE2B 9d7b3088d547d294dab498dbdcdef7f5eeec0ef8c264fd62a49e2e64a9adfc785f8becae91a6f889184e53af04aabe638d503f523daa62edaa3bf91596a268bd SHA512 2b2f310a3ab332f9d1c2f7742fdd902cfbecf49360df3412839cb67bf69e8eb1f9e051461d4264ff7d732d1bbad285b5a635aea085945d543c2b58e880f0b807
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
+DIST pycryptodome-3.10.4.tar.gz 15552675 BLAKE2B aaa6e6768d099b7b229f2b920671577800baea11b8b5a8efdd818f3d5685e46ac51d1c79d9c987f1d93cc9df98c786028137348c946da7aff35fc436ff21894c SHA512 1ee2f6c499d7ea73bdeafc94b1e91b45bf888f84ea214a01db180e030b4724264ba05e16241c465484ec13075f5300f6c489229bedb84e54b93e2852906b634f
 EBUILD pycryptodome-3.10.1.ebuild 1533 BLAKE2B 93b9523336f06fa12c19140fc4dbfe1e1aa2c0be7e7d48955b3e86b0ca461a0b8b4d360e9e6e37448cb9434426db78ff3a7d7ee646a8d04fe2349c945f60e903 SHA512 671ceadeb8fd10c0fb8a4bdba29f082f192f03f4163b92fbe753fd46c7fe1b9a3c9371f6460dac44552e5485fbb337726098bf1c0e24d4777763777ac60bc9c3
+EBUILD pycryptodome-3.10.4.ebuild 1130 BLAKE2B 0c62e744f70243af0b9ba0327ae23dfe81861241b054dcf1eb34d811f8c10ae0a6592d739969a41d0ab8ce391182e164cf0e415aff14159d9ef56140f7b444a6 SHA512 ab65e2c962ce6bf7a64431e353fe2899f0182cbd51e7dfe4eff70dd3e9607c612b27b254053389aec2eaba2c5d5f298bf6e815c16e3d29cc976896a123b938a3
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
new file mode 100644
index 000000000000..b9f61b34e0f8
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 31370095bce4..dea00ac18351 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-r1.ebuild 975 BLAKE2B ebde70fcb7f641bcb8f0cef4096673c4578d05ca0e15eae657310af6aa30559115d2f043852bfb8035370d05d93fd9e1c7adaeccaab14f6f55124f4a903c80d6 SHA512 1e09fa53a77412cab19156ce88765be2e3e935eb5bfd47208c57664413bd3514fae6b00aeee7ca1f96f1c66b701b1a37daac6256d64117818262527270aa0ece
-EBUILD pydecomp-9999.ebuild 1247 BLAKE2B 58816e0ff408cde444e39068eb6bce1a44255593fb6ff826399b54beb74071d365ea0a24c7f5109f1bcade941c05ba94ff21f176bc600fa5dc5a246aeba73a61 SHA512 6cf6e93aca0e38fcafa7d25a3efc42930b12b94be2244849905a58e321290514baedf6016217153b417d68b0f9c3a1a152169ca0ea20da5fd3383b5d1be0b7c8
-MISC metadata.xml 691 BLAKE2B 3afaed503dfa89534ee4f8bbcc0e407fdfc32fa34be76b384ac5e0a8af83d8e81cacb24e92c3ed4d41d6c285e935eaed8fd1b287cf9637de96a785b47dbbde34 SHA512 570c4c96609599df60eb3c14039ff2db2fed60e4e7e949a6894ace4726a599598b92277a23829778fd915fd01deb26871935e780e9fb22d3db207bc6e9640896
+EBUILD pydecomp-0.3-r1.ebuild 695 BLAKE2B ea110154e01f9590d12dcc0f9ff1c8d5de2c0a0da019f06a2c7b383ef0199b93485af8864f619cebc2562b91c3555b6e6b8f11a751fe9471b15ea2661480599c SHA512 b6f3e3d5047d5e98a3b2978e3a742e0a9bd9069444c64a06504a31a67b244a0465e1a9715b98ec77a442367a914336ed3221d8b6bacb3f850cc80482436077bb
+EBUILD pydecomp-9999.ebuild 702 BLAKE2B bd2c7ea91380f809fb3fbc568942e6a66769e03b83b543903a2665454aa99aa4ef01aad074c638bc15bc23b8ed0d7775c05abbe9f28f3d1889b964bc8b50cfb9 SHA512 8a0d5891bcba858b97e36cd22b1d9b6a7ecf46e88006f22e82e368b15d6032ecc3804ff9e967e6d3a558a86ed1da4405fa96ba03ecc2a49380786ad73a4ba742
+MISC metadata.xml 755 BLAKE2B 3978b4b2bbb09544898f6e07820857f8ed8411b6b2ba665b2353282fff1df47102dc09d3f3ee025db2b5edf6b36a14184aa245abe08cae435ec126f251cdd3dc SHA512 da83a64a40ca4140de6907734243de082db074e8c833f09fd92d811073d032531276292d6f6d359405250ce310933879dd373f39df56320ab48378ccae91d486
diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml
index 4f1b4fd4b797..dbf942eb8211 100644
--- a/dev-python/pydecomp/metadata.xml
+++ b/dev-python/pydecomp/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">dol-sen/pyDeComp</remote-id>
+		<bugs-to>https://github.com/dol-sen/pyDeComp/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
index d2be8da9d372..89859791adb4 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 python-r1
+inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
@@ -23,15 +23,3 @@ HOMEPAGE="https://github.com/dol-sen/pyDeComp"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://github.com/dol-sen/pyDeComp/issues"
-	einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-}
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 1fbc9bfe62dd..007ab948ae8d 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 python-r1
+inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
@@ -23,22 +23,3 @@ HOMEPAGE="https://github.com/dol-sen/pyDeComp"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This is new software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://github.com/dol-sen/pyDeComp/issues"
-	einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-	einfo
-	ewarn "There may be some python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
-}
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
deleted file mode 100644
index 57418a4426df..000000000000
--- a/dev-python/pydns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8f24c433dbc6754ea32a7284ce0463c392c1392538eed9d8bf9ea3f09400bc08f1970a7c96c52bf072606718 SHA512 22f16c571f9fad02a70a8e0bbbfd802f4f9af23946edb78e15f69f23e57411369274945a1dea5603acae1fc1eb404e5445207c541afb7864a60b92dc4d5477b3
-EBUILD pydns-3.2.1.ebuild 738 BLAKE2B 4db35c3f5b318b62e25e06c82738276a6cfaa97a75e11ded15642baaa007da1d4491041e96409201e081b32210524a61e9dfbbefa4027fd0db406029e50c8179 SHA512 59c53f2c7562bb7c73b2ff9fc12db9306a60f02e7589a7bb1535223b90b29a8234497b0b30ff9960efbddfee032398fdc0fb92ad00e787281f1a6fa1aaad4a23
-MISC metadata.xml 687 BLAKE2B e06c0e40e24414ceb22a930fed7ac268426c9ef2e7d30796186187cf23ce7ca3ed9b4792e57d6aeb6eff433d950c858d6a51e84fa7c1db3cd25ea98952904d40 SHA512 32a2215b3099d17d522606561410e6b59e9fca94185219582244d66271cb50999e80dd94c0a1bd7e9a7ebaac225636f88706038d5918f4cc8a668bd9a777f583
diff --git a/dev-python/pydns/metadata.xml b/dev-python/pydns/metadata.xml
deleted file mode 100644
index d239c14665c3..000000000000
--- a/dev-python/pydns/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">PyDNS provides a module for performing DNS queries from python
-		applications. This was originally based on Guido van Rossum's DNS
-		library code, but has drifted further and further away from it over
-		time.</longdescription>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">pydns</remote-id>
-		<remote-id type="launchpad">py3dns</remote-id>
-		<remote-id type="sourceforge">pydns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
deleted file mode 100644
index dfe9713d03b2..000000000000
--- a/dev-python/pydns/pydns-3.2.1.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=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P="${PN/py/py3}-${PV}"
-DESCRIPTION="Python DNS (Domain Name System) library"
-HOMEPAGE="https://launchpad.net/py3dns"
-SRC_URI="https://launchpad.net/py3dns/trunk/${PV}/+download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CNRI"
-SLOT="3"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86"
-IUSE="examples"
-
-# Tests require network access
-RESTRICT="test"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r tests/. tools/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 3bfc70a0946c..3538a5dad203 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -3,5 +3,5 @@ AUX pyflakes-2.3.1-fix-py3.10-tests.patch 3166 BLAKE2B 9950380f37f84e6c6356a62cb
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
 EBUILD pyflakes-2.2.0.ebuild 739 BLAKE2B a13889d951d54c49dca0df763c347390c69c1bc6e7471d8ad9b1a1c932340096874c2ec09cca6ec9ca23472d2bbbac90924a6be8ad06bb7b7f4b731d7d712bd8 SHA512 dab20e9ed9a1ba53a50c72466d5093a3a214dce230348910a91b91473b7bcd8370355a47d438612129a798d087b1ce55b7c21c881d06e740e461848ff8991271
-EBUILD pyflakes-2.3.1.ebuild 659 BLAKE2B 71b0d7bb42de99f65526e54a6df3522830cc917dfc4e474414b9ab1df0604f8e0ba355d6a6d8922275064ebe848725a390300b87be12663e93b91ec4256bb527 SHA512 bef1fdd9d2cf92b20a1647478c6d4f0a74b4aa8d142d51248192b82f8a73ab270be59f61247cd746a8027befe68ee29f563caeaca16b4055f94a9796f4a52d69
+EBUILD pyflakes-2.3.1.ebuild 665 BLAKE2B 1f45b820bab9fab2fcb7cf744471d1caefc5c5c6c5ce50ed286d8baf5976e81d26f7a971880edf8791b3c17a3f47f5d0de0ec77d88cf7e437a5d29aebb6ca719 SHA512 adac3b53362f3a56bfdfdf05e7e65d6c3c641bcf7488eb2612cfba2daa0727dbd2a25ed9ba567c070f0e858ab9fb6a1d18ac538e0d7f3d58980b4da7cb3773ef
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
index 22e7eb0818dc..1c9e50892545 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 10f83b9954a8..b83e2dd8fd8e 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,5 @@
-DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
 DIST pyglet-1.5.19.tar.gz 6446786 BLAKE2B fef21122cf31718e0a796b3be4edf386bf477dc4fa6480970159b9d361e489417c9cad1df1060290bc1678408eed36e287c15da442275beaa8d354c268568411 SHA512 7ef85d91cdcafef8cf097e96bd34e800002824696ffbc1132c2dd776fe9d3c7be0b5633fff1cb10344fcc1aafa3c0c9a75547ad374be091f35aa99527869ab4b
-DIST pyglet-1.5.20.tar.gz 6517626 BLAKE2B 41b63bc650823fc3065f71215822d39a1e3f40b02f75401ab8fab6be7d3d8848813c721f400ec923fa29f5d5b0a66f7d7af905caae10f1ea5ab5241cbead1c87 SHA512 da1519a2c196348d8af90f280ffc90b0f46d2d325403a5ca53fa663aab161d13802e22259124c3af77fbf5814c06d8920c0147b30c22db74fff885091e9a9ad0
-EBUILD pyglet-1.5.18.ebuild 1249 BLAKE2B c334f422e5c5ca40b5098d3cee0ab37a0dc5c2cd73b51ffd9b54914f1326e741b211fb1bdc7a1c4bc048f27842d478d542783fd59bfef9dfb17e65b8ef443969 SHA512 89edf1fa62b8ae5c669efbe3a892ed6815110e324b1df8fa8f0e4182ddbbecc9da16dc7f0a4ad57f538753de4a664e620b9e53a655db3ee4ae386263695141c5
-EBUILD pyglet-1.5.19.ebuild 1250 BLAKE2B a74881446c0a96d63ae605c26353adf0db2120a2bb2ccdefa3b97f8825a7ac5030fd9a99dc7bfb7736a501a559affb0cae4d258cfcd733d1091488701c043b41 SHA512 c51e168f4c57ceabb5917dede01b0856783d902ee65261987ab04dc0119c4587b7e669f227148139f79456e213818504ee708d5e44022ce07df298e319900ccb
-EBUILD pyglet-1.5.20.ebuild 1250 BLAKE2B a74881446c0a96d63ae605c26353adf0db2120a2bb2ccdefa3b97f8825a7ac5030fd9a99dc7bfb7736a501a559affb0cae4d258cfcd733d1091488701c043b41 SHA512 c51e168f4c57ceabb5917dede01b0856783d902ee65261987ab04dc0119c4587b7e669f227148139f79456e213818504ee708d5e44022ce07df298e319900ccb
+DIST pyglet-1.5.21.tar.gz 6516128 BLAKE2B ab7f23dc4ba48450f3da4efd30fadd089777f50b5392945636886192e89e230475f5bff9ba02cd166295423ed67f98b89fd186d18601504fe0f024c203a198c8 SHA512 3df0134dbfdeb15baae059bae489158273fd4797d5dc4da903ac2fdd58ae9e291e8d5371ebe545bd125a1670adfec84cb9d9f4f11841d594f3e4d38e5910ce2a
+EBUILD pyglet-1.5.19.ebuild 1248 BLAKE2B d362891ca55225dd387f881ce7a7c86f08deea21b9e476a75169dd50d5ca5789993aa3d3af8b886a384c94926fa2cd8e9081112c676bd324b449d834bfb8dd0b SHA512 68d54a055c8c0267d66ca0b14d793f3d7e5cd991cdeac4b0fb8f7b23312bb4dcf466995ced79d486c23b0eac5c72ce0131cf23476845ca94fa4abf5681ab1b11
+EBUILD pyglet-1.5.21.ebuild 1250 BLAKE2B a74881446c0a96d63ae605c26353adf0db2120a2bb2ccdefa3b97f8825a7ac5030fd9a99dc7bfb7736a501a559affb0cae4d258cfcd733d1091488701c043b41 SHA512 c51e168f4c57ceabb5917dede01b0856783d902ee65261987ab04dc0119c4587b7e669f227148139f79456e213818504ee708d5e44022ce07df298e319900ccb
 MISC metadata.xml 1037 BLAKE2B ebbed18b0f2da5a586f2b97e18a01f8464455ba32ab74919501b9940e8c0f0bd1058f546c6ed781aef7ff97cf890a09c55712313f9589097c973688670071e0e SHA512 384ab6a4f5a5613c4883e29a714425ae74b7ccca1e205a14f08d653da1eb939ff39e31c54c000e7a61ac65fe8ededef0e9380c70bedc7de1580403ed51a68bbe
diff --git a/dev-python/pyglet/pyglet-1.5.18.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
deleted file mode 100644
index 24e77b128b01..000000000000
--- a/dev-python/pyglet/pyglet-1.5.18.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_{8..9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	epytest tests/unit
-}
-
-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/pyglet/pyglet-1.5.19.ebuild b/dev-python/pyglet/pyglet-1.5.19.ebuild
index 247321eafd39..fda20a04ce6b 100644
--- a/dev-python/pyglet/pyglet-1.5.19.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${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="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.20.ebuild b/dev-python/pyglet/pyglet-1.5.21.ebuild
index 247321eafd39..247321eafd39 100644
--- a/dev-python/pyglet/pyglet-1.5.20.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.21.ebuild
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 8a8fbd3b964e..d207debfdd5a 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,3 @@
 DIST Pygments-2.10.0.tar.gz 4052321 BLAKE2B 003d13344a2c5fe448a23d7bb45a401dc839cac10be262f5831c9547444d395811c92b74d1b18663a11a2e6cedf29b5a74cbd75267157429d61375bd9df6eb49 SHA512 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12
-DIST Pygments-2.9.0.tar.gz 4048049 BLAKE2B 3531aa35d875296694dcfea267c3922c94d73959de82a34329b7582b35c8b76310cfd364bf22066be5251ee61bff996e44d8c8ca82e9e34af879f3f2ba734120 SHA512 60a8b38e9ea941e4f10d1c4a547be81b8545202d11e2162c6aec0f95014a5c2f718adab8780017be7f49e1f220f731d57ec26dadbd543bfd6a8a7d016c01d772
-EBUILD pygments-2.10.0.ebuild 919 BLAKE2B bbf87f3a490dc81cf9f94da9dc94e35eff8e01cd879b4208995974b7a97a95c99496d2d1e8b4ec3294fbe343383e3e1585e0fbe5abfd38c159848a905374bfeb SHA512 7e1d1e62f722c24a7d46e30db646619c96567f6622b2e91eb9433a1b3c90d838c4623b135979a0444d0698ad8063e11b3bacbe41938443b49aa51ba9f2aa9e9f
-EBUILD pygments-2.9.0.ebuild 911 BLAKE2B 8694c191296321ade3f7865aa83d44c7a8361f925784192e980b4fc00ae4f12e490c7566ab036135ec55dedaaaa140269422aa3f45f97de4689c8baa7b167113 SHA512 9dfe28589c5de1375b8e9eb1c3465dd0a04f6984af95372f1b361d66cbc76618362c1e86b0bc97fafa29b6c4f76c2d6b64e32872c73867c4889058c31771c1d0
+EBUILD pygments-2.10.0.ebuild 911 BLAKE2B fb910522498e3303072b67f2a4a70fb6e1644b76cd737a4897ad8c3a766807d718e25a57c981abd922a0d57fe3ef64def519dd4d64f52ec16cad0b83474334cf SHA512 fd273c2cfa43daec4adc42a8cf04f20bf08efcbfc7fe15a1eaa83f22c5d2e0155677d4f155092aba35683123b3c1d45ac631a2f24f094b5c7e4aa743c58d5265
 MISC metadata.xml 557 BLAKE2B 59b5fbb74f5d0b8f65127b36871561853ec6afde94f0a31986067c1f6f24aa18e648c38752ae7bcaebe0ef43fc457ef32d017e463006f1c2c9e92932675e03ca SHA512 0810f5412085ff458230b3137845bebf5841a1bab0f729f2bc5152ee44b570e855323cefbc24eee54c5febb1ea2c90a5a4357106a15c8fa250d77eaa057c01fe
diff --git a/dev-python/pygments/pygments-2.10.0.ebuild b/dev-python/pygments/pygments-2.10.0.ebuild
index 65a7d13c876d..b2ee01ec01fd 100644
--- a/dev-python/pygments/pygments-2.10.0.ebuild
+++ b/dev-python/pygments/pygments-2.10.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/pygments/pygments-2.9.0.ebuild b/dev-python/pygments/pygments-2.9.0.ebuild
deleted file mode 100644
index c173f9797cb6..000000000000
--- a/dev-python/pygments/pygments-2.9.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..10} pypy3 )
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index f9cd5d1e5f14..bdde9d2d5b01 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,4 +1,7 @@
 AUX pygobject-3.40.1-dynamicimporter-py310.patch 1785 BLAKE2B 5c1779972f3e44a711465bd7b0138f0945118e39d566a7721b71e890756f41d10ea5af1864af40d667b195c5d3658f9cd982b93e18a6784289a5ecb3df2f9678 SHA512 4794c6dd097cd708614ef1e34f0a324bc7b607d66cb05c4025492fd64b7f165c1da10650ff9067f0b9342955643ff6c9519082ec3ff5abc83025b10fe45d9e48
+AUX pygobject-3.42.0-dynamicimporter-py310.patch 2283 BLAKE2B f59cd749cea48343d0bf1c798c1b8d038c763c2cf3afd798030c7befe428427fe30d37c4dcbd5ffe8c9bbca18b3cb04fdae464867262e489075a254c9ac29fc5 SHA512 2ab000c63386eb986cd396e6c51054482d06923f279021d04e9674f16e17cbfea00a8f0750c8cd05d04db0a07a35e5f2739aec7040372b039ae86971e636d96c
 DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
+DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
 EBUILD pygobject-3.40.1-r1.ebuild 1817 BLAKE2B d8029762266f8a60b3e6aac7293cc554691cad39401f150e020e65c1fc459141aeb0d3cd9183a1769ff1c8ef1b5342b0079dab7b6f4aa4dac8a02c1afafccd15 SHA512 bb999c619c68775b7eb936ea25344ade7c970ef002b75d0a643aa76c84febd1f7766d8a2e41dbc17530501d3cdc3edd3fd296db4fb9d5c080143ff80133e83fd
+EBUILD pygobject-3.42.0.ebuild 1825 BLAKE2B 874ebd24bf0d966afcb38a254db85f34d8b2a015d2c5e7defdfabe561af2d01cc36963171bf5f49e4f952987f15c52785086d417caaa139977ecf7f230823abf SHA512 95b9d27a7eeb6428aba7d20bdd4c4bf6d36b06492244a1d41539768ffd3e1a636c9de3817f4939bc2b02b64a6c470de00117a7074cf90f32434823cc5b8a14a7
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch b/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
new file mode 100644
index 000000000000..cf292ffbf7c6
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
@@ -0,0 +1,61 @@
+From dea457c0754550e210ab3cca9da8be1ae52d1d31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 18 May 2021 12:31:51 +0200
+Subject: [PATCH] Implement DynamicImporter.find_spec()
+
+On Python 3.10, the code raised an ImportWarning:
+
+    ImportWarning: DynamicImporter.find_spec() not found; falling back to find_module()
+
+See https://docs.python.org/3.10/whatsnew/3.10.html#deprecated
+
+> Starting in this release, there will be a concerted effort to begin cleaning
+> up old import semantics that were kept for Python 2.7 compatibility.
+> Specifically, find_loader()/find_module() (superseded by find_spec()),
+> load_module() (superseded by exec_module()), module_repr()
+> (which the import system takes care of for you),
+> the __package__ attribute (superseded by __spec__.parent),
+> the __loader__ attribute (superseded by __spec__.loader),
+> and the __cached__ attribute (superseded by __spec__.cached)
+> will slowly be removed (as well as other classes and methods in importlib).
+> ImportWarning and/or DeprecationWarning will be raised as appropriate to help
+> identify code which needs updating during this transition.
+
+Fixes https://gitlab.gnome.org/GNOME/pygobject/-/issues/473
+---
+ gi/importer.py | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/gi/importer.py b/gi/importer.py
+index 32967974..63788776 100644
+--- a/gi/importer.py
++++ b/gi/importer.py
+@@ -107,15 +107,20 @@ class DynamicImporter(object):
+     def __init__(self, path):
+         self.path = path
+ 
+-    def find_module(self, fullname, path=None):
++    def _find_module_check(self, fullname):
+         if not fullname.startswith(self.path):
+-            return
++            return False
+ 
+         path, namespace = fullname.rsplit('.', 1)
+-        if path != self.path:
+-            return
++        return path == self.path
++
++    def find_spec(self, fullname, path=None, target=None):
++        if self._find_module_check(fullname):
++            return importlib.util.spec_from_loader(fullname, self)
+ 
+-        return self
++    def find_module(self, fullname, path=None):
++        if self._find_module_check(fullname):
++            return self
+ 
+     def load_module(self, fullname):
+         if fullname in sys.modules:
+-- 
+2.32.0
+
diff --git a/dev-python/pygobject/pygobject-3.42.0.ebuild b/dev-python/pygobject/pygobject-3.42.0.ebuild
new file mode 100644
index 000000000000..01f7b7055ebd
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.42.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/gobject-introspection-1.56:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dynamicimporter-py310.patch
+)
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_feature cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 729d231ca464..25cba0ec4392 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,6 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.10.2.gh.tar.gz 813391 BLAKE2B 109f8817e32ddf8d93c9120518e77a1d2f7e61cd1a6362eb1cf9e6d242db72fa1a9271588a3abb28efca54bcc449dce623ae5d5fd63153ec2bc367e008aab465 SHA512 5d694587956c4f11eb4afaec26cefb66ccbe14dc2aacf378a0362326506d80eb2633e0d351c0a20715a3359a9bc438092d77b2e46f7f787210c7ab0555f2722f
 DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
-EBUILD pylint-2.10.2.ebuild 1445 BLAKE2B 16074651f55009e816db9b2aa12c08b942d86b031c31a282615145d21d0dc542fa73445857d009f84692ecedea4d1762d08a2d307aee555e8aca387b35aea237 SHA512 17cbe4248484f7b67994fab61210b018df9820a687ee391e5bbcca6c731a543b9671a76541b8c425e00a43f4cab29f065f92ba7b4d57e64d1099c2b7454d14e5
+EBUILD pylint-2.10.2.ebuild 1451 BLAKE2B 7ad2315c2d652e005b04354b2cc57aeb09590aa5d4c216030b2000ed08e64941b26be9fffd2169195946ccc157e74689a1b4fd4788c1b25ad68cc725e58201ff SHA512 6672969604b2c79a89e4f1907659f264c6fc6df0c7634ddac5458abf2720ff0717fa91b53f58b4baa0d875b89b7c9d6847fd22fa8f53f5be22ee640c8261ff39
 EBUILD pylint-2.9.6.ebuild 1417 BLAKE2B 5949b36afe3130c030a608e7e2854ad4264fea065082794463870e2801a13c992952de59d83d2dcefa25a489cf6faae5ea4e441545429380e63298f9aa5d3297 SHA512 1d600f96bfd5c34a7f7c96e3451f71d8b7eb81cd06f475fb1a244ab6c2ff2f0e9e593470dd797a126fa9ea1080872d6c23e9427d74f919b7dbff838ab5927576
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.10.2.ebuild b/dev-python/pylint/pylint-2.10.2.ebuild
index a2a3afb3474d..5127696ea382 100644
--- a/dev-python/pylint/pylint-2.10.2.ebuild
+++ b/dev-python/pylint/pylint-2.10.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index a89e2c5f7e4d..3ab5cd7fdf3e 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
-EBUILD pymdown-extensions-8.2.ebuild 1185 BLAKE2B b1c01a69d0858ac86e432f964efd569e85db811895352ee73959b40bbda70cb79d911524a541139672b959ae6fa1b65c8104a6b302ce0ebe577176e8f5ae541e SHA512 09efd9fddeec3d22ca3f1e713a68964e4b543a8e2a3c5d77940d6181ea1266f8999a9b0bdecd9048a196b2a5d563b835636e3566b9a199f0366d7c719d077a71
+EBUILD pymdown-extensions-8.2.ebuild 1192 BLAKE2B 10a13e389416f44b7156715ee1ed9948720ee9e839dd7ed203b8e8d0de90ab4b9fa637f8fdbc22f1cc207bd54fd65c7e50e3923df39be4b3c2419f3269ae52a0 SHA512 c58b66762a48a8a88e6d59ba171af5c312909d371444a30c4041c93982232cab39eac07b7a23d0d5bfb68baa321b3a6714448f873da4b8f6beaa7791cf05338a
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
index 4bbccc154f0b..4924c9c9c55f 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 0bafed1ca945..8caf1574b65d 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
-EBUILD pymdown-lexers-0_pre20210308.ebuild 556 BLAKE2B 554b38a1aa7a4703cdc31c948972f2fddbbf14ee55a1e7902442a505cc355099cb96870dce13015d7b39b7f58f8f389e547e488af0a24f0ab5508f6873d0f185 SHA512 d5cf32b8f8ce028255652f2cd12fc15de7d89852b4cd456f17e3598c5f95010e539714cba9f20bf159dd0d4081ddbabe62ab2dcda37ea4b26e569593d2aaea43
+EBUILD pymdown-lexers-0_pre20210308.ebuild 563 BLAKE2B 6909927f327e89d35069e74752ef5ee33c8a4fc41c0559ac3fb54db95350e8fa1475a92bd5f106fa3bc9e0a2f759d517ee6590d9533a6e8d928f5e7418a0459d SHA512 fa139c3d2adb752b7bbc7a925d9eb495df809c316f35d536ff9aca83eeb0c9df125fa3d0c4f5ba7b6144183d77f0efc661fb8a6a663e2ad6cde5b0124ebc25c5
 MISC metadata.xml 642 BLAKE2B 15a30cfe9ed3e554cb573e57d6306ea638265800d553d13574ed475b33508d6f28733462f3ffc710806ed3f88c4fba8e5ea5b9b0a3f93d8d13bdb08744cf5abf SHA512 b572d550e2c28bc51128f01dc506eee21ea4c0128895679b5fca69a185606eb4d7d41c22c9af848e4d9a765c3b0ca1691a6049fe5eb71deeec3a9bd2e5de9f81
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
index 6c4ffc243f19..d7e3f44fd5b5 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 34e689cc5bae..05bdbffd07b2 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,7 +1,9 @@
 DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
 DIST pyproj-3.1.0.tar.gz 182603 BLAKE2B d4e95f62b10b282e7bbfcb7a2059a11a489e53402cbb1760b7da73248dfc05de6be8ca820e55d34c9270eea38178f1fb934bd5ffc389833b3734b87b79991187 SHA512 21a5d08207676d8d9722cb5e3b13ed68f03b1a2aa034c20c61bb8dab5d204dd968ba9a3df1b0c43ed174e082725c7624efb75a0c9c3df920808cbcb44f4d170a
 DIST pyproj-3.2.0.tar.gz 212708 BLAKE2B f880b8aade716e6137bcd4cc4c2d96946e2c7c735077f8707e37b3f174b2613f0281a48140a0154a21615423cd2e1ed70cea79916a04f4b9d84e958b6fe31795 SHA512 67eedd839d625f57accbabadee719030184a79f74185765da2b5610d73b8341435edc56d70d42d5a5d0ece0e22421742a327fe746761ec4f782a72d977306a74
+DIST pyproj-3.2.1.tar.gz 213342 BLAKE2B 141f64f33f399e1089009f8047b2541516dc84f2b2133f5e0de5cbaf5d5bef30197f556f630076725a4d78c4244011bf1a7c9a54114d6e166cbb9c10c468da05 SHA512 4ba5bd2d2356c06b711e53581665bdcad3faeb420258c7d4bbb5639784948842a3a6ee0f1f0f50363878c183c38a27063071f25594576eccca146ceb33107761
 EBUILD pyproj-3.0.1.ebuild 1454 BLAKE2B baa1dd99d0e3c02662f1ea337583912d1d1978f4577dd548f1c7d12c6d7d539098324525d63bcaecc7eed9e2cbcc87bd0c80df36430e28d071897f5cf8b7a455 SHA512 45244a36fb061eb99c8fd56ab3e44aa047689e48e9279c2df2e26ad1f10271d2e67ed5eaf335d61e108e8e0ad86d9ad92ce2fc8cb7f8d2fead5f1f6e4faa750c
 EBUILD pyproj-3.1.0.ebuild 1439 BLAKE2B aff436fb0e36addbdef3ab39834b4db2acd560f66e4743e9304076e8d599e83e413b44f9b5dd60236f24afe38c8bd71214a38aea0c828174521f3a527475fcee SHA512 8b7a1714ee9df21959093a83edb5783ffa6a8fe2300c45c897472946b479a036ef82c38a193ac984c9c3b8f895363dec473580586235794481d16d6e75739f97
 EBUILD pyproj-3.2.0.ebuild 1377 BLAKE2B ee70c2410a392d3fcda1651d3d54797b909d074ca4021274e0becaa8254df487fc3e2f4e6393568438604a23cd8bf6618f5b3e157391f8636d937e8fa9116d8c SHA512 b98c0234a9c2176e113e91b4a741ca8aedb638668d38e06cac8b3b4a314188908a7192f6d13576b559218d7883345c93c66c316468f75e08af817bc8e46f7905
+EBUILD pyproj-3.2.1.ebuild 1368 BLAKE2B 1cf20ae2965180458d04b95bee43626e7634c0bfc6f638f041ba5d0371dca35832ea97f03d8d5a144d4952c5a55659644918dcd345378cefd3381e2e1522d110 SHA512 9747e35b47153c7136c140a45b59ae8638cb592c3df865cd7bdfec59d52844f9be59421f5f2dbdb82afdee4c174df39421960bec77bf0177c1b8816037d50c27
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.2.1.ebuild b/dev-python/pyproj/pyproj-3.2.1.ebuild
new file mode 100644
index 000000000000..64f2ad256bfa
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the PROJ library"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND=">=sci-libs/proj-7.2.0:="
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/test_datum.py
+		test/test_transformer.py::test_transform_wgs84_to_alaska
+		test/test_transformer.py::test_repr__conditional
+		test/test_transformer.py::test_transformer_group__unavailable
+		test/test_transformer.py::test_transformer_group__network_disabled
+		test/test_transformer.py::test_transformer_group__download_grids__directory
+		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
+	)
+
+	distutils_install_for_testing
+	cp -r test "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest --import-mode=append -m "not network" test
+}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 43189af6f4e5..e4aad4126222 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -3,5 +3,5 @@ DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff
 DIST pyproject2setuppy-20.tar.gz 12795 BLAKE2B 14f1862c546d9850f0e523b79c44d49dceab76752c4a0b5527d33b36bbb459735b29ca9fad9d8c72f1be189004014b2ce6b2b6858842263fe913532800398064 SHA512 1d75b908611f121c6723037d0132c890d9d00f3f7b1b237fa658dc8c217a1f60e7141a99a7d744e9b8ff67b5fdef1fd11b38f4a3bda0858a55836ad49211a068
 EBUILD pyproject2setuppy-18.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 EBUILD pyproject2setuppy-19.ebuild 789 BLAKE2B e9e2f1054075cd7f5d2bcc2f58f589816817ddacf4e73be175fb3f7491cf51a59e8b0d18f9fa872347a902b01e39ea4cb7f8f03911f993e1309402183be8dc9c SHA512 1ce6b5186288ef992365ecde9cddeb48ba98585979f2360186f323cd048b59a9c9ff91c9ade4e9c41efdc2bcee1b3cc6aff4173988a31f6bf51b17db4c828faa
-EBUILD pyproject2setuppy-20.ebuild 782 BLAKE2B 6e7014d432aa10c6bd096a5ec0bc00954ba746739214ab172e616fe43c116220abe8ea5ff82ec165e56f61925fee045ec18bcac9078106c800d670a44ebeb222 SHA512 4b40d2e800ba401bf0814c50de63187948ba6058c2fb0a01d5b323ab56327920f1005be861c207edd04b8912e84741806cbc2eed739169c55a48366e8169ead9
+EBUILD pyproject2setuppy-20.ebuild 788 BLAKE2B e5d2d17b2b6117c69a12f7b21f19f4929b3786fd318e9a6daa0cd978f312f08d14aafa1cced2e9739e3e8f61cb3da70584d47215ca9500154ce8c6798e2826a5 SHA512 83fb22f8360eaab4871a28ad38f1b7a6064eeebe188bcdef4ef9f16d53f8e5444743f1e64b258d3f54b88978f68b843e22d3daf70a70c71f5be3e91b9014433d
 MISC metadata.xml 431 BLAKE2B 6403b7a6b11b6d90ce2a2978e3a57bf7c837d0ef5d2af3e5fe45f105aceb0c32e1a76cafb9dcf8040b0ce2bd884739a66aff2bd318cab35799e26efd1426c73c SHA512 6638d532a2ff39492b13f9114f4ed22c0ffd2bbe1c28f53fe1f9f9ae6731a4dd05ecea612b65d3bff830f5aadf5c87241f0cb84b2403513707ed453c4e091f37
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
index 6a1cfa241af6..4c79cdf97029 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqt-distutils/Manifest b/dev-python/pyqt-distutils/Manifest
index ab762cf28179..010ceee752d8 100644
--- a/dev-python/pyqt-distutils/Manifest
+++ b/dev-python/pyqt-distutils/Manifest
@@ -1,3 +1,3 @@
 DIST pyqt-distutils-0.7.3.gh.tar.gz 16628 BLAKE2B 0d9d7f951890c00efd95bf3caef8c8964d02f3097840f84006a8d9523c0ad9b78dbb5f46c4d752945074ba971c92e81e81be0345b7a8c807932e7157ecd00e03 SHA512 450569be205aa0de792c3f2d8c43e26eb6fed1088b241291347ae14d2343b61517bd7547f741bd62bb9e1bfb92077d1ae5c64b871c39d59a67ca82172ac1c598
-EBUILD pyqt-distutils-0.7.3.ebuild 608 BLAKE2B ab5c1ced3d8f5b5a3bcf06745435a4c631303eaab0264a3e8b55fed47235e093331a828f88238142b5cb1f394159594a984dec84b001b00d34810ea4578151b1 SHA512 c40feda98a4aacb2f62f8be9e9ac837f0e1694e45be227609f36c6f5a1e735ed69b66bf2fc243abc4369ff75823cf90b722cc62535e473610aa74f11dfa16e61
+EBUILD pyqt-distutils-0.7.3.ebuild 575 BLAKE2B c5a2a638a0300e2c6625ef3854d8cbbd00700d6e695450915deed200fe183951b7221757f8580fc9d44ade8dd4ecbd31d130fa6c7280d3116ac6bee206d03617 SHA512 19c1406c8bbf34a709aea4bb894fa1ff4a878216642c3783d0beb94c861008063ddf3c7ec95214edcb018a201741989df772d87ed5b4a2b4979bad9ed9cef728
 MISC metadata.xml 411 BLAKE2B 88059d8994fc3fc6431d95311dd6e197a1d84c8d16898f11c8ed5526fb2c890ac4b8d0fadf5ef45f237d5a8fe539b0ee07028c9d7ccba38b81bfc99ff5ea6da3 SHA512 d0c121ed4cf148288fd5eb66c0a5175f79cf9fa37e96157af16eb1e1be71722107288563fa858a91778a9a04eb521979ba86a3680f774e04b7f37d0b09747c13
diff --git a/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild b/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
index 6bf341c0f77f..b4c5df952c0e 100644
--- a/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
+++ b/dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 54081355ef44..23ee7c23d885 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,5 @@
 DIST pyscard-2.0.1.tar.gz 149193 BLAKE2B f140e3e62635634de8125d88c69e4ac3657468eef04798b4ce5b20d73905189ced71f041ef7742233a185aff8b28cc0fcda5af175d6dff21afeff84f062afcce SHA512 c9292b9616f150e500b308c47b0d6ed6f869f2022149c99a7789f8fef8c145dec4db84d35b6df30fa31d4007dffff75fcc21c9846693eccd9bd3bc8ec77fce5a
+DIST pyscard-2.0.2.tar.gz 149302 BLAKE2B bb1203aea42a0caca5212780f1312e51a4cf1a2b2842e3e33f25c17e57e3400d44c387620ec4a1dc9ca7a4ef5747900981971c87d1e37b6523a5990362645f5a SHA512 f6ab42a0aa037189f2fefe4001dde7f49125fdf63358352af956e58da9a51744a884ff1f7173b71e035a1a4a20825a906ee5d94f314b760333d1110c898a6644
 EBUILD pyscard-2.0.1.ebuild 697 BLAKE2B 62fb79562d575c17603c3c4077ae9dfccf03f558802b7e2aa72377f17cdb9b4dcb89ff927d3d690eb87e59d399899ab7b475e82615c84c9e137d9a6e414528a4 SHA512 6ab4bdb5554da983287d8aa10b53e750c2ce60dadb973a5f39a5c9ad156cbeaa91e9028f25365b6d68910bb0d7e8f177c23139226ceae498b108dfbe8dec1eff
+EBUILD pyscard-2.0.2.ebuild 698 BLAKE2B f85bb21fa42f8ea2e57ecda553a29494f1fac471d99a61452ee8493463863c29ab72e2530a4fe7d253038bcbe7345428fd4564340b04f42d868edf49571ef173 SHA512 02ea28fa31649e11c8a7b5d595165552dedeb12a58897119df018ee0ce9e2148f065a18b41408109d66fce1869da270a466db61db40d4623d4efe65602e2bd79
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.2.ebuild b/dev-python/pyscard/pyscard-2.0.2.ebuild
new file mode 100644
index 000000000000..3ca571fac574
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Smart card 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 ~riscv ~x86"
+
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+distutils_enable_tests setup.py
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 895db9bcc530..ca57d0e09b51 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,3 @@
 DIST pysol_cards-0.10.2.tar.gz 20776 BLAKE2B b9f3f20e983453196a7db78ac81c17eb35f157e6419a9dd25e6286ab82763bf2a1601177e41abfe0f49367189a4a78ac66e4f77151c52acae006e3198ff8c524 SHA512 df8848c63ad12496c4346fc51fbac803b7a27c274147d458c78f937b70c804cddeeece8c6a980ef2a422bb17771ee1825c9824843e7d1cbc47e3678e506a30c5
-EBUILD pysol_cards-0.10.2.ebuild 581 BLAKE2B ef43c60fbc25caeb2cc59c6128330e8604a27f51c75aa1f2ed92e00ebb1605824adadfd0317817f8114c71037abb931eb4ef1ce5ec4431136c0a2d0a7fac99fc SHA512 e8aae83b09903e958a768c786fcad3ab19979d272f6180ea572f1e697e28a437a1b1f0c2359d42309bbc42cc96a50443581e3664a82ad4427e5cbbc63d8fb39c
+EBUILD pysol_cards-0.10.2.ebuild 588 BLAKE2B cbfbf3214dadb8712e11a7297d86f7a0268f66b5d2a7e6461253cb1d0b39470a45b6b9982bd5f56e0cd5c9ba68c00442497a543c00dc92fc877fe5e140507435 SHA512 b530e9205c2c15c5e8f7ae06444fbe6ab015fd0eaf20d277d84561ba5c502413af5aaa8a82e2d8e358abad29128d1508952d481cc3c1e548e3a7ebec0a6c1d5d
 MISC metadata.xml 314 BLAKE2B 8ce1a0f91285051b9c320936e58eed0732e60f57758fcd4c7460fae308791c6fca587ce4aad03bb0801b4f33402cba0982fe4fb9aab6eb0fd13f53c447b51371 SHA512 e03a0c868bfcd3718db0fd79a0daa025def13fedd90ae1228e32c9c8f0cc4c4813a515ebf220b6c1716a22941b6fd59cb1131d253c1adb43ac168b3a995fd132
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild
index eea6d82458cd..b69022f7f7dc 100644
--- a/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 152d56e15717..338260636d78 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,5 +1,5 @@
 DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
 DIST pyspelling-2.7.3.tar.gz 151244 BLAKE2B bdfb40c6f39dc5adcc31691ef75b2582e78e8d0ed800ef0e263f8f98987ce3911650cb08085315c617c185e6ef183a11508fde4608349d0dad435b9f4fe1da98 SHA512 6903b620993933e80dfef320c0218c6372ee37f1db958b489d273aca24dd91bcc86fd12967848b8e31c2d7d458fb5fbfb521f41328c5955a1914f7d552ae7341
 EBUILD pyspelling-2.7.2.ebuild 1338 BLAKE2B e391f4fca032ef16798e460d4f79c8f3e4b617dfddff7c072af4be0bf0d28af031aa6ab5a293d3c97653e9b0dfd18e52d5dc6be2d8d6045021b4a427bb5ccc1e SHA512 932d21a498a92808df0c9fa19daabff8891dcb261b1c16d0b233ecaccac4c26b9fd526741f54b84be5c036dcf2481457170c34274373954803e34a66bd3986c3
-EBUILD pyspelling-2.7.3.ebuild 1306 BLAKE2B 9064c2340062cbebb43f7bd0ba7730912d302e93c4fa92efb689b85a02431268b5c214de8ea4f593ce83761e66d4fe60f3fe78a882468d9e40b02687b63a8f0e SHA512 8027933589afd9286bba93cb6f2bec44cbe0ccc14da6c002c85fa65f2f0f7f4f90e049f0e2f530f3457adf98ff0bb4ccc3af337abbbc200f87a5d536a177bf5b
+EBUILD pyspelling-2.7.3.ebuild 1313 BLAKE2B 894ed92c548de6a437af46a0f95b9dd49f33fef97b27d898fd91953bac0946ba875a6d64cebb2f563e21903673b0d68ef109888ef1d8e1cc2675114cc2b5cb88 SHA512 c8c687f259446847942d9211f5fc619b02ae4ed50409836fe5a9b2ce270a4a6df43bd2715993fed17fce3e0892a9dce2e62dd99c6c262b1df17e3fc6a73ada1d
 MISC metadata.xml 1923 BLAKE2B d82f0be825f6bd90b0a20c49de49490b8efbeeaf30a2715cfcec0412e7ca0b15fbfa830a11e83e22e691d14b48ae1c21cca046d6e44b3c025cd23cc71a5a39d4 SHA512 c4e89e70fc837a9feb201adbcbbc61320fde0ecccd5a44d4db4c244d879d1648c2a9f10928e94c32952c99237160e7cc36bc77de69bde2acd6a6fabb69f1f92b
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index ecc4d5168913..409cf76eca5e 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
new file mode 100644
index 000000000000..38e3dc58f8b7
--- /dev/null
+++ b/dev-python/pytest-check/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-check-1.0.4.gh.tar.gz 7738 BLAKE2B 179575dfd4f9e50715fd5a664039fe882b0e14c9369afb6f7aca65e9ab276147b2a0b7fe580d2a249721152d891c12cedfa06ae7e26027c6b7d3b34da17d4a53 SHA512 ca71295fc5a831df295c8ce40c6a57cde9a1b98ca25354a3954fc44c9094096ea0c9c6a49139659d4c9aa4e3d3d81d80893edb657bfd3f4d988c75864e843447
+EBUILD pytest-check-1.0.4.ebuild 708 BLAKE2B 1e68b9f74aaa64e7a281bb304036117cf99ac9c8ae0f42bc13a79af810b3b8034fe1fafe62e6561ddd929b2e1d2e345ecd47229165f3474207e49859c3863be0 SHA512 4dcc656f1620d44973c0016354aed1bbf677c40770840141af6f974510a34f6bae84f758aced5d4782e982872195210152503cccebf7d3fdcd4815239e8f24bd
+MISC metadata.xml 408 BLAKE2B 3f2a2f62298e5b17ecbb0c11d87eed1d6b841cbc832438951ebc6a1f7b4c530be4744bd655752b5b659aa271094949075032b239d47b459cc68753a2a94e22d9 SHA512 8404e883e6d145b26cba45c3344a41f7622fe6cbe77a2b36f4c8c08fad8d71c30e09b93067977f01324759214b7943e903ad9d4ca1b27ba9c6335993d5bf51d8
diff --git a/dev-python/pytest-check/metadata.xml b/dev-python/pytest-check/metadata.xml
new file mode 100644
index 000000000000..af6127a0bf2a
--- /dev/null
+++ b/dev-python/pytest-check/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">okken/pytest-check</remote-id>
+		<remote-id type="pypi">pytest_check</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-check/pytest-check-1.0.4.ebuild b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
new file mode 100644
index 000000000000..a1cf5186cc03
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="https://github.com/okken/pytest-check https://pypi.org/project/pytest_check/"
+SRC_URI="
+	https://github.com/okken/pytest-check/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/flit_core[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	default
+	mv src/pytest_check pytest_check
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index a513b34dfb65..b338209deecc 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-cov-2.12.1.tar.gz 60395 BLAKE2B 42e817c63c9d787de9bfaf804217a1e020d5a38e564df0ce2d43d6b4f0631aee43ccae329f44c6d7ac9a5662776463456d72138fd20c65cf8d0accfe118e1e2b SHA512 4c234178febeba1ce93ec0804c3efe181d5d88db9ac02effe14e62eb3b0f7ca1f8757fb4f360551e0d3e35a3b6207892afea85611a49db6c71a2dbaacabc5375
-EBUILD pytest-cov-2.12.1.ebuild 1285 BLAKE2B 701357e55609bea2f32098d4290deed25bfc33633e76d14b09f902ddf9556afaaf7567494960c08cc64491a66a0f2cc78323d59417d537567951f51a6d7b9f93 SHA512 3d4fa3e5d3820f9c36cd6eaf4a8e3d147315827c95277a4d6b1614b2c9081b6915093aacd0b5a42bfc0efd04586959178803f76585a6ce965ad6ac8a2fe8a2f5
+EBUILD pytest-cov-2.12.1.ebuild 1291 BLAKE2B a52a9688ae13e66a349fa326ef3fc90a3560571b454e0a03764224bb9aefb4808c17795ef193eda1f54a7bc931a23099e026ddaa0dee8efd533f8ba499b231bd SHA512 57fa47eaa32e2aa96d78f3968f32775f5009910d2dc97e95f321de0e1553d94970e306b89ac440865041861b6501c8df9bcb7d7fe13a282b0b539e440c2c1cbb
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
index 4781883433f7..4f559d991ad6 100644
--- a/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.12.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index b162c7391da7..cad3c3b1b743 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-describe-1.0.0.tar.gz 8917 BLAKE2B 8608a00151273ebb22da6a297580295abbd64c7d9e90bfba9611eac3be64247be20ee43bb64ead1a3f74e65719112a94535506f4402cb7084802360609ab0173 SHA512 1cefa2911e598063b3b9dce381750d204c925cb0dde890b79745c8b4f1cf6d0349f85dc9eaf895000a6f15f45a84fb920f27c01b0af1959125fbe3716cbebbbc
 DIST pytest-describe-2.0.0.tar.gz 9711 BLAKE2B d9a799afebf77166c81a9d2477a378d7664e9aa586460043c9a9448838eafebcb0679768d10d2439ab350b48ad7263ebe17eea6fdaef96ef14aceb6aa9ff943c SHA512 28edd2b10607424aff7b95dd834716fc1888a09c23d810e0b9870a5a93de3ca745d3506a6327ece6f92b3afcdcee0fb56f6f163e2868abcf2022175708ff58af
-EBUILD pytest-describe-1.0.0.ebuild 702 BLAKE2B 729d36069f53625ec0ebc10b81eb135274534c60186f97b9e189ed8fd360935bb79db1e15f05524bab0d28b9c1d832257c7534ee69d5e6629d0acd4cb50952a5 SHA512 a48317e9b1a9499f86e642116a84a1ac66d167ae115c1d250a8b01e17cf215b17dad64b25bc1d0fc67579ba4be081370996d27a3dda764f83a5129ca45e823ad
-EBUILD pytest-describe-2.0.0.ebuild 701 BLAKE2B d8e7eb2c344a07c03af60c30759dcef8fe2d9f70b5ecfa6392bc63d436ccc088a9ccbffd509e775c7c35bd70eeec12a1ab89121660e817a0038ef013f0f28edf SHA512 95cbde24ce976546710a63d8e2f37958f2ef2b41dc4f58ad7f1db599cfc98110018dfabf672bb952bd9901c0a6ef386f74516d559f7eebc39e8b1ddbf80e6cea
+EBUILD pytest-describe-2.0.0.ebuild 699 BLAKE2B 0ee5652721e0ee463559d96594d4da3564b1779ffd3957f16b07d8757f3a4d33386b2f2e53973369972840e5a5177728ec43779fcb69ffd85b2dadc302b9051f SHA512 6657e80c6d7081473f5071c79c831fc9c4d3452849c94a8eaf15da7f843f1604cea82df3a14fa2425711615082833b6e46e59e6f240690e766ae2c61c32c75b2
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
deleted file mode 100644
index 7696495e056b..000000000000
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
-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"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# We need to disable some plugins because tests don't like unexpected
-	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
index b0f2ea97b6db..1d2df2e46f29 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index beee0951747b..57a53be93a99 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 629 BLAKE2B d52d515255d606edb4c80ba69085579d068a87da6d0637e9ee50a4e1951f3d4903d6b33094c6541d2b48f26009715c64fc7c0682ea231b2a8f056f8dbdc276a2 SHA512 f26afb2e67fcaaaa83692a38eda8fea6009f3ec90364b4a28927a5a1c5885625c218f29f5cf9656d109b7d2a9081b9b47d351e970f68b37b247cfdf6493cd3ac
+EBUILD pytest-freezegun-0.4.2.ebuild 635 BLAKE2B 199816a86088fcd6f125ac3cb51fe73e9cc40d993a74efabcd2c60c1b2bd699c408b8904488ecc10f7e778275138d08cde894a001c261662e797a98a4aa082e9 SHA512 27f3e0ede6e0afd84a8096005d4856e236b054c5bbf532a58e18618287503652d9624f3d16842db097b887677809248e9b0c9466971feae67c5bf70bec1519a0
 MISC metadata.xml 322 BLAKE2B 3e34df76fbf36fdf27dbdae10499c4925f51f9ef3945895ea54f4423f5efef036bcaf6e9516e74c4e0eecdb4e7a314f0a689804e1719ee28287b6c417bc7c1da SHA512 6b495faa2f661da0b83e25fd3bbfad4e3856247948b503a3f01d82d2cd3d9908c85699ab4e5d99dfe2ca48d55287e320f9c908ae4a2330f2f2c037aee258bfa9
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index 6b9608f47ff0..27d5e3ea6050 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="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 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 05ce70c73e80..be29dd18b317 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-httpx-0.12.0.tar.gz 21319 BLAKE2B 59c3678937a7756f13971e3f1f8d312b227f56339b4234ac8e5544f4370622bcff401f76f68c2ee042fdc64deae6a7a9dd05ca8a54b60b14bfb74b2d2d724de4 SHA512 b5866ab0123755020fad679d27d4d113132b2a79da85c52a334904d19aea90ddc71088a6e0f27110498da2731be664c525f3cab256d447a37d9a507f9a508b43
-DIST pytest-httpx-0.12.1.tar.gz 21422 BLAKE2B 6336a79d3aedbba7ec32fdafc6ed6fd70a24354adcdd3803af73522f9eb2d5bb1ac51364c107d3ca663f2c627a29fa9d3b0c12ba1bcba94259932a36c7695ed4 SHA512 959906c366b3cfc4d3df46773888f1da0c65ca4a9d31de302c859a61a71f10df5712b058bf89132756028eda15c35241aa245bc708d69560a0d3a80f9fa1e814
 DIST pytest-httpx-0.13.0.tar.gz 21515 BLAKE2B 691ce45dd2b27c8f47724e3356ba96e62a0d6a7ce7d3feea68295a873c12f9a3df00d5b25aad7ef8a1154e887077ae6f6c1b12f3685a0669534a0d0ee8aae68c SHA512 514d9acacdfd60d13b5ce2c5ebe46d0e4d16c1b06fd359b0b9515ae2fa9091296537f369882a78bdfad48e9a0aad0b2f8c172c2e54f4ae9e23ba03220c7c17fb
-EBUILD pytest-httpx-0.12.0.ebuild 653 BLAKE2B 49026b4a4108d22081b0cf24ae5921ce32b54c948b804b1c1ab6daf790f030f727738313862390b9c5b7a9f9761fb34b95a5ab8f6fbb70f0aea563a4aa2a1902 SHA512 fb68de7d314fcaf3e256854a6a882fac594e29ab4b331f25024da8d0092551279bf15a273089ee4174b7a7d29d8b8e8a96f58c21bf7fc919940bb0732671e5ee
-EBUILD pytest-httpx-0.12.1.ebuild 652 BLAKE2B a2624ce903778e87e6342263190c7ad41bf44b6fc85a293adb8f2be7b263bba58e277b00465fdd84eeac248a91525416560ad40f537d5642e6522e038c166867 SHA512 b8bf77a8d969b2dfc3681f080702add98e44a60bf4273484f8cb51b37cc77db3d2ebc381f179ad6366b667907ebcab7a2cfcc965a21961f3424c34878ad37712
-EBUILD pytest-httpx-0.13.0.ebuild 652 BLAKE2B abe44c7aabff8eb583a18a63968c39114bcf7a754da1240f9f6c34b76d7df3f81ab89bb00633dbc408ea53fc94c4bc384888ba92aa78ba5d0f7f5f3c59ce79ee SHA512 152d42c26e8d775044082e07d6a41227716c6f8391859e67bd2c95b4b29f209ca1f5b130518fcc927ec1f55a9a164b06804c89ad0d84cae0c0e905f11245cf85
+EBUILD pytest-httpx-0.13.0.ebuild 650 BLAKE2B fd4272301785db52c5f41ba2b5908e3ef998c7dd693943622ae863cb4b2268237c2049e7ee962b3a7aaacfbf4c53a9ae7250c6d7d24bfb0fc817ade5d414ab14 SHA512 e9ec9c242b2fd59ac20c7afbde073e0897d26ca76dbc3c1196e6dbc0d52484cd3ac85c46e27a5a9a5daed64d3d757fbd6e20fca562951f6d4edd07492dde9e53
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
deleted file mode 100644
index 89a575419478..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-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.18*[${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.12.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
deleted file mode 100644
index ce7fceeea820..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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.18*[${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.13.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
index 684f00600e08..b655394efae8 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.19*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index d67c0872776a..8fe7100c408a 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-localserver-0.5.0-py310-tests.patch 1608 BLAKE2B d11471960e35b43150f2783b728e2f763e8b3b54a4a8a3fcc56fd12b6c230d03ffaa9826ee20c83865754c95b75c35343e3038d32b2e792fbf9975bbb936c961 SHA512 149526734f33dbb7903cf8381f6eca7cea7a0a3c452759a16d7a0ee8d415bd767722acde88189865eab769ff4506d209155df1e02e130effc724c4306f8cf99f
 AUX pytest-localserver-0.5.0-setup.patch 170 BLAKE2B a82759d54b0ff9f7f457ca9e3665d68b05c92063ea4dd47bb4e5932999cb600aac9bda9367d33dc7911d0294932a30f52c618cd7f2f9b9db24b279efe64e79ab SHA512 75df9fe8dbcb38151478bb7039bb56a4fc00fea5f7867044ebab90260f7289930090f84727b1e449c95baa4fd275cd277fae5fcbad283e1f84ab72f6277d0926
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0.ebuild 814 BLAKE2B 4443f00387096757315f3c7d50698772c7b102d334339a63c123d59ea996c990282029734a152e9233dd4c4cfccc364577c3497da67ab321e53c5caddc8fe5b4 SHA512 6d63c912da6eda8f6c9adc4452670323dc9e99ae7a0239dad11f354c72ecfbfb7ceac7552132bc6f73c91212fde6fa58386e8b1bd92e5b082513f2a2ca9b20b7
+EBUILD pytest-localserver-0.5.0.ebuild 820 BLAKE2B 4f43eaf58d6fef25ea7203dde6921b5bacb1803295796112670ed47923491dc36a1d1b44698a9539992d9e4762ad57d25c4a2a020ec291c2bb98ee6163fbd360 SHA512 ad3e015bd199f171ff8947516f75f919151cc9955146ce638d0eb8abf41bd807bf5805828374b621e8149ac8ecf325910c0d957ae534dd7f3a5d08e9adcabdec
 MISC metadata.xml 346 BLAKE2B 00f1243b0ef08f63d41fd211743230b93c976b52c5048bcdb2b5317610541a088ca13302e9c66e6a1a03156f071c5808d6960ccb1bfcf1349ba727f7ea608c25 SHA512 515a24e3a2fe049ad130ed44c1d42fb92ddf2f1bb4e512f8fce7e63b18af8529ae8790ca0dfc9b93589940c00fce192f1b16063936be26358e0e827afd359148
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index b995790ef5d4..f3bfed9ec65f 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 9bd540aeb3c6..8f697c3e899b 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mock-3.6.1.tar.gz 29933 BLAKE2B 6c22d23f3a8e9b5ef26f990325f5a2c2897b60f61f84472716a1f984e72a8c38f6992e439ef581d7772e25a5fe9e76d190697d9c7bc8b5dcbf6375bead4b3dc3 SHA512 50a8ffbac1b20b1962558789b24d50c1e7d8d2e2706ee15a576eb5fd1b40d4523482dce7a1078d532b686ff8d38b6d769d356b04241528a0196e14acae0b6199
-EBUILD pytest-mock-3.6.1.ebuild 842 BLAKE2B 1227954d87c158685aa53fc55c9653f7392d837d54eb439660a184bdbf365e6183e83f1faafcc8d120def8a6d61d21b61ecbc604a845d3969ee91be5785fb3b0 SHA512 54d63c8f1ee99db28af396d885e3da8296ce9e89e3b824e9332af8353d2637779f0d7a934ba1fb521121f1b807bd480e499b0ccaad23563eb91e5476579682f1
+EBUILD pytest-mock-3.6.1.ebuild 950 BLAKE2B 7346bbf6bee0fafd0f90cf1d2139343597095bd9807cf8a616833598ffc6b2af014aa6034deb8ecca9f0ce397924e22e3f440a67f070ac6504a76ca563d90913 SHA512 1a0645374bb334ec8e212e3efab72dac4dc6b9fe50ecb3f0fe7454752ec507cccadccf57e46cfd30986b779df92c590ff85c7a77c30c3185a72b0abebeb4b10b
 MISC metadata.xml 458 BLAKE2B 1f30330ee4d263236a048cfd114c4129df9b5a7a78a35af366903ecd273ff34b353516f56874870b06b4d39e3c5a0c5300d3455b784193b168dd13b8c9aabba0 SHA512 87a4daaaa39a6d551ab677370c815dccd377a0e6d30cb56e346dd0343d3f099557a1f95156983fb9e2eaedfc4e142dd1faac7a9cb01e72442644b0f4c7a91093
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
index 8f048a9f8998..7e9b2eb105f5 100644
--- a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
@@ -12,21 +12,25 @@ 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 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	sed -e 's/runpytest_subprocess(/&"-p","no:xprocess",/' -i tests/test_pytest_mock.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	local deselect=()
 	if has_version dev-python/mock; then
-		deselect+=(
+		local EPYTEST_DESELECT=(
 			tests/test_pytest_mock.py::test_standalone_mock
 		)
 	fi
 
 	distutils_install_for_testing
-	epytest --assert=plain ${deselect[@]/#/--deselect }
+	epytest --assert=plain
 }
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index 175d2b8af504..109a50a8f60b 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,4 @@
+AUX pytest-ordering-0.6-fix-pytest-6.patch 920 BLAKE2B 2b964bd2cef5f947bc53554abb8c7f0432f3a8ca632b0f52dd304836a79a4e4050edc0e6350f92f517f43a8fec077a58ec407ec90ee1489501ceb7b6971fa76b SHA512 7164f9982668dbdeb016e39937101bf879b6b0267e05f854b34a50637505ed762f6fbc931428e346591e7a1b1ce1da0a929f19222931db5b284bdcbdd2fc0ef7
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
-EBUILD pytest-ordering-0.6.ebuild 870 BLAKE2B b44ea3f2392b3eb1989dff5b0df1764991d2598d9d28e8352fca4866b9e3d72ca03cd2833af384ee5aedbec59bddb32f8345438a66965bd345b59d952269fd3c SHA512 188df2e6b31de1ceca21ebf9d4c2babf50b38781140bde768657eac40e666ea0f75b7169d731956b7e72c630e990ae446f09f20fea6b5ec8d6067a4fefcc2930
+EBUILD pytest-ordering-0.6.ebuild 919 BLAKE2B 3fbd5f620665c87a3cddc45a3a8505b7278a3fffe84d885b97a08ff2d1c54c78cc9d2292c45d73bb9fe946080e6bdfcc734d6579d708a8f42322c637cf0e9b62 SHA512 d5d7f5cf5ba4c9860f2587f95ce98026d0909ca9c409ba790a89df817e284ef11ecf5037895385dfce00e017b6ff4c93ce0b6e3d727b872d34444c723492c57f
 MISC metadata.xml 423 BLAKE2B b33ec2a8e4852bb8d9865369719cc4c38398950279b84ba6feb2a7869b42824310ce9a664cc6cf7b3a1febee4d86048158923a396fce9ee1e99051daf34d6e69 SHA512 dc144919d84e8933f9ce70faa6482ff0334d28fb7e6a5b2feba53d29d3b2002cef05a6012e1e2764a8364da39b2914b2e8ac7101611828c41809372fda94a12e
diff --git a/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch b/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch
new file mode 100644
index 000000000000..3a3ea15f4b8e
--- /dev/null
+++ b/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch
@@ -0,0 +1,21 @@
+From 9bfb05700386254afabb38f762e0ea860b567209 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 26 Jan 2021 20:42:14 +0100
+Subject: [PATCH] Don't use accidental pytest API, fix tests for pytest 6.2+
+
+https://github.com/ftobia/pytest-ordering/pull/76
+
+--- a/tests/test_ordering.py
++++ b/tests/test_ordering.py
+@@ -12,9 +12,9 @@ def item_names_for(testdir):
+     def _item_names_for(tests_content):
+         # some strange code to extract sorted items
+         items = testdir.getitems(tests_content)
+-        hook = testdir.config.hook
++        hook = items[0].config.hook
+         hook.pytest_collection_modifyitems(session=items[0].session,
+-                                           config=testdir.config, items=items)
++                                           config=items[0].config, items=items)
+         return [item.name for item in items]
+
+     return _item_names_for
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 0bd6f7293be1..25ef67eebc14 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -18,7 +18,11 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
-RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-pytest-6.patch"
+)
 
 distutils_enable_tests --install pytest
 distutils_enable_sphinx docs/source
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 989658b09edd..c84862e3dc38 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-rerunfailures-10.1.tar.gz 13644 BLAKE2B 05b654128cbc94be803d15e038cdfcaa3879dbc43eb57dcf5cc3f5e52d0e4848a38b70048b32eb5afc99bcaec614abe6febfa95e4e8f7c7e07f6dc71dcdc3915 SHA512 9aa825c7fb1fb36edb78f1cdfc4a5f705e1688d00be0cd311e5cdf542698a2e03eed15b526235e2a35262000ce24923ea1049f3efa449c9a3723a2a5c1316717
+DIST pytest-rerunfailures-10.2.tar.gz 15863 BLAKE2B 9f317f3a39ac234e145a14d532d2727bb9fb5fead65c05372cf95268e0f589f9de994cd3c47e75dcb354c996595698c43fccdea5134d2e1921429c8ea7b71451 SHA512 8830610276e2cc172ee372ae4d8376bc6329138751ea2737a4def6af32d05c112c872a7a180ff554018058c05ed0d109927dbac61f748586257e40b0243f03c8
 EBUILD pytest-rerunfailures-10.1.ebuild 618 BLAKE2B 027d6d02641e7aa59f80fd8f0e32ba657f05ec79c8208b532d187d554e4992676f50bfff3229f09cf17202b09a8a559249238d0ee7e982acd02fbcebf916b707 SHA512 f49822d9a12f42a68aedb34d71aac6753aa73a42390f7e1e9b8e31ee20c8a185ea81737f2b167659b1dec7d9b7904c5d11f8eaab1062fccb698489ce8f880999
+EBUILD pytest-rerunfailures-10.2.ebuild 626 BLAKE2B b0d15f1a500bf71a993b067fe9204aa6e12136af17c6654cab929d1f9374a697bfec6e75de3415a19f9a26c84f945a5fca1896cff2a8f6f4dfd20bd096f9880c SHA512 3cc5b1bcca219b7b59d48ce8012cef89bb123ffdc58bf6a396647bd04d18a506c0a1bc4fda93566227733827aa772acf97af1e13f54999b6ee6b3b69e5c9062d
 MISC metadata.xml 432 BLAKE2B 3bbb0bd303a26d2a336563f187160b3b023e6d7a3a776922dee4853164d7461f395e840b2c0ba1349687d24050ccb5fd18166aeec397c9b21a1aa0e6b536b795 SHA512 f372a1f73a4dc3e60f66bd6049cddb4d8cd8fe53bebff2a6d194eb3d5872adab9b7ac226971696fb24a8d4e4744427c4d4148054fc51a94f63320d428ef80d52
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
new file mode 100644
index 000000000000..369054f3e717
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+	test? ( !!dev-python/flaky )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 240d72fccd38..f352b84080c0 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
-EBUILD pytest-timeout-1.4.2-r1.ebuild 839 BLAKE2B 18d3d26573eeb3913920f22762f04dee350351a320c594b99dc5d2c6206f53c29d76be9bb1b69f4df52e139f74c1621735d67729a1f636fe60312d98e57005db SHA512 46b6f980c1c503786f63ab89c7a9c1cb5094c29be93df68371e5c86c99f5ab404bc3ac3062df9d6b8d9c7a196645b61076d42ec4c1872bff19a3f66302b63fc0
+EBUILD pytest-timeout-1.4.2-r1.ebuild 845 BLAKE2B 4012f45527042dfe78e888647feda657e447176b638049c73a557b30208a3204057fe5a21813ee2648b5a3833dc9634f6c51cbb1f414c80cb6b912a1ef1e474d SHA512 a0f3e201c15cb22929223e63ce6cdd56fdc31229bce3292b5713fc3a45ce541816ef5f3125405e2823f08eb3116223d95aefe342542d466affd915130ac110cf
 MISC metadata.xml 353 BLAKE2B 4865119ec7c91f6d9ac1ab4ce5b1cb73b784f29f7efd669c629062cca2d433eaabb51af1d0ddb3275d414a99413eb8aa76c8639d484c7846ea33c4f53a013bad SHA512 764118890125a80df18e5d9a1bbf6bb35261c0cbcc04e6c9c67ee7b307cdbc31979b831910022a1caef97deee6830d7236f258f524a95a9494229dcd4a14c8ad
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
index e329ee7f084e..3c8268e3967a 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index 00e82962bf6e..2eca0803157b 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
-EBUILD pytest-trio-0.7.0.ebuild 1337 BLAKE2B dc16f7239df66585234ce66360918ab41d8ef65bac863ed2e3bb4e24f5472d5eebf37b0792cf49d10849217e26f35b8a8334bb0cac1fb3728a324e19adb65b1a SHA512 32bafaa44cc96a732cada087afbb2bdaf35ae992e6e387f438656906c4a204bc19b3dbf0407d3659ec29030348fc98218e943c4bdcdefc68d87aef6b52c8b026
+EBUILD pytest-trio-0.7.0.ebuild 1336 BLAKE2B 340e02db478308407406f11933ed9e40559ae797254fa5ca73df916ce135fc49a42527618d43652f03389246c19fd6be8a5774adfed093374ed183c5e7a5ad9c SHA512 c99ad511efbd4ee4d3918a869f3193d52025dbbb899a5eecafc4ebf8b29ded26ffdfabe7f179ebbd012aff782a6cc4b8f149228e07c0f5aa2d70be8176feb187
 MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index e9f29025613a..b50d103696c8 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index f18d83d1fd6c..36cb255aeea9 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,4 +1,6 @@
 AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.3.0.tar.gz 66072 BLAKE2B 367ff15cd46b8594668ccd9710a2fc7665295d41e268b464b81d5e740a580d70621a1ab5ab590788e44887b7aa3049a83853ea097c0cff54e22c3422c8f11b24 SHA512 bf49a1684b29f0ae21621b9d293f530cf2fa3d88b33f631fb803aef872c0d5ef6b3bbf2e16d01be8a6c1872fe3e6cff86ab842e3000b9e642fb46c2a170627f6
+DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
 EBUILD pytest-xdist-2.3.0.ebuild 930 BLAKE2B 6a6d05f009e539a9bce4749c6cd6cb3de3414470f47654c15b11cccecb319bd60a11ccbd755f5699f1c0124c860bd887e3d38d0053992a5d5b28a2dc553be144 SHA512 6629403b5e92ac75b51ba53453e51d0c2e2e22c89e99cd6e686610857cffcccea92593729a0d16f5e1450141a8b0f18c1c20295bb509594e9b3c17622d42f9eb
+EBUILD pytest-xdist-2.4.0.ebuild 1166 BLAKE2B 44c93dac1e0cdc5a46243f236f223a68aa2ccd3e285743130448a175dca80fefbad0683b1087f66990ed36bce2ae174cc0d27cc6f208b17627731737669d63be SHA512 dab48191ac867caff2c55d2ef1f566ef767baa1c5e166c0403107f92274ae76af07d559ac5f8de162c6f645a487597cd0756af6b052ef25f43c5d22b5df60963
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
new file mode 100644
index 000000000000..a3f40e53e852
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.4.0.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_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# pytest-xdist >= 2 fails with pytest < 6
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	distutils_install_for_testing
+	epytest
+}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index cb595a6b8353..1fec718f1e00 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xprocess-0.18.1.tar.gz 26976 BLAKE2B 9772fff488414406f487add01fba9ee2e10e12965d5b289b8c17cffb5a6566aaea0653ca1b390e6b4c70d79ce3698b0ce8122ed919f9778cb8cf3f7488cffc8d SHA512 f19cba9954e4b2363db13b7dba373f5e50cfca6f43d6455f271bff4d01dcc2a3b15c13a47076dbeed34feffee856a8271df4837edab413e964a848cbb6228e7e
-EBUILD pytest-xprocess-0.18.1.ebuild 633 BLAKE2B 002b2d996c9eaa6f8033a01f71ad53b7d912173c5592b4895cee81ad025fb3d21264014944e957373ebfdaa129098802ada5b8ebb23d8ac7caa578139a650897 SHA512 2ba22cf44a11bbecd8ea12cb8c21981aade1bf67a1c4c784bb0255677a62d208f87cb9fa27faf7cda6809d3cb1c5b41729f7dec0a0e8c5c43cd116fdd9c58d5d
+EBUILD pytest-xprocess-0.18.1.ebuild 639 BLAKE2B 7cfd8906ab46f7ecd7c0d5d7e9ea86dbcb14a56a572953c5b051e5e318a7d47db5e8f8321ad49ee238175415fbd26ede833a44684ae753e88fdc50f47a773fc2 SHA512 2883d5733f962dd8bdfea5b61c831106b7acc1eeb167fe5b8a1d02d0e386c39e2a2b5e94de7acdc7dec8c20e8e860ff24ab67a69aedb887c9aff2b5708585d9b
 MISC metadata.xml 422 BLAKE2B fb18d498d2325613b4ddb9262d90108aca85cc28c4dc298359adc0cb589565df894b5c48bfdc7a7f83cf30421f324fa1af93333ae20fc793910993e0a93db90b SHA512 19e96fb0695284d9adfd71eccee8f3ab0661d5e0231f3f55db0456a3dfe797fb683985cb776e45a183a710462e990f539f75a764dca68d0c2e631abf68d8344e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
index 8957a7013ae5..2766e61af2dd 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 75d58a6c5734..269d54a9e80c 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
-EBUILD python-email-validator-1.1.3.ebuild 1172 BLAKE2B c269b9d4f54934e86d0c39dfbec326d001a0aac06c7156b6789d08f9150a7200a87ec8526f39c266879b3bcf899f6517e74cd87f07f8442efb9cad1d7c1cdc0c SHA512 7906e93fdfecc20271ecb2b92e829d717a3fa4abe3d20e732608f1a78e4eeee6e0c353c254e393667f3767325b4d86c3c86b584752fd0625b34a9ac30b5010f8
+EBUILD python-email-validator-1.1.3.ebuild 1179 BLAKE2B a1752adc16e7dd3ef05006fd6a65540ddb4337ad90a2c3ab417944949d3c25961f4d20e921319547dc7c48137b88df794ca392e0f9a9672e60f7609f4aa50725 SHA512 eb7891776bf7c6f17362cc13dc214aca310cd0bd0190c84b1a89beb0250f73f80efc0ca20b4a60850eb2879c12960c7eb57bb3465a157f9ec9c743bd8f0c49c9
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
index 37514f3ad4d8..d2f0895679f6 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index bbb26b59eeb9..df42ac17e1ed 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
-EBUILD python-xmlsec-1.3.11.ebuild 901 BLAKE2B 77245e435fbb4741bc130aba61316959bbf93fb86c653e5ac2a4fb033110234da53dbd77d82f6daa462895e3f7a8fd4725b56521f2827051ffbba03a647a0c70 SHA512 13491d16a271099ed556ce155e9080d58df08a89bf9be6fbb67180ce479096088db3e5a7a88944f10da7eb5a2d2616a96969121afa19afa7a77d9411af9f2190
+EBUILD python-xmlsec-1.3.11.ebuild 899 BLAKE2B 8a441f253d63282c8b5ca330ef8ee9b41b1e673cf693122128c6459e42a39fbb7c51df51477c8dfa3355cb2cd8a0c6b766383e58edbbc747b2a073eecc40b07f SHA512 7e96a22c5a467d0be19bb08162ac56fb02f69bf3645d9fd6f2d312a8586013337a54e2f450347fdc1f00a21b0129d9759a9b527a676075dfafc9c6914c5649fa
 MISC metadata.xml 420 BLAKE2B 8aeda69d8870ff72e5ff7476fa1e6fe2bde1bdbdc12093821a29aa905abb644bf4a78a8e5f8b2247f8bc89662f6055f26bd05eadf2f31371c2aa75f59f5b62da SHA512 96532b3a747f1a669b50ed86fb22f986e86f6456239c432c754ba12f5f3303a67037d25584eead27c6f9398d5d48275b558a8b0517a1128d9960b96e5962e474
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index a43d02473ec7..7ae6f52563c3 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	dev-libs/xmlsec:=
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 821a6b539eec..20c32fb7bcd7 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r1.ebuild 592 BLAKE2B 58ce98b89d7c8c0a4a521970de919d6f80e6b197fd004cdff490f7ba2ebc47a49649a8a0850d86bbfdd92b0d3e01edd4db401ec647c8c43931f8f90069eea53e SHA512 17481ab9d1a49385f54ad402b0ddd72d1f75103db7ec86d6570d0afda27469f707803dd373d5bbc1166ca745822b876f154926af4d094c95d5da5f5b800c5186
+EBUILD pytidylib-0.3.2-r1.ebuild 598 BLAKE2B b651fd69fec5b94be9abf4844a627e27605f220baf90cc290796790d24776fa8fa4072b2f421e119b381fc0a81270e70d61006b7bd94f855655b9b9053dd8bf7 SHA512 622719a27ec15e1a9eaf977032a6b47679797ceb273abf4083c36b7e626f34a10a67339e64360f8fadc9234909471d1b66338bb4b9a30996f13848b65859ffc0
 MISC metadata.xml 386 BLAKE2B 827fbfb2980cea331345e42992787858b4bfa481157841c2a6970d75e4a5d669e864e545c07723baa5fd673d7fac020fa8ed26008e57064e3de4b230809ac358 SHA512 88a181e7b71f76b1d0271362b39a7310ecf5cd90cf98aa41e609833cfae4c5886b6d4beb1fd387ca6aec3f7a9da1bdc9a1e3424b018039804049ed94b717f92c
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index af4606a00b43..74d643a16278 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 8c2c4d633212..95b94dfaca6e 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,4 @@
-DIST pytools-2021.2.7.tar.gz 63673 BLAKE2B 0d64aea8c87bf7d8f6f0fb432545fc20589aadf8cee41fdc9096a1e59e1ec4588812b803cffcbf8cc92bab4e18d5ea4422beeddc9408051af11e06b04d8e7a6a SHA512 284fbdb638d40247e330c254567f594f723cad467a504bb31852c0ec5cbbb0648d9596c65e9839975bbe3a52556896440c25da5d2171aaed7c26ba38db6a4426
 DIST pytools-2021.2.8.tar.gz 63381 BLAKE2B 975a611c0ee7b013facf9754926d52e66184d69b9bbbe3ddafd252d0c0bd093c11cb91140879e2660b7e2a4f2291b58f728b2e19add2e205653df59a9f2b7be2 SHA512 9dde96889c3505f5cf4eb06c3174b889ed8ecc964ac95d8cbf36ad500ab23470c5ee46b8f96bc4fa5d2dc710d3603680643a61e10bac4da8305d92b1e3ebd0d8
-EBUILD pytools-2021.2.7.ebuild 551 BLAKE2B 9464350a8af26c40562d44ff6ab247c5967aaaf0f416b33155c3dbed2e7431b49906f1ab4edd5fb5f7b5bc41f84c2eba6dbae832a8208933a90c1a3de7f58201 SHA512 fb0b667a071206237ce63ff0ca549135cf8992a15816954ca68061f7a674609d758b94ec2b4f4b56e11fa5b94706b97302b3dac0011a16799dcc033715685d98
-EBUILD pytools-2021.2.8.ebuild 552 BLAKE2B 8ed49e0428f6646baf0aa74bde7effa173a68139d81b4cb9a4da65c24472eafa7965a5707ba1eb0f44f13985a3f3282056ffee25953c38e24824d826cead0972 SHA512 b82416f833ae16a5551642d06175d2552f7e1d73bab5db51e29cde8f56cd9e9b994e2c6485059b27092450be1b4814de4c8a8f4ec3645670d2c3084ebfcd79e3
+EBUILD pytools-2021.2.8.ebuild 551 BLAKE2B 9679116e983c06b650ade862f561ab68bb164915b71fc032151f7866674b3818b3609ce2eb05dc89ddd906f94e5a5be883ff5d317f65fd09f63f3b35aec4f98e SHA512 b17924ce980dd2424ca2b57e0d5416a98f2d97f6ec08b64767527d06631c9d791abd4696e92030d0419682dbc70007267747b5ad24edb7c3dd3635349a351a6d
 EBUILD pytools-9999.ebuild 540 BLAKE2B 79935eaf65d8de5623d628068ae537aab12ecc18588272ced9da06c7c3f9343cd83423baf7c56308fa596809f4b2f28607b5f7cba9810958df8ca8157751a3dd SHA512 41da1b9e57b251a497a6040bb95503534a262b1481dfc92a52534874d7268857ada753d36cad384e78878c05221bfd4efc0f427538c829add7be996f68f28d43
 MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
diff --git a/dev-python/pytools/pytools-2021.2.7.ebuild b/dev-python/pytools/pytools-2021.2.7.ebuild
deleted file mode 100644
index f45014748290..000000000000
--- a/dev-python/pytools/pytools-2021.2.7.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..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2021.2.8.ebuild b/dev-python/pytools/pytools-2021.2.8.ebuild
index 5400173d9dde..2ddbc8355127 100644
--- a/dev-python/pytools/pytools-2021.2.8.ebuild
+++ b/dev-python/pytools/pytools-2021.2.8.ebuild
@@ -14,7 +14,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/quantities/Manifest b/dev-python/quantities/Manifest
index fb82f096c0f7..df4ad333d0c5 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,6 +1,4 @@
 AUX quantities-0.12.5-numpy-1.21.patch 1081 BLAKE2B cad600d3961359dcfe3ae0534510e03300a81d0d7e8911c037abe556ae8d81e2cf813712c042c6663624103af1eb08fca144ff34c8c16680ff0450d8b340f3da SHA512 b0b027a80c121d9f9fe453f3663b46e1ef4f38781a107025a201ae18f6bee9b1d3473fe25eb74a2e79e10097f93cb06f34493cfafb7c2a35bd64704f3fb6a351
-DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
 DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
-EBUILD quantities-0.12.4.ebuild 818 BLAKE2B 139945a3e343468e1e4a24cf6483645a5c819ac3d860e552923764325d040eca4b4d4fe3a1505e2831664ddcd4b4a4f06a62fc4f7bdff36acb742e608fce75f7 SHA512 9d8c51fe991fcb60b14fdae709007785de7c5670f8201e30970f7e49d11099bbbe22e940ba5df4c6d9624c3494e4118b947d90b720d94230c7f49a3aa1bd96ca
-EBUILD quantities-0.12.5.ebuild 770 BLAKE2B 253b04a127ed222a7094b38ef204f9c30d7602033497520310660a1e2eb082ea47795e5d7059421c27c4f1fe649cc435ec4b61914158aa1126f11cd6a29c41d8 SHA512 1376a543dc40367d8e18699e7d28d32d224718e91518693a1db8e693919ef8076c6cccef6f0d141807f3773ac623e12609e218afe05dd24742d4b5fc84d3e6a2
+EBUILD quantities-0.12.5.ebuild 768 BLAKE2B 1d4392e23350526440d3e07289496f8ccc2c4a31feb235c6242904738a9171e3287f89f928658d2f83062560332c02f4205f99f3f075ebf026efc25c556d9c26 SHA512 2944d20b6adceb9303cccb45ad6ef1f3754f0cd03b5af74ed2ebcd1c3ee42346c1e300af039c1dec83fc93ee70d336e5ff8e460a693e26cce1632f0630277d47
 MISC metadata.xml 646 BLAKE2B df1d2cf46f590a90d168f7024d52942531f8b570418aeb9e5ba82882b8b8be86f57a15e3c652246ce08e42ddcaa2813ea594a45ba15e9db9bb80795736e0eff3 SHA512 0ba5443c1554361cf079ae651ffd70b979bb70f6f22049470bccd07537aa967a7e3c1d46b7c580319c4941aae984906a40216c5eb108a9f1aa95fa0680c75248
diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild
deleted file mode 100644
index 6a7c1364b3f6..000000000000
--- a/dev-python/quantities/quantities-0.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="python-quantities"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/numpy[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Unexpected success
-	sed -i -e 's:test_fix:_&:' \
-		quantities/tests/test_umath.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/quantities/quantities-0.12.5.ebuild b/dev-python/quantities/quantities-0.12.5.ebuild
index fe5b4e6f264f..2697e7840c36 100644
--- a/dev-python/quantities/quantities-0.12.5.ebuild
+++ b/dev-python/quantities/quantities-0.12.5.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/numpy[$PYTHON_USEDEP]
diff --git a/dev-python/rcssmin/Manifest b/dev-python/rcssmin/Manifest
index 8b88378bfa3f..23e759baf729 100644
--- a/dev-python/rcssmin/Manifest
+++ b/dev-python/rcssmin/Manifest
@@ -1,3 +1,3 @@
 DIST rcssmin-1.0.6.tar.gz 582894 BLAKE2B 64fcd9bd9ea96037acfcbb0edf5ddba45f0804cb1862fb60dffaa5b60a0ee2a0927fc237fd04cbf9be438a9468b54dfccb56729a6d191ee323d9ccb819857dbc SHA512 5129a6007755a5b1949256bba7ad3616a08034d7bfcf06a1f9d8143897dddc5d2f6b8a0ebde7abb2e8b12e5b1aee2e46260e59101a78f35026e15f9f6503db77
-EBUILD rcssmin-1.0.6.ebuild 517 BLAKE2B c4bf16990da1bc9b64c6a9cbd2c0cfbb4bf73148d785ad1448b7f615d15a6f5353e91681b82f7d356ac9dc909ac19b89941ed3c9b16080ac96472ee5baeef952 SHA512 80a1c5a41688b92921201c886a9a37378a489ddaf47f1089cdd4624527fda80ae7f07f8eaf260369f8cd6907263933cee401ae0cc114028eaf9684db2f6b5257
-MISC metadata.xml 287 BLAKE2B 729944c8df5268c4c03ecc0f6e14c7e367d669f0e40327d36d98323aa8b8723c886060b97b2ebfafb5b56e24670f6ed25d4d1567b444ee0065129bbf12fead07 SHA512 4553f30093fb4ea3a1c7bc88b5c35cae5242b02b6ab7d5728b3e8a9f19a4876caabdbfd11c1cf9c751ed2397438bdee3daddec1b3d855601be6a7a950331a387
+EBUILD rcssmin-1.0.6.ebuild 599 BLAKE2B 4be65fdb61d2845114a40ca7c38642e20c7bf962cbdb51950bdb72eb81aae889e46ea0e0fe6e4f6fac59db3c1d60f73f196fada21e9e84309c2390e83b11b843 SHA512 469b4c67183ee49c44cf33247855025129a000a8045a936f6b480547855c501a124d74f508e75c6f413d86090f814c42b56fd4db637c8980e105fb2da873fcf2
+MISC metadata.xml 343 BLAKE2B d4a46b0e80d1e14997478617a2f71c115b9dc93f8258eb236ce83097b76ddf66bddc4c5b5b7a48ea9cf7d160ba4a734410a4850942a3bd09887dd2eab91f07bf SHA512 41839f085800f6a4f5a017c65809090495bd8e599ca9b473fb1b44c62c5d95120a96315faf64e1282b841680736a576fac5e309562111f0d770b48cbe368829a
diff --git a/dev-python/rcssmin/metadata.xml b/dev-python/rcssmin/metadata.xml
index 607a2919b3f6..2235fd3abbf3 100644
--- a/dev-python/rcssmin/metadata.xml
+++ b/dev-python/rcssmin/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">rcssmin</remote-id>
+		<remote-id type="github">ndparker/rcssmin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rcssmin/rcssmin-1.0.6.ebuild b/dev-python/rcssmin/rcssmin-1.0.6.ebuild
index 1161a3a5cbef..515bb03be054 100644
--- a/dev-python/rcssmin/rcssmin-1.0.6.ebuild
+++ b/dev-python/rcssmin/rcssmin-1.0.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=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
@@ -15,8 +15,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DOCS=""
 python_install_all() {
 	distutils-r1_python_install_all
 	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
 }
+
+python_test() {
+	"${EPYTHON}" run_tests.py tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index dc991f750675..0341fcdc03e1 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,3 +1,5 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
+DIST rdflib-6.0.1.tar.gz 1245483 BLAKE2B fd1c9837c25c8110bb44bd280803ec987ba865f8fea8187a1fca6173786deea65f462cf9f55f3c3c69d4fc18b01d37fc77b7b425e618c7b2e80324d7f5531f3e SHA512 d78c61a949a9c88297368820de386d289ef1722f5b2c4dad25a453c6bc9919fb98be23e682f739de6485f81746a1c338e4045c24ca058ed0b2848b81c0d34f52
 EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
+EBUILD rdflib-6.0.1.ebuild 1281 BLAKE2B 92ae231efa6c58c39b8bbe9f83c27c8d9585da7baddf4beccd41b22850a418d2104b4054eecc52a0a7c8fa00c7ee4dea50b55da31d160051fa38ef477bcc1998 SHA512 2dbe26855a757f267d190c85ea78aff53e7941cac0db96fcad0ed03e1f4259b3424493b0fd5bd3423cb986bc18ba15735dbc95b8f43a8ca455e20cadd9ef6776
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.0.1.ebuild b/dev-python/rdflib/rdflib-6.0.1.ebuild
new file mode 100644
index 000000000000..30171ab9031c
--- /dev/null
+++ b/dev-python/rdflib/rdflib-6.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/berkeleydb[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# these tests require internet access
+	sed -e '/doctest/d' -i setup.cfg || die
+	rm test/{test_sparql_service.py,test_graph.py,jsonld/test_onedotone.py} || die
+
+	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
+}
+
+pkg_postinst() {
+	optfeature "support for sys-libs/db (Berkeley DB for MySQL)" dev-python/berkeleydb
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index bd19caef5232..1de2c8f1bd4e 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,7 +3,9 @@ AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fb
 DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
+DIST regex-2021.9.24.tar.gz 703375 BLAKE2B 77fae095228ad2e83a77d04c337356fda7d5c9c9dbc9ac6645cbb128c87831ad05f9d2fd910163903e56a6b35f5a54bcce6f477aaccb1b5e297d7df414d3f044 SHA512 2adcbca3d2ec5870095a41d357aa219f108b0b39519f73edbf105e2cd9d5b429e19f9967a90dd1654fe04f415d21b59e345a1aa502788f74223a9e55c3cf576c
 EBUILD regex-2021.7.6.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.8.28.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 EBUILD regex-2021.8.3.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
+EBUILD regex-2021.9.24.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.9.24.ebuild b/dev-python/regex/regex-2021.9.24.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.9.24.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 40d9b78ac1c8..45970ac02213 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,6 +1,5 @@
 AUX rencode-1.0.6-drop-wheel-dependency.patch 493 BLAKE2B 368e3b618490538adee98c42e574c2130ca57c43d6502d35d9c35a72a3a0d20077d48098ac91fb53f39a32f601c594aa355657fde25502f1beb1450cb08f0654 SHA512 254cd71919906f24842e921ce6d4a8cfe4960b2b048a25c6eb170d8ff1dcde0b758d429a7bcdca971379a0b5706e278111ae1f43b64c4251d3dee87d9c6df063
 AUX rencode-1.0.6-fix-CVE-2021-40839.patch 1166 BLAKE2B b0ddee3e9ccc62d7caaecfec8d8e1363942fe65c9d931fac9bd609e8738d8a796c644e1657906257daf5161de0f1e7a5efcad31eb424dd3fc9508d5bf6d56f84 SHA512 885ecede3d9fb52eb09728e37863cade4800f87d09ab6ffc1e55d1ace90b8e197e4f3073f6fcf548f2e8e4b9d7cfadedb3190d556427e826bbd6b2ba48ca6cac
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
-EBUILD rencode-1.0.6-r1.ebuild 917 BLAKE2B 086d89d7b66dccab037cf89d2bd913267c77844784f599c06b5b3c5eced67ec5fc272f76f83fc4deab9eda25765f90c88c91411aa400cb349dc3bc9b930e109e SHA512 9b505ad1a73b6b275141f1e89569f0a3a4ded38c98947b754e8ccedff7be82ef9979c53342fcad7c6d355798a919c2cb6c5be90879a5842559e5388c7ce5cd3e
-EBUILD rencode-1.0.6-r2.ebuild 978 BLAKE2B db9faaeb2cb7e9b1c05a18569710e6c8d1b1ddcd81075c9464c37edba3cd399e19ae8fdf0698a2974b9e0d85890e0d750d49d90dfb1ffa5919e93d66f9d3e223 SHA512 345b70c2662d61f9f4603a18680089270459f1fc21c701f289a723d12a824fb85dd9809febfbd7cd1ba435cf2f50980a1bace1da04b71aa7a0c1c6e3b8380461
+EBUILD rencode-1.0.6-r2.ebuild 977 BLAKE2B 15a4a35f2c803a2ee938e9d1d524693c7b69137699824ae643c2e64ef893bb668e2e3d0132714bbd923a82813930d616620572ea42048e656c4b34b522881e59 SHA512 84f2e115729e2939111a2a10b16fa323fe23912e19705ecd71c84d9e61ed8b51f89d1a2e22088933599c6e37fcfe316a5cb14f5129563e68a9ce0ccd6de9cdbb
 MISC metadata.xml 712 BLAKE2B 0d5545f8297c043a09922dc92765fa62ed6aa3fc77fb69df2208a46f298a50575b5235780c174a044df7f0105b11d1fa9667b77d152bb6f1b91720976200f26e SHA512 10b0ef1c5a426a0ab03b157967710193ab783382619191530b4f9a27e352879c5e48f462ea9624008f6aaf779391f4ccb7cafcbe11c86457618f0365d6f81ea1
diff --git a/dev-python/rencode/rencode-1.0.6-r1.ebuild b/dev-python/rencode/rencode-1.0.6-r1.ebuild
deleted file mode 100644
index 2765b5c16726..000000000000
--- a/dev-python/rencode/rencode-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="similar to bencode from the BitTorrent project"
-HOMEPAGE="https://github.com/aresch/rencode"
-SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/aresch/rencode/commit/16e61e1ff4294bddb7c881536d3d454355c78969
-	"${FILESDIR}/${P}-drop-wheel-dependency.patch"
-)
-
-python_test() {
-	# The C extension ("_rencode") can't be imported from "${S}/rencode"
-	# so we need to cd somewhere else to make sure "rencode" is imported
-	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
-	cd "${T}" || die
-	epytest "${S}"
-}
diff --git a/dev-python/rencode/rencode-1.0.6-r2.ebuild b/dev-python/rencode/rencode-1.0.6-r2.ebuild
index 523227282fc3..7a0faefed188 100644
--- a/dev-python/rencode/rencode-1.0.6-r2.ebuild
+++ b/dev-python/rencode/rencode-1.0.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index dd2fbeeb4d39..28cd7a5adfe2 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -10,7 +10,7 @@ EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 EBUILD requests-cache-0.7.3.ebuild 1381 BLAKE2B 4d94dea5ad279bbfc023e63ce465c0a73a7500b5f2e509f022eaa7920252270afa23cf50fd3e653c45da168390589cb4af16d17f5b8bf83850713906600bd20e SHA512 66b726a60c236dca80c8d69403993e667667a394ba8c0a355cc8b864b7b32280ee5fe8ff4a8fae58ebfee808b0b409cb7474c32588f0acd7dd66f377e80196eb
-EBUILD requests-cache-0.7.4.ebuild 1382 BLAKE2B 89469e089c23754dfd8c85657e38ca490344ee5d3c96cba114258bb458597f62d46c986e71bbb5298398e7e1a83047188895e939fc2fe3105d5c1bb26b5a2947 SHA512 0b7255dd53efeefdb270b90de36d14133ab599ef2d5122d57133c47f44447b99dda5b6f37520f142306efa094bc3f0b8a040e84b1fcb78e9d8336ebfe7001d97
+EBUILD requests-cache-0.7.4.ebuild 1381 BLAKE2B 20ef0c093e5e4b03cf9e400eac7637ffdd67d0e17b457065559944425c141fb6c61d11f22aadc98d9759c68fae1564cfe782ee1567d677965534a2ee41f5a5f9 SHA512 7dbc8a6767b79df253e0d5cd2a004383dca97a59ce5474e90a8efe05a926ddccf875a500804d0b354a5cd02bdf0bf163da46b4ce6b5a13d8f052e563b7b77f07
 EBUILD requests-cache-0.7.5.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
 EBUILD requests-cache-0.8.0.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
 EBUILD requests-cache-0.8.1.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
diff --git a/dev-python/requests-cache/requests-cache-0.7.4.ebuild b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
index b3e59acf4577..0c8b4192cde2 100644
--- a/dev-python/requests-cache/requests-cache-0.7.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/cattrs[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index 057ab8d415ce..ec46e337bcf1 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,5 +1,5 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
 DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
 EBUILD requests-file-1.4.3.ebuild 504 BLAKE2B be19d49a1e83e9bdf88ee353501517bf203445eb626a8596e92044a5f2f80342cf73758dd90ebf2a997bf0248ab22a333ebbe8eddf12a2348db7fcc3a69dddc5 SHA512 517cd9da9fecb560f2e17823e41332441dcee631d9ad70d44d12ed5f9ede68a85dc7938224ed3291e58168a51a89a6f99a1180e44fb13a4ce3d3ca744535d38e
-EBUILD requests-file-1.5.1-r1.ebuild 494 BLAKE2B 1a4f6aa67cac8def91cd6d3d7c3fbdae5b8ee9798e59144a36fdf8d54cd6005a078535b8035e0031a663eefa3563ed13997711c2159c51a0a671444bf83ffd2b SHA512 4dc2d68b850cf51cc7631d35d40c3d7cafba254e4a2a723d226788d3c06bd7260c84166671bf6a5a6e338333c3c01c462fd856000dc0b86e368f7d2f1f7bdfc0
+EBUILD requests-file-1.5.1-r1.ebuild 492 BLAKE2B ceeb2b2b6a6d6da6156f958810e0bff26afc44667170840fdd7ac40718e07814442c764ac7412776f2a92979f1ac40fe0bbfdb948e4bda31e96687eb3094dfe0 SHA512 2f62230bd176607611d29ddf300c610919643620b814297d40bd9324423447f941ffe31fb345c245116d020e444ff460865c9285492210b4cc65a41cc0e0a98e
 MISC metadata.xml 452 BLAKE2B 18888177e7a3de72dde3461c1400e4a250f30c68f948c3f0dd3f84c8cd7cfc768ff00e09bc75a936b377e1a2b4e6d8eb5ad704e3194cec74356d1ad1c141ced3 SHA512 efc7c2c991afd404f394057204a0a3450911b466b07f9b123edbeddbf5ce0f54634240e0a91193cb657fefe238483d6f3cd1a97c545ffb62b2701d2edf8cdc0e
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
index d06b05258f23..64b3b87dd7f0 100644
--- a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+++ b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index 793be2a61d97..814929210c36 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,3 @@
 DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
-EBUILD requests-futures-1.0.0.ebuild 665 BLAKE2B baad3d09d0185bd0ff85cf5a8c4ae616f8e69d34195859194e4fa899725a84cbbd4d3a65c36c7b896ce6b72eb7832550b8e6bb9d5972ab6d2b64e450a311a381 SHA512 5aae91038f680571c0dce9dea1d01c22d20e0d023b925e3e710779d89561e1e2d394362b7331884815f7d5542f376115de9f4f4aa79987d4c1f43c8f803d471b
+EBUILD requests-futures-1.0.0.ebuild 967 BLAKE2B d0be961f4c7942c3604b888fc5498bb7a84782b3f64d1abd132bfdf54afad7ce43a2eec5baebae39835873a4ceef3b5f1144e2f0f45aa53f1723f31728b13cc5 SHA512 0c8b2f7a4ae34a72237395bfd0676400a93ad374a50808000b3e9643b976981356a6ca56fb2d5fa121249d8f644acfa1c18e5085dd00b905e525ea3da692e733
 MISC metadata.xml 562 BLAKE2B 116ce554daf71a47d20efa98708554d50185eca1272c26556666152459feb42ef8187fb74da72a5b365f360ea397ed1056b932e9339ca4c3fdb82b2f12983278 SHA512 fc998b8ee8cf4a4d01b02db9890632eb793c8f3ffa021c3eb2466e1ec221c5d36aa5875804989c6ec0897ed243019673e0b185a371d728a86d2d5238fdcaa25f
diff --git a/dev-python/requests-futures/requests-futures-1.0.0.ebuild b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
index b72806bb2c6c..fb52803aeb04 100644
--- a/dev-python/requests-futures/requests-futures-1.0.0.ebuild
+++ b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,8 +15,17 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux ~x64-macos"
-RESTRICT="test" # https://github.com/ross/requests-futures/issues/94
+RESTRICT="test"
+PROPERTIES="test_network"
 
 RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# known failures by upstream
+	# https://github.com/ross/requests-futures/issues/94
+	test_requests_futures.py::RequestsTestCase::test_redirect
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_existing_session
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_session
+)
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 0010272cd68a..eb9d59b391f5 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.13.4.tar.gz 30608 BLAKE2B 1ae4fec958aa165e5cc76ec0bd87b7f872e97f3ddd952f6a79024eae3e2638c08681020244c86d05f6fe5467408cef30f6c8c311538aca28a618dc746db42974 SHA512 645bb967d2ff601a49c22e603ac1ab0c1f070dc6d62ad3b87ec58fe97cae7e4882c0068b565a24ba05ec1a3cccb8e9d90fb1b398bf79935c7a8b208f3ead1920
 DIST responses-0.14.0.tar.gz 32666 BLAKE2B 1792f1a78415e412a97323259cba62b1a41fb747f31e5c7e323c962c80e63e59210d66b098cd9244abfd8888092c2df91e6f1dd82cc78e451c5cde54129b40a0 SHA512 abc117e5fb9e065202520342e1e5dc4862e5ba553899bf0427726bff02f581124d2d2225371180c97b04fd258119b9511b3319622402a44411ebf51614d26022
 EBUILD responses-0.13.4.ebuild 760 BLAKE2B c4cc6eaf5be99d9ab2f0674078c9bbe252bb104af59ed70d4c1576bc102905d4b1bfecfe7642740516286a8b454f50804ef9e4b09f81ac2b379673b6caab0a30 SHA512 5a4797525347df68e5f1d70bfdd6e7ba002b51f79df199d5261ba308a0ed4091597f660595b8fcb5c1c106a09560130a7f610e2c258cbc79f5444565d9b3fcf6
-EBUILD responses-0.14.0.ebuild 768 BLAKE2B 7aa09dc433f35e002f5621ab172f703c7f1d4a5152a57751c40c9d1bef58806e7696b28262d4a244a40949e5173b7b7c7d6d0beee70bc4345e990a5cb86a708b SHA512 71c7d49ca15a3057c57104d0a608b2acdf7c2168f7b1a2664cbb1cf2664ee2847df3635d945779a0e3ee2ebcea976f73c616fcf2d74277529e4d14333227e82f
+EBUILD responses-0.14.0.ebuild 774 BLAKE2B d0c579bd87faf1e5ddba630ba7c19c504b4e27cf63933932ae56872427f9df788b5cb752fdf80519858d1048f258308756ad224a29fd378b97417a352d265e4d SHA512 17b84c30e2455bf139a06b9054fc18896d189a25c64f0aa7a1a57fc3c873da97dcf22049a26f64fa8c865a564fad9cc2928abe1bd345d98b808d836a01b8738d
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.14.0.ebuild b/dev-python/responses/responses-0.14.0.ebuild
index 2d7e49efc92f..b67ea1c08a1a 100644
--- a/dev-python/responses/responses-0.14.0.ebuild
+++ b/dev-python/responses/responses-0.14.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 0392d4c24e8f..1ebdf9073e6b 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,15 +1,5 @@
-DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
-DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
-DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
-DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
-DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
-DIST rich-10.8.0.tar.gz 16263649 BLAKE2B f73ee1996d16ba06dc0dc1909056deb731819395fea6c36d6953045bcc20ea95ab7b7d6a2025ed7b7f7991b75eb909a8cdbf80c561d1e60ad095ea24d005638f SHA512 89173ddffb421b09025ccfc479194d751bf96e114f06728e789f0b5fd903de22423c268c7ecf78ee8c6791ba6230abc7a5f2fbfd17d3445a205b84f326083447
-DIST rich-10.9.0.tar.gz 16264350 BLAKE2B dd8f27bb48baf6abe190ee5bc73d2a3dddac19cc3f52665655fbd6ed62654c1547fa33bc767d18b972e4d92d924db9eaf199e39affc34779c82fd4d45978f65a SHA512 8154994c1f21c7cbcd9ec03da4b0f22bf84c1ff380bddcf8c7f00d07fcfc8794da4160d2d68064d0664309bd1075ca593ebbf9e5c5f4fe6ad26a10460736fb02
-EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
-EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
-EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
-EBUILD rich-10.6.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
-EBUILD rich-10.7.0.ebuild 735 BLAKE2B 875be51f53984700db70490288f736476aadfa252a9eb3e64dbdb6fda717d278efc752a0b2fad93833fc118240284181a32d4069692f0b53fed7f57495215b93 SHA512 443876cc52c19b83804365142903b887966fe46f68ce1f2e0c117a03efe0633d74ecdc091d284dfabee0c5c1d973b825aa94a5f2377d93b9ebbdc7ee3d993228
-EBUILD rich-10.8.0.ebuild 735 BLAKE2B 875be51f53984700db70490288f736476aadfa252a9eb3e64dbdb6fda717d278efc752a0b2fad93833fc118240284181a32d4069692f0b53fed7f57495215b93 SHA512 443876cc52c19b83804365142903b887966fe46f68ce1f2e0c117a03efe0633d74ecdc091d284dfabee0c5c1d973b825aa94a5f2377d93b9ebbdc7ee3d993228
-EBUILD rich-10.9.0.ebuild 735 BLAKE2B 875be51f53984700db70490288f736476aadfa252a9eb3e64dbdb6fda717d278efc752a0b2fad93833fc118240284181a32d4069692f0b53fed7f57495215b93 SHA512 443876cc52c19b83804365142903b887966fe46f68ce1f2e0c117a03efe0633d74ecdc091d284dfabee0c5c1d973b825aa94a5f2377d93b9ebbdc7ee3d993228
+DIST rich-10.10.0.tar.gz 16264680 BLAKE2B 5f57b7ea7a091b3478ddc17dfe29309f558f36e8795a66ea918141f42f2a9e5a655667a1db8420193f3f44ba070413ebb512601751a6a5663a87db775576ce65 SHA512 8b9f1348b0f55db90c17042a83e8317d4f00b5446a77334a12379676ef1fe526f40dc92425e4bafce22ee5f65bcb2fae2422b903c6f958feb5734c254813826e
+DIST rich-10.11.0.tar.gz 16266050 BLAKE2B 34081a127eacbc875fb5af1b00a195df4718eacb4e0371ac1367950fc8e102bc2a611d970364a1b02cb400137cb838aa30d9bcd757a4d4644ed976c49c9603c8 SHA512 34cdcad401dbda0763dfaa6f46e19e498b2da96ed9423a00a957d55f9e2833fabc6b2e6d65e411dcb5814c869a8670b5242e1a891835d6b6675d4da86b28f33d
+EBUILD rich-10.10.0.ebuild 742 BLAKE2B bfeb1e7979e03274aa699630c82ec5f4deeaa45d282a81ec2c764f0cfd48a724c1f248112fee45f68ea2375f49af029f543e028fd103aa2375f2a23b939ba2c8 SHA512 80cd65aac4b0bf470f552b030c26b5047860ae27292381e727d475498294d8f8ee32492a7f1cd6974f2a6125e4a2534b6990982e72f849cafe2d5d2b98039a9c
+EBUILD rich-10.11.0.ebuild 742 BLAKE2B bfeb1e7979e03274aa699630c82ec5f4deeaa45d282a81ec2c764f0cfd48a724c1f248112fee45f68ea2375f49af029f543e028fd103aa2375f2a23b939ba2c8 SHA512 80cd65aac4b0bf470f552b030c26b5047860ae27292381e727d475498294d8f8ee32492a7f1cd6974f2a6125e4a2534b6990982e72f849cafe2d5d2b98039a9c
 MISC metadata.xml 494 BLAKE2B c73e78111e2513d22a2c9f82984f014cb8a205b3bd5ef171f78e48f6ffc8b537872a5754307cdad23a276062d7352793aa087ca8f858a925aee80a28c7fbd1ca SHA512 6f6f93620183bb8e69a1ec8451ab29e1e202912af080e586cc7a140ac1bb997745d8dd7029480feec947fe95f70ec7eb219643a5e49e015a2b0c6846757df70a
diff --git a/dev-python/rich/rich-10.7.0.ebuild b/dev-python/rich/rich-10.10.0.ebuild
index b676261d987f..a18af32f8dc0 100644
--- a/dev-python/rich/rich-10.7.0.ebuild
+++ b/dev-python/rich/rich-10.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-10.8.0.ebuild b/dev-python/rich/rich-10.11.0.ebuild
index b676261d987f..a18af32f8dc0 100644
--- a/dev-python/rich/rich-10.8.0.ebuild
+++ b/dev-python/rich/rich-10.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-10.3.0.ebuild b/dev-python/rich/rich-10.3.0.ebuild
deleted file mode 100644
index a2484f490f5e..000000000000
--- a/dev-python/rich/rich-10.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.4.0.ebuild b/dev-python/rich/rich-10.4.0.ebuild
deleted file mode 100644
index a2484f490f5e..000000000000
--- a/dev-python/rich/rich-10.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.5.0.ebuild b/dev-python/rich/rich-10.5.0.ebuild
deleted file mode 100644
index 6d4831ee5fd9..000000000000
--- a/dev-python/rich/rich-10.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.6.0.ebuild b/dev-python/rich/rich-10.6.0.ebuild
deleted file mode 100644
index 6d4831ee5fd9..000000000000
--- a/dev-python/rich/rich-10.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.9.0.ebuild b/dev-python/rich/rich-10.9.0.ebuild
deleted file mode 100644
index b676261d987f..000000000000
--- a/dev-python/rich/rich-10.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 6d138e238762..99277c24c3f3 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,3 +1,7 @@
 DIST rope-0.19.0.tar.gz 252902 BLAKE2B 41760dc29d26558bdf5f296238b7d59ca949530826953fe5592b763b8d24fb49a90a56b9c7d0e3475daf145185987116a7dd0cbfba74829abfa4bf6a57c79937 SHA512 fd41777d76861837479bf0777ea42cc052eed7ba396bc4531a0c7f101b05b1c5a57c300950b7a3c8a2902e28ff049d146646f83f8a8a447ab9ccd7cd8aa48110
+DIST rope-0.20.0.tar.gz 257356 BLAKE2B 054ab1fd1b8ede2576c83eada588fb04827cfef570b2cd30461e1b12b3a42d601aa1e60bf1428a54b4d74127a561fce3f34f064b8018943fd1e6fe5c03764a5a SHA512 d84e2da66712da927b6dcf0ea40c50627002baebfd93585dbecda32e6ce0682fdf13577769b12890d31c4f1022795ab98c2dba25aa23a8b434762dbbcab974b8
+DIST rope-0.20.1.tar.gz 257811 BLAKE2B 58f11c02e68e08c532d08a4b36c08316afb42329f10ca67f7f73f0e19ef6b09aaf4b4e4fb1e90cf0af61c9779efc067e42945f9f10cf0abe4ff82b8cb3c8b5f6 SHA512 328016e711a7d684fa316b3eb8ebc233bcdf579d2545d038dedc703be82e6d5b4a8af8a9fba96569c84b9cab4450a139013ec25ae16a082c699920ea9096ce7f
 EBUILD rope-0.19.0.ebuild 933 BLAKE2B 3c8766ae480e454a83e23feab1f65c60d3b9e3c0313272d29841a7cbab264077bc0011465c9646d28cb7f92adb4d2aa28a66050656ff60a42d5c2f539ab17c10 SHA512 4d78f475501069670e67bedab9dc837a42da9f3fb0acafd1593f6cb926d656f398b59deb860aebda8f764a2bb71a8d52ae291b1a5c8ddabc3be5ad8fb20eea12
+EBUILD rope-0.20.0.ebuild 992 BLAKE2B 1b7e18423c23a88800d7018b0bac2516c78ad1b383cfaccdd5a3547696f81d45c55fc4860a647318e69b0994de5cd855466ba616afee2114131870bca722588f SHA512 059f1854f520dcf4a481d4accf6e467b6925bf5bdce8aa97865ace5afd498a504add877843b090fde0be70ebc7de6a79e2543048bce01ba196facd940af1e877
+EBUILD rope-0.20.1.ebuild 992 BLAKE2B 1b7e18423c23a88800d7018b0bac2516c78ad1b383cfaccdd5a3547696f81d45c55fc4860a647318e69b0994de5cd855466ba616afee2114131870bca722588f SHA512 059f1854f520dcf4a481d4accf6e467b6925bf5bdce8aa97865ace5afd498a504add877843b090fde0be70ebc7de6a79e2543048bce01ba196facd940af1e877
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-0.20.0.ebuild b/dev-python/rope/rope-0.20.0.ebuild
new file mode 100644
index 000000000000..b734b2e0002c
--- /dev/null
+++ b/dev-python/rope/rope-0.20.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rope/rope-0.20.1.ebuild b/dev-python/rope/rope-0.20.1.ebuild
new file mode 100644
index 000000000000..b734b2e0002c
--- /dev/null
+++ b/dev-python/rope/rope-0.20.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 05eb24d243d5..bdb54510aad6 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c4c2e3a46395d406d212e6526e89f31ed95412f370ef79cc8934671b0496114776ee325b340dbc SHA512 2777345d1008698092a76c8d6783b372627c0e872895c1d4b0536816fbf12fb8719d3f3c48251ede194646076c4cacfb50ded3d73b360ae2b1c7a7f0b09e5905
 DIST rosdistro-0.8.3.tar.gz 61665 BLAKE2B 2d5084409d8222cd277a710a06616fa914a35fb6750e32df7bdee6b7b0285df1b15648b8255cda4aa5867dba3611c5ea294db4711ebf2cc38a11648092623aab SHA512 19e248497b4001c522a84a52d768bc9f20a08020c88574d1a8345cf2173dc2aadd8a1480d4fddf2285ac579ee69dd0b6d4b930333cd6a9cbe32708efed2e5747
-EBUILD rosdistro-0.8.3.ebuild 1204 BLAKE2B cbcce7112510d71d96b98fe1c785b10cf3901ae7c188aae2989f0786b8937e77e7e8f7f913413e260ceb10c023cc363d5facac01557e2afcaadafaa58042e8fa SHA512 ceec0d96013bfc495e388bf454f8f5a73f3a4d406c8c5881e071eb3f75ce95fc180e8608feda24d5b25d4c33969ae97416b06e361296ad62f64c4e1eea0aaee8
-EBUILD rosdistro-9999.ebuild 1204 BLAKE2B cbcce7112510d71d96b98fe1c785b10cf3901ae7c188aae2989f0786b8937e77e7e8f7f913413e260ceb10c023cc363d5facac01557e2afcaadafaa58042e8fa SHA512 ceec0d96013bfc495e388bf454f8f5a73f3a4d406c8c5881e071eb3f75ce95fc180e8608feda24d5b25d4c33969ae97416b06e361296ad62f64c4e1eea0aaee8
+EBUILD rosdistro-0.8.3.ebuild 988 BLAKE2B c264b56b71d37904abc8ad4c4e4d04ffd8acba19e319bfc647aeecea6fdaa7983c9c4909ccc518526918860ec4cf93fe054b07ad7c8918de2433026c3e532829 SHA512 476686277b4ee4d3fa891856500a1840722369c3d506d1dc95c8f42a2571d02c0e55026c6771169883ab48dd1dc30ef447902740575b6ff62395f5bc79787a3f
+EBUILD rosdistro-9999.ebuild 988 BLAKE2B c264b56b71d37904abc8ad4c4e4d04ffd8acba19e319bfc647aeecea6fdaa7983c9c4909ccc518526918860ec4cf93fe054b07ad7c8918de2433026c3e532829 SHA512 476686277b4ee4d3fa891856500a1840722369c3d506d1dc95c8f42a2571d02c0e55026c6771169883ab48dd1dc30ef447902740575b6ff62395f5bc79787a3f
 MISC metadata.xml 343 BLAKE2B 4f30f62e871325404fa5128256be12fc1f18f26d4349bef6471e8fe5514f6be73060b323394d3efb515678be71c7d226a3070ee49b2665065d5dc3f567c5d96f SHA512 a778ffb690da5296bafabdfd2a1a533d9d68160a8b832165407c40e0af988696f39e2e34c0b1f160614f9edcd095c767e51e9c18ad486ba8a47103cec6f8d234
diff --git a/dev-python/rosdistro/rosdistro-0.8.3.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
index 8bd21ec57713..87bc969239f4 100644
--- a/dev-python/rosdistro/rosdistro-0.8.3.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index 8bd21ec57713..87bc969239f4 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index c4c8d881cb4d..4832da3f8d0b 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
 DIST rospkg-1.3.0.tar.gz 91442 BLAKE2B 9bf217ff103513471b1a2b0812e4b08519d667c0b883c545b23dd42f10216390f4fb618bf67baed0ba2aba71c18c13b0a702445425ca29568394c0cc5b4dff61 SHA512 bfd67eee80e063db45eb98b1b73cf1865d23a14a55d72639890d7ad3d01f4c85f07aa662d9d66e996340798c002f5ee9d1167cee32b20caff900fe527ed50d5b
-EBUILD rospkg-1.3.0.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
-EBUILD rospkg-9999.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
+EBUILD rospkg-1.3.0.ebuild 958 BLAKE2B 622a7a74e86af4252310ac69798913487cc1d03b19e9a10b730ed641069a65295080263b84edd9efe704c989671630d6ccdea607e77a08a82152fcfe06e35b75 SHA512 862bc13ed80cca8f4458f88cc4d2ff0decde07eb2d52f362aac907e47d4e351e9b5227f6fe95f8c7319b43a44d88983d1235af265ebf8cab64517047d10a96f9
+EBUILD rospkg-9999.ebuild 958 BLAKE2B 622a7a74e86af4252310ac69798913487cc1d03b19e9a10b730ed641069a65295080263b84edd9efe704c989671630d6ccdea607e77a08a82152fcfe06e35b75 SHA512 862bc13ed80cca8f4458f88cc4d2ff0decde07eb2d52f362aac907e47d4e351e9b5227f6fe95f8c7319b43a44d88983d1235af265ebf8cab64517047d10a96f9
 MISC metadata.xml 340 BLAKE2B 317bdd9ae3ac0445b83c1beb2e31db348ed88da4498d6526be372e2cd71fd84b0d10f03015f414ae56701e080b12bf8b3630edf9cbc16b0290893213e3ef1c33 SHA512 0fa44f0f4a284d56873ac55d6744c437963a2e2428cbb2ed1060784b48f3487eb05d01f572e1ad5459d3181f5546090c650623405fa71f1c75d1818f20aee5b3
diff --git a/dev-python/rospkg/rospkg-1.3.0.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild
index 9a43e2fb6d1e..fbd4db374f38 100644
--- a/dev-python/rospkg/rospkg-1.3.0.ebuild
+++ b/dev-python/rospkg/rospkg-1.3.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -27,26 +27,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 9a43e2fb6d1e..fbd4db374f38 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -27,26 +27,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index a186da183902..7a2f148bd71b 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,4 @@
+AUX sabyenc-4.0.2-fix-segfault.patch 1133 BLAKE2B af92dbd8413437562dbdc96bdceb2c2422002ec29dd67b206aa249d8c6135325779ee7de3a352caca57473f5224efe9b9847159bbc2def927e7769e4976f1dbb SHA512 97e5b4c99091fc8bc0dcb975afd72a70b5a26d46e4543f55caada492ee5da1909b8bcc344592d228c678b6f4ff4df36d4ddf8fe485d23e170be5ed358f943cc4
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
-EBUILD sabyenc-4.0.2.ebuild 600 BLAKE2B 163df3975de786717c2ec506a0f69092d92eb911b1bc82315caa5e16b80c793d6788d553b1cae1e9e44f5edb6613eae779b072355fcb0fdd7bde8b02f57758f0 SHA512 ce8fa14276e2bf832f487ae6945457dae370e1092ed9d9c239e4c282c015753d026bc286cec810cb5ca8b859686b5333ffeaf1ba3b0ac6b1052a757c6bb15b80
+EBUILD sabyenc-4.0.2.ebuild 613 BLAKE2B 9c5a2baea3973fa4b1ae29868a74111f30fe0b658d119b14a0871f0e136f918a64ed843f3b40fe8e9f686a299e2bec1f9ff4486ae51585cec1ca5b9d8e3bd867 SHA512 7daaf7d398a057026a075f2b8ca5fed662541dc00d39094012d8a4719e63876f93e0ea66a4b640408fcab5f6fe85f4f0f60bae032f9db9254939d1a913712b16
 MISC metadata.xml 322 BLAKE2B 2c3fb412a3bedb26045d4e4d30de2c8d642a9936762861bf52cdb039a7a4fc0891be287d3e30d8f6074dd12d25547005e01a3ae0a0a03e32cea8384dd9a582a0 SHA512 2afb177d9ee6b4f7c445fd0614f260b2422087ac3c800c75efd786c0213dc7f9ebf99c9d66dc9faf998b53af17cd79186b510b3e85b94c002776b4d075fe8f48
diff --git a/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch b/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
new file mode 100644
index 000000000000..1a80d5f13da8
--- /dev/null
+++ b/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
@@ -0,0 +1,28 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Sat, 18 Sep 2021 21:07:45 +0300
+Subject: Fix Segfault during testing
+
+decode_usenet_chunks might receive it argument as bytesarray, or
+as bytes object, but the C code expects only bytesarray.
+Add code, to apply variant for each case, and fail using assert when
+both don't apply.
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+
+--- a/src/sabyenc3.c
++++ b/src/sabyenc3.c
+@@ -593,7 +593,13 @@ PyObject* decode_usenet_chunks(PyObject* self, PyObject* args) {
+         num_bytes_reserved = 0;
+         lp_max = (int)PyList_Size(Py_input_list);
+         for(lp = 0; lp < lp_max; lp++) {
+-            num_bytes_reserved += (int)PyByteArray_GET_SIZE(PyList_GetItem(Py_input_list, lp));
++            PyObject *temp = PyList_GetItem(Py_input_list, lp);
++            if (PyByteArray_Check(temp))
++                num_bytes_reserved += (int)PyByteArray_GET_SIZE(temp);
++            else if (PyBytes_Check(temp))
++                num_bytes_reserved += (int)PyBytes_GET_SIZE(temp);
++            else
++                assert(PyByteArray_Check(temp) || PyBytes_Check(temp));
+         }
+     }
+
diff --git a/dev-python/sabyenc/sabyenc-4.0.2.ebuild b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
index f777975da68e..d9536017b50b 100644
--- a/dev-python/sabyenc/sabyenc-4.0.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,13 +14,15 @@ SRC_URI="https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
 
-DEPEND="test? (
+BDEPEND="test? (
 		dev-python/chardet[${PYTHON_USEDEP}]
 	)"
 
+DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-segfault.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 6e1ec17c57ad..e08a35f20c89 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,8 +1,4 @@
-AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
-AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837da997024ee87bb3fd878a6492fbd63088aab294048e700652a82cd3e27bb8e55ea5fdeeda4240971a32b6c7644f2c51ab7c42da1abea SHA512 f52a6096a4840baa743b90296b98f55963c13990ce795cb0ff9ad11256196d9d5164d3118bb48e8e10779e55f2341309de71a3ee47cbde326280de0064f1b21a
-DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
-EBUILD scikit-build-0.11.1.ebuild 1417 BLAKE2B 0877d71bb33439613b60fa747490cfac5898644d042d79966eeee192bc7133e0de6ad85c4e38405748d3f4c600c3d0d91356c4f4aeb23e494dfd09086c3e496d SHA512 24ceae6bef1bb7197571433d3adaf89feb021ed8c5a3ffb3994657d4c43a77e1fb38e76c09cf0d3785f1abc19cb9c7e02f1d6bb70dea5bba2d2cb56376f6d0b4
-EBUILD scikit-build-0.12.0.ebuild 1521 BLAKE2B 0e2c509a1204b74ad5af8a01386ce5769a1010f329fcb72f23530dbf48ef3ce66e297cae9f2d3cf017af11ec465678db7f04036682296c1d5fc405a2da1bdbeb SHA512 a613584bf99e3c45f1923ae170742e935c6def75d62bbc085255992001844e78eca5a035a90a0bef368e34a4e4da5baf59c7e6f1557cff3323385fcc5ce6fc1f
+EBUILD scikit-build-0.12.0.ebuild 1519 BLAKE2B c6d562e747b6e5372c617a18d32f93af0a94569f62a08ee9fa8dfb7c12a72addfd1ada5624a185a1ad742b777dbe8281f842e71d6c897e35d2073f8b81e8b616 SHA512 41c09a5e160df37d63469e5211f9e9455eac81e913b173880e45c45d28ce098752dc324ff5e1c04539b9ac7f5187c208846bb078818690c60a1251e81cbf3afc
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
deleted file mode 100644
index f48ad9340754..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 094ed23..a58cb85 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,6 @@ import skbuild
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
--    'cmake',
-     'sphinx.ext.autodoc',
-     'sphinx.ext.viewcode',
-     'sphinx_issues'
-@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- if not on_rtd:  # only import and set the theme if we're building docs locally
-     import sphinx_rtd_theme
-     html_theme = 'sphinx_rtd_theme'
--    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-\ No newline at end of file
-+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
deleted file mode 100644
index fa00556f9add..000000000000
--- a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Jun 2021 19:27:09 +0200
-Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
-
-Fix the regular expression in test_get_python_version to permit
-the minor version to contain more than one digit.  This fixes the test
-on Python 3.10.
----
- tests/test_cmaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
-index d63059c..52d0028 100644
---- a/tests/test_cmaker.py
-+++ b/tests/test_cmaker.py
-@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
- 
- 
- def test_get_python_version():
--    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
-+    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
- 
- 
- def test_get_python_include_dir():
--- 
-2.32.0
-
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
deleted file mode 100644
index 1d799fe0cd23..000000000000
--- a/dev-python/scikit-build/scikit-build-0.11.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-docs.patch"
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/scikit-build/scikit-build-0.12.0.ebuild b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
index 88ffae1649ec..19e0c60df628 100644
--- a/dev-python/scikit-build/scikit-build-0.12.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 39df78a7a2e0..ed842e4a13d7 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe0
 DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
-EBUILD scipy-1.6.3.ebuild 4162 BLAKE2B ee3da32f74b2b4d878992cf95ec069ad296e248c46770a0bb0464c30afb8a3fd568aaa933b8fc2bf4586242ce5b5e127fd3f55278de4e479d3207a6be5eeb4a1 SHA512 3e43ab96a8c7592088667368a05bd312521cd76d1f2c03ffa2c35f2c7c693035e93d92f14e8884261157bf06b88a82378ac4948f8ee5af42ec7e6bdb0b9571a1
+EBUILD scipy-1.6.3.ebuild 4366 BLAKE2B fd4b6ed960d8cce4f035fc978bdc2270cc00480a292a9e3fca3d711b4f0361d3ad308d9c1a492c9faf1cfaee44ec12f457822650e88eccb2269307e3d8eaba4b SHA512 e57644101d43a91c8184778e965177df158d2a6844dd271cf049ce992a6e86d046ad215534cf3741148c24749845326cb6c0030ab8f93c7a000fdb05046a325a
 MISC metadata.xml 1039 BLAKE2B 74d7919c947e4efbeb597dba51ce74b9e2ef995a1e06c0db7fc7c13dcfd0c175afd0b9bce04907274e4eeab2dfcc49f0eca81ab71f76873817f3b9a1ca8ca196 SHA512 c0024d9accbb563f13ba22b32c95881118fec0ec0a68ce498a39d6bc63e13cf2c7db903132481e3b4d085757c5aba8bb4959780d67fd33db5b161a149e18c643
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index e98e4bd93794..8dec73bd4f25 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs
 
 # upstream is slacking forever with doc updates
 DOC_PV=1.6.2
@@ -108,6 +108,13 @@ python_prepare_all() {
 	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
 		-i scipy/stats/tests/test_continuous_basic.py || die
 
+	if has_version ">=sci-libs/lapack-3.10"; then
+		sed -e 's:test_sort(:_&:' \
+			-i scipy/linalg/tests/test_decomp.py || die
+		sed -e 's:test_solve_discrete_are:_&:' \
+			-i scipy/linalg/tests/test_solvers.py || die
+	fi
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index be5a6ed82bd3..e24937e7c665 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 563 BLAKE2B 1f5342eaf0e3cd67f26abcbadc003e23d43f8d267b7964a46b1192d8d942bdf308cfc3aa8d05c3231b07ea697083c9392e489fad4b7cf1c51faa311534f08de5 SHA512 dae94181c046afaf225094ac3c32ccda4402ccef6e520b296fdb4b63e61cae040085119f10972ba4283c9f0cc97c279784ba7bec94c23ff473d376118795f0e5
+EBUILD scripttest-1.3.0-r1.ebuild 569 BLAKE2B ab58b15a4eb75ded0f7d451b3acf1b9c9696b4b7d9c03e821c53478a65079ef8ae7d68f9a0dbe560fe5364aa173dbe832ae89013494cd402181c1972f3d9ab1a SHA512 8aae651c7de79fd96b3a8f2ec6606880bf204c2f769acae553bfd95ac2eb1cd37081bfab1cd994cd102b53c83dea609809df163c8e666cc292a6e53eb581103e
 MISC metadata.xml 369 BLAKE2B a74d3242d3ead45eb3efc8ab6d63e782e8683ef0cae61172141720c0f51c1a98a9709be54c46d9328ad113f590dd82016ccf269f5954401b48394417da340d2f SHA512 2af70b358850dcf9cbd2b2fe427489c2d33ffeaf6b331b6e5fbdeb0a097f857c5a981f1170ceb68428c319e0225d6c7fdd9ff7bda75bf0204863e0acd67ef33d
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index fdd926b2be42..6a6be6c5075a 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="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 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index b72fcf54750d..2115c0d40e90 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
 EBUILD scrypt-0.8.16.ebuild 552 BLAKE2B 11d7b75f0d5a78a0dcd2430c7517e5ae73e0c8fd15811b8746d064fa40cff5792754be52096a616a27a86c11679065982e66d59c6dd58aa107a3760710c13929 SHA512 bde7fac5818e59d6985af755ddfa475f9ab22512cf6e28790ad675a1eaf4cae85841c9902d9544c43484ac2e5fe631eb20cf609d9a3bccead0884c7225f1926e
-EBUILD scrypt-0.8.18.ebuild 560 BLAKE2B 91fa10fc5b072fd4573e3a092971789f00e4826d398e16c248d9715185496d428adb61d825a32415f3b3aa23e7a40bb2df5629ac52943de8fa7a91591bd5bf7c SHA512 c921c3822391cb9821de0fb927b9c385eb8299543d44986718c358293e571730c0c2076e7ddb704de73e6225b0ce6c14d4185669a94da3bef6622cf8abfa8667
+EBUILD scrypt-0.8.18.ebuild 555 BLAKE2B 5cd5d8ad10b0ab3e7b64f74d4433ec4cb3982d6b3b0c52ab819a5014251523c47c0559bf3d2bd9b0928ec9e2426de31e3f5c3db72529492acaad45773959eb6e SHA512 350489c2d94f23fd0fc49cd8fe45fce2cd6ebbbbfc38d788ac932a4563ad8929cce5ac188cdca115007048e284576136109fb06f9f30e57c1ac0776c80b91d3e
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
index a945c11c5375..8786df021228 100644
--- a/dev-python/scrypt/scrypt-0.8.18.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 495b071d9aed..fb8ec4248e68 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,7 @@
 DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
+DIST sentry-sdk-1.4.0.tar.gz 230870 BLAKE2B 8cad1f0046219b60af982d3a01ae67aa1b018c4c8815c2adae834beeea6015057791abff6e1213a4a5902fe62e56f232dcb0cb355927c2f986751145dc633962 SHA512 b1f3021b4a67c2c4e13109ec3e189d1e133f07ecad18bc3e0ebd7b99e90b53aa83cac2cc567b8b47763892a9e06e1795aca497f146cbaae15952c880f9c160cd
+DIST sentry-sdk-1.4.1.tar.gz 230985 BLAKE2B 0c193d5d564377d484e8e1ba2d30580ad373114e6a1eb3c4d38af6d9745aa788d1369836c4686b80503a027810273cd3a2d1833a6df18d32e1f352f6fb418c8c SHA512 b38ce6448553a05158690808ed4e7013c44f35922c1eb1662f3f9fa73e1c5f9d8a5385eccb8ebd062eae27b7e037ce0c204778ffd24b9ccf38b14d8e511d4cc9
 EBUILD sentry-sdk-1.3.1.ebuild 2386 BLAKE2B fb8db9b507bfecd18b8ad697b7c75af6d5638bf6b957756badc40db23c5294c00274c2925270331d025d5a3afaef415b36faeca3262648e08a73f5657f70fe32 SHA512 93ae19cb5116c807af0e1b81f53ca9272cdc5670f058cd5bd668971fecd3f27061ce0faaca56fb0fee491aad8dd794bdda9c83fd4c81168fc370394e4ff6a303
+EBUILD sentry-sdk-1.4.0.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
+EBUILD sentry-sdk-1.4.1.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild
new file mode 100644
index 000000000000..d0881dad90d7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.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
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.1.ebuild
new file mode 100644
index 000000000000..d0881dad90d7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.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
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index bedc3059415e..e0e4327f5162 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,3 +1,4 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
-EBUILD sgmllib3k-1.0.0.ebuild 442 BLAKE2B 666bf095c2fa912e49526dcdf8198d8c346f1141b65dd019739644cd4fa6bcf0016a1b294e27a5bae302c071a8d0c43b26f31a0ae7db2118b2e478cc415a766b SHA512 f15fa4ff86741105264fdbe6133995d49338aab8b651cee1323e999740669e4b67937a212f132807af4854ee772708c9a692c7e6056e66275b448a034d54c7c8
+DIST test_sgmllib.py.gz 3769 BLAKE2B 026a843eaeb698d87e0137453b7f82763dee9a1ca446fc2c2fa9af8324297176749b041dfc2fc4c1954d743d9cfb7e773a189d99f22f7dc55ea1de486da80dd4 SHA512 722b79aa8b38626540bc331f9edb36919a8fb2561c5526be19509a58901aa1e2582e312fc2ace09cae54cb62577f266fcb10a1d98ab10685e2c79a17fea2f124
+EBUILD sgmllib3k-1.0.0.ebuild 676 BLAKE2B d9663478d9009398edc59d08d690376f026855ea0eaed918f865e0e776d7b5d6bfd1f5acf8106707a54f35280b7735045b154083cdebf9231ad6cd0c4183280c SHA512 4726dd7698a68b9e1d69bb9f51c6bbccd47ddd3fd19a2449a10cdd6df317cdf4405699ce767cb3e329de875913449e465d90780ad0d996a826a761b5ae5675c1
 MISC metadata.xml 337 BLAKE2B c95ed9109d2ab27ccbe5311e23f4617d19c2b7489b805500d8bd2c8dff99d8a74054d3e2b0a455f12cd616673071d308ca404e6734fe1bf4b16893d1a2bee577 SHA512 05cbda57d5634c30f963382afc29ce0f7e761bb7e9f48d11457c5d10fea14d9df3bca07bcea75d02430b421fc5d87b6c083c2feddd7f46d9d841f6e403d1d0f9
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 7d34b5788ff5..d61a1417da37 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -3,13 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Py3k port of sgmllib"
 HOMEPAGE="https://pypi.org/project/sgmllib3k/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/test_sgmllib.py.gz )"
 
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" "${WORKDIR}/test_sgmllib.py" -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 4ed5f13dd9ad..f15633d7c902 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1.ebuild 764 BLAKE2B 4a33b753a818e83169e895843f0920ee9166bd6d0134201cfefd3cec134554b2aa12e4c3a6d582cdb423bee61d79404acb3a6e7eb750c7106425b7fc47b772b0 SHA512 89b9dc999f1a78cad767c69bed1e002ad520c646426376653bc64b83aaf264f9f77436a8111d6c2fc01071f224b878ecf7fb76187c784c13f101476764f5311e
+EBUILD smartypants-2.0.1.ebuild 770 BLAKE2B 8f890613adf8dae433b3afc4567f456b85750d5a529eb6609f760a921f77d1532d4681a6b084c6501658c83b6a65f3fc9929be24b502107fff3e93f600610563 SHA512 ebd50ab5a858d1d29ddfddc36d2fa9820ac599c5f8c61221d148f66a015e5f399818c8300a630455abda68f2ec4dc3bf882d2b0342e53975d516b7061bb3e049
 EBUILD smartypants-9999.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
 MISC metadata.xml 612 BLAKE2B 5e1c5bada2a202266456f1cf7fe703ce38e473bf0fb242c3b3e273ee0c0018794d8395fc8a49898b96fbead2894b6cf2fc7cabd0cabcd73d592acbbbbaaf0573 SHA512 d7ec325a55a7a636555aaa9105839afd89649276a8087292e393cbc55d430f344976a1a17d80905fd0c9ea4b0ddb7706de80a6a6230b3900db8896e34a45a58f
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
index 5d51fd41318a..301e986c42b5 100644
--- a/dev-python/smartypants/smartypants-2.0.1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 06ccfbb4f768..c3cd12242f81 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
-EBUILD smmap-4.0.0.ebuild 493 BLAKE2B 479fd725ae5d664ebc8067df1a4ee7efef9ca498067767b34928cd3395f82b61ee7c964ab1aec55772a429168026c635d2b2b1a124863a7d2c2b3580667f09d3 SHA512 7d4a2d7efbf9ec8f029bb4ddf2b863df815c9625824e5d4ab685cde468815110e6fa2da661a25bdc8273e0ed68d362b13738a4f4bee5f014c41c7704f5dd045c
+EBUILD smmap-4.0.0.ebuild 500 BLAKE2B d90c05cac09da45c1c6bc1276002cf7cd704c65fa0826a6c5a18dfefac384f2bf38ec65c6cfbd138748cc2aeda76f0be792771d58b8bd510d4592fc11256ae0e SHA512 f9c610e158af79c275c8ba3b9b9e2d93306094f10636688b9c9173208b1b82212012e3afe150e6226535e970108ab3d2cbe040bd079efa3c775512c65e9b1b33
 MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
index 4b3bf59251eb..e08951a4b74e 100644
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ b/dev-python/smmap/smmap-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index f48f79bee898..0fc9296748fe 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
-EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1093 BLAKE2B 7cb8e9bc14bfbc0370a2826f622e7f61b49aacec665459e5997c6d0139fa603e1cbca430b0b05b91e7c5ab28a543d8779055b2ec4cece6d3fad9704b3e07210e SHA512 ed64ff65856ec681a6bd368d67bce151238a82dd90bf317bda79499b5a4d1c68f8e4d8a091945506b77180cf36d56efa2dd889b9d0495966fb8f109c18277118
+EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1092 BLAKE2B 45bf2fea1b08bfc8d279a690da59caad920f991c8093b8234357d172b1bbe85fcc56ee95efdf493b297bec734c10d3de9cad1cf59b500058414e64f0f351f4f5 SHA512 12a1e04b6b5c382f7f62ead6f975bd36c9d997012ee0ed3ae47dfc14f4185ddaede308eb2c3f22e9714acf187ea0a64a6ae8caafdabc5a44d89eb864d203d892
 MISC metadata.xml 702 BLAKE2B bfca265104207bcc67ffdc3059f12854c5f56236322db05c020ef4a1dbedf0977e75ae538b9581eebf7792e6d26b7456e2c7ee16eaff97244ce84e3a894ac58e SHA512 00352a03b892a9df5390860b58e79b0b2622167f5b4cca921d14db8a9ceb8f75d92a5a90a23602ec0cb5d57110660bb6433b60f91c1cbea7172c09e437c6e077
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index 0b8aeb394387..48b3c1602cfc 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index ae9ffff92f9c..09b4fe4a1b50 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,5 @@
+DIST sphinx-gallery-0.10.0.tar.gz 6544847 BLAKE2B c7ca0398b4a2c0090a9c6154b7aa068e05d4eef832a756693b07a23902d1c2e54bbcdb19c108a261555a12646b6fc5fa2314e0337ad8637c4d63173338189054 SHA512 9aa56966ec137f678187383440c0949fb1f91e88c66ad297efd48329627b9891c2d668a2472b071d9352cc22d717e41a5088884fa89a26707c5399dca7cc7237
 DIST sphinx-gallery-0.9.0.tar.gz 6530860 BLAKE2B 925a745a9bedaa98cf03fbd66bdb87e5c147543a21944d827f738ea1a8bc657a01f0eba2fa5abe64f7bd3632bef604d9490740f2b6fe5100bba92aeb93f3eaf3 SHA512 e511100c5add06de681b0682c90b3e914d49625c63391896dfdec8e6f6f378cfc65fc3425d4216ee0ebbdd4feb3397517ca40a838947b31257654fff2b8a7e8a
+EBUILD sphinx-gallery-0.10.0.ebuild 1057 BLAKE2B d9610f89dda4d6ceaae91bf44259d4a0d1f31b567bc32496bb706246aa2951167fa9fd6bd3640373cd03bc232ff14141013ce339c988ff1e10acf299d0b2e3c2 SHA512 2f4f7e138a90923cd582ac6783cfce5d5f2fd85ff86ebe86928c3f6af83159d71a09356a7e7a6c015ecf39a87b33a6f3240a452bee15842f46ebb158f6d11ae7
 EBUILD sphinx-gallery-0.9.0.ebuild 1115 BLAKE2B f981d3ae9bbcb2e8bc66cb04f908da54b84c27b37b3ff3448e7d6bfe5225ad2913de49a28ed2ed0bbcab413b3d701853964f0f3bf96fbba04ce6694ae1e03557 SHA512 72576a4da31d63d3048184c5940479ffbd02305d8067f53750fadeaf741e0e5c3fb017804b9c3087af831fab8f4af79bc9b0a976dad1699b4bdf1e8b3f538924
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.ebuild
new file mode 100644
index 000000000000..01bce9304f3b
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.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="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}]
+"
+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
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internet
+	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
+	sphinx_gallery/tests/test_full.py::test_run_sphinx
+	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
+)
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 5525d1e04cf6..3aff17afa980 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,4 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1.ebuild 1408 BLAKE2B b819c6a50a974c96db2c49807dff7c9dc3e00ef75f4a9f037b1f7b5695ca4fdf804397d42fdb5ced13b009e3c00657336504889a83772baf4b450c62c9d29875 SHA512 d5348e058f003fc4354090115b360cd9e12d31cda7e018458d4951b8207cc532bd6cb19213c7052a3fa2d1cafe28774d1e13ae68417b3780338c6ed99f9ced38
+EBUILD sphobjinv-2.1-r1.ebuild 1363 BLAKE2B 77b597267459fee07588a91f4d1bf374bedb8f21b1f4c814c2f2217739527a3293cdf63a4dde0aaa0238de9264cb15e2f4d2baa7d6136e69cda82b057fb9b0c7 SHA512 50c5c7f668c8fed92f43bdfd95ffd369252e10f73de234684a9b55238cf14c497731917f18d7d2c3d5187862244c74f53870a1969596fe7fd61f985ae300245f
+EBUILD sphobjinv-2.1.ebuild 1407 BLAKE2B 8695c5392eb2d5440024befdca08563838dedfe1aca714dfb84d276c7bc75ac4150e4d5d98774734f51ffc0790b9c35e90d21e9e81b6333e64e1d6e40dd4c91c SHA512 df353ad06369be41d9dd815ab5abb5c24daea166931a563005425f83687d724368ad4bf5f5be7b3104b0f440269038726ea696cd9d830aadc15a3df1b1e7f6a4
 MISC metadata.xml 894 BLAKE2B 9e3b9ad864c23cd1cf346de1c06bf25035de4566733c1716846267aeba3aa09c025e04b15b67369e74f703e4b3205d89e35fd6614627d9f5630fd233320843eb SHA512 f5407da0c6c12279317b17d7174627d1fc3a42f249c1e63acd73c0367c526aab6b62fd358a34760c4986d3d487839905e2ddf5e40c62668933280c5278fefd9e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
new file mode 100644
index 000000000000..e5d408e9b3af
--- /dev/null
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.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=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
+HOMEPAGE="
+	https://github.com/bskinn/sphobjinv/
+	https://pypi.org/project/sphobjinv/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/dictdiffer[${PYTHON_USEDEP}]
+		dev-python/pytest-check[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-programoutput
+
+python_prepare_all() {
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index 47ea2e1ec337..fd89afa41e92 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index edb7e4c9af5d..0e1738700afd 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,8 +3,10 @@ DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e33383
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 DIST SQLAlchemy-1.4.23.tar.gz 7730769 BLAKE2B ad812a068beba3d55f629d4a3ee5eed6f61e46b19a7e1fcc717cfdd7a8d2cb759d894402a64550576b2cc28d82b53aa56ff4305d45433126a765909150a50450 SHA512 9e668b63487d0b9f9321a73bbf652aa82f31a90222429c4ba2f866edb0a313d8d10989febd456c87bdcde63ab595810232257fb011dce007538651426c1df0d1
+DIST SQLAlchemy-1.4.25.tar.gz 7776002 BLAKE2B 0c0330d07ab022925cdde0e94c4a33f699777239cc444f3ca31eeaf046b91b41dfe281861725af22a34d9641abb32b5e3558f684157bff9306c06b9333b89c99 SHA512 254d02f36df655638b204bbc8dbe6d32ce66e9f4a072cdb78dc7433b4d91b9cc88a3ec7a279ff2c818e0b794cc69debcb38310fa4734d9c295d067ed3dc33c22
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da7f086f15d8663b5f1ada31b5485b996403543a25d3794105dde8976911aeedcd8f61bd3803f0dbd02f2858641d51a SHA512 87037d20361db24faf4b55d975f54a36f2b6b1d113ee8c0cbb7ff410270812951160c53ec5f6002a1533498be28e9487178a15c916c9bada7539599154d8cf4d
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 EBUILD sqlalchemy-1.4.23.ebuild 1561 BLAKE2B dbd9e34b6ac33894ffe547827b8fad24fc3e4194457e7ca83a2645fc45f1abec67d3152f9a69cb6bc64d3949bf952ae17b4b823252efa303f4f48409b709cd61 SHA512 016509c20424b3cbedf3dccfa96a39d59427e43dea14cc938471c005903023f5d0dcd04caf7153319310880ffb0320539d8daa32c02d97e75a03ccf04b9cd93c
+EBUILD sqlalchemy-1.4.25.ebuild 1552 BLAKE2B a2ddacd0f8d118b3fef7f39d0e021139b30c087be253c9d9b00143dab86ec4bd4b367546f102e4db60fd6c17eeab15715adfdb20f56171667954dd3407e4bfda SHA512 955605361dfceec1832f26de69cab1e2fc7d5d7f7c43e2a10f47c610a96a28cec9f79989feb9f36573d637abb9d4e97c99d5d1fb84c7d3f250234d0a64e5224b
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild
new file mode 100644
index 000000000000..0cb76d297ef5
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.25.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=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 75888b5a1174..44d15a21513e 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4.ebuild 962 BLAKE2B b1eaf03fe9cff0d8b52bc76f1edc9e013f25d70da153cf7705e3f67bf0c0f181f63c810ed1277a20d80088aacdccc31d8feaf1f8280e131b39c1f15a86d05ded SHA512 3261e72ac99980672cf1f8e5ee35ea2db64f845c92216ff100c0cd0c888ea889d2e2c024631181c715271cc3442ad518de9617cd5f8361ed4b4801f659466c1a
+EBUILD ssl-fetch-0.4.ebuild 961 BLAKE2B 6b38aed8a9436c2d6faf1a8e0f9317b955b72a87d46271b9464303ecdbedff45b25f37f04377b89662ae07d641a9febdd3e50ba519a8f5f980ca88a0b3c5a158 SHA512 9770d3a6bfbb2c9413b6e8586ba5623496059474a87c7b669e48d2a529e162cbfa1a34c13f10b15fca4bd9be509a7aa9dcf06c8cd494319f8bdcc409f560ae62
 EBUILD ssl-fetch-9999.ebuild 812 BLAKE2B 7bb326e973b55235e3c1034cef8ce394df86864f1380707354222bb0b52e955f9f27c0d687d6293b72ce4ffa0b5eb015648d635ee0e3b17fb8cdfeeb70ac875b SHA512 46d6d2e7607a85b5e9d2031c2f0372f371d12d1108be90bb6dca386790e5e5140ca91f7b6459890efff860b7e8492987700c5687905c23f8bf409709bea86b21
-MISC metadata.xml 359 BLAKE2B af425e067704fa7426201b160259bb014fd1d5cdb7681c6eb68f8765e425b0e54f9c5e22751cf2187eb67e1140182f20411390011f2bab9b67c11f2ef0990484 SHA512 8d7fe2bcfa7e81b651ca9537ccd1aefe5a3f77c185cc2668018005a3f876249022d11eefb824499c8d0a596b6d7d37394f96f1f70dd849bcd42f8de2adf5c2dd
+MISC metadata.xml 384 BLAKE2B a6d808e54df2c5b89dc5c0f4a92f38f188a7f7ea8d512f014e6c372203688d8d011582c4c275df70225ed11e3205126a660eb89fd67c9a07da6958bda3360b73 SHA512 c4d2c22a3b9d98e262db31005022c763432d5c11ff020481e69d931086d3871d9c278d502a7625b6d15e148c90a40eb4dbfc1d537b7a94794241acdeb5f12946
diff --git a/dev-python/ssl-fetch/metadata.xml b/dev-python/ssl-fetch/metadata.xml
index 02d66c5c8372..b0bc58c4429f 100644
--- a/dev-python/ssl-fetch/metadata.xml
+++ b/dev-python/ssl-fetch/metadata.xml
@@ -5,6 +5,7 @@
     <email>tools-portage@gentoo.org</email>
     <name>Gentoo Portage tools team</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">dol-sen/ssl-fetch</remote-id>
   </upstream>
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 719add9d8ae1..034e3141fb95 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index 7dc21a54fbef..49623132b3ea 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-EBUILD stdio-mgr-1.0.1.ebuild 804 BLAKE2B 9c10a75279f1c67f1758b90c8a0ba57bbd62cc715b48aa2eded095d011add11d61c32b330d5eed8201867c4c9c8e4a5ed7337c464dc490725034b6b2cf6cc3da SHA512 49e06d9d9831020832697ac48f8b9ad883bc5279186f8927fdd2e23e30334050292c7a725bad90a340c0ad1fe440ba56a58b0b129ff0e7a508d254646de8d8a8
+EBUILD stdio-mgr-1.0.1.ebuild 803 BLAKE2B d977df91db471c58ceb2763633497a0d2e7499f1ed7ab3801addab7ab477b2f60ac0baa237bf97e1333db8ccc59d062ac028b56768afef21495e61eb2502aa28 SHA512 a84549721859004b03e66fcb6049fd5fbd30a144897041bcc4313fc23a002559793650e916923f5a55546b9eea11e2ec6ab9e99484f0e1cd8352012e84385a2f
 MISC metadata.xml 939 BLAKE2B 5de63d07f8d39fb1af9bae43810bd958128b73b71a3dca0add2fa222443b2df8dc0e5733ac566fa2d9bac22d7c4418e51b7353a5ea34577803052ff4050d775b SHA512 c1be4c8396e71317c0d21bcceadecab10c5cc98014523954d39fb9a8f687667c7970bdbf152462090bcd20e462fd8bd6f1ab6cec410d5d53393f04bd6df669a5
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index a0d17e911709..399e137fe878 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index f644ff57ad9c..40d876255b3e 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,5 +1,7 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
 DIST stestr-3.2.0.tar.gz 118000 BLAKE2B 901654b53fdc9e5ab287b77b0a26ce531e3a167b2f5d0aa0765de170341bac8ebfbc4efcae39f672ca6dc6f7518913cb5e56d87faaef35c0b06287652c06edb1 SHA512 4f5e41c92518104b06f5b9717d59c214a8d87efe47fee199a602e71efd64e29c98711ffcf3b88cd00209946d0ab123c7ec5aa842e1d54bc65d83c8d70fa4898c
+DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
 EBUILD stestr-2.1.0-r1.ebuild 962 BLAKE2B d0387ce2d488ff93dafbcc1a0ef2f92c6b9440b40baaa905d560a8e5591c3981e8433319ad7ee71aeec2429f2d949b02f71341b18c143872fdd77ebd4f230383 SHA512 1f46b2bf824b3782b72f2fdda92241497ec4d8145e9564d42931d6559a68b8c1160fc810ffef3e6ca7f23e79af4a7df332fa3aca5b5da2a82da7973d91d17941
 EBUILD stestr-3.2.0.ebuild 1132 BLAKE2B 3377ce534d0d8ee6c83c061d1c509356147ed06b0cfe3be215a2269bff093cc0bc259f2c93351f8c205dd29c5e6f83c9a707b748dbe4a2e7d2ae6f58a89bfdeb SHA512 43d147a1c513240fd5daf25e516ce6f8d449f7b9f15a31d6eec2ae29169c9af43c96fe2d463e6315877fe72f83c59fe26b4a8bf8ec0668030894697dd2000076
+EBUILD stestr-3.2.1.ebuild 1103 BLAKE2B 3c68765a4b0cd63786054a1c915206a9620125ccd32e64cec3c04c78e45b704ec2030d7e32fa6c9d746dc06fe15bc1403fd9f9fe5a14b566bb9d3cc22ef8bfbf SHA512 466f839725515af222ab610b00ec3a235940a7b1b3d2b665d18beec90a126564617365a628ac8f3eda996ac7618a2fbd34f0e01b418f0491e3e8b8e445cf20e6
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-3.2.1.ebuild b/dev-python/stestr/stestr-3.2.1.ebuild
new file mode 100644
index 000000000000..bc0a9302626e
--- /dev/null
+++ b/dev-python/stestr/stestr-3.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A parallel Python test runner built around subunit"
+HOMEPAGE="https://github.com/mtreinish/stestr"
+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="test"
+RESTRICT="!test? ( test )"
+
+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-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	stestr init || die
+	stestr run || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 473e25c0b601..fa55e0af2ca0 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
-EBUILD sure-2.0.0.ebuild 689 BLAKE2B cb61e898377ff7e9193913362e2dfeb134625c15b248bd0b98a8f32928541290941a7bf7b7b77377ae1ac97939ea3175a57100f2b10584f76a609e9057fa7163 SHA512 a5de2f724ff297f3f3525436e37150da0e3d1c00223f17c32a2611961ee041d28eccf9655bb8d41e68da1632518ce225d926278e56e1f664648efbea8057a1e0
+EBUILD sure-2.0.0.ebuild 830 BLAKE2B b35d2a6e33a0e959da887257ec7373cd174848f6214aa5f1441a1d74eaaa71a6cc59259cecac37ece666ac1b51731d3768336557ae386b467fba21a897e82ab5 SHA512 7a25a0e6e9d895f3c6718698895c08c7953d90e33742f703eaaa6cc784bab3aedfacc7d4abd1a166817cb3338a5e50b1217608c4e38c166827fe46acf1db26e4
 MISC metadata.xml 583 BLAKE2B 3a551f125c9df8f77a05b69cf54b30d94bace7869decb608b3685e06a7cb9f1462d4e674d06d59d84100e06ee95cce30a68c4777632bb0691397f1e6faaa26ef SHA512 57b87cbde1f34395fbd42bc8f7712aaf193aded2248815cb6919cb51387227f1cab46dd0d1595be9a55bdd131ac554e401366c3740c3d01782b8329a6f8e6588
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
index f787aa00d109..a5d69e46b1cb 100644
--- a/dev-python/sure/sure-2.0.0.ebuild
+++ b/dev-python/sure/sure-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -26,5 +26,7 @@ distutils_enable_tests nose
 src_prepare() {
 	# remove unnecessary dep
 	sed -i -e '/rednose/d' setup.cfg || die
+	# broken test with python 3.10, but when manually run, passes
+	sed -e 's/test_context_is_not_optional/_&/' -i tests/test_old_api.py || die
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index c3a0c5a87603..3d2ad4e130c9 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,3 @@
 DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
-EBUILD tenacity-8.0.1.ebuild 688 BLAKE2B 66d985b1db113a6955f2eab7ca98edfd34be9bc218a35f19b7d565ed2000182b9fbdb0f9a2b09d648b295fc099d6d99d34b97410063fda859f24a282d7c915a1 SHA512 0a84226115436d38ce7b20501c22c1bf02bbe06c4fddbe76fa981ef4caece1428111d3f84816d616874e0a6e4f76d8b35543a46d3828cca28919008cd66a6c6b
+EBUILD tenacity-8.0.1.ebuild 695 BLAKE2B d1e237c8dac54fc033a5918c6172fb28d1121a5554e33a6bc632541ef05ad95ece7f416c09d09f025c113cbc0fa55920578a9c986fecd92a68d734cd3e9ef569 SHA512 5016feae5ca37d9b79ee6f9315826667b37e9e09110e172eca177bbbbebcb2e1d3892f8adbf6bac80bdc3ed35586e860b36241f6877b2f3ebf996061d17f8324
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
index 5463a13b0e50..1bb3fdfb5e08 100644
--- a/dev-python/tenacity/tenacity-8.0.1.ebuild
+++ b/dev-python/tenacity/tenacity-8.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 692c89e3bef5..0fc043437945 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,9 +1,5 @@
-DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-DIST terminado-0.11.0.tar.gz 14423 BLAKE2B 0fd782bd2b75bb74990b4638af3855d4c63bc53c1be5b1614ab7669e0504ad40b608bfcc4d8c77a4aa36bc3f2a0304a534b791161320de11c1687b4f568ce9c4 SHA512 038619e3e2114200afdc940c4937e20ac0aaee5df152fd2f1fc92f50c5f51bd0e351d3fb8d3979fe8ce5d5a12a27b9f896cf9ff0578a82772fe464b73d6a8d98
 DIST terminado-0.11.1.tar.gz 14451 BLAKE2B 02650bb272d2f11a5a4fa24d1d67f6fb7e35aa2b55e24abec0016c190d6af705079f2e4f56ca4cfb65eb801b7db02950daa8834c8f8768c15ec7637bb8d1a21a SHA512 55b44e8153a54ab43eff35ce8e1fcc0a3ec9189d5fc14cba6953fa03a7584b1be24ba53bcd8a5ca6e17da1fdc8e4f34c5c74417842bdad54a6c913a083d9487a
 DIST terminado-0.12.1.tar.gz 14513 BLAKE2B 97537851a2284c4cae2d9cdc42ad2714c9368f4318ac14c35197d6691404bec205b7b589c35302ff9d3fa99e4a15e24e713f70cc319e26788631134ff4b77cb1 SHA512 770a41b8fa6b43a577c077e8239a43b654f8e4423564ca38d66428ed6c322edea64c98225cb94ae182add9757b6d4e52796edd332443fe7ac643677a8d133674
-EBUILD terminado-0.10.1.ebuild 809 BLAKE2B 8f3f0a83261f53e307f501ed29bf6ba2d55e039d400a24bfb7708c64d9857fbdb5af801b7b93f9113672d8a992c0883dd424935e55de727568794f1fb0fb5754 SHA512 55a12ae5625804379275ce5237523d6929f5a5f053c07b209f95fa2e39fd32053dbb5190635b87d3f36788947099290c106a5445134ef8d492395f0cc14174c2
-EBUILD terminado-0.11.0.ebuild 811 BLAKE2B cb2533f5a1d0502a4f01d87eb5eff2d7cd34f709e71963ba723ce8eed92714755a9b87d0ba68ed53eed221faa0094bffee560244e2e2acfc8f2e9b93fef88362 SHA512 840fee8f688d133b127955796c1661f28d47622309e6248648c857ad881ce617db755a055941ae3e8d972a4af5df838cc420a9731b48a05819bfad6446929443
-EBUILD terminado-0.11.1.ebuild 824 BLAKE2B c47e09d0202312c9afd444f37967c1bc84ec0acb4dc033f7b246c5d7e7523c401e0ed0f55db69ab3ac096f32a0022549aae2ed35ae12c37e7a50cac77c1a23d5 SHA512 5b05468f861528b2c1fccce4105d36094b10bcf510229b9661f5c877477a894a03f12758a2e11ddd7ad731c0df714c86b4bc6fe47645bed2649916fb5fb20621
+EBUILD terminado-0.11.1.ebuild 822 BLAKE2B b9b8138ed7f380f8f54214a123313238cd291ffd77aa17f82972994069ad8f7fd0b3d06f22985fd1abb192caa80f6038ebb562c02b0b2e93325368aa5553430d SHA512 8a08de2bb4d62680606cdf798ef8a64d9e8c0a346b39adae452e4fb23ab6d1b3b2c9bc443b97f4c93fe18b3ae79b11524b53f3d13c9853068b7e9c3469cc606e
 EBUILD terminado-0.12.1.ebuild 824 BLAKE2B c47e09d0202312c9afd444f37967c1bc84ec0acb4dc033f7b246c5d7e7523c401e0ed0f55db69ab3ac096f32a0022549aae2ed35ae12c37e7a50cac77c1a23d5 SHA512 5b05468f861528b2c1fccce4105d36094b10bcf510229b9661f5c877477a894a03f12758a2e11ddd7ad731c0df714c86b4bc6fe47645bed2649916fb5fb20621
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.10.1.ebuild b/dev-python/terminado/terminado-0.10.1.ebuild
deleted file mode 100644
index f94f8bb0b938..000000000000
--- a/dev-python/terminado/terminado-0.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.11.0.ebuild b/dev-python/terminado/terminado-0.11.0.ebuild
deleted file mode 100644
index eb50a120e233..000000000000
--- a/dev-python/terminado/terminado-0.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.11.1.ebuild b/dev-python/terminado/terminado-0.11.1.ebuild
index c4b306ce1319..bd491020dfe7 100644
--- a/dev-python/terminado/terminado-0.11.1.ebuild
+++ b/dev-python/terminado/terminado-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index dcbf041692d1..a8a41351cb9d 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,6 +1,8 @@
 AUX testfixtures-6.18.1-py3.10.patch 6506 BLAKE2B 09db867dfaf8b76098681ce2b74731a8224b54e72b96362a34187e3e55309095bac8459d40b3c54fc6cedebe13c9f76ac9cc18ff43c2bf9e88b9dbfa369dff5a SHA512 d91b46005525cbefa2100eee25720b1229c6ca8213aaf36578635ffc82edc50aeef278d8e009d13bdb14ab791d7969b5fd39ae70fb2becce8f255edee1256792
 DIST testfixtures-6.18.0.tar.gz 121584 BLAKE2B abf90012fe79d148c44d72a8aaa5277c95a33933c7b753eecdcaeb11279b4439ad9ea394270e440d9681c22789a17738d367b66adf3d04cf6e6289713c1ead59 SHA512 e6552e6b1837ae4ee4754ce3675bdbf2a68d8e46b892382bd8320290050f2c296348ef6310ce3ff46962bf1978c351fe2cdb853a73c9f800f68818f81d5caec9
 DIST testfixtures-6.18.1.tar.gz 121731 BLAKE2B c31873d3ebbe47d5d3035d6aaaf674472efb32b061080df711ee558bf91d1b01d417ded4eaebf7436132fd7b9233437e735fa60dee47777d032fc1b610fd1de3 SHA512 088c6480eecc9862e91a0188ab45620be3d8f8898ebb284dc932155fffbd9f75ebbab9425fe4db8dee75ee8fcf82d8c27b950a3f9298e9f7ca420744c65edd91
+DIST testfixtures-6.18.2.tar.gz 122026 BLAKE2B 2b30c03ae71a300883ace52dc80e06c6b6610283687fa8df4ded1678991a47e8186de57060458a2fe98fc8eeb8fae8299081697a6471bdedcca2772405c91c6d SHA512 ee27d9944e8e8ec770199b115a50274f7167e9d3d3d866b0d0bbe7fec8a939b25a469ecac0158aaa486b129e078077c5822e7500ad473f98ba59862424413e15
 EBUILD testfixtures-6.18.0.ebuild 1107 BLAKE2B 6fc7510546cb7d9242044516a61f02aaf8c332f15d304427959b3472369aaa8085996b938e9b099b44a3b14b0600d5886e64769e201e163259138914f06962b0 SHA512 dc79e500f56f3c838951d2b94ac0b00c663901572ebeee920ff1ed81895d219e6187c180052e9311dae85406e986916eb92a149e2f213c3e9e0c816436dabd99
 EBUILD testfixtures-6.18.1.ebuild 1250 BLAKE2B 86cfce299416317e4c16fb549d15c4388eb8b28b250081b6247686bbd26fa5ff7319045bc2025a3ac20854550c00f91e1b57572100b82110846c8561c6d7ab36 SHA512 5654831168434f1a084df1b5c29ff1c76ba7f9d2e008f49649e319c26264bc4b1ce4fb3f07ceb00e2db111eb529cf28591c7678cf58c1a0cbe555bcbcfdb12ba
+EBUILD testfixtures-6.18.2.ebuild 1265 BLAKE2B ce3dff1e0accb6a201a4f8ebe79f828d61d6c99f1fdd0f0c361d0b4868232b505a91a8b2278c32114863c67ed45f46f8952f6b770419b549a5106115f7603fb4 SHA512 e3d8450c4bc118db2919cd0dbf6f628737deef71e25f30766c7d77749af1cb777de1ef945db7dc64c47ac679e916e359d59c861872393fdde07c80b0dea91c2a
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-6.18.2.ebuild b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
new file mode 100644
index 000000000000..c2e4ba7a58fd
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~arm ~arm64 ~riscv ~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
+
+PATCHES=(
+	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
+	"${FILESDIR}/testfixtures-6.18.1-py3.10.patch"
+)
+
+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() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+	epytest -Wignore::DeprecationWarning
+}
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 1e00406c9f9e..13e2b327e0c7 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,5 +1,5 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
 DIST tomli-1.2.1.gh.tar.gz 122701 BLAKE2B d0280bb81a6e931a175c6ef2c58b4f36b1237f99a73331cbb95f98b9e68a98a4c6a635aa12751ac46492c2b1a06a821f1ae70cd0c36f268998488e824f3e577c SHA512 34f9529b137331b0ae03ac99170b3f6509847356594be14166bae306ea4fbbddff808ffe0c48d05434f72d223a2f35b511675217053029d287725b7142fbd089
 EBUILD tomli-1.0.4.ebuild 824 BLAKE2B 7355a32afbdf50eac4dbda5801647dd2bd160b3390fe20660dc73ee2f4e633dcba3b0342dd2d9e92fd9c9b5e50eff56d31afcfa77079cfc53e2b3826c2bf8572 SHA512 3fa25d4bfc1b2e7b209689fa58d6bd55fdd07ca4e937d811d5e0ac41573456f4f1b776ec068c754d3b00a6c8d79e07d5ec76fe7de53c5ba144f8848bbc156cd6
-EBUILD tomli-1.2.1.ebuild 838 BLAKE2B 5cc66aecae54b17e3989e60e7124411e5f38a665d0fa5c0be3462f529f40219d7e74299b0f1644cf20aaae0e7c724c268620edce66ffc11a09aba00d2d2c96a5 SHA512 ec06db03d410fdb08f0f87297a23e2e52c90321dde7b87763d2dfdd72ef70c33a5cf1bd6782f9b6a1de4e17a67dd4780c8844c154f90fd7799df7fa3f026cd50
+EBUILD tomli-1.2.1.ebuild 844 BLAKE2B f486473d5bfcaa1000f1aff7b82bca34a279c359b6ac7593c560b3f5e82ce8985746138d1fa0165ce2a9dee60eb9e48c8051b0f8dbada1a3eef4bd0b8edcf4ea SHA512 72ff51e0e217fba09c28cebec2e069b40b11f950858429919ae88765cea1c8ff19757949cc01ff181178be9f11b3421a44ab25674bdc1a1f9fda77b2a4b907fe
 MISC metadata.xml 339 BLAKE2B b08685e6617443fa9014550136bc6c5a94980e9c067c7a37a90b573d00621364d5484843fc5c5ad73c361807d59dd65c95893fa984be3fe6da9e630529afa3e4 SHA512 b20def328a2eda3374034e9c597a746e396d8cfee2b0915946c349dbf19174821362fd5e1e8722319d63677ed7a14441a0e1afb6fa1876d2040db823eefb09c2
diff --git a/dev-python/tomli/tomli-1.2.1.ebuild b/dev-python/tomli/tomli-1.2.1.ebuild
index 9f31d1a2787e..f30a01a6ebcb 100644
--- a/dev-python/tomli/tomli-1.2.1.ebuild
+++ b/dev-python/tomli/tomli-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
new file mode 100644
index 000000000000..1fb4c316588f
--- /dev/null
+++ b/dev-python/toposort/Manifest
@@ -0,0 +1,3 @@
+DIST toposort-1.6.tar.gz 11690 BLAKE2B a9a57fd182a3324d43112c3f84a20039f032d99bf2c35c6678a6a08c23b123f18610f460529dd39c769b935d98270a25ded2f1a483e4e6f06d3ccc501b340cb8 SHA512 8dc30b5d5a6f476756520236bc93840243690779783ec8f0b5ef0f72c64d774177b25d10d2e024cda968f81352abbc4f89f3069760fc3a86bd5ee387e7951928
+EBUILD toposort-1.6.ebuild 413 BLAKE2B f9f0958847ba209b9d07593b17b8f0d802fb2c1d95da6bf3465b782015c8bcab0ec6bcb11f1397c844e941c3f8dc8d51b6929d1bf31de95655cbf7b66ed7ffbc SHA512 56af58526ebaed5cd44ee0e1cc50dd1e09df469699a2c0277d0bc328dc9a5caaf9fa71ba6dea7856f36e9cca09fb0f6027154d63134a0e170ed7ed9978c250b1
+MISC metadata.xml 551 BLAKE2B a8d8483b1a725bfdbb0c5ed3688bcd15093f0a51fc56cf8cdf30a836c98818a5ca5e7732e8045bd9cba76dde69aa05f2be45f9765f48b2177e9e8aa67a726880 SHA512 f2b0b6fb5f95c0f946149c1d959affa926452acfc21e46dda6f34448c8799df4fb8ddefc3856cb09420bed26f41c945ff309514bdc3fe87c77465784f3c57cf5
diff --git a/dev-python/toposort/metadata.xml b/dev-python/toposort/metadata.xml
new file mode 100644
index 000000000000..d8231c836080
--- /dev/null
+++ b/dev-python/toposort/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" proxied="yes">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="gitlab">ericvsmith/toposort</remote-id>
+		<remote-id type="pypi">toposort</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/toposort/toposort-1.6.ebuild b/dev-python/toposort/toposort-1.6.ebuild
new file mode 100644
index 000000000000..ae4eca4b79e4
--- /dev/null
+++ b/dev-python/toposort/toposort-1.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements a topological sort algorithm"
+HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 5078be9bad45..f2a59175955f 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,7 +1,5 @@
-DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
-DIST tox-3.24.2.tar.gz 305924 BLAKE2B f91af9fdb4de94eb9ecf65774619234f1e52827c7c6e3ce75ca8161564f8cdc8af210f229ae07f5d381f7964cbbc936f47d4242848513c9bf1c8989a73fe0420 SHA512 e33a1126440ac53cf07cd7dbe695ea1307ebad92e0ed4d6e6c738affa059104f1b5bfc360883283ddd59e5156f7bb00c52d2d2ddd2294b6664f22a2abaaf66c3
 DIST tox-3.24.3.tar.gz 306285 BLAKE2B 368eaf959533f62b08d6e44929ae327ff25ea6eca25a3f47c7b9945428821bf80ab7e0ab4daea8821b55b9a7a009f30c3d5641812fd444a86577ea0ae83adb7d SHA512 de1c1ccc3a277c617521e77806d1d993a5c19f811016bebc442bfea12c3d40a22bf80b7d11b11744a5ddf705c6e8955f2811f149d413ea8522d94c985ed1f715
-EBUILD tox-3.24.1.ebuild 2134 BLAKE2B 9589d30a68afe753813e64b7ec5d8a60db842c08634d4e94f8bf942d022fd75c93901a05e234a10a3354b6e3fba88bce5fb868e1d76ad181efac7fcc88fed1bf SHA512 ed38d8c09730746beff05bbb9c9813fa5db5205d462252cfcd4dac19d32fdbe6e7713cefdc16f9f7c8ab6a19b73f9831b9eb7feff3e7b61d3953e00f30038caa
-EBUILD tox-3.24.2.ebuild 2141 BLAKE2B d27b4a9b6e0d4e0bb963365c26e2cfd9e90a1bdcac628335240c3360a589c07d9d79cd3cf98900484ef21fb6cef467d81f3bd0ede54ab37a852394ac2d8fbec5 SHA512 4607531b81a352bd6d6e6d7f7711eca0d8a14161e4e704adba48d175b2f86e3d508f57798bec24c7dc8dbf1354821bf96df831699d395fc4760add99e65e9f6c
-EBUILD tox-3.24.3.ebuild 2147 BLAKE2B 9a9cde24dbd680f2d687e1a7af0467a95da864cb930cb87a042acbdef0507fc211ef5225c69c9f700f0ba63cccf06435986ce5362a1232ab66439c842a29858a SHA512 f1e893873df23c2157d3e7de09bc0ac76f8b06bd069e2f91ec8296555ba1b62424010240e79511a00d865ec210f116891b61cb221b3351f9a27c089ad7a3305c
+DIST tox-3.24.4.tar.gz 306760 BLAKE2B 332c99d021bc3c25549fd95d051baaa1f0dc3aaf776928320826bb7e6bce6444fd5a993e1dbff3a4ebbde9dbb59e30d07eae4b04096294b3a186b130b8312587 SHA512 49e2cb74f119b5cc049d2a64479e56307cea1f36a5586840cca12cb8f4ce8a2ba991cc6142bef7f095a7d32b44f7513f89cce56d89deaff0e12194ceb3da6249
+EBUILD tox-3.24.3.ebuild 2140 BLAKE2B 7a0ce5f2f7d3810c8353be7ff636bacb254a04af8c2000c08eec3ec643c259a0dfca8fb013e703c6c67056916051a8be70256d3de78b499f198fc0e2c0b685bb SHA512 0eb0ade1379a295ecae8aa8d14402a1dc15e698fb034dfc6d927b3336651100b5f5325511a0b5fe51a3158ea6324bfd7a25d357f4870e238e8062efc93a297ff
+EBUILD tox-3.24.4.ebuild 2134 BLAKE2B de098e35b77564825d15e76a5f39fe55091c91ef7cd0dc66c60f52ad55881257b9cd30728d29953cf4a85b34b25db9b9d0b7fe1278a05373b9adc861f8d3ff02 SHA512 2ec2311c1e2e6efa4be096ff7ba52426450d8e3241f2d92d92b943230f9d0590d06f3a58fb9670239b2d8ae904a51a3318c1ae429d88a05cdd0cd1a5a140b76b
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
deleted file mode 100644
index 57560d97071e..000000000000
--- a/dev-python/tox/tox-3.24.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 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}]
-	' 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
-	)
-
-	[[ ${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-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tox/tox-3.24.3.ebuild b/dev-python/tox/tox-3.24.3.ebuild
index 5099e4959d85..93e2236b0b8d 100644
--- a/dev-python/tox/tox-3.24.3.ebuild
+++ b/dev-python/tox/tox-3.24.3.ebuild
@@ -12,7 +12,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.24.2.ebuild b/dev-python/tox/tox-3.24.4.ebuild
index 1e0885d735ef..c0eac290ef6e 100644
--- a/dev-python/tox/tox-3.24.2.ebuild
+++ b/dev-python/tox/tox-3.24.4.ebuild
@@ -12,7 +12,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -46,7 +46,7 @@ src_configure() {
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_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
@@ -55,7 +55,7 @@ python_test() {
 		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
 	)
 
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
 		# TODO?
 		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
 
@@ -65,5 +65,5 @@ python_test() {
 	)
 
 	distutils_install_for_testing --via-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
+	epytest --no-network
 }
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index c717bebc76b2..5d1969b5213c 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,5 +1,7 @@
 DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
 DIST tqdm-4.62.2.tar.gz 169564 BLAKE2B fd3484db22eda5db7431fc337e23cfcf44882efc56c8b10208d799c156fefb5aa70c69c7063315d86d3ff881b97b62ac0b5c8be73ad3546ad0728f3f544cadfa SHA512 a59a041fa239e215e541f07c66292c27bfe067f3f2eac2916662b4ef1faa630346dec9558a7f66a3456b3d2ddcd164f9381cb89e5ac8350d0295367bfc248a8c
+DIST tqdm-4.62.3.tar.gz 167952 BLAKE2B d5732fc97256e1fc4f55bd1a0f69f98a87e7132cc1d8484baa12b7615da5a95ce20268515539c595c2b2aaf20f9a9434c17d581b3b90ea3cad3515150e469471 SHA512 1083ca2080163c98bbb55e124ce9d47c790e47c83cd8dad60e4c93773d1d97a50aacb5a25ddb8a2ae3691738e4f4942c88d55dab406c3e810cac18b8929d20ee
 EBUILD tqdm-4.62.0.ebuild 1162 BLAKE2B 1c239c6f6202c694f1acbda28820226d91f9905c055ca5639f3f896293078271ba79acf3e10dd5b8e4dcf9a6abd20bfc5a7bf2bb3c171122d724866d27e6f7ba SHA512 10d7735f0c6a7f22caaf0f59bb915b4bb0ce0a04531f15850316dbb5a4ff17aa614b0b37934324c2f7f3dc9e530a79dc6ef2d2a657c5888155da1fd2b9b54f85
 EBUILD tqdm-4.62.2.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
+EBUILD tqdm-4.62.3.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.62.3.ebuild b/dev-python/tqdm/tqdm-4.62.3.ebuild
new file mode 100644
index 000000000000..be993f734871
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.62.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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 ~riscv ~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}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+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/trio/Manifest b/dev-python/trio/Manifest
index ea03d46463ed..39f364bcb11f 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,3 @@
 DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
-EBUILD trio-0.19.0.ebuild 1470 BLAKE2B 0b9de7038876d49333909cc39d366d35ca370ecdf840eb2ef81dde606b2853068841730b3686e51468bf5b33658473c8a027287b0d828e21fea7a41c8f904022 SHA512 e9c3e6b0aa36dc5508a29e767e04bb7f99e49ee7de83f69a93877673411b600d301bcb64cae4fdaa882f3f9807593c7de7bab7a01c9cae6e28ba55f6a4cc2194
+EBUILD trio-0.19.0.ebuild 1469 BLAKE2B dfb55b55f03cf08eddf9d6849167d0c9e92a84a7473836a39e9cc05ad5766c161cd5cba17081ea2f4d04c146eeb19a571ab671ff5e9ebb48e3635436d59ffa5e SHA512 7e641ca81eabd798aa21dc07aaffdd811c414e65e9c23a0996663e833ab35a62eee68b8e4b1db5e976e7f01ba5401e5ea30146741c1b6fcebd719427f2ae9aa6
 MISC metadata.xml 1959 BLAKE2B 8b8c53b057e11c334de01db932a4b7cb9dba98c200142765224af1252be7e3e756ebd2e8c1295212d8930df2afecafdaf252375e3e842c58d8149432ed038606 SHA512 d7ad911af38df2e7ef4e0659b3a8abf25c334e10d0a637c1d901a05e517e5caeee68932e4263c1bdedbee6af6e15b80cb1bb377ababe4078a507fc5096073b1a
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index c337c389eb26..9cc46ddc68a3 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index da412b195205..37bf4d82b212 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,5 +1,3 @@
-DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
 DIST trustme-0.9.0.tar.gz 30081 BLAKE2B 5623fba91f07027032f48ee355b5c4f853518bc6a5c1e93b4ea387ff25838302efa42476db8eb64e364980805aa1c3be97f827260efc31ffb536c53fe30ba988 SHA512 f0d983a4c52374f178c0bf96f758fdb5f132e7f7c4bac187c84fbc8dc82dc36d6c801c340bf8871e872178f7b2ac66d6159b5462d073beec9a13a086f64b58b7
-EBUILD trustme-0.8.0.ebuild 816 BLAKE2B b98441c0bf208482ad89506e5f47df5b171f816b539f2b40c004c4aab9a13e68933fe3f3dadb43adda96cdaf5cc680f52f4f21d06667c9b70d928592708f9203 SHA512 91a209bd08a2d1fb97e4bd1d40de82dd5258e793e85ab7e49e4967a0e784f2da23e3991fda497ea10faa661b364a31be43d3f112b92173fed1394d32937b3ffc
-EBUILD trustme-0.9.0.ebuild 824 BLAKE2B e848a2d9571756d20ee7ea2843d954055c097ac39199a2a6c2905186260af66b99f54badd29e1a0b43a454345eaa0b222ffa33ec54c7bfe858c32db1bfec2ea4 SHA512 eaf46b382dc1faa54b24e1752831c1c60f4e9fbf8647422a016aa7ce2b36672d1d8e98cd42d1b69df605e098566d4a60d8c34fc5d2e74e9ccd9fc47aa3b1e814
+EBUILD trustme-0.9.0.ebuild 816 BLAKE2B 4c8ff92d9799ecd6388295ec3425f30bec031cd2674007a41bfea136babe714d5d8415ebe3397daa9141b6bd55b6ce759ffec53930ac3b531895cb875bd4e7d2 SHA512 1de99621c33363b73ece600b272de65eeb295ee994dbfc8f8716fb9736b9ccbb20d3e368c2849695432c1d4ee3c470fefa0be9eeb68cd5b3e0bf671fa495d439
 MISC metadata.xml 444 BLAKE2B a8db99f28b98a6f6c9afa9479e4b568632aa76959c2dcb24b038e72b756d23dd15ed5b0aa408168dc65bcd3733a0ef58ea6b3a1e67a1c93f9d969f43e7d5301e SHA512 32a0d2b8e347a863394c94e23ff25c50ccece6bed2eede6ec0d8a05ee321948e3a79f5b7821ee2fba7276b6259cc55dfbf5b117ce74d87ae32bb655e95674cf9
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
deleted file mode 100644
index 98d886c57307..000000000000
--- a/dev-python/trustme/trustme-0.8.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_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.9.0.ebuild b/dev-python/trustme/trustme-0.9.0.ebuild
index 3f23c392ed2b..64c4552cb770 100644
--- a/dev-python/trustme/trustme-0.9.0.ebuild
+++ b/dev-python/trustme/trustme-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
index f9ae99d72d01..3e9d1713ae5b 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,3 +1,3 @@
 DIST txrequests-0.9.6.tar.gz 5306 BLAKE2B c1b55835c360f27c519371834de6cce0760e201a746d960425d7bef98e10cdb421d4db90b93bccdfa05b1fa2d5d6258fea4cce93fe62c7e9ad75780f1a5a89e6 SHA512 3892e121417b8346a2a2db02f8f4143b8f87c060cb4d48dbd07fa77559cfb0caf5742b257377ec0a746f2b995eba36f419a1a5b19d83a0c343cd39057dd34fb1
-EBUILD txrequests-0.9.6.ebuild 532 BLAKE2B f9e4f7c5fef683c174b1696fe0d058201d9c83abd6ab3d6963d9aa8bf5dd86d2d99645bb0f375f49a8085a0b4480c1ec3be0024df47a3abb29af52ad806dbda0 SHA512 b520cface4fb42abb1bcbdd860fb6c05a9cf38c6f553d5b8ec99d3c8387cabcf9877f783339a629f31a748c4063ec7921537175463f772dc93c2e7b5f5e0821d
-MISC metadata.xml 717 BLAKE2B c0fe6ab0869ed80981d2b6970dec0ccdbd8556993b174b7c3d37004a7f5f18b6ad3d87c022c3799c29a67657171f86197899add76a31477c769f6b5c9a659af5 SHA512 2e8dc99483b64ce81b548b123ddd0c0daccb13a3d31ffa940220dbd8c0e2b7a714392b61f5986b730e1fee8b0a2566720d44b59ff5bb3b23ec6de6db8888464a
+EBUILD txrequests-0.9.6.ebuild 646 BLAKE2B 6bb239e630c3705e86bb0cebf9139304ae49b56dee388da0dc53fe654104c1a275a06425ef10e194a0e33d6ee928c5ee5ec90f989aba2932c3d2c9908475f949 SHA512 d7ce64f7ab4300a134c6ddcbb5aaa157b39b4050b053ea43c41898641461e51ea853ca9e83fdcde8fd1e3001ff6474917686fe3df3d080576be40b1e5c4ae5bb
+MISC metadata.xml 741 BLAKE2B 8905771c4310260f3a5adc31f5196f87cb4103c4fd0551d52645adff4ced8cb772ed2cf0c04e2bb26eb3dc19de1deb585480af47e9b083280944305a3bf7738b SHA512 308430b0cd9df5809e9a0eeb59742006dd5a2d08f98d35f309d8b89c0e9fb321df4817d07723a02a20753db64fbc049300d9a085b8c8dc5e03ad88cf7ae51b52
diff --git a/dev-python/txrequests/metadata.xml b/dev-python/txrequests/metadata.xml
index fb93f4840fc5..38995d6314a9 100644
--- a/dev-python/txrequests/metadata.xml
+++ b/dev-python/txrequests/metadata.xml
@@ -5,6 +5,7 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>tardyp@gmail.com</email>
diff --git a/dev-python/txrequests/txrequests-0.9.6.ebuild b/dev-python/txrequests/txrequests-0.9.6.ebuild
index 7f6e3418d14b..729977c9a889 100644
--- a/dev-python/txrequests/txrequests-0.9.6.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9})
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{8..10})
 
 inherit distutils-r1
 
@@ -15,9 +14,15 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
 	dev-python/twisted[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial txrequests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 3bdf57baf67b..9480c197e394 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c
 DIST typing_extensions-3.10.0.2.tar.gz 46048 BLAKE2B a8f7ecacd553ed469cf090f4b8f52e15039fbcf1ae6879f5899fb99e7bbf5b7289cf5d7e5409314a110b2a626b59bd5e6a52f893e4322244c9e7e80ab393d334 SHA512 171ada56758fb04328a2cafefe80b70fbf166f2d799406883df642927964925ca73f04d0646661cd4fd016dfb5e1856b84f362e3b404c27b368ca06a09cf87db
 EBUILD typing-extensions-3.10.0.0.ebuild 734 BLAKE2B b9f74febedb3bb79a1cb5cc849102488c9c55e6c8571e932190f7c206bdb5220faf1bda96b48f7bc7a2eb8a0d0e44a7c813a76aa4b39412b1564fe4f67ae6631 SHA512 08a3f910034c1f588d1ed08c5b8f8a738debf212aaf36c046db0486ac51d9fcfb47b372415eace95a6ca810cd734fb00f7dd5757ba95244963bccd63be9dbcac
-EBUILD typing-extensions-3.10.0.2.ebuild 717 BLAKE2B e4d1109e7f1edfa0e6e571afbf6c4babd1223bf430ec921d9faabb1430c6bae0eb3290fb32c193e9c342aad7c3af54d0111e72a6698bc5384d8fe2f2950c43c3 SHA512 42a64547b2e25cad3d907a4b0c0deae51f4ecc3c541ba531fa764b5e92f982ef3e92b7277f3dd2d0ad7e56fac3a92fffb2c10632f1af2a3e7fc69db9f3b97d0e
+EBUILD typing-extensions-3.10.0.2.ebuild 723 BLAKE2B bacd16a30eaa56c6e17b15c445ddb12dfc7f1be428b646d53dd6dd2ad7a3b3213ca94a9e78131a90e94b94ab014006e216133921d596816cd013836936023509 SHA512 96524dcf5a8a96d2d45e2926b2e9a01ac077d4541bb0f01b720afca30bff55216a72cc1eccb73a2d22bd30bf2b2097538d1ca521064ad177df301ed8c4b05393
 MISC metadata.xml 398 BLAKE2B bff4c130e83d0e2e21739d4767f4edda2d40b649943dd7c8138a5e4d9308d876abc0c2a8a93f875e84711abf00fcf2bce03668b40c5ab4c07342e4c8476d907f SHA512 abd5fde69521deed87ace92128fde7ed147c19e5cf60034fd4d82c7fe5c532e497034ccc15b00198b996f5c6d75504f38a3df3616162344fe142dba7a2783cdc
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
index c5ec963b069c..b9e8ed3ef803 100644
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index cda13551dcc4..b286ba0e1eca 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1,3 +1,3 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
-EBUILD typogrify-2.0.7.ebuild 677 BLAKE2B 16b1ffaf63132d391d5a270b85be967c335ca59f6cc723e06c1fb5623c0f92957bccef3dcb71e4ea179a9c0555430b93a3a769a08cc0a5411a6690efb3b80706 SHA512 5223670a815b35de86786327cbc01697c926f2629de07c6e8f163ea1c6a40987c10be6177eafa9fafa389caae0da917a0bcf444f7008ec8f5c6eb7dc8c1aedb8
+EBUILD typogrify-2.0.7.ebuild 683 BLAKE2B d70f9b6bd4d324742f05ad2205ed0f479695e30dd638b159bc4b7aab7d495bffa9759a343e43106730cd97acd32f990a311ccaa83f47f8c428be4b38443f3fd7 SHA512 18c4299fcd548c38599bc20a22b90b08e0ef8f804e523373f2c94b24e01c7af8f620ad08657c10ab0a782ac8fe4a5b153a72417cfe9b3eb3a1dca5455ca07566
 MISC metadata.xml 464 BLAKE2B 444a374a2f105a3ca17c78e8ab53300ecf6ea64669031e493a5a211d035a40104a1b97306817f0d9d02bed770100a8cd39b73ebbc273dbfd9f8dae8922ebf92a SHA512 1016d229071882740becd626c26283fb113205c2e327d668aee7ad47a512618a9e5820fe795298bb44ac54d602fdc8b55a7062e84936d79a01e7dc3271f574f6
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
index 8231e7265ec3..965450a43817 100644
--- a/dev-python/typogrify/typogrify-2.0.7.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 1f16dbd4169f..ff1ccddbdbf1 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,5 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
 DIST tzlocal-3.0.gh.tar.gz 18924 BLAKE2B 340739015ce0fae245ddcb2d3f6250886261a81a49c9db7960515e178090183d3a826ee494763503023c033d3d9c19771aad865d4c1150350a118250aab23362 SHA512 9060eb325783d183bfaf7038476031a2ea22fd4ba50f6b5caf3d8eda15d9c90e557c64a0218c7e3c3df51f385378fe8a17f10871abb038012e1d05a9547918c3
 EBUILD tzlocal-2.1.ebuild 553 BLAKE2B 8a04de4cdf378cfcb94e876d8547e7b23e039004692e59901db1ca32cee2c2cd93735d814724d87189bc6ba43c39222d2b4303e3c7c84f561331988125000c17 SHA512 f1bbe5e0b0a4ac64d8261570aa3e587f9c98f3af5d81eb73e2bffe0947c2b2279608eb1f4c66a0b9c856c4007e1c745a46c8fd1d6b650064e2e1cfa25048518a
-EBUILD tzlocal-3.0.ebuild 635 BLAKE2B 2f16d58c0a33bad16aff929948f52a9ea27f3eb0acaf40e0a615d0952b435c529164405a4df34d5a71d9c431978a8b7e654e48a74c672b5c5058297c086e4577 SHA512 96cf2ccd333839187bfcd838d6652d3bf2982805be12359a06f557816edf1ccaf75f72586edc1ae9930319f66014b38ea6e7b3fe34d5d45596faadd34a8fba20
+EBUILD tzlocal-3.0.ebuild 632 BLAKE2B 2eba582041d313df61854f303d4a474da1f7e820e327060e5f8a51d39e09c884dd2b7162710919c6d09326e34f5135a4fb3342b571a4242acadef867c0ce0d13 SHA512 ee7407e7b790e4d6cd5046582e68615c6d23a30331d92163cdc8919e3ffd88a9d8a9e65b7e20a236f0867377d3cd14bd7cc3337d6fbee6ecdebf7b45fbb0a4aa
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-3.0.ebuild b/dev-python/tzlocal/tzlocal-3.0.ebuild
index 503a8b94ed62..616020e397d2 100644
--- a/dev-python/tzlocal/tzlocal-3.0.ebuild
+++ b/dev-python/tzlocal/tzlocal-3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index c63c2b5ac82e..50cff9bea8b1 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,7 @@
 DIST ujson-4.0.2.tar.gz 7129106 BLAKE2B 8ebf68c6bac65100baeee4f95f175ada09ba48b9efe1876b7b1ff2c3cf87d1a50d8300a981fd97eac73e4c5a70af1b7fddcd468aa6067aac8a2e44133f397057 SHA512 ece12d4407cb7cdb647597ff7fc32e4390fc4c790c59e764da5c5644e5dec470c48cb6a6aaa18429cb713643e5205c5d26b2d2d2195bc90f3a171615d3dbd80d
 DIST ujson-4.1.0.tar.gz 7129002 BLAKE2B 0a9b8d90ca977b3abf7a3dbcb42fc40d9b6faa120ea59aac2aacb83faadf36cb3c0ca1073579f6bc5f94c6bd45550d82e55e1859b0afc7b3bed511e63626703f SHA512 b3661c23fcdad2dbbac1d92b319f85ad3b7b575c1e773f5207cc83811974ed8de0e9780acb50986fcdea1c4237d5ded8d10a9bb641468b198824f5da15b8ae0e
+DIST ujson-4.2.0.tar.gz 7129419 BLAKE2B 478ff6a3de9603478e9b747935ebc966f980dc832252974dda444b2ccb53878b3565ebdf7e8c223c687304d5f95607027d0652956d1f804cf2d80df6ce19be1a SHA512 894316eeeafe80eb3328958f4336c1989c9591caf84de5a9442f9d028c85f67d08e7c295e74f5828abc93ad56ffa2d12b98ebe0ecf4bca27ae37642fbffe47e4
 EBUILD ujson-4.0.2.ebuild 544 BLAKE2B 0c38370f6a502b4b0649af5950768ecb08e52e499fe6b10ef9250d8e2e7b5d9151d3a6b8847c29ecd606fa2877ddf2b3f89992c4aa1ecd268b98bfde81028e88 SHA512 eb9851665382569b44ab5d4bd156b0b4b3751254670282f436f24d524d476e0f49e975357c4e5e15fd49134e2f4871ab68f554ffb45ca6af807102a4f862ffe3
-EBUILD ujson-4.1.0.ebuild 548 BLAKE2B f91faf68acbc52928662d50da4f8946b7f96329c8714bcc860598c3099947e522395df8b262d9bfec2c3cfca05ae30c2f7068d97a2839b26ad619d72714d9c1c SHA512 ec30ca17e5252073e8374822a4df054d424859f12386a8db02e2d1802a7dd3b726b3da2d7a438f5945b7e8dd08da6aa7da842e9e1567bbc3606f352857710b8d
+EBUILD ujson-4.1.0.ebuild 546 BLAKE2B 5915c5336df15af74275a32c137f2e57a89da5aa27150cfff4558cdc80150b611de42692ae5eb4ec012eb45bf9d52452b4b80473e922e57404601a6eac042cb0 SHA512 c151da103220e121531a4767ac66321c5d590c95d15ff0ce23a25f8123ad3933416ba569df854b5c327cd429d6b3b31d44af3c50ea2bdc75625e0416436e9a4c
+EBUILD ujson-4.2.0.ebuild 548 BLAKE2B f91faf68acbc52928662d50da4f8946b7f96329c8714bcc860598c3099947e522395df8b262d9bfec2c3cfca05ae30c2f7068d97a2839b26ad619d72714d9c1c SHA512 ec30ca17e5252073e8374822a4df054d424859f12386a8db02e2d1802a7dd3b726b3da2d7a438f5945b7e8dd08da6aa7da842e9e1567bbc3606f352857710b8d
 MISC metadata.xml 433 BLAKE2B a29140bfbdfd1e2050148c8e7dd901d5e5abd06ed8ad82d47f898ef76f315ed54f48420c860536be70446e5418e424760e8270889690554376bfc3e19f1874f8 SHA512 431436a7aa950d3786d69462d540a7c2486a83e1da4f87c6c71ef1cf73ab2b079f06df0ac4538c2bbe4b56cac1f4b7499fed270b5c0c940ee7fd8bb377324288
diff --git a/dev-python/ujson/ujson-4.1.0.ebuild b/dev-python/ujson/ujson-4.1.0.ebuild
index 3d2e889a9b9d..5573925c5eb8 100644
--- a/dev-python/ujson/ujson-4.1.0.ebuild
+++ b/dev-python/ujson/ujson-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ujson/ujson-4.2.0.ebuild b/dev-python/ujson/ujson-4.2.0.ebuild
new file mode 100644
index 000000000000..3d2e889a9b9d
--- /dev/null
+++ b/dev-python/ujson/ujson-4.2.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_{8..10} 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"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index 6adffe704a03..8090f0302a35 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,3 +1,3 @@
 DIST urdf_parser_py-0.4.5.tar.gz 21512 BLAKE2B aa50f24c35c7919707c89770cb1b60b3d97d1c54e2a613e0fc272b15b023626c0b9ac4b7d7f26ed73859c97e9550d8c0ad32ce8d3804dae0dbbf2877fdfdf1f9 SHA512 d288a26bc776283ea8644c51ed5da14a28b619200269ef7719e894fc4d284ed12eb1932db79083aaf0349219770d5b75b7f4bf6ad2bef21ddaf8089f8263b0b7
-EBUILD urdf_parser_py-0.4.5.ebuild 778 BLAKE2B 9cb02e9a66d2cecd60f0e491e90dabe8efc1fca3b027f332ed30f657870d24593ef8e34ad1dcc35fb15ef921bbfec4da25307b622b1046a55d01bd88c578ca16 SHA512 4d185e4370f72fa13736d99583bb1329eddb881b8e03a98b06a989413fb3a54da95d01571bcdec731342b64958a00ef6d689edb3324e4395ddc846c5552a3679
+EBUILD urdf_parser_py-0.4.5.ebuild 595 BLAKE2B 24dd45983d2526e26219daa91168c21c1a581699920b2af855109c6a1519a875b2465cb28b551b98589f7151cbe271d2f692572dcf8fce5a209863e1bc840f4f SHA512 9a38f8207460cd168eb24f49378f4a3e676698cb4377ee4f7c95f4bee5f1776f30179b06ef078fc18fd68ef4214a3b828ab03ff109713401f457e2d6f3dd4f11
 MISC metadata.xml 385 BLAKE2B 1a79ed702ebd7e2036727dc2d9afb3da48b5a6e58a117052fbcec73626ad10c6f6b8655df88392580fb986ead2955b961d0196204e361c60311c6df5f83242c2 SHA512 cc72be43d6ac14786569ddf01df8b0921e43de202404072e04915525d45cf2e583e8b1eaf3813501995d2171cc77e4fc0be7c31115e2926484ee1c56e8b3c526
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
index eb02edd82cea..7d12842e3722 100644
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="URDF parser for Python"
@@ -13,24 +13,16 @@ SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	)
 "
 
-python_test() {
-	nosetests --with-coverage || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 994f42c10027..2a6575464f73 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,5 @@
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
+DIST urllib3-1.26.7.tar.gz 291350 BLAKE2B 5a95ea4df2e5a66ac7f3059b5453e122ae0e40531a23cb743e5a9574778a370d0cee3cb63fe6b29483b27c4a6ec498266ec5a0434db882ce0a79fb8d8400e08d SHA512 6f5a5e6dd5ff99950fcc051495e0a698153b57e20b6c83d869b54c7fece9616909bcf2fe99efc40815f8722996ad93e430bf765ce5c629b912690c286014b86f
 EBUILD urllib3-1.26.6.ebuild 2028 BLAKE2B 8379275480943cdeb822db1904e5e3e5fd80d4a7899e4590091848f0ebb59ff0c3071fbd047dddfbfaf327cd66875f39303f22e4250b1ff7fa1d951e77f59b5b SHA512 344c80564c9e63aed9095fbad65ddf85bf117ba88d47bc4369dfdc9525b533c648a322ce52443e46724e5060349f68bfc3b84655ff1816b245004793063b9705
+EBUILD urllib3-1.26.7.ebuild 1824 BLAKE2B 7f0789b5e922fe9e31ee813dbb3920066a4137e65116236c636c4107ca9323ec68d608ad2b525b50db8a00a1d78964c76d2348c9509a0afa6f54ed17378f6869 SHA512 548e9b5063bcf48a392c5d2b2b09bcdb3a35c58ad328ac413409efa1661d4fb173b8304234fbda6835c726b7e6c79d3416765bff8c836be80107a19030433575
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.7.ebuild b/dev-python/urllib3/urllib3-1.26.7.ebuild
new file mode 100644
index 000000000000..7a5cdef1ddf0
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{8..10})
+	)
+"
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..10}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# TODO?
+		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_3::test_verified
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+	)
+
+	epytest
+}
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 2118919efa5e..dec4bc62890d 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -4,6 +4,6 @@ DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e
 DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
 EBUILD uvloop-0.15.2.ebuild 1186 BLAKE2B fd0f48927d952bc9708aa93a987a64b5d0eaca3af5394c4874a2fd31212c0d89114da7cc2c92374999a60b8d822e3b22375dfe60832170e02d29e2b891fbfc7f SHA512 682e85299f491a92eed9c5c06baea83778e748c94e2d99240db0c07866829655f5b351aaebe83fa93fede258f42709b6c411df5f5f2d999988af7dbbc631088d
 EBUILD uvloop-0.15.3-r1.ebuild 1406 BLAKE2B ba8d047185aa66f1048ff6fb5f31247e964f48ee39786ce3962177b4b503b12563342020501312e90011b88e265fc4681474a3153548afe225dd9b572284d204 SHA512 6fb3967147daa33b6c9aa00cfd7c37faa2aaac9fdc1554d2be1b21b5c71aada4c2df83723079f3ee4a69eabfadb0491ccd4702f60dc6c6bb8ae8a3daf116d47a
-EBUILD uvloop-0.15.3.ebuild 1194 BLAKE2B 6af2b9ff94aa9213dc90d430e2f814795e0737770d4d8d05e2283219bf1837437cc1dd180a677b6acc3796b2b30cfe5b31835ff892b1f3cdcc5be88aa6f8c645 SHA512 cb50ec260320f110e0a393bebbe0bbfe63f5f815aba8b0c58bc3f7cfa30ee52e5b93460ae9fb1d3579e474c9a7881a269a6f57eabf18de707e5b97b7f6976878
+EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
 EBUILD uvloop-0.16.0.ebuild 1415 BLAKE2B ee8572ccd738b73253be93d0b440fb8d2c99a502fbd6c66a5ffa15e9fcd44d469fffc90742bbee4702dbf47a056d457d3f29cd8944e73e47734c2f7d12668035 SHA512 d67943ef019f211c6974aa63ea8cb29cb5b211bc3264c769031477f1484ae7676da85a89e6e0746e1c08b6e027a7cd0f6ef622d692b9ccb5a39f391b09fdedce
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index 14bd0d99ccb3..53214c0c6779 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index da586a5d8792..cac6da5f72be 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -3,9 +3,13 @@ DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c03
 DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 DIST virtualenv-20.7.1.tar.gz 8714303 BLAKE2B 9ba0714fa842a4d4dc07f8a47536ad95f049c7d4149be7d859af55e6f26aef5d61c80399a8e03de183b7e170ac47eab6bee263c5d3df79eac6a00c63cb368873 SHA512 4d0127ef38655c6370c874a99dc3a92f2d1e50428496878e64aaf52a944f54fb6fc8397c1b4943c40c7cd5c19ee93cccfab735f38d3dcc202372e1081f0ea23f
 DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
+DIST virtualenv-20.8.0.tar.gz 8706991 BLAKE2B fe605a57ccded505a4f89a0b8410cd492fe165dca5b73a818422b14fadd3c3951b753e59a33a1f94dc4ed5c584ef32eae352cc92a0b71570dbdc2388ff792d62 SHA512 7666d3298d732017631fe6199256910becc91fdbfd259dfc32ca74471ed65055fa9e36e8451bd624af287b5a4611659d84e607b3669fd6183ca599929db88666
+DIST virtualenv-20.8.1.tar.gz 8708080 BLAKE2B 703e3e8e07105e4a7154d0e91a13ec2c6b7e37be92e73733a6850c7c1a96711c19b4974bc4f6d3816ea78095b2af807183f53cbc579acad9a7ec6815ea547294 SHA512 db373bdb68efce0ce26cefe508e452b62d4336ccf74f08a51aa61272127c8cd43639443342f42cacb62d7bfd1381bc1204211218c486dfcdb165d8486a2e728b
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
 EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
 EBUILD virtualenv-20.7.0.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 EBUILD virtualenv-20.7.1.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 EBUILD virtualenv-20.7.2.ebuild 4259 BLAKE2B 8a0c40d38de0bcc19a1112fee3352c738516c9586947f8dcab84595467dbb8c39119b93f66fd5ccf3a7bc3b6da1c86647c5d2133a6baf924bf16d559b5fbdff0 SHA512 089298f444f4f667dd5995f3dce29bd25848f55ee560238744d3f2118564e0b3a780c275cffff48f5a8ef16a796f8156040d86a26e4f1c8498cdba235c66136e
+EBUILD virtualenv-20.8.0.ebuild 4266 BLAKE2B 5268eb5253bd16aae9908c79309be6c9e41af015f8adfdfb133670e154aec7181826d3a45b65eb361ac9477fcbfec5be8bdd31371801d41aef489ee4ca9d0932 SHA512 3a25a1fecf2924d9470a9a260662bf882aea6612b97c3af43a37822f5523f0b4b9797913e809accb035904a727dcac22f10fc2fcbf43391baf9f9f0719d75e2d
+EBUILD virtualenv-20.8.1.ebuild 4272 BLAKE2B 1f51d9d30e8b52f106a1b5246ceb14f724961e62759f6136a647c818e761e2de471ff2e788dd1a6d832442c639789889b6d751c4c7b2c4189a830139e15dca6c SHA512 65918cd565777c6eea4716d721afe6e047f8111f8a3735dc20b32812d45f5b11d6c3888d49c535e14460b4626588ae65b44577257d49f3cbd044c93387d18460
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.8.0.ebuild b/dev-python/virtualenv/virtualenv-20.8.0.ebuild
new file mode 100644
index 000000000000..7e18c125fdac
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.8.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${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}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${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}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+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.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--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.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--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
+	epytest ${deselect[@]/#/--deselect }
+}
+
+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.8.1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1.ebuild
new file mode 100644
index 000000000000..2bfbb6c72e50
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.8.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${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}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${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}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+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.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--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.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--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
+	epytest ${deselect[@]/#/--deselect }
+}
+
+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/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index b0afa1be4037..267a9cb7bb14 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,6 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
+DIST voluptuous-0.12.2.tar.gz 48477 BLAKE2B c1cc26b3ac87bcd357d522c8a5210397f1a16e68f812727f2e8ab18c6731d12a04c2e9a96735e25926854eb378feaaeb8bafc083f394b7e9c2dfa2a503abeeb9 SHA512 86193294c1c6a593f6556f23a9a2c093690a06cbdabb7e268db135e36af6a15c113e78f3e05d000276b6ff54b8e17a0a01d589e9232da9eb5320500fdb5757e1
 EBUILD voluptuous-0.12.1.ebuild 538 BLAKE2B 1ef91e2236295fdc43c989cdd0cd49455f2792c966c7f0475d44b240b7ac966b3f5bda39156b979944a97c0ec9fd4c4871cbc2ba302a5c3bdb64b015dd5a8be7 SHA512 d6ff61f338eb41db1eef7b1eff3468263668a212a34376c16cc2b16d03656342e95657b8026f8525d4545c3a9ea4189d594c330799ed91298226e563a585dce2
+EBUILD voluptuous-0.12.2.ebuild 541 BLAKE2B 3a4e7cd5d35fd0b9eeaebf7e3fe45bb41f576b9629092bb8034ce5585f9dca0e22cda05bc6b23029508becac3b6ecd59fef2409b28258a606ce1b4e204279353 SHA512 374ed18f613ee632dee79dd93ef462803c67cd35c6a62d715989c3c0327fd9445788acffe62472213d7160e3b97f0b281cc75f202b7b0a48f185d8388218e6e2
 MISC metadata.xml 716 BLAKE2B 1298492f8a89ce4babc23481dc56da06e4d9007546ed2804fdf42906f6d90d3b1327ee2d54724fa3621a387429544931d30a0334312a68a17edaeba735c9d7b8 SHA512 80636ea29257b1ff070427dc759f9d0abf02ba2037676725627308c69a1e9bc49353c09507523a739c3f07a4cb284e2df76d3935f4f9dadb64005ad7204ddf60
diff --git a/dev-python/voluptuous/voluptuous-0.12.2.ebuild b/dev-python/voluptuous/voluptuous-0.12.2.ebuild
new file mode 100644
index 000000000000..0693690f26b0
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.12.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 95586ebe03f9..0287b3e22fb1 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -6,5 +6,5 @@ DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2
 EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
 EBUILD watchdog-2.1.2.ebuild 1105 BLAKE2B 1761e1cf618be7b611c7483a13a3fc399b0164f064a138361bc4226ac2a7d329dd48aee62afaa4e57776f146c78a8ff960b556ceee0e42a1fb0791e2bf33f6a3 SHA512 98532227f30ee84a91005b303e959cd720aa2cfa508d7c7392a969482e7d1b4917b846a0f358a5f3103a0e937a224d0d2d2e1562aa5f2d249b72806ec9942d42
 EBUILD watchdog-2.1.4.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff
-EBUILD watchdog-2.1.5.ebuild 1052 BLAKE2B 84d05de44f9d97f994c0a5a07a53a1904438c3cb7f81269bc0b3475f0b4e5ecfaacc850c7e0e07ab5f655e51a35edb51d4b84f62884f0f793067851e97c5c47a SHA512 6638e9bb41742f96fe5b0d039e718869f0a15f080ffd1d15573abdde1f3f71fa171b0311040ad4cf135e8a2cd6d728595078cb800fb4986533ae7a01e3af0d00
+EBUILD watchdog-2.1.5.ebuild 1058 BLAKE2B ec5fd44a03155d510f27e5eeee22370b7f4480f1ea703f2bc69289c80f3cd731d540aff6c232a1fb84b0fac8e881cdcec1c258276aab9023ad33e436f22e26a3 SHA512 8ea9694948cfb7a21cc2a8baf2814e94eee2cf06733b7d756ea615e0450d094237af2825e67d3d4fa2502aa08dfd88c7fdb70abfa5575b2fd1dbb00f555ea1b1
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
index 3fea4d2ea7fc..86a4a9f86396 100644
--- a/dev-python/watchdog/watchdog-2.1.5.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 79478b250eae..2590dbc6b8fe 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,5 @@
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
 EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.2.ebuild 1291 BLAKE2B 409128876860780c14ceadc564c6fc91c47f0663e7541b16b98efa7f963a4cfbea875ee0a77492cc931c00dc6a55d67d634c384d5fa98fc2e56a9fb15c454751 SHA512 c3f5e658f2b3ea4ff157065b5b93838b0f07b336bb88df2917bc99600a1fa783a2e61a4e1956a2eea3f9560a5dda43feaee0b587306692d9764decbf27bc329d
+EBUILD wcmatch-8.2.ebuild 1298 BLAKE2B a407e9dc3878ce0d0ee1b14600156b77d5a04de131d21cde63f5761601d9432f2f8e5db3e4a9809b7a429d168df6ea7cbb27656d73ffe0e544cd460315acfd10 SHA512 9435d1e43aa0608eef47e96add8dcd8f45b5c52303ab3eb58e8ba7eeebc27fdc92909a1c08684013715594c1167c9a3391526d729bee951aa2d2b0d6f2881a01
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
index 445b9af017e2..83020ce9dad8 100644
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index ea3d08344efe..3b1eed585af2 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -3,6 +3,5 @@ DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6
 DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
 EBUILD websockets-10.0.ebuild 862 BLAKE2B defa9b15e0de07aa1608e2e15c3b170ad0b780f62e8bf6ce08dd597e9e1abecfdf22f013e594e47743895788380fbb01b7bd6738ebdff34e84ac992d21967e5c SHA512 a6969e66094d3536946b7427385e8a9e8e8b2faeaf0b0ba900c363542eb42eb97ea3889b636ae804f7315d4970fc21e4f72161bf8fece6995cb65ea53d1d2a55
-EBUILD websockets-9.1-r1.ebuild 941 BLAKE2B e040f6f54aa6f0adf312fac4132052d1b241cb726f6b9e820a4d4a53c391e5a313bc3ad29842ddb5fc5ca3497eb349f25e17fc7b01a017bb5e93071fef6dc5a8 SHA512 2ed22498de369b6f3264db0fbfa2d0679a56cf0eb497bb11adfcebee07c2c4b8630f311294c54b5354b3c714ea8d6971d896882bbeda5dd40b9e9e2ca16e98c1
-EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
+EBUILD websockets-9.1-r1.ebuild 936 BLAKE2B a1c0c1796d62c5afd1bb4ad63402f5505577ffff9bf8cd0c4c466a03563fcc9773b2f677766761a54a17d4635afd642ee37a1548a198a656d4b02e9458aa5294 SHA512 dbd6b52719b1acfa9ad7990a70d60846b5077e49a5d0f063db2628136e6e83bfd0826e08a43cee560c2ce745c2fcd1e237ba3dddb6431d7256bf66c12b86ac95
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
index 79f4bfdd411a..b4202f59a401 100644
--- a/dev-python/websockets/websockets-9.1-r1.ebuild
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/websockets/websockets-9.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
deleted file mode 100644
index 5e3b89269e27..000000000000
--- a/dev-python/websockets/websockets-9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 76013db08504..2832618a0c8c 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -5,6 +5,6 @@ DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb
 DIST werkzeug-2.0.1.gh.tar.gz 894795 BLAKE2B cef0c6d704604d8b63d9e9d1ef8f232f97cae6654a4284b66ba7cd97f850df725d644ea11ed898a53f69668247545de86a9c44bc381606c700f4e2611fea7699 SHA512 721a6c3cf8f803c80873f68d94b273da2ddda79b5e83d9283b9af3d3c971bb8c7ac7828c7a60c33b9bded7b05f063810df12fc266ee7d264dc6261100fc97708
 EBUILD werkzeug-1.0.1-r1.ebuild 1352 BLAKE2B 8e8cc3e15bb6f78ff783fcb03ddc54bae9abed4b25012e71766902b9d2bdb3699c53a71608b95b58a625ce6091d61d2745524a38a6f44dcb77490c5d720f2261 SHA512 329fa7ed8319d7eec1321369ad4e19cc345d21a5ab3f5d954bf2bc17a0c1b6336baaa52081086cb08e0dfe9ce032c44e207d25c0de868d8a2b24e88afbd8e3d2
 EBUILD werkzeug-2.0.0.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
-EBUILD werkzeug-2.0.1-r1.ebuild 1163 BLAKE2B a91f72350d2de7606ad87a054ff647f7974935dfc00556cff83e586dcfea8dd0c01f0e31ab0562414006ad4992be67b98acace4f66690efc8788f98f33adcd12 SHA512 2bdea1591e5172e3af373e7ebeaea62a78e4bd79c10b112af3e25528846dce062999a61bc00043ed2ba7feb6ba8c9e23523f9830e4e71d8982eb23491cdf4090
+EBUILD werkzeug-2.0.1-r1.ebuild 1169 BLAKE2B 2a32953488b2934bf6e7548a023156689dd1c36ec6d95cf8d1305ce6f5028ed7dcb591b4f9ccd82adbf60929502a39b191011b95c4badbc84fd7d448186bb64a SHA512 f367265ef139ac60bd6cef591cedc53b2eb6ae47be8432f9ee1c191c4b39bccb085d433795ba43cd62ada1007b280c34f4923ce984930b7296714916830199ca
 EBUILD werkzeug-2.0.1.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
index 2c5d4738a9e6..16a9a2ce257f 100644
--- a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index f0e73a8f3906..f2bbb09eb4a4 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,4 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
-EBUILD wrapt-1.12.1.ebuild 759 BLAKE2B 15b9ed8e46f677f53edac41b0629aa269519625418ac273cd649b564d085685b7cdb7a65897d417c47ae6ec3a335ce879d132d4191f3bce23a2e8b412facf879 SHA512 c2c9305a4a4b266ccb89749cb46679f6b640315a2b4cac7c1239f32a29af8665105cd27d8c87f4ede4a9d6bd22b0addfc0820e21f9fe58d382ad4662bbacac8c
+EBUILD wrapt-1.12.1.ebuild 765 BLAKE2B 54e2d2d3ce53c7c234f48b305bcfd1c0b1c2a4ea00697816871580dc5347f428af4729ba5f7c280e31420ea88221a640430b8e98472ebf2ab85da2ed882e6253 SHA512 0ec5d5a96394877bc7a29b7feedf13a203d7d0c8282d3f452c70a9026234f6888187756232a98e94bb90c459c2d9c90de9000722bb692fa70e826bea8518d640
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index 4ff0e1d5eeee..9e3ccec56fd1 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 0a578a668438..960c04a19b5e 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,8 +1,3 @@
-AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
-DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-DIST WSGIProxy2-0.5.0.tar.gz 16464 BLAKE2B be8f818a1eb3280598427d52b4a7661f5c3cb86a4701e6c3c6b9c57bfde740a0ed616f9f6df8d7f4539c6716898bb5f7ebbf245d72452d84da9862df7cbec761 SHA512 8351225ffe78069f35e636efbd508d3ccd1a3365ac8846bc8fd5712c04869d21c1f9e9e9207d286649713cb9dcbc4770cf41f2c5f06a8d72e86f290211f05c0a
 DIST WSGIProxy2-0.5.1.tar.gz 16565 BLAKE2B 54bdc404111d910af61a59a7da5d47924e1950162dfb79dc0fd221a417c4fbb717dc4e7cf521589e3d087ffce1917449a199f5278bd4410ccce391b9c551eced SHA512 6be9d4893515cc70ee1c5d7b7a29895a8c8b5afd316e2ad05f92fc1fa93e26da22b93440994ec9782f0663ff7073e476f75351fb7955bde93a2b6fbf9f4bf78a
-EBUILD wsgiproxy2-0.4.6-r1.ebuild 1043 BLAKE2B cef79f4a9d625a58c56e698eb57ad16d8545f5bf19f3e0d073b24f21d1153d411fc8e65397f911909cbe9b0bff868f037f41818c19444826899f791fbb4da848 SHA512 d6f6cf33f38a9640952d33287bfa5773ac529740debcae42c029f74ab15048d443aa09b6e87a539c3e9a1f5a20230491ff219a8187ba1ac298321971ff5ff63a
-EBUILD wsgiproxy2-0.5.0.ebuild 795 BLAKE2B fa71db4d81ea28111335afe689d6bd9f83c581dc812ef854f7443d3c92156a143695e2c28cbe546be4bcd6abfc02fdbe9b5053bb61c29623d253fd7bcfef0e2d SHA512 73b77ed0512f5f1e24c90c522bb7df46612d20b54843ccbb645dcd180712c15000f658321dce306780ffe497662bff139341640a82571ef40058594b97effa98
-EBUILD wsgiproxy2-0.5.1.ebuild 768 BLAKE2B 0fe0b0cba896c7fc8ef83385db87ae01297d2120a482175ea0f8d4ef78735bbcae92df2a36bbcc489b144a88b7ef5a8970dbfb1716a0e53dc5a7a0389df8d455 SHA512 f704ac455904dac5d3aa2e8f935783588d58f16ae3ffb96b1ca740a611f153ea5fc6d646a90a6422ee20cb0fbe968c2ed29d37eba20170423f99030bcd94d337
+EBUILD wsgiproxy2-0.5.1.ebuild 760 BLAKE2B 8ef0ec17f84d111f0fca5b9da24d6752e21bbdba634f453842c3da2d28a9d7d66f24e9a6c8eea50f6b797bd520727d578007cd1014cc7f8f53fcedfd442753f4 SHA512 5a9c4d3e50c30f4aad2af47c2d5098b3e55424f11623f4f178517f2aa4dde425cca73753783d5fb04b9f6b34f6c1d5fc2a7bbe55b147c1e4e89c439dbc81bad8
 MISC metadata.xml 338 BLAKE2B ad788fd89f5187ab162da326b7d3351c92f99a61f2a947832ae91c692f2202803fa6a754b05ff8f4ce9d752d28a490870dfbf630ecae510d03b24b2725329261 SHA512 38439e1fe9b37f8b911f42bd7e49b2f9455c7486551a8553e3b7ce91ef2f18ae50a93d535673bbff00b3faccee2082df96ac5e6da076dbc91fcecaf35c803f43
diff --git a/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch b/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch
deleted file mode 100644
index 77515b85b027..000000000000
--- a/dev-python/wsgiproxy2/files/wsgiproxy2-0.4.6-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/wsgiproxy/test_wsgiproxy.py b/wsgiproxy/test_wsgiproxy.py
-index 39355d9..7806d3b 100644
---- a/wsgiproxy/test_wsgiproxy.py
-+++ b/wsgiproxy/test_wsgiproxy.py
-@@ -1,4 +1,6 @@
- # -*- coding: utf-8 -*-
-+import sys
-+import platform
- import unittest
- from wsgiproxy import proxies
- from webtest import TestApp
-@@ -86,6 +88,7 @@ class TestHttplib(unittest.TestCase):
-                             headers=[('Transfer-Encoding', 'chunked')])
-         resp.mustcontain(no='chunked')
- 
-+    @unittest.skipIf(sys.hexversion < 0x3000000 and 'pypy' not in platform.python_implementation().lower(), "broken on cpython2")
-     def test_quoted_utf8_url(self):
-         path = '/targets/NR2F1%C3%82-human/'
-         resp = self.app.get(path)
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
deleted file mode 100644
index 19cda237b3c2..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-	)"
-# Testing also revealed the suite needs latest webtest
-
-PATCHES=(
-	"${FILESDIR}/wsgiproxy2-0.4.6-tests.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -i '/with-coverage/ d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.ebuild
deleted file mode 100644
index 5deefff8482f..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
index 9b16e4f12d82..4607eb3edbb7 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 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"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index fe3c25e1b2e8..d1cc4e638dc3 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,8 +1,6 @@
 AUX xdoctest-0.15.8-pytest-flaky.patch 1126 BLAKE2B a96a688165b8781ce189f8963df89e6ee61b6f53508c78de0b95ab8c519ab5d618a835a78c21abe23d79d34cdd9c7b677430ff3bacb05d26c439afbaf886288d SHA512 20749730d000d50a80c660e536be465463d08162788c470f51721fd793e9cee9eb0138e1c82979dbed67976aec6041adc55c33f8d518ec9cd9eff2652ad8f56c
-DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
-DIST xdoctest-0.15.6.gh.tar.gz 182717 BLAKE2B 39af1bdc381e6b6044321ca1dae8ae893d4af9ba8d595ce5dad0fea7e805420635bc9f9a2c04726cb03a7fa0311eb1df1f93aa59e682790e15a3e119356d7b9a SHA512 5c7a7cfea9a7b37e8e5a383b59896730420dbf737a4217bd19ebe083b48a6d410b0e6713b0e5b9749527ff3992f3d24b83d49622bcde0a68722ecab8337d7040
 DIST xdoctest-0.15.8.gh.tar.gz 185463 BLAKE2B a16578e6d50398ac80d950bcc9a05131880816e2ff3a15bd1489474e532f9b495d099dcea204d8375c884c6957aaaba9b276fbcb65b5717b2850314453f787f7 SHA512 ab4f991ba6e312bf6cf675c3bbeeae87c0666b96c911ee7727f64b8e4c13420bb91e0a7a955ebce73b3fb15625b52bbf1b67c6edfe91234655501060b17723d5
-EBUILD xdoctest-0.15.4.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
-EBUILD xdoctest-0.15.6.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
+DIST xdoctest-0.15.9.gh.tar.gz 190313 BLAKE2B 9980752ad5742a7c4a73418a3ace408c38a6bef6cd43ee5cd1893d6cb195a7c387c5062735b2c903725898ea670e3e6d8e683d4341dcf2dc9e17a2c723107910 SHA512 6a49fbe7f2535ab86ac7047406fbcc9f7e98c964664a95a115c3d945ba8157e4e70ab8c31edae6faee932cfd5e90201d883d9b4b10e2cea9cdc8ff14b5d52d54
 EBUILD xdoctest-0.15.8.ebuild 816 BLAKE2B 12f0e5958db5867207f0d971788601d0e8354fb29e5f4e1b908fd55ada84c0946d61e94152a99b5832453c580e1898e36af677da0eecb72a2cccc98c37cc7931 SHA512 651a24d1ebcbd6168ae4f50c7e5283f654c048a8106b40a416e24d7c9863d600e181f69eb97f2db91122bee99c0ed1b65aa4190820f5a0a9cb772f17afea936e
+EBUILD xdoctest-0.15.9.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/xdoctest-0.15.6.ebuild b/dev-python/xdoctest/xdoctest-0.15.6.ebuild
deleted file mode 100644
index 3f8b3416a702..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme
diff --git a/dev-python/xdoctest/xdoctest-0.15.4.ebuild b/dev-python/xdoctest/xdoctest-0.15.9.ebuild
index 3f8b3416a702..3f8b3416a702 100644
--- a/dev-python/xdoctest/xdoctest-0.15.4.ebuild
+++ b/dev-python/xdoctest/xdoctest-0.15.9.ebuild
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 5e5ca6c84842..d2d696c08a49 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,7 +1,3 @@
-DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
-DIST zeep-4.0.0.tar.gz 163646 BLAKE2B 84547f5ac5bfb42f6bfbe9879ae19466270e7699764a0f91b68d927d1776a040307ccc4f482dce93b765b8b3de191615d6a7b6a3fda38655c312c02a962fc954 SHA512 1ccc59d6ad1979f291cd89d0ac73d7bfc886501d7939c7e788b700454c571deffcc5a93c0e4fee7d6bbce4ad3cc2b309a95da57bcc4551ee5b37111e2fbc0acb
 DIST zeep-4.1.0.tar.gz 160333 BLAKE2B d29db92efe048ba854ff14cde062993c3f334cab6cfc122f6db9aa7a1a490c82f93a50ca5028a5f86e316d9ecf567ac40aef10f3e7d8db89376c7d8dea2a2e23 SHA512 acc54f99d21fe401e06418223591bcf8e7f8819e225f892beb0f6e2a1ee359a0da6f9d0aa4212899197c084af37cc56126879b93a22cdad2458e57674bf66ed5
-EBUILD zeep-3.4.0.ebuild 985 BLAKE2B dd20d8f598eec245a4d0de25bdad0c9e0c734c26743c1b2bbe5be269a18696ce2a58a3ee379362a87bba87a47ba4d1c8ce2d1ba126b34d9a21530e4526e12a7c SHA512 f02ae7598fc9a6b5973ab188c4e26c11dc320cff1991f0865e8b3c5411202a4a4e333031ba629b3c12ab97d70df4f797be676ddb4dc69bfb8eb5d892238fedf6
-EBUILD zeep-4.0.0.ebuild 1507 BLAKE2B c87f6be47414f1f710a7dbb0cd6fc3f59830b339aa05c0ec784d5b486ac661655d317818617cdbb120914b82fe27d563c02e35fcbf2029fa6cab891ab4e6253e SHA512 eaa724e25df23f2509ac768551242513e79cc1417b503889fff39868813ca1805592575e50374bd12772c69b489c9357a3e86a14de4ec07b8e7f9d6de01c8eef
-EBUILD zeep-4.1.0.ebuild 1313 BLAKE2B aa3d79655d6082b4f33633182ae5b0e7b0228f3871dfa64e5423ea2f746e1d6d1b21f99e864fd4c0f149c5d1c27abcac053be9babb1ec954391c663b2aa6a5da SHA512 75e7a6c247bdd9f524f80e06ae0d7cbd74fd54db51ddbf9eac0a035b5c6fd73f09e5125173e4d46c7ea0cffacac04516a78390ed51a79b1e948b34fbe988050b
+EBUILD zeep-4.1.0.ebuild 1312 BLAKE2B a24d6d3d7046d0284e9f2f97ef9ab16d060b8bd763c8e725a5cee1cbdb89569433380bd7c1c8c81604c73c24ed6f3d9cad39b0d713fec07e8d84acfaf995b46f SHA512 801f4700513a5d9eadc688276c9f5dee9b76083758d663bc26a7ae8978cf78786795ced33ccbe6ac25c445eac3b5556a11233dc205d8b6e23402d56b487dcef8
 MISC metadata.xml 485 BLAKE2B 7bf7fe5fa8c3803d58acb9b572a9b8cf5250f5bb95c95eb385748bd87da46fed52a6c13c48c5c623c61256289b598873c05c7bd24aeac331651708c365974557 SHA512 e4af11481fdcdc75c3e5f31d457707c7ea8baacee3c0e912a93b2d224e60685d821347f6cb7f6f12483e2051043ea25f5560446ef11f210cdd41b13e1e4e1fcc
diff --git a/dev-python/zeep/zeep-3.4.0.ebuild b/dev-python/zeep/zeep-3.4.0.ebuild
deleted file mode 100644
index 06223e76cc02..000000000000
--- a/dev-python/zeep/zeep-3.4.0.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} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="http://docs.python-zeep.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="async"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES )
diff --git a/dev-python/zeep/zeep-4.0.0.ebuild b/dev-python/zeep/zeep-4.0.0.ebuild
deleted file mode 100644
index fb84f87366ce..000000000000
--- a/dev-python/zeep/zeep-4.0.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="http://docs.python-zeep.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="async"
-
-# TODO: remove six dependency when this is merged:
-# https://github.com/mvantellingen/python-zeep/pull/1250
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aioresponses[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/python-xmlsec[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/zeep/zeep-4.1.0.ebuild b/dev-python/zeep/zeep-4.1.0.ebuild
index 751f99d24f08..579382f9cb1c 100644
--- a/dev-python/zeep/zeep-4.1.0.ebuild
+++ b/dev-python/zeep/zeep-4.1.0.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="http://docs.python-zeep.org/"
+HOMEPAGE="https://docs.python-zeep.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="async"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 3d1f7bf77e38..c09f5e0ca6a7 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,11 +1,11 @@
-DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26d8a52b6329500a1a18354148590fdb47988f200b0658a41e18b78694cd9f95f1322cce0ff289a795bf9459ab6d383d5ee13f9 SHA512 fa6dd453ea22beb113c53941ce750e214da3211b6fc14d8b0cb575b927cff14759c49fec4e9ada4a2fd4ebc0bb3b0b355a2454ca0e128a3213fc8be41f096af7
 DIST python-zeroconf-0.35.1.gh.tar.gz 127099 BLAKE2B dc09dadaeaac64d8517de407ddcfffc4152e366430c492d4ab562c56afa3264c33a26373f249bbddd969bb28dbc5c1b7513e59c0ebb728c12a77fb9d428e4f0a SHA512 27386cd425928821080c9c6fd2babdcfc001cc4583ef4c699169e3818f6bb8536f712cf7959e6003a6aaf40e85b5337a8a5abcfdf686455dee577cfa61270fb7
-DIST python-zeroconf-0.36.1.gh.tar.gz 128104 BLAKE2B a5f2fdf35dd8c51e727ad1f4cd9ba442f2b99fd7ecc6ce0ce9cb0331997f445be90bba17571cec5ec0f59b64268241abacb5aee39134427098902b8d592494c6 SHA512 c568dd836a101a47ef74318154cd6c7fe2eb93c674450596f8e6ec4b7cfb66740126cc994b8f4d98458dd64a16c971ebab29b0877366396b8f5fabd03341107c
-DIST python-zeroconf-0.36.2.gh.tar.gz 129052 BLAKE2B 4bdc4ac13064e162590af12da2d89cd566fbe749f1b11ebef210b2adbe7e33e75ff0e95d3ed11f7d045e016fff525c9a7b9124804d741160b0073016f4757d09 SHA512 2f2a7a87afa07907ed3aa3cd79d2f2e9b61e82193301f219f0505831349b003bca1ae2b6fc1dc71fcf6cb9cfb849413f9766ef88e3955fc569ad84fb9e5e5b60
-DIST python-zeroconf-0.36.3.gh.tar.gz 128887 BLAKE2B 57fa2359f5086eff9069334738db7515607309849b5d1e6bedfa16a7d24a12c068cf139d6885a85c418bf22c1033fa437670be6cce09b758af6d073f3cb37123 SHA512 a93799713ee7c4d507b350b4074bca23556275b1a1a14795a621f2cd9c10cf711fd80333e5685dae753207db265ab454a5bfe965cf44de77121bccd5ce8e1625
-EBUILD zeroconf-0.33.4.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
-EBUILD zeroconf-0.35.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
-EBUILD zeroconf-0.36.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
-EBUILD zeroconf-0.36.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
-EBUILD zeroconf-0.36.3.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
+DIST python-zeroconf-0.36.4.gh.tar.gz 128860 BLAKE2B ee6d02b583933404b6a1945235c1708e74211ae985a8c8e493098c59fe7003ef09223a87f9db87c78a22d0c1823748ea9f3aa1ca106a340d5df5a3ca6cfcb0bf SHA512 b1bfba10f374d006979ab0a626b9c3e9c0be25b07ad0f5242c463507b221cabfe11d18b02b29edc68f14b838b738b9a1265445fb8988e3243889454f17b3d7f3
+DIST python-zeroconf-0.36.5.gh.tar.gz 129395 BLAKE2B 3e62da5f38bd0648ed300c2ecea712121cc3b8707871cf3de325cce0348b5972e538e70d74acfccb8540fa8253db992670902c13ac4b81928a47df4fa27d248e SHA512 ef51541da2c8d6703644750572d55093230ccf776b1a5bd67e0a6fa0f5f9762056b4cd7124e88efbee27ca768bbdf3e54fd051432d252f45376b7354bab4c50d
+DIST python-zeroconf-0.36.6.gh.tar.gz 129469 BLAKE2B f52348d8fb5a2ed865bc946ad52ea0df474fd59ca5735411381366f08b2a5e1b673916256871128cc9f3a7fef1e72e2ea35fc113e5e41fe63f67659b3cc8f0ba SHA512 fe8d9026e9a19d267c7e734df51253bf69d5ca38b79b00b752886d59288073e8a4b9de40bbd2324064a574f40bec147c8b44d4f3395e480794600c440f2d7c9c
+DIST python-zeroconf-0.36.7.gh.tar.gz 129775 BLAKE2B 9b8ea59e2e62de4476c6b014b925b000b3c47cd9f965a23dd1c6a15b3a4f1ac7a4473eb6b9953d8893a445ffefcd1167c1e32b87b210ed3777fb046b3bd584f4 SHA512 c589c58c92d649c42f9a752d080c2b36a1fcc0c892ab6868cc79a3727087dd95f3e7b779ffd8b040d649453b8c70de4214d76d0f6c16c46a67628545c2472a54
+EBUILD zeroconf-0.35.1.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
+EBUILD zeroconf-0.36.4.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
+EBUILD zeroconf-0.36.5.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
+EBUILD zeroconf-0.36.6.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
+EBUILD zeroconf-0.36.7.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.35.1.ebuild b/dev-python/zeroconf/zeroconf-0.35.1.ebuild
index 0e1b2943b16e..8078abee7f30 100644
--- a/dev-python/zeroconf/zeroconf-0.35.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.35.1.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/zeroconf/zeroconf-0.36.3.ebuild b/dev-python/zeroconf/zeroconf-0.36.4.ebuild
index b416d399c1d2..b416d399c1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.36.3.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.36.4.ebuild
diff --git a/dev-python/zeroconf/zeroconf-0.36.1.ebuild b/dev-python/zeroconf/zeroconf-0.36.5.ebuild
index 0e1b2943b16e..b416d399c1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.36.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.36.5.ebuild
@@ -24,16 +24,12 @@ RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
diff --git a/dev-python/zeroconf/zeroconf-0.36.2.ebuild b/dev-python/zeroconf/zeroconf-0.36.6.ebuild
index 0e1b2943b16e..b416d399c1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.36.2.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.36.6.ebuild
@@ -24,16 +24,12 @@ RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
diff --git a/dev-python/zeroconf/zeroconf-0.33.4.ebuild b/dev-python/zeroconf/zeroconf-0.36.7.ebuild
index 8078abee7f30..b416d399c1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.33.4.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.36.7.ebuild
@@ -18,22 +18,18 @@ 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}]"
 
 distutils_enable_tests pytest
 
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index a37785be2200..479e5cc8e6b2 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,4 @@
 DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
+EBUILD zope-configuration-4.4.0-r1.ebuild 1014 BLAKE2B 9c792c098ed2b414042e796dfa524c9efd1d44e2d49d0150e9442622a613f28671cad3575f19a5433bf893f7f0f97a0f974295dd92edf6458d051ea6d3e2cdbc SHA512 43e69c9e3c40596321b6c28502b42408455128ee7ff74070db0a135ba99c6c136ddf3ff7708ce45f7cac342d89d8dc90bd1228badf7f76382fe0e2cd61a9bd4b
 EBUILD zope-configuration-4.4.0.ebuild 871 BLAKE2B ecd10d860abe3acf81185c337bad36e5bf9130c5ceedcdc392196b18267e1f07844b77054c9c3ecae25d2c0d85976e3a829716fb75a9a223c7c26f123d27a54d SHA512 aecaf445c6b422184641d4aba881000c7d986b4a8a15ef7447caa560ffa04d3d9921d01a77be2bc56b5237e73674ad093187f97737813059dfaa6027644d3e44
 MISC metadata.xml 671 BLAKE2B ebe65df9424a7f5e93a1095224dcbed784cdcef2f463dd9ee6e9580883ff93ea11e72463a897d5a1756c7f5c4f6c9fff562ba5d30dd8de8913aec58547ce3280 SHA512 e72a1d422e9c322fd92bd53f4bd8a5d9f0e5505fdb18dec30b9605d8ef5b943c1893f0fa78398fb8610fd7f3b9bcee5a602a3ce1cef8821239cd9681a340dbeb
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..843acb2a6151
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
@@ -0,0 +1,45 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Configuration Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.configuration
+	https://docs.zope.org/zope.configuration/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest src
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 9fce5d275c2d..9bb1ea44f4ac 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,3 @@
 DIST zope.schema-6.1.0.tar.gz 103042 BLAKE2B 1892e5724b6f947cda40567f0694821d49ee66239af51d13d331dbb55b8251352670a7b37ff77ad6b36da7c18a8614338364e43f1fcf92464121d6b5daf65985 SHA512 a832bc779195dc3f1ce812610adc97205a4074c9523d70ee4019e03285f7d94df24f165a834e65cf26b06fc48754b76189299e58af5d4888a4abb15dc0d64ec0
-EBUILD zope-schema-6.1.0.ebuild 998 BLAKE2B 31e4fa5827804c58540197638a92f9a14dd2c85506a14c8b07f93338f8e4f49c9490ffc552a62b4072b18622089bdc1ecc856589274bba5e8f63d3c07c23f5d6 SHA512 0b7257381cabce43ca9eb848d4584ea8c519628fb13ede90e20a4aa32c97c5e02ac5678a1692df349b0d5252d744cd117de7e2f694cfa09086a8eab1bd9245bc
+EBUILD zope-schema-6.1.0.ebuild 983 BLAKE2B 9684366f58049c978f5635cb1b3315eed86ed6271132b1bddfac157c550916a28c83098b8b8432ce97c80ae6ef59941d28ef8d125ccf9ebacaac5c9631f19077 SHA512 d035f6e1599d78ce0a125432f5e5a30597434415caf6c818bd740b7b5c63e2d64c2ca455308022a9a3cf7426dd23c3abfb4aba51ee0fb76883ed875e1db6939e
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.1.0.ebuild b/dev-python/zope-schema/zope-schema-6.1.0.ebuild
index f137c80de517..26909a7d20b4 100644
--- a/dev-python/zope-schema/zope-schema-6.1.0.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope schema Architecture"
 HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
@@ -27,10 +27,13 @@ BDEPEND="
 	test? (
 		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
 		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest src
+}
 
 python_install_all() {
 	distutils-r1_python_install_all
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /dev-python
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)