gentoo resync : 08.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
commit: e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree: 4c5f7db60483518201fef36f8cc0712789a08db2 /dev-python
parent: 391b5b359a346aff490103da7dddc85047f83830 (diff)
518 files changed, 4913 insertions, 3792 deletions
diff --git a/dev-python/Faker/Faker-8.14.1.ebuild b/dev-python/Faker/Faker-8.14.1.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-8.14.1.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/Faker-8.16.0.ebuild b/dev-python/Faker/Faker-8.16.0.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-8.16.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/Faker-9.0.0.ebuild b/dev-python/Faker/Faker-9.0.0.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-9.0.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/Faker-9.2.0.ebuild b/dev-python/Faker/Faker-9.2.0.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-9.2.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 4c6746e03a4c..a6936e5c6a1f 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,8 +2,16 @@ DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff
 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
+DIST Faker-8.14.1.tar.gz 1163121 BLAKE2B c4f42696f34872630a5cfc0a5203ef2983ee78229d88c90ade1ca0f180b4c441932c8ecb87088c35f297ea5083b3e0af328912c98c1b2a8aa5505c87e94f1190 SHA512 6e2e0fc182a084ee6c9c78baa323ce3574a89df9f1bf071f7c3210516e052b6428b367c65f7db51e3eb40d6f67eb4d75ec8b1ecd10648e40fd6bb170ab49b6c9
+DIST Faker-8.16.0.tar.gz 1164636 BLAKE2B 162c66e09eeac7c52fd8d289c10b8b9694dca955c17c00d0fd5772da3b68af8a86bd997df0acae1c104a6de4fa3789c95236544725c8094b9abb1432ea2c9044 SHA512 bb74d3d03a8afef8f961a71921f41650d2fb7faebc0be18fc8da341f2cd67746488109a09a2506210a86379eb65423d47054933901de51f33859ab2797f96c2f
+DIST Faker-9.0.0.tar.gz 1164493 BLAKE2B e87a1ccf15ae9db6b263bd229987deb00485a1d43fb20b3c6155ea5a10ef132d1d5def3f66bf00377ecb7db2f9ae24eb259b768d3713257b3c3832cf98f8fc4d SHA512 ba20a218693b14df8cb7d1387695ed8026618b410f0caacc658995ca9235af11d4114a6737aeb5788f0aa8c499e6701acd21983b52da5a5823438c230a5808ef
+DIST Faker-9.2.0.tar.gz 1166874 BLAKE2B 8590431fea1179a2e6459ae9b2d6d55e8b95a91848c26b6f0d9035be2568c5f3ca34708b4bbef7d06b53855c1c1fe800ad723f90ee330f9fab4c13e00530ae60 SHA512 1688bde73002419d73924435fc11b0346cafeae8f3d80d8162c7742859258f1ce34fb3b549d11d92e114fbdbb22c51776a9674f04b4f170a42cb2919ed3b54e4
 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
+EBUILD Faker-8.14.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+EBUILD Faker-8.16.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+EBUILD Faker-9.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+EBUILD Faker-9.2.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8d1e4f486274..90d88f6d0554 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index e8daa98beb37..d2b6641f532e 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,5 @@
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720 SHA512 26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
+DIST PyQt-builder-1.11.0.tar.gz 5704150 BLAKE2B 4706e8c8663356e7c70b60c19c45db726de6b7b1b05f218aba5a966318cea497219f685f295b9069c0059e88eca053a97717a7a52add7c5ea59820bff2b810ea SHA512 4eeafaa725afeffa5794cc47e733ecfa99887c0f14f461843f4b8c71fbdb2ecf58ba05ca64dbec3e00bb2c192a25e29ee78e93d0bad742becb3379bd357e8e68
 EBUILD PyQt-builder-1.10.3.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
+EBUILD PyQt-builder-1.11.0.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
new file mode 100644
index 000000000000..4d69521c2f08
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.11.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
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index ba5e63bd1858..b8a9cb93c035 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,8 +1,10 @@
 AUX QtPy-1.9.0-python3_9.patch 401 BLAKE2B a28d4344fd4dfed3270d4dcfeae7df6a12ed38fcab779dcbf3e43798a0385960b3fa45e5077ef9c7d00cb9fe69e84653668a09c50c5ba9dfb5eb13e7b23cb554 SHA512 c0996c53cd3b7401986c11510cbe9717ec7448c9b4d6acfed43d64c2c4035e6d474c90783f7d26d8eb530c9ad91297e02d4b27c95fc1ed026344273be455404e
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
 DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
+DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.10.0.ebuild 5708 BLAKE2B 84fe6cf1d5f3a309a6c4ff3fbcd6c7223b785c9d1fce5086102b4be37c2e98047ffcd836ba66ffcba7aab3d6abefb583cdce1ed79096e74381549b75aa312448 SHA512 335a76cf409e529e47d275b2e8da1437c59d5730b1d0429e5e7605cc124292298225fa53af8ccaa8344aa9278823ec2756dcbb6c4f4344e53dbef06efe9c4723
 EBUILD QtPy-1.11.1.ebuild 5707 BLAKE2B c3efe90e18116a2e051898a7f649f2f15011bd8ecc78a459ac61b56faba8040529e25b5b203cd63c4e7d2445201896ed8c29d72e80899a816790c530258bd6de SHA512 031ecbe5877c6bc9cfd5aec6328882e800a47c3edacd146e5de9dfdd6a4f017f283e27bc750e60ea402831c786995df7ca516f5082c726a52e790571bb3a8884
+EBUILD QtPy-1.11.2.ebuild 5707 BLAKE2B c3efe90e18116a2e051898a7f649f2f15011bd8ecc78a459ac61b56faba8040529e25b5b203cd63c4e7d2445201896ed8c29d72e80899a816790c530258bd6de SHA512 031ecbe5877c6bc9cfd5aec6328882e800a47c3edacd146e5de9dfdd6a4f017f283e27bc750e60ea402831c786995df7ca516f5082c726a52e790571bb3a8884
 EBUILD QtPy-1.9.0-r5.ebuild 5740 BLAKE2B 8209c68896c4af894eb6367bd28800c7e73b18fdad3699cd2c730ade95e76d175b40597145dec8edd8b4ac873bc721af329ebbc69d0dbdcf16e17450b80fdab5 SHA512 e1e78067fb64d692b1b46aae1853f977b9e950a6f8d81ea2344dc87f74b5b953f2a2385080a3cc241329163906415733a1873ccf1dd7b3212ef907f4cfb883d4
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
new file mode 100644
index 000000000000..4f256a44dd52
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.2.ebuild
@@ -0,0 +1,158 @@
+# 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 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+# PySide2 does not support python3_10, nor is it likely that it will in the
+# future since upstream appears to be focussing on PySide6 for Qt6 instead
+# (which is compatible with python3_10). So if we want to use python3_10
+# we have to force disable pyside2.
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	python_targets_python3_10? ( pyqt5 !pyside2 )
+"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+			dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+			dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+			dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+			declarative? ( dev-python/pyside2[qml,quick] )
+			' python3_{7..9} )
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyside2? (
+			$(python_gen_cond_dep '
+				dev-python/pyside2[${PYTHON_USEDEP}]
+				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+				dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+				dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+				dev-python/pyside2[xml,xmlpatterns]
+				' python3_{7..9} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	# Disable outdated PyQt4 and PySide
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 26dd3d016aad..b4f02e1d53b5 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,9 +1,7 @@
-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
+DIST alembic-1.7.4.tar.gz 1227696 BLAKE2B 1bd11a9dc870dbf861b5c09262dbb0edcb413d6e8f86e6ddcd60d8aceebeb4bfeea9ef7ac6a389c10bded0e9cf478df313c7913ad5995580b88cdf9499e89f18 SHA512 7e3fea729d389c01a4c7756d83d54dacad7ff5b485e80e450da6584f8def14c478e5701bd97290c76894151aada5d4ae2b2cea360c3ff8e48f25a95fa1d19d79
+EBUILD alembic-1.7.1.ebuild 919 BLAKE2B fb38639b664817305d82ddf3b7e798a84ff17324c1dd7dc288dd4e6c1dc0bed8607b3435fadf6397287122189274b1507ff7250d2b59efd335138ce317aa23e4 SHA512 414de10aaba50d97eba309bc5b3b0f6e71a19a037ad28a4965d5ae71622b87a380152f73c720b7d0e769acd7554f1b5117a892c2e81e8b8cf80c8d390d9ea1ba
 EBUILD alembic-1.7.3.ebuild 921 BLAKE2B fb76bdf6bbae67b9023a2dc614f1401ad6ef0015743691b00e6234cc9d24e834ea23b3e9506894193b0459068a86bea2a5dbe5f166eda871821b22b95539d684 SHA512 695beb9a442737726d59daf1470d4ea1bc03dc64d480aa3024bafd7cf976ae223b0020288176e750008d29bce344a09d655ede1dac7c3fbb74d1573eca8e4414
+EBUILD alembic-1.7.4.ebuild 886 BLAKE2B c4c11739ed63ca479c11bb62ea58f1d9c850f0a17c77e8193141ac9654e0fd431254be55f7ff858aa54473a6c550f94bc7d1d18ca6412c3e21a191826b72842f SHA512 07d21a9e28aafed1fce157e643407300823341841ce47580080fbc6244f971e03084ec6d7cb8d3f90a5b002ffb14ed8e3b5d4017aefb8704b1ea807218e536fa
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.6.5.ebuild b/dev-python/alembic/alembic-1.6.5.ebuild
deleted file mode 100644
index 362eedb6a1e7..000000000000
--- a/dev-python/alembic/alembic-1.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.7.1.ebuild b/dev-python/alembic/alembic-1.7.1.ebuild
index 08c9b69bc08a..653f1ccc7b78 100644
--- a/dev-python/alembic/alembic-1.7.1.ebuild
+++ b/dev-python/alembic/alembic-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.7.0.ebuild b/dev-python/alembic/alembic-1.7.4.ebuild
index 08c9b69bc08a..41da578d7e6a 100644
--- a/dev-python/alembic/alembic-1.7.0.ebuild
+++ b/dev-python/alembic/alembic-1.7.4.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
 	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)
 "
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 281656ed7b9c..41808e9bb85c 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,3 +1,7 @@
 DIST apipkg-2.0.0.gh.tar.gz 11724 BLAKE2B 3ad0ab8915bef0632b522de662c9c2424e0ba9c13c0d9bb415d66112ccd0621a226b546c9d248939e83f16311069fbe8170224b8e2e373f194df8d6654671347 SHA512 d1c336f835d28a11640904a6ae63b15a01c3bde2e100eb2ed31877fc7037e538e0fe1d107556d48fb288c3b72a53586122c4ec17e089179aadc222ae80938c53
+DIST apipkg-2.0.1.gh.tar.gz 12683 BLAKE2B 6c918bf4dcea7cfdf57a181a41abe9fec4d166fb0be56f24a5195dc665115100012aadf57c0aad887ffad0f76ebf13d77e3855fcd5e775abbb922f535eaa3bc3 SHA512 8366d23528216421d094f79d9b97a560e7fe449552761d3f5a3e3308bc80c3a963aebb2475ec4218bef45816ce2fc014cafa60db3af304e2a7c9eae09ef28600
+DIST apipkg-2.1.0.gh.tar.gz 13489 BLAKE2B 2ad670c6971b3fd6f56e35d3dceed25cd3950efbd9fb562595ea4313d50e9711a6099458eba3720dd5405335bef0ad1932bb2ad1e6db65c93df9f3b57b5caf56 SHA512 af74217f283be6dd1a674e12a2fc95739f90d9783caa095eccdea814a1da70b3cc1f756c2e150e5e5e75d1207857071aff97aa10bb2eadc83e04c42954c47df5
 EBUILD apipkg-2.0.0.ebuild 655 BLAKE2B 90893a142083e3b483f15c8f4de5edfee1bf393d9153085fa103e91394194c7f909cd74af8edd2e911ad2f1413dafc780a5bb48b64b6a49cd874e84fb229a2c6 SHA512 e097ef51e0c9249b8d4bdd8af4a3deea23ebdb69a4dad9567d2f91e367ac1daf41731b5701a41784b7dea98f47b839975dfe6798fc3d6ae53f78aec7af349ebc
+EBUILD apipkg-2.0.1.ebuild 663 BLAKE2B cb07cff0677a3cf0ed13bed0d610d7c1322e3dfc13abdf7bbe5226662bbd47cb48922597e148ceee8dc666ac5e66c99207ab7e8d0cd6c3d7644a7785a7e0cf32 SHA512 b8364b4957acad127efd8f180c0615775abe6bf0ebc71d59edaf18792d9abb6058f51bbcbee875354f26d0e97d063bd277717f1942b114ef7d3eaa1635e155a9
+EBUILD apipkg-2.1.0.ebuild 663 BLAKE2B cb07cff0677a3cf0ed13bed0d610d7c1322e3dfc13abdf7bbe5226662bbd47cb48922597e148ceee8dc666ac5e66c99207ab7e8d0cd6c3d7644a7785a7e0cf32 SHA512 b8364b4957acad127efd8f180c0615775abe6bf0ebc71d59edaf18792d9abb6058f51bbcbee875354f26d0e97d063bd277717f1942b114ef7d3eaa1635e155a9
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-2.0.1.ebuild b/dev-python/apipkg/apipkg-2.0.1.ebuild
new file mode 100644
index 000000000000..521b20593649
--- /dev/null
+++ b/dev-python/apipkg/apipkg-2.0.1.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/apipkg/apipkg-2.1.0.ebuild b/dev-python/apipkg/apipkg-2.1.0.ebuild
new file mode 100644
index 000000000000..521b20593649
--- /dev/null
+++ b/dev-python/apipkg/apipkg-2.1.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/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 540c2236d953..dc730e252021 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,5 +1,3 @@
-DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
 DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a59f453c3c0d0e5f2c437e7a62132abf86ab6baa8bdd656ad28d00a151296a66211d365c0afe228821c8c1ff1a0a66c46 SHA512 bbfebd2c075f360a6c1c187c0789be2aae7480b9398f36db7bdfe74f288d9e00b44a788918c54f4cc8bb1947136ab0493f61975de408c482a5131e2bf1a8f4d0
-EBUILD argon2-cffi-20.1.0.ebuild 991 BLAKE2B 55329181f3991616541d4b970ec0d9f83f2e14980dd54e4a52ac96c407577d7d241273645c1051804bef21570a3f5edab1d073c2809d72ae4d30cf34b1d885f0 SHA512 967156be754cac67f2d85213fe7ab1931baf9e5a7548b3deef83aff7d81d7de1e54f94b66dea1eeb20a88de8ae8c6a75cc0981f801b931dae81c8bb05b98b0ee
-EBUILD argon2-cffi-21.1.0.ebuild 738 BLAKE2B 513b126e5812d03a40375c0cd42014c24e13f7ec073012a55d61c50964918ef7efba51b67636836ac970d589c992af9e2f4eae89ad84bd298f89172f1406a843 SHA512 582e465eb8d3afdcc3b67b2c2c05f1491a622cd0ca3b0be318bba28ab3dd0830419395408e36cb3e36dba1c21877fe86329223b7005b9f3e964bab119910eb13
+EBUILD argon2-cffi-21.1.0.ebuild 734 BLAKE2B bdffd9fc8647fca7ce2760fd15c60836952791dd2c72903a241e9a590e0d74be418c74fa28b49bf43f8fd00381cb19ab3d113e409f591e8f1924e288f45877ca SHA512 abb98dae7a6ea2316fe83050fcc7fc40b16cf657c2394cf19c1af0f6cdf0a0649d39e5ae446b25f793d46c964895b4c0edc5bd3dfb810e61011fef1cc7b24cca
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
deleted file mode 100644
index b25341a87d64..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ /dev/null
@@ -1,44 +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="CFFI bindings to the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2-cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	app-crypt/argon2:=
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_configure_all() {
-	export ARGON2_CFFI_USE_SYSTEM=1
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# fails due to changed Enum repr
-		tests/test_utils.py::TestParameters::test_repr
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
index 65e3cb3dfc14..eff4880831a0 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 8da157b8cc73..e048fe715c4f 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,3 @@
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
-EBUILD arrow-1.1.1.ebuild 790 BLAKE2B 612ba06d20f3d7b7d77c450a700fc1b00d1a164ae6714b571a8fa8882ba724d8e7d551fbe7779d2bab7e88dc2836a1e18ae6fac31e1f07eaa72f80286e773f6e SHA512 d70cd7567fd752c99dbc5c4ad58e90a1a4844de911930765c9505576e8952a21588c98b8f6b8b2231b12ba2af9b8f67d6e42466e854b292374df9c1d82001de4
+EBUILD arrow-1.1.1.ebuild 809 BLAKE2B 75f6ebe3a05276383eff4d14d83bdfa66ed81e687d6ae913a654942a5862d54c4f127bb61c9f1ff585b3697321bffb32ebd0a9787ef27dbee6cbacdc85cc354e SHA512 a45e5a2e24b058cce22639c6a4560762a9036dba3a73f94908fe82066da3d337ee561f19056e826c4885ff5b6f31068bdfaf3a90d76d3faa79d998b353199d8d
 MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 768a457ac45f..5c51eec7473d 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.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 ~arm ~arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index eb0b211131b7..e6c3df13edac 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,9 @@
 DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
 DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
 DIST astroid-2.8.0.tar.gz 384821 BLAKE2B 74150d67fd883b2bd4356c49c9c1b148a5e98b4d219405e745474c536691276d029bf8a0bb9275ab9df3d09a9b3492a147c67676ab1f80c9c7d3ad10f240bec4 SHA512 0f14f094a6dc753f0171b462f856fb1bfb1b979a8853f76da14beb04a5b02662f6b4e63c3241ce2c9a37f63490a86300152cbe9509c43e0209d5ef536d693b08
+DIST astroid-2.8.2.tar.gz 388957 BLAKE2B 0e91b1978d8715f91b24e1d7f817bf7db3c4ca8c2c7af09f5df98b5a40c9307d54ec4051f08aa5062ffe51e5c396ae2e38078e1e124e23855fc207e34638719c SHA512 15b73c24517217ab54157d6568abf2c81c70e47980aece58eaf1d946e9d5d44316467ddaf2153fd8f6278cea80cfd09dc31783b215305c71c09d1e4e6f406862
 EBUILD astroid-2.6.6.ebuild 1230 BLAKE2B 31bd5783bba20a5c1851a2961a8ef2dc8485d24745dd3129b7138380d623a7a65447d6c84a60fc14911efb7b3731e38f266083d08661e1e032034ed9311feb86 SHA512 dfcfc505644d4049757ba68d4921214271ccacbfd4dd52d1321c8c4792fa4e1ac8f5552f412ab1495657bffcd8e0e47f1d376d2d2300b8cb9e03b39b06b0a9ef
 EBUILD astroid-2.7.3.ebuild 1236 BLAKE2B 27aa5cc29d38dbb2e24b244313d813705584113732c03010fe5af060ba83044d1245d97febcdc9515e70ab4353d545ff0d2e19cc2e336bb26fe5299066f2fde7 SHA512 df717fbd058beb502048bf26e51c40794ffb9d8b93996391d8180c4b7520a1368e1e453b01e3cdd424e17eae1aa345d60a417158acb833bffe5fa7aee45c2363
 EBUILD astroid-2.8.0.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
+EBUILD astroid-2.8.2.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.8.2.ebuild b/dev-python/astroid/astroid-2.8.2.ebuild
new file mode 100644
index 000000000000..a5c9c9f43cf4
--- /dev/null
+++ b/dev-python/astroid/astroid-2.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+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}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index 4775d6509278..044e2183545f 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,5 +1,5 @@
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 AUX astunparse-1.6.3-py39.patch 2466 BLAKE2B 8779b2a98e801f675f67e2f57b283401aa577f76bfc9633c0f17af9ee9c11f1508c3b23f4bba12040012e9796f887bb7253a40603f1777a1f8cb95c5cd080c4f SHA512 6bd1a46f48e96634f67ffbd49fce4a3e9251f030a1a4298455bbe92f09bdaf1d03ce807b9bd44b8e04218d80df72974570f2c4de00e617dc6557ce537fb2abcf
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
-EBUILD astunparse-1.6.3.ebuild 667 BLAKE2B fed9add792390e5557437b0178081b3cf8d84135a67be1d1e28a20ef45dd82735c103811025652b83b0b375515eff71e254cc38c75a9973e2b046e8bae975dbd SHA512 b6c73cf423d092e5f6b76caf82a48dc83ccea05aedda63f9e899197e8acfdf4bb5c2418fa223ef0383914a21082c37f725d1a0e9995123f480232f8df881cac5
+EBUILD astunparse-1.6.3.ebuild 681 BLAKE2B a973a0d0d626cb4d8f0f002f0b4dff2805c3e3a639a16a7db20b3d5c5fe04857f1716e00c39b20e8cfd1387c0a06f5ee7d463298ffa778770933557a57ba56cb SHA512 7e05db2195a4ada4cbaa2ceb98b184e6a7eadc36fe325dde1e60be3c5b3b25abf5750558b1ecfd33a90d8b8765104ff12a14af4473787f0cb40510c351bdfff7
 MISC metadata.xml 423 BLAKE2B 2c4953145f52c0378af4a7170621e9d4060aaf20ea8a2adb5456cfecb4a6c3c223f1d5b75972a7512c4aac8210e1f62b8c0e07089e09c372e1e8564769aac9dc SHA512 d693f6f76e67227bb63323d8d6564ad3727c193e00aa5bd8ceae1ea99bb6dbd35521d97e332220a3541b0e5369928b491385ec2278279b410504920148a923b1
diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
index e8dd6a0f9b79..9b4e339f3732 100644
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 5b03fd231037..ba25fc212992 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,3 @@
 DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
-EBUILD autobahn-21.3.1.ebuild 3248 BLAKE2B 8a5968c9e2106742cf03e6f38d3f5aa374558695424dc029269969689e5311493e64a6a88e5f75ff8cb614dabd44c3ce444f5397b60fe3199d60ab308ebab86b SHA512 6a146a8d6285057e1816691e62cdfe2e4f065b9a643f762a1b5c7c1cc9b15bb1028f20cc1b5cfc733dd8e1efbbbfa6a621d00c123400dfa7b587bed1d41b96cc
+EBUILD autobahn-21.3.1.ebuild 3215 BLAKE2B d8ccb2dd8d0416405bcb7ed60d743865bdb77e43d994e3b42542166d708c0589d7466dfcf6b6dd7326d3173beac446a5c6a890d17ce58ac055661b067dec5b22 SHA512 a81983cbdbbcaee49e53fb59f0a39dcdfc7e1f2ae7271853bb7e5af2dcecad32d9342bb0972e6f3a377424b99923d79ccc3d3b0093d2b6aa5ef63913fb0899eb
 MISC metadata.xml 666 BLAKE2B 97509f8466cf0c3ebdb3e167bb9bcc71b9cf27f065f4f7a3cd40111282ada3433ed23e6ad52e735205d165342c7895adb85461939de797d17a1569267189adef SHA512 3cbf58119fce3e9f097f785ff8fc760c675190fcc3a4569a6667b29cc8d1a4a977cfbc2564e227ab0463e6406061ea6e16a2f94f34d5c51a5f2bf391da54c673
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
index 9d630f8a3d56..bb29fec98698 100644
--- a/dev-python/autobahn/autobahn-21.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.3.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=${PN}-$(ver_rs 3 -)
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 34c61ce6abab..c56c5323edd3 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -4,10 +4,12 @@ DIST awxkit-19.2.0.tar.gz 94870 BLAKE2B becd8819e5d7f495d73a16302389af802db9fc3d
 DIST awxkit-19.2.1.tar.gz 95129 BLAKE2B b68b98da71e835132993395f50b2b2a9dc344dec3534977da8468bd76c9d401bbf1d931878d79e2123e4d9cae1553d08c7132dd3041ed32d6282b778bce65098 SHA512 be46963515877b11f75e63c606de1900e244617480ebe90f4c5057e4b22c9687d6b371581beeb311c9e7bed94173b88d74838256024055b2fd5f1c5be1c4bda3
 DIST awxkit-19.2.2.tar.gz 95096 BLAKE2B dce95f819f2bbbaa60e09a8f25685a0f75b112f9fc27023f8d27acf4230a29477e14020dc838633a9fb20c65928857806c8a672c0666308798a78d2213ff15a0 SHA512 bab28be15011e9be3bd3f0d22ed5d5e67f0c19db08672ee4404ddd49a2686a2d7de790b4d06d8544b30a6b827def3a6974b0ee2960d9959d4c165afef4202995
 DIST awxkit-19.3.0.tar.gz 95520 BLAKE2B f02433b9f82537fb5318ed163c669ae00cb8f2e747368113f9332486d226eb3be7c5110929688cc0492d8cc91bb5800bca04da7d9250015142c6312e4996f4b3 SHA512 133665d3f5fa7cba194f2ef0bf4fd5b52a0a5eacee30041628023b71696efc8a11e76b0731879dde2e703da33e74ec73aa016c1ce486e92655a660e5ad778b09
+DIST awxkit-19.4.0.tar.gz 95558 BLAKE2B fa8f408e310ba819e6d8a326e67dddac44ffe0fec2ff3018e8eeeda269c50257689b221785f27c897f526e6f5180c49aa506be6b85e01602b0d7d1dcd88a6987 SHA512 c6c6cf897128153fbb1dac77d50028a7649b97278394384bf5a549c1583b9c89b694f1ce2c850d0b072a4a7142a9b906edfba8d3a68cb446c73a13e3e33c0a61
 EBUILD awxkit-19.0.0-r1.ebuild 797 BLAKE2B 7ecff34a0436d846d71815c52fe7dc0bc5b02c05e92f7fa0cb726453cd43294d140c3c7bbff1bcf3101fab5adde5b838f091fea9e172dec98cff058de820c6c4 SHA512 a5ab9bf2f37931d183c6f2adb4cdd1a75c573a4cba25ff7b12f2c6df1163c0ada217174ce52da3678f8a8b7cf72954ae3e43f342a90bbf61a61e2a2dc0802ac9
 EBUILD awxkit-19.1.0.ebuild 749 BLAKE2B 385da85decfa2a652ae75f3baaa625d9199266d197586cebbcf8a816657faa07bfdb762934f643f520456eb60acbcde877a75ca61f47e0e622f869a76da70b8e SHA512 d28aff6d2b17fb87efe6b5a4f48a2a8ad54c5153b3c045f2e72d1163fa460aa2167a3857258fcb996ed1f4da0222b9423eccedcdf02f63e4729be662dbc49e8b
 EBUILD awxkit-19.2.0.ebuild 750 BLAKE2B 30b63a533818c0f81ee41a5d3e9b8c11bca3b948e7d5c3293ca33b930efd634b1079a6e722379471b77175ae38e578c27c2e085a6552358f6b277cd3949cb7a7 SHA512 8ae9e13bb0a4fd0cb2834cde5930824b9d2ddac7d2019dc02eb6303b1a01db2b3269cd72efe9efb0edf7f4260ed91290475bc0b38a072c2615c32652eb2ba614
 EBUILD awxkit-19.2.1.ebuild 750 BLAKE2B 13f965813d6e58a28298b278f8e64cd9013f034a1f93c3adec684af42072b6d42cd688f4165d9aea296556945c669b276dde54dd4adc03500a4567155d0394e7 SHA512 1d6eb343227b6c6c289aa67f7b1e6437195c0a304b8308fbca6340f13a2bec6fead8d1f445b855d3e08f28cc2dbd399fd7e662a1b88a9ecb0c2d91b4c3dad611
 EBUILD awxkit-19.2.2.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 EBUILD awxkit-19.3.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
+EBUILD awxkit-19.4.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-19.4.0.ebuild b/dev-python/awxkit/awxkit-19.4.0.ebuild
new file mode 100644
index 000000000000..6a4107d47a51
--- /dev/null
+++ b/dev-python/awxkit/awxkit-19.4.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="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 844fdf9dd8f1..fd9d0493dd2b 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,5 +1,5 @@
 DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
 EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
-EBUILD beniget-0.4.1.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
+EBUILD beniget-0.4.1.ebuild 569 BLAKE2B 452d0c54a1866db490608c6269d8762a914ebfdde6b5a8c7a996e293f40554ada32c62c2ce0374436b7fe97f5d3c391a6e5b023efe43eac968806c37aa117fe3 SHA512 3616924237c66834a03b17339ef37ff2be38357bdb0f9be15eb0773fd5b0abb8540e6c92b4709505f9d39cf53f04c0ef0a68b1389be6533a8f69e6812c138a0e
 MISC metadata.xml 354 BLAKE2B 07c668c0a7fbbecdbb11f3a7b302ac589ad9af00e5ffca9b10f2542d9cdedf3f16cd5e9b8e04fe2b79a469f38a2083339b49503b90589b7322ec10cc867f9d61 SHA512 5dc1c04d0de4d6150797e91bd7f3224ec6fb5656bba3bcd48e332fcc5758c41b1e02bf74844a92eef5299af953ced75ffcc59cfee062c21c5c5ea6d83fd3472c
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
index e1aeadad6a54..20664fc78236 100644
--- a/dev-python/beniget/beniget-0.4.1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index 2c49bedfca8c..6f0377c14d93 100644
--- a/dev-python/berkeleydb/Manifest
+++ b/dev-python/berkeleydb/Manifest
@@ -1,3 +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
+EBUILD berkeleydb-18.1.4.ebuild 1719 BLAKE2B 9ad5b562f5011486ccaaa6f0eee1a5a577b4dac95c8f5094819d470877640e2e39cdde87d1514d9268d73c85a282b9aa23e44cab94ee1912d81238aed54dc485 SHA512 1af49936f3198f4a891cad5ed2ec37d2ce888a069e18ba4f996a62ef717b468e15331096ef12228fc102ad02ddf0ec9f260169152a6a9b118eda9d5afb65a784
 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
index 1a26deb5db93..38a111c13063 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 1eb74621b972..29017d05d657 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,5 +1,7 @@
 AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
 AUX blosc-1.10.4-cpu-flags.patch 1419 BLAKE2B afcc14d97c6b38e1d7fce06ae2b00e656ba656cc784f4f13f4acf12145cd1ac9a1d4b3f4110b4a5f8ecbb8c056647cfc5076016e5c563d3b05882245cfc0ba32 SHA512 9b1a1620136aa76c0bf6f8d91b784410de7118a6006d36ad3005f2b8bd6a952f7fe25cfe71de2a52127e2ac825ab9155946e2e92a132afc31265a8bd2e60e023
 DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
-EBUILD blosc-1.10.4.ebuild 1022 BLAKE2B 9cb1bfc7664f59c4f72b651c1c7f1506f860a0de8ef3aacbead8d30f9a9174522ea5b0ac56d7b84f7efe2d8c25e718457c8d6d70fd54120668bc08624bb11316 SHA512 47c378f54b24a4115937b0102281237da02c20feda943522738db9e8126e24191e6bb439024515e10b415b4ec451c2972e24454f7925b1f4ce4ca49c1c5d8b01
+DIST python-blosc-1.10.5.gh.tar.gz 1570462 BLAKE2B e2ee3cc3827e1df89afc97a0cdc3f07670368d2edfea9b6ae32ecbb74b464d5311bbd7b129b3b94fb91d20fd579425859412665de397facd4c119e429fbcd014 SHA512 75b91e50def65ecbbdd29f7b7aba65c6ca611eeeaa9e55583c0253eda5d1e1ab7d899d0c77c45ae999188f701205f20d8c8ed130a3865433edd87db3c0eeebb0
+EBUILD blosc-1.10.4.ebuild 1021 BLAKE2B 7f81753019b02edb6dbacd7b293b523b9454e9769f6597db935885e30f4d39f41adbc0077bbb89f8cf28cf374342f433ebb6782b14e5a478accd276780207c14 SHA512 8b1f0d5cc368a81e250839aa7c80e3ee4be9ee72c12d25a0998c300ead08fe43987e5bb2babf04ea3401fa4e0641c6f777c6062a7482a8f4cd9c5963505b758c
+EBUILD blosc-1.10.5.ebuild 1040 BLAKE2B 3c42b8fb9aac72333e8b4bc29940f39e8301a051384b41342d31428d33b069ebbc637e6b10b2e15033473a836261e78f0737475ea0e3873000cddc8c49861301 SHA512 67473f8bdb5037efbd4e72be80c1b0d848dfc32e1f9b9cbb5fa79b9558389c891ceccc5721ca0f65affb94e04a2823c1ce7de9b52090dce606edfdf23998939d
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index 0c41f56d01dc..8aba87bf6936 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/blosc-1.10.5.ebuild b/dev-python/blosc/blosc-1.10.5.ebuild
new file mode 100644
index 000000000000..a16e6028266f
--- /dev/null
+++ b/dev-python/blosc/blosc-1.10.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-blosc-${PV}
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="
+	https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+
+python_prepare_all() {
+	export USE_SYSTEM_BLOSC=1
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m blosc.test -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4dc537c8428a..a98479823a4b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,30 +1,18 @@
 DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
 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
-DIST boto3-1.18.49.tar.gz 420662 BLAKE2B 92995cd06f19e26200ea51e6d171914ddbb20b860b286b34cf97ffc6c9ee4f29b59073d84cc7d99b2cd5349bbaff03ac004431ae2cf65af571044c6c52634f55 SHA512 4d94e11b974857709dc7907bd31a3eab087eafff3938286803d4d1bc850d90e4dd82be747a3a9c4725bb15e3670a12c8bd239a98df23198c498519d196279dc0
-DIST boto3-1.18.50.tar.gz 420875 BLAKE2B 22bfcf6ffb6ae87bf45a907f50998f8a04555fccf5e327037c4127f31ea097bf497ad63d08875f10de91a19e9bc53a022caf37af6badf00c424f4e84882fa35c SHA512 25d524e7a96e6f9020dab689536b012a3c708fd03898240e8186df1c89dd049bb627488706abb687173e4d692c85d5258468c903319614f0854d3a4cfab5ac2e
-DIST boto3-1.18.51.tar.gz 421143 BLAKE2B f3a943a2b8d91602017b70a0a4f9233a1c3d0bcd189594ba3b70db3d4a8b5f61758e0b7e5bc1658601b6fd58e47eb5ebf7d329a78ebd014b30d7047065b9c806 SHA512 88c6753bf12aff9c161276802be8936209197698065fb47a6ebf2d9de2b7cab7be9eef0779d612f9327cb444604baf1ca4527de60e7cd396c0a12e2495e6e838
-DIST boto3-1.18.52.tar.gz 421808 BLAKE2B f81c00ee211d3e9402d4b266030696fe40773364b145184cdcb57feee6f7011cbb16345177a4bd2fe74325b133c7e1690a95345a40cccaf14c48de1232dba4f0 SHA512 1ea23881c0a06fe1ad9b30b612b25d7a0b92fbd373483f0e0a604168cca77442fd963ac9363a8ce9cf4a412471e4a4951e7c4428b550c29571dcac3b1d041f8d
+DIST boto3-1.18.53.tar.gz 422176 BLAKE2B a07155f6be71c049479c1d2e47767bb2c6863075ea0085ca5cc4609e28aa8b0af0e2136754c0ed6fd05dfecab079f76d636e19e1b8af4b68220768cea6125e93 SHA512 ae774e3db52a90a0850b4bd90be105d4ab59b6478ed16e30e2cc5afec0664e2b13438ab7a460e570c680d49be240855b7c9ae30a373c83d50dda5da6b84d01b7
+DIST boto3-1.18.54.tar.gz 422231 BLAKE2B a010a19a801a939421fab0b8b28ca36bfaceb30380d4e7ace262294acebbc12209cb05ee207a2c8ee536735aadf01c4d15f1c92ab86543970cd967d8a5300b3b SHA512 cb4ee30ee2f7c2270b0f0689707d129fbce94a2e740e4d836c41fb1bb641345ac73aefe60a6e1072f3d8ad87709b3411539a7fda8542c98cbb7bb4ae1872ead5
+DIST boto3-1.18.55.tar.gz 422930 BLAKE2B 2e30f585f2a99d30b9683893c706a9d00bcabc15bba7f033753cf8c0463c40227a5c668f29deff78da0cca02321e79a99329fa5acb8a4e6430970c08f1fe851a SHA512 1b885d423f17edcd441c48a3a456c70f823fd65b94ac89011d1dcfee1ba1d67fbe7e9470869d73733876abdaa4d8e13593ceaffd446ff46e4dc2dbd85cb2bc30
+DIST boto3-1.18.56.tar.gz 423262 BLAKE2B 97caee83b3bd074157096383d069427f1a2fae7917927983d5e9f3c1f11cf5d710050a505bdfa047259434b9b8f358f276de54a9e879b31c0eafb3c14f5c172a SHA512 cda79fc07e1f4c37b3aa0644bd1e81e157de19b1b47f4cebd5d7a66e5ca9653649ba9bf84c7d88dce383b592d673b0ee85fa823247517aa24f869af13755ed2d
+DIST boto3-1.18.57.tar.gz 423704 BLAKE2B 8b778a6e5549ed81ae411521e3d1e4792a18a539a3f7896022739ca25a9ee1f266b555f4baee507ac71c5129c6a8e919e6d95255f5c0dd64136d89d6fbe5605a SHA512 cad772acd9c93e61fd3f77c935986e0d50235591c63bcb27bc925292012a66c7d0a4a62e6c5129b8f26978eb9e5802eb80533e24566d8b369951c6c5ea42e28c
 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-1.18.49.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.50.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.51.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.52.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.53.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.54.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.55.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.56.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.57.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.18.41.ebuild b/dev-python/boto3/boto3-1.18.41.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.41.ebuild
+++ /dev/null
@@ -1,57 +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="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.42.ebuild b/dev-python/boto3/boto3-1.18.42.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.42.ebuild
+++ /dev/null
@@ -1,57 +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="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.43.ebuild b/dev-python/boto3/boto3-1.18.43.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.43.ebuild
+++ /dev/null
@@ -1,57 +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="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
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.44.ebuild
+++ /dev/null
@@ -1,57 +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="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
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.45.ebuild
+++ /dev/null
@@ -1,57 +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="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
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.46.ebuild
+++ /dev/null
@@ -1,57 +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="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.53.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.48.ebuild
+++ b/dev-python/boto3/boto3-1.18.53.ebuild
diff --git a/dev-python/boto3/boto3-1.18.49.ebuild b/dev-python/boto3/boto3-1.18.54.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.49.ebuild
+++ b/dev-python/boto3/boto3-1.18.54.ebuild
diff --git a/dev-python/boto3/boto3-1.18.50.ebuild b/dev-python/boto3/boto3-1.18.55.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.50.ebuild
+++ b/dev-python/boto3/boto3-1.18.55.ebuild
diff --git a/dev-python/boto3/boto3-1.18.51.ebuild b/dev-python/boto3/boto3-1.18.56.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.51.ebuild
+++ b/dev-python/boto3/boto3-1.18.56.ebuild
diff --git a/dev-python/boto3/boto3-1.18.52.ebuild b/dev-python/boto3/boto3-1.18.57.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.52.ebuild
+++ b/dev-python/boto3/boto3-1.18.57.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 480c485ccdc9..2629e7022f56 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,31 +1,19 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
 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
-DIST botocore-1.21.49.tar.gz 8202118 BLAKE2B cdda23ddbd1d9540c8dc1e53763bfccf9984a8df65683f1bb9e7541beca866beba75fd76a983c14c953224cdc19749b0e0af7e17529b4bd41869b5a2bfa49d0a SHA512 4a85a0bef518b57942b57fe01b10c588c3cceb1d8c7fa14e4bdc2e0c53fd3bf5b19947659870ce4af57bdabc4036d9a8c15b53530b7ec312e33b5bb91a784781
-DIST botocore-1.21.50.tar.gz 8204209 BLAKE2B a2db3a93696d6be68268265a7dbd1809edcaf9a3039974d55d718a86a3f9c8a08342f54ec9a491cdb0d32b6bb5505bc17e21d43fa8be2a93b34cc8305fb06b55 SHA512 b487a0463159d6e9109f8d195a567c0c086f705406b52554f2f18ccd57aff6e116e9176716a79f5d24066a43a8193ec088fdd4671df69d6c23102537b59c4f7d
-DIST botocore-1.21.51.tar.gz 8204164 BLAKE2B cf9a74b509ee721d19dc3c2f3e6c1ed5f571ea35ab813402d13d285c5f465f8146b1fe3ca99b863e4eb48574034ccadca6dfd0cc118f267ea917d4822f1bfa73 SHA512 4835bfcceb14a46315afdd74ee8015d51c951c4dd8e8b49fbbd9c02bbfd2958925b52661a65a9a26be6c386e2d251bea4322a8f9c3749d4815f2efdb97e403f8
-DIST botocore-1.21.52.tar.gz 8219147 BLAKE2B 2f60387b57cae96f288d08f71a68c6135c3e13008a31f4e9fd7dc19b9a98a90b20de92d7b3aa2e0a793524cf3944b5a707202e201214eb3fd84a8da47486473e SHA512 9b773e6852ab2b5f7f96383b6dc2d0d7d85d45d2124cc896e216cea576f82be8a642bdc8664b3478901dc154898211b9a3ef5cc0501cdf0f9cc75a6eb170cba7
+DIST botocore-1.21.53.tar.gz 8221904 BLAKE2B 79a87c9678fad9f3b4503740d9857579850eb2e6cf8371e233b9957b031e79aa04f28ce35b96826bfa4ff08c84a7ec646c8cd4302e5eb785530e8f3e2bf9b2f2 SHA512 0a3704d68a09a1afe53d4321d327036f4581d8c6942bc02f594c26d24fa2a60cfbbfab595cc3c4a4e9d3439790835739f7be8c3b572536feb655646c7800cf61
+DIST botocore-1.21.54.tar.gz 8221388 BLAKE2B ea72e84b9ba5cb4d97a3a353f3fdd2fe80859a073c7edce5c0f593b12b90c575ec08aec8596ab0317a99b9cb56551ab222971317b62dadec8b168a9db21a36ac SHA512 bf5086e503b2c4e096597b2434d5ec67e2da9cf173890e5a6d68997b737f03a1f75e3f813251da05cf74d7b757da6b712e2bceab0c8239c1db71818a79dc3792
+DIST botocore-1.21.55.tar.gz 8225756 BLAKE2B 8a0d333802cc196552d905c61716f601e2725c1b19a296a3e07b6f6e4b2deded5dadb68ab9de1aa5c2a07b34ec4c9eb333c2131e6a479998e150810a4b31e75e SHA512 2bd2bae733d2846c41415ddd07431abcd553f8220e87e228b1f91dd7b7af5b8f8918a43bd79a9b8d2b0196098c37b05eed6433859beb74f806bb20717ac41d8e
+DIST botocore-1.21.56.tar.gz 8227172 BLAKE2B 0a783e76c0a4a3ea577661a5995fdb2e53658aa462a6e59a950979c3c35864e94df1848aa5af40270e03833797bcd48c45f633dd8fbb198b2913df975f59069a SHA512 cb4f3e72f8d0bb9451b6b748e3763f6456937938047a2d9a6c5f47c498329b6930bc324e7d6f296952816c96aeb74047f7c2e33044abb551d289d24659a406e5
+DIST botocore-1.21.57.tar.gz 8239528 BLAKE2B d2b98f37468e0faf593d5fd42341dcab32d7ade253c80929722adbe7523ed6efb2b491a12b4335faf779703acc6eabbd3e1c6e0a02994d24dd13cea7d376bf6e SHA512 6bfcd57c7ac77c1098004e5e8a77c14a3718099eda5af00fbcaa0f54fabd93caf0ce66212c5807ae58d565cadfee25dfdcff9dcef8a68e66ba74f03ee28acfb9
 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-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-1.21.49.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.50.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.51.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.52.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.53.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.54.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.55.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.56.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.57.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.21.41.ebuild b/dev-python/botocore/botocore-1.21.41.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.41.ebuild
+++ /dev/null
@@ -1,59 +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="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.42.ebuild b/dev-python/botocore/botocore-1.21.42.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.42.ebuild
+++ /dev/null
@@ -1,59 +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="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.43.ebuild b/dev-python/botocore/botocore-1.21.43.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.43.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.44.ebuild
+++ /dev/null
@@ -1,59 +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="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
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.45.ebuild
+++ /dev/null
@@ -1,59 +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="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
deleted file mode 100644
index cb37cb422ac5..000000000000
--- a/dev-python/botocore/botocore-1.21.46.ebuild
+++ /dev/null
@@ -1,58 +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="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
deleted file mode 100644
index cb37cb422ac5..000000000000
--- a/dev-python/botocore/botocore-1.21.48.ebuild
+++ /dev/null
@@ -1,58 +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="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.49.ebuild b/dev-python/botocore/botocore-1.21.53.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.49.ebuild
+++ b/dev-python/botocore/botocore-1.21.53.ebuild
diff --git a/dev-python/botocore/botocore-1.21.50.ebuild b/dev-python/botocore/botocore-1.21.54.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.50.ebuild
+++ b/dev-python/botocore/botocore-1.21.54.ebuild
diff --git a/dev-python/botocore/botocore-1.21.51.ebuild b/dev-python/botocore/botocore-1.21.55.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.51.ebuild
+++ b/dev-python/botocore/botocore-1.21.55.ebuild
diff --git a/dev-python/botocore/botocore-1.21.52.ebuild b/dev-python/botocore/botocore-1.21.56.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.52.ebuild
+++ b/dev-python/botocore/botocore-1.21.56.ebuild
diff --git a/dev-python/botocore/botocore-1.21.57.ebuild b/dev-python/botocore/botocore-1.21.57.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.57.ebuild
@@ -0,0 +1,50 @@
+# 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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 11f6a53245ff..36a7cdaa289a 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.3.2.ebuild 704 BLAKE2B 258ced6638abf4fe146a40553558184ab3558ebe6e5245ee916ad5ef48e55795921ce41b1a7cf0e1d3508417b3083a35746c4849a8386edf136eb1043fdb002c SHA512 db0381b7566798c0d75177bf6799e817abd07de2a870ee7537849e542fba3b55817f651c38e9efae3a898132358f1464661b90130ca9330ff0097ef657e2b867
+EBUILD bottleneck-1.3.2.ebuild 703 BLAKE2B 911a37546363a0ac6f6081be590890efa0293343401321ba3cd82a192dfb3ce1438d8c315377a8bc15efcdb156ecae6b493da7fbf894595351191426baa6d2d3 SHA512 0be311c72d7962c079f121ded3e85cb1c6ea63c5e685f46d5f93f6623055157509a63cc953bbcd9d8e3f083bd4759fdd7eb80dd1eee7988abdf39eb784fe9008
 MISC metadata.xml 353 BLAKE2B cd0e1e695bbe0af12823801cd508e8a6ce2e9f0ea0bdbf3efc1869cf401a85e0a03c000f7d115429024ce638b141e85c61452095cc5dedd524e5db2b7537cbcb SHA512 41ed9ce12cd3865ecee23487e3214ee3c0d4d4d551707b5da2cd438492b1432adb701157bc6e30dbae84b92290438a54a1cc0b5fe9791132362730fb6de2d141
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 9f3723d651bd..950b2503e494 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~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/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 6973df47e30b..2bda8359c555 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,7 +1,9 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
 DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
 DIST cachelib-0.3.0.tar.gz 18340 BLAKE2B e7f8aef925320c23691721f2f4ee7cfa66ab0ae8bf1e414d7344fc5799fbe66187791ffb9544f27b16dbf56ba8d2ec27a6ed080ccdf154a9b1a8582aa86c0127 SHA512 f9184cf9702c2df77e09d28d6feb8e6f0bc22f17c110a2371e76c4b78163950803e4f013c3746e21b9ac5771f72238ecd8bb041c5a7f44eab6bcb4de6e2ea377
+DIST cachelib-0.4.1.tar.gz 19762 BLAKE2B baadfe920fda339cd8f3241664ae91b2767423ed09bdb6204573b2679e37c2dd3157f3b4d0f16841b1ab859f7c777986c0c251bcbe4bdf1ade69c442ff8ec756 SHA512 051e6f31b6ee58836a1512de4c7eedc718c081389df92605ad065f4bc5e4c861971507af636686d8abf00273a379ff31730bf040a7633a143dc1492263e3a543
 EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
 EBUILD cachelib-0.2.0.ebuild 711 BLAKE2B d99fcbb4f6350f3c8ee6c3d6f9a1a51489217e723c518f05011409aac0d10045eb5955dcfd84a39fcceadaf0230e4266cb1c6aa24749b2821f0fb6cfec2da91b SHA512 a3084f3dfac675bb36bd1e5fe811809e5a2d7702c8c0c0ab75b349fca86ce8d8a2fcff127018f9587626bbeb279a92bc54fe1e69dc7858ee2523a473a6bdefa3
 EBUILD cachelib-0.3.0.ebuild 712 BLAKE2B ccbe220e674a264b8402fe8ad6963079ec4232a5bce1a5f86aa0e0c67c2a4131f83ecbc97d91216ac890472f28a76386a7908a3be0708fc8211001f84123747f SHA512 9de72ad0c74186a30899e9cbde117bd2907f5e49c4cbfbd0ecf42b230c30fb46c2c26ccc2ad0cedd67b7ce2809067411f8d76958e480c092658b2f460d1bea7d
+EBUILD cachelib-0.4.1.ebuild 712 BLAKE2B ccbe220e674a264b8402fe8ad6963079ec4232a5bce1a5f86aa0e0c67c2a4131f83ecbc97d91216ac890472f28a76386a7908a3be0708fc8211001f84123747f SHA512 9de72ad0c74186a30899e9cbde117bd2907f5e49c4cbfbd0ecf42b230c30fb46c2c26ccc2ad0cedd67b7ce2809067411f8d76958e480c092658b2f460d1bea7d
 MISC metadata.xml 474 BLAKE2B 68232ce6be8604d810b8f8ed5a5a92cfdbd74f61b8c6d5cfb2dfb354cec4336ba9459eb5d41782824aa4a928aaa5f583f06b03f7e1ea6eee521c1b17be80fc10 SHA512 5de03537b7551f96a156476f693359f2222c060384baa54e4a35564377e88a2916eddb486bfadf327d86258ebf1555b2a942f2c993f68a5f7fc5e837e01317e6
diff --git a/dev-python/cachelib/cachelib-0.4.1.ebuild b/dev-python/cachelib/cachelib-0.4.1.ebuild
new file mode 100644
index 000000000000..3ec6572206d0
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.4.1.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index b6aee6bd19c7..bd5981a2098b 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,6 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
+DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
 EBUILD cairocffi-1.2.0.ebuild 927 BLAKE2B 1d0938563003e5589c90b8314c0c5e84c0007c59373563f35d5d9731c9c61a2920fd73ec957e3d1c671c9a07267895b5e32e387be46c9fd8c0fa9011e83ce840 SHA512 4d6fa68be086ad1b53e9990db3c5705d71c8e181a96a037f8799c28ddad3a362d4720921158ac0359604d96068d5f48d39e42a9d5531553e3e5ddeef054e41fc
+EBUILD cairocffi-1.3.0.ebuild 931 BLAKE2B 98aa9a48c1e2d59abc27d53cb0233913e856f4563207c6cb33c51e583214cb80de1502bb57ec604ff112d66c10dd6cf6ed6c1f681e98ad6f3d78d1dcca0f99fc SHA512 7bf68323746f49d9c67cf93cf826ef55e038ec1f995cb329f7a802f9caed5fb1c72cbe4c27026cccacc1f19e692b592278f7f0625d45dfad0397f7d11f37c368
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.3.0.ebuild b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
new file mode 100644
index 000000000000..7465ac246324
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-1.3.0.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} )
+inherit distutils-r1 virtualx
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=[X,xcb(+)]
+	x11-libs/gdk-pixbuf[jpeg]"
+BDEPEND="
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-tests.patch
+)
+
+src_prepare() {
+	sed -i -e '/pytest-/d' -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	virtx pytest -vv --pyargs cairocffi
+}
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
index 95280068e4a7..d696187c3c46 100644
--- a/dev-python/casttube/Manifest
+++ b/dev-python/casttube/Manifest
@@ -1,3 +1,5 @@
 DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
+DIST casttube-0.2.1.tar.gz 5182 BLAKE2B 0cd279da67aa59ddaa82913ef40815d28884b078448804742dfa3a6242a666c86cdaecf30cdf1ea913188d61953b5f38e133311d11491db443b55ae78b186558 SHA512 0b077b1f622c1029e9cff949a1d1cd4f380d9110324ca6211eb4d6bc97fbf3aa4d7be47cb692c2a7628ab62b309fd9957ee6392060f27e06d030691ad8cde00f
 EBUILD casttube-0.2.0.ebuild 520 BLAKE2B 0a9fedb88d0f4db921194df1dcb72f178f1974bc10233e4677ab0adac354b6ca8e96792167f84a591a8062c2a6cc6776f0bd533548bf7faf495990830b64aa7f SHA512 be6417192069f77d2196b266132c084e78f4d54fa2fe8428cb0d925ca2b3a29166163b3fafae884db92a52417c6b19a2c5bb20a191b9ad633f5373e530b9792f
+EBUILD casttube-0.2.1.ebuild 530 BLAKE2B 31c902d0010423b160b8c2b68111fe5d888ef6cb7628742a71b4cd41c81cf32774cca3718a585e19226e1c065f2cd373a68b0bd99f8d344aed790d6cbae1fd6d SHA512 0f1d848d03cd5f0921076ad789ddda23fe9ad41db189578cf0800e229ac5985a92eec5645e768d58abf42e30edf66ce71f0566dfc52cedc717901772303643d3
 MISC metadata.xml 405 BLAKE2B 2f7548b83796fc2d972ce9d108a023ec153a82a342a95c3114b671ca5a741ab9c709648d6967a13f3b7e80268f08b4ef84906635e7d07affe1f4533dc97a007b SHA512 2e4d5ea4a9f5f583a451d94aba2c5a842626ccf588e405efae99569f70130ccdab3b61e78d02a85045352e119e19865f30f7aefb0063f0cb455f4abf58ec3427
diff --git a/dev-python/casttube/casttube-0.2.1.ebuild b/dev-python/casttube/casttube-0.2.1.ebuild
new file mode 100644
index 000000000000..db1f1d648330
--- /dev/null
+++ b/dev-python/casttube/casttube-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="casttube provides a way to interact with the Youtube Chromecast api."
+HOMEPAGE="https://github.com/ur1katz/casttube"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -e '/data_files/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index c04f3cc7e4c6..7b5449abba55 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,5 +1,3 @@
-DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
 DIST cfgv-3.3.1.tar.gz 10395 BLAKE2B 8727a9886334a1fe59aeb0554c4c53139ae7e1f66534102c67f005d66dc1f78cff5e5534468a10b85df645f7e8a2fc72ca6ca2e448d09cb7636d08e8b3843113 SHA512 59c358bab9f2b32a1ac6eb72bba67b76e8368e0cf78c32228a6add200a0205f698aa80d9bd1b1e8701fb699b9599c88a240f76e2c91a602a0c292a67693e6857
-EBUILD cfgv-3.3.0.ebuild 486 BLAKE2B fa141f26e941bc0102e9f228931a4cf4f9c929837625a81a583f238af2e6ee427cd01124c75be46c3148877b9ebdc11389caf027172fa9709e64cde9987cbb39 SHA512 0fb9420884e55312e3ebc56caf5b5fc5dde2b1ce8f8d79662b0aed09d389296228ac9aa4818009708277e8b9ae34201f84e00274ab8b96e9181703da9d3dbc29
-EBUILD cfgv-3.3.1.ebuild 486 BLAKE2B ff4e5f92d609c6fcdca71a3c1c7e785ed4404a75855e5f88f87c6efd5f611dc5f9367e4e6a42a9db8bc3e8dea5f1dfdf3d86f13a3f60e8f5ecb2e1c059713ab5 SHA512 161830ed16f19ab1803d03f51c03232d26f3806548aaa5d25e7f36980c0c9e3a5fa48793c738c246bfd97d6f9f50b475e3b0d30d7a7c135668971d10a4fb8a18
+EBUILD cfgv-3.3.1.ebuild 485 BLAKE2B fce4109fc3bf41ae3c69efc96700dd64b8f5bf02951c5f54c17e4c59ecfbc277ff649562061981dbd61fa4450496844dff5b14f7b8eb262ab08c6ac2b967e97c SHA512 24ad1e6348b13e0c6eee76865a20d6b01dc50084f293c615650d2bda9a5df65074f033d66d837e8dcdbc71b6d50cda2108f3e0eff14dd3d0986bff7f5baad715
 MISC metadata.xml 491 BLAKE2B 8adc9313dd82bb837c84287063374dae8d9d851f8d515ac69e81cfc3d5b0b1369f709113bef6ce348329e0e6394de7c3b568fe86cd45081a546a3fb54f01642e SHA512 ef1c16ef95820a9eaaface09373366b62660b6e9a8fa05800c4ecc578d4b3e6c64ef3094c496dcda1c8449b9cfea7e427299ebb4750e5fb8ef49f78cdcbbe96c
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
deleted file mode 100644
index fea5746619dc..000000000000
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Validate configuration and produce human-readable error messages"
-HOMEPAGE="https://github.com/asottile/cfgv"
-SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cfgv/cfgv-3.3.1.ebuild b/dev-python/cfgv/cfgv-3.3.1.ebuild
index 3d62b21962d0..f62acde1c450 100644
--- a/dev-python/cfgv/cfgv-3.3.1.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 4d4f50c331c3..b2a2d43551cf 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,6 +1,4 @@
-DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
 DIST cli_helpers-2.2.0.tar.gz 34018 BLAKE2B c7dfe8b87db6312557b4ac87aa4eda77b94f12789fcd4a9e686cada47bd41601f5c357a77de4a1c6d550b2ea110b682da0a04edb312d26ecf281e6d323369462 SHA512 26d78227999e8bb37f58529ce29bbed1bc8d51c80f81127552fb1d1f880c476abdd43ca628c591ba50c0316b35d1df0541906bf902a7549f459da0e1200c8479
-EBUILD cli_helpers-2.1.0.ebuild 659 BLAKE2B 1a0e3145b9979a5c9e0417f41b67ff5b185536ac0520f57671d5fb9cf0b858b362a0f5d6d3f7e0e8e8e2e3d00bdd66ecb1849adccc4f92c5db259c72ff93c98d SHA512 cb1b52ef15cfbb4e908c0cb7a1d0881a6f71232207a8eeae0f074b5d409bc9611d463fb0dc3dad64ba5fcefa8d8ad70b580095b8bb8f430a93f58a7119855069
-EBUILD cli_helpers-2.2.0.ebuild 608 BLAKE2B 2033a3fd8610ce23f022f7c4d5ab073ff71ebe0a488e0cbf0fb4cf4340e151dc0a77ee716373308cc9b1ac0426c77eacc899f294fb4bc4a092f5c40e36fca330 SHA512 9aac9b1721a48da0031d344488ef04e5cd7c9a4d5baeea5b3d4927e438a8aca7af9ef6a96f583397d644be54847e503660746aaa267464a810532eb6d118b29c
+EBUILD cli_helpers-2.2.0.ebuild 606 BLAKE2B 3b90221d2bca6a7ebd349b9f692bcc403201d49c9ef22f65d41b0f81008e642062c68d417993fd291e186307915b8340678d9c5ac69a51dfa8106a47057be7b0 SHA512 d1c26283d26f916566ddc45188350592e171db712d46ccd9ee8404a60bd968d0c5dc41e49b10c320d366161b5eca54486110c902353de6335aa02ce978fef2aa
 EBUILD cli_helpers-9999.ebuild 588 BLAKE2B abf6f583c85379da640a8b9a2075d2f59f1bd0134f2656d2e3be7b3ae9a63efc36df1b94f4e60af2d00fbe4822430c9519660049496ae1907e43d7ad96711f16 SHA512 1b8ffba1750845b4f236d50443d1dd9357a8edd8898c81c4563317761809faa111fbfc81922c53757906c6d43844f4da205bf116821842554020df807dec3a5d
 MISC metadata.xml 457 BLAKE2B d80fc53c1c6b9f0124668ab396f114340809d469ccc61ffcc51de16d91b0d35a396ae192d413f44865759de57e342383d76ea2642a19bee794f189f4878b2807 SHA512 0493ddb20222eb69cfede50810063b9f9a2b44d0f46d31013268a6dc2bf611eedfe89806e771ed511ddda25a8d0f489bf8086f12c1ea4986e6b32193f3df7f94
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
deleted file mode 100644
index 9abb01e46053..000000000000
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="https://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild
index a558d553a0bc..d966fc5e94ca 100644
--- a/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index e1797579503e..1d616dfb5cc1 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,3 +1,5 @@
 DIST ConfigArgParse-1.5.2.gh.tar.gz 32598 BLAKE2B 2fcf2b93f9e80686f658217dbc5871f1b920565870bb8194855088dd6f81422325d505fbe5bfa014def8188cc792660d35450a0daf0229c0dc59da37adab9fff SHA512 823d7b256b803d3b60a373a124ea5d255b67a3b948d6543bd9a33f63f4b0dd1a416138a7105c64b064c222a90b4cada3b4aa6aecb70054ae2f1978fa5791330f
-EBUILD configargparse-1.5.2.ebuild 730 BLAKE2B bd9bec58d337f1b9bd5b5b2932d72a7aee5242bfae23dce79126bad9f0285bd1a2f5cf97d5e3b9fa7f7929c0eff609e1834f6056b573e6013ebef31e6cc19e40 SHA512 7a6bf44a5d4bff3aa89cb0f0ab78e70be12673095d72adb39c14eaf0b54a89b32b7aa94e13c7e19eaf2642e4a3990fab10af487f330c7dc019d5227d5db5dfd8
+DIST ConfigArgParse-1.5.3.gh.tar.gz 32732 BLAKE2B a9dec6b3ebbb7aed000651adf76ac76994b56d00236789a75f7da6ccc76e6b87e0dd292c260a768c0d402811b69e55d417b25032363429535cef4e09e0be5d00 SHA512 bdc0340bd92cfd5319743a4860af80fc2352f38b156031856c2b39b8c8ad59461281009030c4451dd464334a829b8143c765979cfc9b8ccbe9fbdcb0e08ac7b4
+EBUILD configargparse-1.5.2.ebuild 737 BLAKE2B 9adcf1408f6b679f32807c642626470e351dcf101839f6f9a0b8704e3409bef7af0ec88e43600396df66ab35452ca7b2e9e0259a12633712fa92037affaf85ec SHA512 4e29b227665f4913e0b518b25cc367fe361ab1a7672ca0667a986c32e0f68f70d642e309f9519c4ac79d4b9868b23a4b5a546d3b3a503ba4c20b831dfa329c92
+EBUILD configargparse-1.5.3.ebuild 740 BLAKE2B 97393513136cd76ef29d92119e55c99cec54f60bee5dcfe0c3622043d9399083be001cfcf9e68997f63504558a6c01e8c40c164aca9686b6e373129242ca1f5f SHA512 4530494ae260f3c7cd78b6c1cd0eac4b09f3b859131b957112c987ce686bdd741f7c267526191f240b0f2eb81def3f528b7eeae7a121d8c96a5b690cbe49f144
 MISC metadata.xml 413 BLAKE2B 06bc019926862278b7c7a0f602f737f0ee20df1271bfd4ccd2e96e602b537403ae641f4196496ed0af92830a457af330def85f4d4b30ae2733510b82c0589310 SHA512 df63096d97d9835ee72b03ee144cb1cbed4f29644380c8711718b570938e0ed1dff9bca15b77c91df052f3f68e10633d1880d553cb8c8d7e1827714355dd8593
diff --git a/dev-python/configargparse/configargparse-1.5.2.ebuild b/dev-python/configargparse/configargparse-1.5.2.ebuild
index 9f01655941fc..c0f5b5708505 100644
--- a/dev-python/configargparse/configargparse-1.5.2.ebuild
+++ b/dev-python/configargparse/configargparse-1.5.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
diff --git a/dev-python/configargparse/configargparse-1.5.3.ebuild b/dev-python/configargparse/configargparse-1.5.3.ebuild
new file mode 100644
index 000000000000..9f2c72f0cf30
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.5.3.ebuild
@@ -0,0 +1,32 @@
+# 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_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="
+	https://github.com/bw2/ConfigArgParse/
+	https://pypi.org/project/ConfigArgParse/"
+SRC_URI="
+	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 54be810edbe7..ae6bc0200bbe 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
+DIST coverage-6.0.tar.gz 719495 BLAKE2B fa2768cc34f5c8e5e1b0bd328dda4b83bccae4bcb37b1e2ea8ff9a7fad973239a264f12cea7fae7ed129abe1a7aa86b43e2e32fcfd5c4de2077c8b32f405cd3a SHA512 b9a5dcb2aeb8517a9a52feadfd817727086d88682d9d93d65d9f4d7b6116d8eca1ecceaccc98ff34ca2fb1c2d4dc457d0d58d387465e67970ae4df0f4c9f7ca5
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
 EBUILD coverage-5.5.ebuild 1666 BLAKE2B 9d962060ebbfa2d75379d57eeec9add4f3dce4114ecadb794e84dcdb5d4d1bacae224499227199c04a9b3e1b58546ddcae726530294e372ce2e035dd60d4be2b SHA512 f2c4486de9babb1c790acb03ab0524178c0d445351229a642636bb73cd076c14c442fe385a9f6e20a1a4612dc8b58a30938d371bca2253e37dc9d3b5f7ed2de5
+EBUILD coverage-6.0.ebuild 1640 BLAKE2B 9d2eb578bda59aef10ad601a4ed098d0d60f79150c3bb26b2d868eade8cbfbf5638c29a1132ea3c204c9a6951ea553106ae6f6aaaeaf33fef4bec4c3aaee8498 SHA512 3c8fc5ab72b7bd11c4cf9f80aa805f9b350c05d2e3993ad6979dfcac8bc17637afc5550037258bbbdc19aa4ebcf1a4b0f86b5489728fa1c365996f7ce63219b9
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.0.ebuild b/dev-python/coverage/coverage-6.0.ebuild
new file mode 100644
index 000000000000..202b422e1551
--- /dev/null
+++ b/dev-python/coverage/coverage-6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 34cc026b4a45..a66bc693e82f 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,7 +1,9 @@
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
 DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
 DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
+DIST curtsies-0.3.9.tar.gz 53319 BLAKE2B 91bfb46ba9eb36f76df7a1fea0c0b1a3d7ec38ecabc015624b93b66b8e0c3dc7c9ee757caf591e77258ab46712c2998427bdc5a6749272bfac6c597e9bdb09b8 SHA512 7f0eb56b37db3c9586a95aa9981cc3f21a99f7317d2484d71618d2ed8302ee1e3a6bf931518034e690cff63b2f38c54cc5d2b5baed7036c588279720d3b96a4d
 EBUILD curtsies-0.3.5.ebuild 592 BLAKE2B e32fd9a8bc11511b0056655bd5ac531ffd4ce8fc14cda8e784689c78c685b1faa3b4ebae4a0eaa913f8777516aadf5f094233e2760b8aa23afb6cbf60fdb60aa SHA512 a01cc46b45aad273aa6daf5d455e11ec8e5c9b004045d3e6e42408d1d3fc1beec7b8329a83a19b4bc2fe909ba0dbe14fe450e11354392c5808464126acd389be
 EBUILD curtsies-0.3.6.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
 EBUILD curtsies-0.3.7.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
+EBUILD curtsies-0.3.9.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.3.9.ebuild b/dev-python/curtsies/curtsies-0.3.9.ebuild
new file mode 100644
index 000000000000..c29551cdcc4a
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.9.ebuild
@@ -0,0 +1,27 @@
+# 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="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index 159adca8e448..364ee52a9457 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,5 +1,3 @@
-DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
 DIST cython-test-exception-raiser-1.0.2.gh.tar.gz 4579 BLAKE2B da09ce49817ae40054ab996aa3fcfa45769736fb56cbc91ed183f73413b3298859ab0dbd6e6ddfae835411891c02c67a01194531cc4269663656af1529e81f0e SHA512 ad245eb87fe2d4d93d244b125d80f17fe6deeac86ae9a9129d211d9ff1738da39dc30d49a80f33d50a6fa52029403018c87a8637db9c21098ef8b0e3afe20ea7
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 627 BLAKE2B 49c9ebab82db4fa3b37addc9188b960e4bf4ac883b052e59922266d13f3c299baf7657a7893b0a0ff0f94a93b1eb2580ad6bc16877e8b3bfbf7c0fb710cbe888 SHA512 edea9eebca886422f75f7c3f2f639cf9845190f626cf6401bbbb012391601cf7172b1d337a86ceb0581fa76bfce4901ab88e61636fe37a14232ae7b1727d50a2
-EBUILD cython-test-exception-raiser-1.0.2.ebuild 628 BLAKE2B b98ab43e36fe4ba5e5859f35a30210a05659d9a00a880892c96520fd6d9027be6b139398ec7c52fca4cbf6a1265e7579c9ad100a30c8f12a91ae3ce04b3d44a3 SHA512 6eb5feda97615b134551a3191a4c31c7a2df633f93563bdf572fa3543ea6d2a7ccb34447cd95c4831c43e3e10c0367e94ef75914f889c2c5747ab564d82854b7
+EBUILD cython-test-exception-raiser-1.0.2.ebuild 627 BLAKE2B 49c9ebab82db4fa3b37addc9188b960e4bf4ac883b052e59922266d13f3c299baf7657a7893b0a0ff0f94a93b1eb2580ad6bc16877e8b3bfbf7c0fb710cbe888 SHA512 edea9eebca886422f75f7c3f2f639cf9845190f626cf6401bbbb012391601cf7172b1d337a86ceb0581fa76bfce4901ab88e61636fe37a14232ae7b1727d50a2
 MISC metadata.xml 386 BLAKE2B 40aa5d14853374cc959b299bf2c8c53fd84f4ea6e570210409f42eca706f1d098bc54dcb4b7ce743428ec361b3359284d564f04916d28cac7546fee2105051e5 SHA512 76f2c31745f906a444b40d4253a9215bcc7757aa26cfeaec19afb40794360c61d5b36e55278ca4adf6016cbc8121cd7ba627746f6f9423601aee1f5a5662b4ac
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
deleted file mode 100644
index ad11c7efe254..000000000000
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="A trivial extension that just raises an exception (for testing)"
-HOMEPAGE="
-	https://pypi.org/project/cython-test-exception-raiser/
-	https://github.com/twisted/cython-test-exception-raiser/"
-SRC_URI="
-	https://github.com/twisted/cython-test-exception-raiser/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
index 7b917c4f775f..ad11c7efe254 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 40547892c16b..26ee33c7c01b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,11 +4,12 @@ AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bf
 AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e082326bccbad328724a4ff5645f0b2aa28f21419044b17bed8495618bb980b23a99310c2b6ef275331e1b9aa6d734017eb33646c92a07a73 SHA512 3f5c6b4108b87cf3014416386095c07ac91762152bbd87e8bd589177d40b933c11e19610bea06720c5c70f76b5b9b70d27e5c3cfa20eed30deaaf7d122910bd3
 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
 AUX cython-0.29.23-tracing-py310.patch 13401 BLAKE2B e2359644ef2dd2c2f9eadc41eac6634d8bcde77edc4f7c11b8c6c3ae2f037965291c3cf9907ac5e07f3f97505adf9c2040f30e7830c9216bd7d51aeca68b5286 SHA512 e0fbd24224da1e848fc37dc8652738086c43297432627599ec8d43cf75c6f7a9cd1ff360d156f778e13749f339767608e631336f988f6f17d6f3f40b654275f8
+AUX cython-0.29.24-test-failure-warning.patch 632 BLAKE2B 6bc40e4c2db922bc05735f83f90017e72df75fb200b285b665b5894f7cf979110b3964a5f49ec7c30710a02650ab9f03ca29f973fd262b5a7a2da30881b88034 SHA512 30ce0529d543d4379d0fef442a0023e1076ff9121bfa98f14792aa3b7c47d98ab1597b85a3851c243c762ed12264fbcdc4f6a177698d2784fb8d06c200d5f9b1
 AUX cython-0.29.24-unaligned-format.patch 1632 BLAKE2B 04b95419636cffd58e4a932227287ca1e3fdc1f7c1f2874233567c01c7cb18aa691281284e917afa24f14ffcee185828ca52022a4ab3092f72569283bfae0e19 SHA512 82665de428d8c043d9ab67bf66a427de61110cd9aae18c7a100ea6d1e8c6b42050d4bfde096b774600bc63c68d81433dca68f2e987ba1b2ea82163f76401eabd
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
 DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
-EBUILD cython-0.29.24-r1.ebuild 1883 BLAKE2B 3ab50fd42c3f81c5f9ad7ea7d45bf080023ac5ac67480ba0224038ec4514973a469e957b35a5665efa74d58d7f6aa081dbd2dab04a9fc012d642188205a0da2b SHA512 e4cacfca2ed041e58214fd230fab64863b21902522882ecd33407c706eea8aa22b197ed1e561f1072ac42dec9254c0a6e71b3241246f5f89728e5fd692f45def
+EBUILD cython-0.29.24-r1.ebuild 1935 BLAKE2B 4e0557c5ba8effde7b65fd644264099b545373196357a64c589e50819724dc2e2d3cc1da89284e3dd7f34400e1bcd4303e056f81ccf272f3363ede54a9138979 SHA512 30ac67969dc74479fdaf859bd0127f8f5c83c222f0c6804664eba408eb34cb29cebf1c936aca9dee5f54379bc6ff238be908129ecde053b6d164893ec80b627d
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild
index b6ec772f501d..8aba26fd02cb 100644
--- a/dev-python/cython/cython-0.29.24-r1.ebuild
+++ b/dev-python/cython/cython-0.29.24-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
 	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
 	"${FILESDIR}/${PN}-0.29.24-unaligned-format.patch"
+	"${FILESDIR}/${PN}-0.29.24-test-failure-warning.patch"
 )
 
 SITEFILE=50cython-gentoo.el
diff --git a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch b/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch
new file mode 100644
index 000000000000..64202a93ecad
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch
@@ -0,0 +1,20 @@
+https://github.com/cython/cython/commit/bf4979e2441ffbc9aaeb88f5c67608578040588f
+https://bugs.gentoo.org/739516
+
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Sat, 3 Apr 2021 08:23:44 +0200
+Subject: [PATCH] Make a helper function in a C++ test correctly propagate
+ exceptions so that it won't have to spit out compiler warnings.
+
+--- a/tests/run/cpp_stl_conversion.pyx
++++ b/tests/run/cpp_stl_conversion.pyx
+@@ -15,7 +15,7 @@ py_set = set
+ py_xrange = xrange
+ py_unicode = unicode
+ 
+-cdef string add_strings(string a, string b):
++cdef string add_strings(string a, string b) except *:
+     return a + b
+ 
+ def normalize(bytes b):
+
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 4deddef75772..c8c8f5b1ebb0 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,5 +1,7 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
 DIST ddt-1.4.3.tar.gz 17862 BLAKE2B f19bbf282180614e1c8e3967a6af4e4696e1a9fce90c07a4438c7b2415ff1e85caf9c113ef3b4d89c11b2afd5ebb66b23c58b18e91a6416bfc1fc85851e75861 SHA512 ac66dd0d20c49df6fae6e86dfa1dce6d4326f985f17ad955ec2c7bdb2e411bf633baf2d3b244cd49ac45eb91e976a33460e73e4d155e17fbf90418062c6ca187
+DIST ddt-1.4.4.tar.gz 18527 BLAKE2B d83df38dc54197063418eacad242269bbc130a8dbac61a9b0dcf473ca1e9fe0f4101f8f96839d81acd1e16d9386870c108dc4aa2c3e206670360fee6066e9e59 SHA512 a7cb4565254d47aeaccaa98cc1bf5a605d5dc323b7f15130d16f6322af3d084e5fae34da5e793be1d197b1ca6213306ab1a907277982766ba38bdfd20f53ea59
 EBUILD ddt-1.4.2.ebuild 631 BLAKE2B c361cc9f54311a3f19c5dfc132c03504205f0dfdd414ea83cee13da91ad0c9e3b8746aba17eeab617df649855df953038e71ad8442ff65c64f39f7b789b5f9ef SHA512 5983870725993973e85cad65c92c81fea7dbf663fc38b7029c55e93d2093db74561ef18aa5cb81e1e73f94da73db570adfa79bf417317bb7ea9d30c630131319
 EBUILD ddt-1.4.3.ebuild 634 BLAKE2B c2a2b844302c26db0c4779588cf25a16d38f0088b051cb85fd6c4865cb64cfaa64d0accfb71ad376192ee934c13910d8fdce1e3e95f1e8452e89b59713997ab0 SHA512 160ec0845b726136e961ee820cc1cab4340f5b7cbed93336190360ee57b74803f13e1f8d2207d211acbd5b948664de7dbe1e7bd147ccab1fb9c2a9e5fa476936
+EBUILD ddt-1.4.4.ebuild 634 BLAKE2B c2a2b844302c26db0c4779588cf25a16d38f0088b051cb85fd6c4865cb64cfaa64d0accfb71ad376192ee934c13910d8fdce1e3e95f1e8452e89b59713997ab0 SHA512 160ec0845b726136e961ee820cc1cab4340f5b7cbed93336190360ee57b74803f13e1f8d2207d211acbd5b948664de7dbe1e7bd147ccab1fb9c2a9e5fa476936
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.4.ebuild b/dev-python/ddt/ddt-1.4.4.ebuild
new file mode 100644
index 000000000000..2af68433163f
--- /dev/null
+++ b/dev-python/ddt/ddt-1.4.4.ebuild
@@ -0,0 +1,27 @@
+# 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="A library to multiply test cases"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index af88cb58099a..41edac63281b 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,6 +1,8 @@
+DIST django-cors-headers-3.10.0.gh.tar.gz 30786 BLAKE2B cd4de0b851932d023982fe2df8dbb00f56b863d2932a776e224b3f026ae03174561b1ac39ada9f0ef2e2057f8f05e67314e6ca935aa8beca31588472becadaec SHA512 dbb4925a1818e9e3cc18294ee0636ed193a195f4f6cf337ff01ee295ff7943ed376fa53071ea68f87df83d30dd9028ef75b36181bc128635c6040c8a3720676d
 DIST django-cors-headers-3.7.0.tar.gz 88367 BLAKE2B d8a41a605d4823852cce65ffa8005d1e82598cdd81702d1ecef304c2a117dc553447c0cc7e9c31641165f0ba6975b757365733b349c0f5b1f4e9964095b918c2 SHA512 e1dc9695f99108f0908d8d348d284f1fd4a8ccbb84b3c748c9ae8d81d6f32ac8ef3417b612710e64ea4c63d464d97ac31a199292ebcdaaec3f3e37ad025ed0de
 DIST django-cors-headers-3.8.0.gh.tar.gz 27602 BLAKE2B a6ad81288b57e731f784fa0a5dda396415d6a4bd8166844f8f2f51752af2825b8d8c1241d5fc645b1bc4f963f852c508b8f29993bf1a6567c07b0ba0f1d90025 SHA512 633269faa1e1606607420ebc400d52105fde5beea46b37238658b5a40a25ad96101648c909f6efb6931d9fe138c5e192026797fc5146acecf791f1d82d4aa2ba
 DIST django-cors-headers-3.9.0.gh.tar.gz 28921 BLAKE2B 8ff5ab2035f938652753920f632d73488b568ccc3278d60ff6a7030ca1c6a7bbc36b29749f450ad312cf3e8c12f80c85f9e9841b3b4a26fb84cd06e0cf9f8255 SHA512 b7797c5ae4a9b8f12dadbf4b794da196c89a336469acb541d159f5ab3bff000825ab687f9e49996d3955c5700194eb62e72513efde8ae1ad4f4b84ceacd26a38
+EBUILD django-cors-headers-3.10.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
 EBUILD django-cors-headers-3.7.0.ebuild 572 BLAKE2B a1068113db9527f8a9c28657fe2c444930081efd361d6a6dd55cf890c5d2a3e77d7c60aabc4b9313bd6faf10fa06292694772f45d0db1bc7bfbb072ebda45b85 SHA512 eb1cb24debf50e6e6c8b6d8aabdaa3c6630ed8cd027f5ff4694f3455d5670f962be982b74c3f3258b1169e95651a9f82f09a336261286bef04e77711569a43af
 EBUILD django-cors-headers-3.8.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
 EBUILD django-cors-headers-3.9.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.10.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.10.0.ebuild
new file mode 100644
index 000000000000..441ad19af723
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-3.10.0.ebuild
@@ -0,0 +1,25 @@
+# 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 that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
+SRC_URI="
+	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-js-asset/Manifest b/dev-python/django-js-asset/Manifest
index 4ef11ac33134..c03fc9d52817 100644
--- a/dev-python/django-js-asset/Manifest
+++ b/dev-python/django-js-asset/Manifest
@@ -1,3 +1,4 @@
-DIST django-js-asset-1.2.2.tar.gz 4436 BLAKE2B e6b2ff1b2b90da5ae95af08b28eb1970e6e0edffee7eeec0a4697855040c4afd0febcc569d0a78c46bca80835b404367c426019016e5089b3aed984916e13cc2 SHA512 ea050c5093abd8312733b1402e275fcb44f0702c27e28aeb64d0470a8514cd85906707915556a9878b669c96918813c4bf2b69d281d33f18fcc7c143f8ae9f48
-EBUILD django-js-asset-1.2.2.ebuild 574 BLAKE2B 20caa6c28ddd1585684114b97bda885e6e1d9c45dec7e3db717586a30814480e465cdfdf48227641a27bfd2af401dcdd360276007aa15b2e58283e55263a92cc SHA512 7c8bbf158be812136a9f1d501f8ede95afeefaf21b5566dabc16393e3faa5f01417d0fa7ec3e85d3981ee61289168c0889a3734c851e092f1e5a175ee50b8a9d
+AUX django-js-asset-1.2.2-fix-django3.patch 1881 BLAKE2B 74ce319a395f14dbd4e3f84b8e460ebb73df733f2070b1d805014930e6030a947d77d1bc1c66b8c206c5dfaf58358ff754491ccb6a58588b9e8a52c6aa0cdad0 SHA512 a18ca46e27ddb31c836c4b7c6e1d7d449622278da0c585d2ea8a0a4d1178c5a571c1bf7ba7dc8803d291e9bf0085a22223a553d1d219bf7539288401d1c128ea
+DIST django-js-asset-1.2.2.gh.tar.gz 6367 BLAKE2B 5b24d3a2cf1ca2b28b82e581541dcb58aa2bf25d99f865007730c00211452dc5a062dc014b47fd1d10020d2a0b8f74060910460dec4f95be2b83c5c6d7bfb4d2 SHA512 ad2c51399da9b5d75305c0fa257cc75496df3f6704a827a0d297a4d762712039c3ebd921afbe6e10672626f1badd8637728292dd700ba41c4192c95ec73095a9
+EBUILD django-js-asset-1.2.2.ebuild 733 BLAKE2B 4228642154df38d83116b614399b8f726b2604f9ca8f6d99beb392a13fba771e2c796a31b6a847b410e2c15a299c129c67180181015a4b73af6bac7d7a0a9f3c SHA512 17d26ede102924fec2ea9ca1bcbfdf25983bf2d7003ad11ee0c8b2e1f3f544e36a73440a8ccb1d0a95c6b208cac7e34102985180d993149ec4745f0c8041dda1
 MISC metadata.xml 246 BLAKE2B bbeaabf225f3b131a4c28d6f20d9ff944642645041d0f9a257ef05e2f1865b1c76c465b7769b7142285d25b77107999d719d73f75db841eb92b92b39d5f7a1c9 SHA512 abb5f9c6ef30b9cc55e01db0aa0093ff146eae298d3b9348226d9835b39e040b6096bc2ac7fa8ae74c55fa94e83f706ae3d2b3b755ed31c8222eb29748c0a8ac
diff --git a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
index 16175edec804..5704b6a31f05 100644
--- a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
+++ b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
@@ -3,20 +3,31 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="script tag with additional attributes for django.forms.Media"
 HOMEPAGE="https://github.com/matthiask/django-js-asset"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/matthiask/django-js-asset/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/django-1.17[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( ${RDEPEND} )"
 
-distutils_enable_tests setup.py
+PATCHES=(
+	"${FILESDIR}/${P}-fix-django3.patch"
+)
+
+python_test() {
+	cd tests || die
+	local -x DJANGO_SETTINGS_MODULE=testapp.settings
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch b/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch
new file mode 100644
index 000000000000..4ab0484b17e0
--- /dev/null
+++ b/dev-python/django-js-asset/files/django-js-asset-1.2.2-fix-django3.patch
@@ -0,0 +1,55 @@
+From 232536ba50a2e1a0cffc6046dbcdfdec22cb0d9e Mon Sep 17 00:00:00 2001
+From: Matthias Kestenholz <mk@feinheit.ch>
+Date: Fri, 15 May 2020 08:51:33 +0200
+Subject: [PATCH] Adapt the test suite to changes in Django
+
+--- a/tests/testapp/test_js_asset.py
++++ b/tests/testapp/test_js_asset.py
+@@ -1,11 +1,15 @@
+ from __future__ import unicode_literals
+ 
++import django
+ from django.forms import Media
+ from django.test import TestCase
+ 
+ from js_asset.js import JS
+ 
+ 
++JS_TYPE = ' type="text/javascript"' if django.VERSION < (3, 1) else ""
++
++
+ class AssetTest(TestCase):
+     def test_asset(self):
+         media = Media(
+@@ -25,15 +29,17 @@ def test_asset(self):
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/test.js"></script>',  # noqa
++            '<script{} src="/static/app/test.js"></script>'.format(JS_TYPE),  # noqa
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>',  # noqa
++            '<script{} src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>'.format(  # noqa
++                JS_TYPE
++            ),
+             html,
+         )
+         self.assertInHTML(
+-            '<script type="text/javascript" src="/static/app/asset-without.js"></script>',  # noqa
++            '<script{} src="/static/app/asset-without.js"></script>'.format(JS_TYPE),
+             html,
+         )
+ 
+@@ -42,7 +48,9 @@ def test_absolute(self):
+         html = "%s" % media
+ 
+         self.assertInHTML(
+-            '<script type="text/javascript" src="https://cdn.example.org/script.js"></script>',  # noqa
++            '<script{} src="https://cdn.example.org/script.js"></script>'.format(
++                JS_TYPE
++            ),
+             html,
+         )
+ 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index f454d4ea8540..100d81c79a04 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -7,7 +7,10 @@ DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
 DIST Django-3.2.6.checksum.txt 2551 BLAKE2B 2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c SHA512 66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6
 DIST Django-3.2.6.tar.gz 9821499 BLAKE2B 9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39 SHA512 adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4
+DIST Django-3.2.8.checksum.txt 2552 BLAKE2B e3bbf05bab72cfd71521451620706eb2b66d2f16791cd7897b2606083af91b62af6c6ea1e9f2b2a1437e3ffc1e1688149f9084d134ac6fc233f6285418bdbe5c SHA512 62cef4cc4c9de4be5db763e35957f2e71e9ca9fc5335a35bc51a1e337a91027236f41b84dd1f9eb513cb769174d9375c0a7b52cfc645331a3927c5498849eb56
+DIST Django-3.2.8.tar.gz 9820955 BLAKE2B 5b53c1033babda046c3e3ff8421465d5bf31e92c5c65e6ebf7d4a401a5f85017625efbf227c718877d58f80f9153fc205b817aeb030d0f322c26b10394e71287 SHA512 0d1d745fc7ebc20a2c3c1d18e270210ec57d605aafafb2bc2bee4229727469dfea6fbd510073ee6509b389eff2a7bdb75765aecafc4506d4489c2ce37a97bfbe
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
 EBUILD django-3.2.6.ebuild 2985 BLAKE2B ffbffd6dc4038b0db6877960329b09e29f82e5dd45c2d7aaaf41ea18689eb81d87ec5e60244816bee5699687af62fd174712706a443dd71895952b0c7312c5b0 SHA512 93719e5e7d6c60394136ac362ae74399f50f62b86595fd8e1a968d946fee40e12f3df87d340669ec502b8ec21730300ada7b49454c116f17d61b7fa0353d0257
+EBUILD django-3.2.8.ebuild 2901 BLAKE2B fd56aa9bff6a70202113eaddb416a2f8877713f871b1cf22b94d59615b2fff48f2bcb337f0f96ca39cb8b13885fc4e8c1deb2207cc7340490286a1ca9033b443 SHA512 c3ad10ca03c068e188723ce8e65ce744219bccf1450dbf5a00c28d21ef4b9755c91db82e89238b88e6c643fd5b038c947b0806c9270756af66a81c7f0b5babf6
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.8.ebuild b/dev-python/django/django-3.2.8.ebuild
new file mode 100644
index 000000000000..28502c5a9117
--- /dev/null
+++ b/dev-python/django/django-3.2.8.ebuild
@@ -0,0 +1,101 @@
+# 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(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 01fba800bfb3..874da92b211e 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,7 @@
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
 DIST dns-lexicon-3.7.0.tar.gz 7826689 BLAKE2B 920bfcd51642c12a0353dbc0ef8476c0def0c1fcf160757ce8ec47ce3516c1a2b203d2e07ef023b502b9a4e52d2fe91e9c0a73fa83337471e7669effc054a441 SHA512 aabfb2460bc2665b57552e6267846a0f2e508661dfdefbd22adca5833f32e8034198d1c3d5c33b2b89fb4a0cf0e9a84ec7d90426a6d8ba78acf2f2d0748c2d65
+DIST dns-lexicon-3.8.0.tar.gz 7830220 BLAKE2B 3e4e2bb6cc557ff75a87e4f32c0e04dc51cdc5552e8c7e0a47e5927a250ff5b564369285e6699b31021a97ac86fe90a42bbfac310c310f97ff2f9499351d6988 SHA512 a730852550eefd3461fd07c441cea65add2f6c0757a09c7f868da4ccdcd7cd2f1cdca96a652d11eeadab5e6dadceaba1dafc5b1d753efc6c6ec7a2fa2a5f342a
 EBUILD dns-lexicon-3.3.4.ebuild 625 BLAKE2B 723c37b38fad26079e87f13fc99833f2f33af22682eb8b25b3f9e4d83c40c8aa1fd312f133e11b15f9c8921c125b599dcbe6bb397e90fa932934c8939d93e2e9 SHA512 0cd5aeff362c83f2ef711ac72dfaed3ffa6ac0488d31e9ec8a4dad8d725d24b4706dee9f1306832174d10266557ec2f873e99b90cbdf620cb609535cbfa3439c
 EBUILD dns-lexicon-3.7.0.ebuild 1615 BLAKE2B c21607e29675f5336dd780a7e477851619a0a6c0a4545eb9156273b6ebb0a6bf062f163980a8f10b14ae3567c2fc5f72eb796962978fbcffa73b4256e0d25ae0 SHA512 75c759d184a933ccb7e06fee971a968dc115272a76abe7b6742bf5d4af926a6377b0c9bfd2dfb3170446bd8101468398b2db212e5af0958596e5909ba2ce801e
+EBUILD dns-lexicon-3.8.0.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.8.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.8.0.ebuild
new file mode 100644
index 000000000000..bf5ab2f7ce8d
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.8.0.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} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="https://pypi.org/project/dns-lexicon/"
+SRC_URI="https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 888832788f6e..0cdcb0dcfa81 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -2,6 +2,6 @@ DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3
 DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
 DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
 EBUILD doc8-0.6.0.ebuild 863 BLAKE2B 7ffbb2689708c46229de6ec69695fc0ea466eee173e23a3b38183ca1af8e0948ed0e9459f23ec551b5f61b2c3bef60141c8ce4e732aaa79fdab029d6ec8973bd SHA512 ed9a8c5ddb1727ccccba2982b4e34b58dca4c64cda05e7474aed7d07379ab20823b48a448c8d20a9e3fdc6952bf97b0477b36d8d88f3f6bd5c2c896443cfe2ab
-EBUILD doc8-0.9.0.ebuild 957 BLAKE2B 8d8e4cbdf749e4dbb9b79711ff9757a5b8b42a8399810641f4a47984dc8b202ce7501f442ef6619ec03f7e6e601c762a7aa57d0fff64842b206ed5d9fa45c170 SHA512 66b66f995c149f4c4bac211d9fb1da1e1579758b3bcc985ee43e423e41ccba62cb1c6d570bad0c72987daef8229d0a01c706b48424c347eedbdef5bbb26ee403
+EBUILD doc8-0.9.0.ebuild 956 BLAKE2B dd8560d5039ab6eb66eae7119817335c7971bb47ed6e9f87b13421deb3d1b52fa7912b6e175a296966b016bca9db6f1123d4b40e325532dcb2f00b46226dc2cd SHA512 fe8e223be01c1c9409b100c13ce7d80e2583a678d91c0f94f7648b6faa944aba4a64c532ea11f3337fee64bb13fd73f9f8f67cc78fc16d2e3a2f09955e3f6904
 EBUILD doc8-0.9.1.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
index ac2608f9c97c..e80ac6ea7058 100644
--- a/dev-python/doc8/doc8-0.9.0.ebuild
+++ b/dev-python/doc8/doc8-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 74d70dad3524..fea60494a9b7 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,3 +1,5 @@
 DIST docker-py-5.0.0.tar.gz 247639 BLAKE2B 7e7f1d0edf228c967ee9252c6dc37e803a2e91601d3dce06db335c4bc4c8af43097864307ad72d4665d13f9ab0ba63b3dfd5ac7baa4dbc903ca57fe67985c1d2 SHA512 fae4afcda91ddf946048f76e62928a4891e1b0ce522b820aefb774dde58eb8e2aac0a381971acca04ca87794989ba675464e7913fab4abf2ed414719d66c91d1
+DIST docker-py-5.0.3.tar.gz 247093 BLAKE2B 607aca3f6a58b289feed018f40fa5e76e9d6cbae9eefd15a3347e393ae68d963e897e5f288ebf3a13cfbbfafd37882152da1398f61a808338424f353384f1b43 SHA512 50890e8d75eb9e4d3d98bbea5f86b86ad199a56ab0761bf2d0c0f3b7902810b2c17c2a677b0063963742a43a4660d400705bb8eb4e217c89302ae849a4ef3e08
 EBUILD docker-py-5.0.0.ebuild 1027 BLAKE2B a3b84e36c310b3314fd43fd6b6317dc886efedeaddfd4c6add31af222eedee30a68164cc9e4e92155e9acd72d071c7305ac437a2733a16e819565d5f8acc9cb3 SHA512 43c19a5b34e07bad6ff31510993f162aa126cad44238adca69a244b93fc80764fa6e2c22eb7ebd49573387cdc0a7762c5ffc7b8cf66467da167caf7a8639522a
+EBUILD docker-py-5.0.3.ebuild 1030 BLAKE2B c0c5ddf9dd8a08ee5ed4c7de34d5c548c0ce85ad1488b9549eca79d4e4134d1ed3fdd929f262bf0b38f602524ecedbbcff8c3f6a79b8ce4862236bf265149394 SHA512 4ec2b4db7d38baad09054dad78901bfd7a93223e2926eace231e9bf24f52d4bf0d75df7ac0a7ca507f3d97303a8ba3889d207b859820cd74e531ae4cb05085ca
 MISC metadata.xml 435 BLAKE2B d73e3905c5e21106255c6f19647879a5eba99f3334bcddf5104772bc300466442970ad489fc08e013af5bfdcbd4439d104f27cbb8c514d8e45fda27ae30a6a96 SHA512 5b5d470fdf19135af2095ca85c002945fd1462ae1ca32b7285411f8e75faeedea893c46bc200352c1bf25b43310b5bba43c226be2f2b02ccd6cba14b33ebc07e
diff --git a/dev-python/docker-py/docker-py-5.0.3.ebuild b/dev-python/docker-py/docker-py-5.0.3.ebuild
new file mode 100644
index 000000000000..f6e9eb29c7af
--- /dev/null
+++ b/dev-python/docker-py/docker-py-5.0.3.ebuild
@@ -0,0 +1,44 @@
+# 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 client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# localhost has a better chance of being in /etc/hosts
+	sed -e 's:socket[.]gethostname():"localhost":' \
+		-i tests/unit/api_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -vv tests/unit
+}
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index ef97f22f3a7b..09cacb450da8 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,3 @@
-DIST dogpile.cache-1.1.3.tar.gz 387490 BLAKE2B 580be4f524196fb56e651d793045bf2e3419d3c98e65be0ba2cfaaed97f9c9cc08efe67191f77b273e97ffe907e8f5e050a7a36d2d8287522a21e7c4290d1354 SHA512 fd735b0bb9b7eb3bb559c030c15ac547aeb3f4718c64d7edb0f26f0f8a71b9b067434e984460c40cfbca57696d2b9579266f0c9d48bad4cb3c5bbc07030a4fb4
 DIST dogpile.cache-1.1.4.tar.gz 390117 BLAKE2B 88c38473c3f177a42c2e336f7913940cde5f793245ddbb2ce3e7569c0853a1f93138a4987dc7781490132f84beb17c568ec9fc9a955201123842ccdbdfff2fc4 SHA512 d70f0ad1097f7de5bc887cfd0835f02a10bd6096433d39e6fe2fad5ed294f019ee043ced670c08bacb8ad1f6cf32ada36a62149a9b6db6205e72f49fa68bf4c4
-EBUILD dogpile-cache-1.1.3.ebuild 726 BLAKE2B 13edcf5770f3c705b46b37869aef9d33f9126922f67edd4dac7953ca371823946e16bc5880afc7fa6c9f059c9999fa1423c959d3d3d519082a2b65d4908a556f SHA512 47ac46f3dae3369271b9ce249bc8f335d78308bf62786f5af4685d3450351aaedf5b9e2e595fdaa66c58609f184a23c9f9f611f0d1b905ad068089bfecd900a4
-EBUILD dogpile-cache-1.1.4.ebuild 729 BLAKE2B 5ba8bef71d0367ee9eef4ff08d3d659b4f900c7382b77855c8e67fbc17893613809dcce097887e5ac1e5e7937a458ca9929065da608c16fbbeb665c80441a0d7 SHA512 6902bb3c62061d93e4cb7c48d4b190f4957cee2eaf5cd58e455dede42f7a39c8ebc6eba180d259bc37bce043bd83b3666d3acd4ed6a96aea98d2cec79d40df7b
+EBUILD dogpile-cache-1.1.4.ebuild 726 BLAKE2B edb9179b9e7d0f5d670f1d5221f841b3a3825b504dd8d3d47c2360a5dfddbaccfe80e2e3072df992379cbf44cf33405415827bc5ba55ce32ba775e01caa138b7 SHA512 5deaa56379e661383bdf71c9151306e7e893fa9ab1afb7fcb127bd5eaae47979c6fda07043ae3d31aab24327bb5fd0e0e599d06025d73ecc64d87c300cde980f
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
deleted file mode 100644
index b7a9ca06d183..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.3.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=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.4.ebuild
index d6e33ac5f616..f4e92b0d2c46 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.4.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 4f94a2b39583..12624d116612 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,7 @@
+DIST elasticsearch-7.14.1-no-jdk-linux-x86_64.tar.gz 191559419 BLAKE2B c4099d2e7a121b47549b44c081f60cd966a371a01827aa19380d171619cb6ef6f30fd411f75de00d41c6a93df2c899ac9dbc5cf2bf2264d7885ace6a61cf55c3 SHA512 77dca78ba865ae74863b3b2a3cd61e8a8e4478cd02eb020184dbf89fa32cf145a6bbd1d11a1cb88c2236a3b8cdb8b0047e3c0f1a40f609f31b898c905b2c211d
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
+DIST elasticsearch-py-7.14.1.tar.gz 302277 BLAKE2B a4502edbaf1dbca9c687a32f012305fee7520555dd23f05888fcb8b82e2a9ffa3f9c5208320eca4ea8033498cd0a951003b94662b6847da664f302b8c2763004 SHA512 49b4e0cddc210e0d73cb7cb28f38dae4fd0595e22733cf017c41f50731479a1a3672307a119b067a0b5c1de3a138908e337145effd2b66bf930c2d439cd2ce0b
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
+EBUILD elasticsearch-py-7.14.1.ebuild 9046 BLAKE2B 357fe8cc00a22a49a1fb21ce1bc2587d7348e3599b21c37703e0916e0e06919e7c747e238a84caa9012300ca4d7627155ef0b4f9fafb3e30028ffc54160a5b44 SHA512 9ba8b963769727107777a26c3c99a7e1fe9cdee2499e05c72684b23c501b9489dfd2ffd55a5cea16452909491cd3beace108a9a5cd831d42aafe6aedc859cbee
 EBUILD elasticsearch-py-7.7.0-r1.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
-MISC metadata.xml 536 BLAKE2B aa9333de869ac4de1497243b643f8d80d7b07d1b7eb0571887a10cb0de8db7c0de61af841a28192918c14a7608b2505808b7b01b5596e320347f10cfa3b665c1 SHA512 03801c8e5ccd10d80bf3230392a3035c37bc01ac7a3b554cefeae6127b1dd14b2077ecfce70e07dd7b3ee7627cf6b6835b8e10920bfe8a955b9e1559cf693431
+MISC metadata.xml 601 BLAKE2B 56345ee1f417174399c98b5ed5ce11557b555a5ff8427bde703a455cfb6af71c3e56edf6f778981dd2684d74910f632f7a079a72b005e666fc35577943b4f500 SHA512 546374a9ba457b0f02b142d92daba3dccf39abc53f75bae9ace0a2f05187e6ff7eba7b1c3cd228176006a329e0ec403adbe51d24841c58c47479b000d41941b4
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
new file mode 100644
index 000000000000..a164db017028
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
@@ -0,0 +1,186 @@
+# 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="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="
+	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-no-jdk-linux-x86_64.tar.gz
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="async doc test"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
+	async? (
+		>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
+		<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	)"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+		virtual/jre:*
+		async? (
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/unasync[${PYTHON_USEDEP}]
+		)
+	)"
+
+distutils_enable_sphinx docs/sphinx dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	default_src_prepare
+
+	if use test; then
+		local es_port="25124"
+
+		export ES_DIR="${WORKDIR}/elasticsearch-${PV}"
+		export ES_INSTANCE="gentoo-es-py-test"
+		export ES_JAVA_HOME=$(java-config -g JAVA_HOME || die)
+		export ELASTIC_PASSWORD="changeme"
+		export ELASTICSEARCH_URL="https://elastic:${ELASTIC_PASSWORD}@localhost:${es_port}"
+
+		cp -r "${S}/.ci/certs" "${ES_DIR}/config" || die
+
+		cat <<EOF > "${ES_DIR}/config/elasticsearch.yml" || die
+# Run elasticsearch on custom port
+http.port: ${es_port}
+cluster.routing.allocation.disk.threshold_enabled: false
+bootstrap.memory_lock: true
+node.attr.testattr: test
+repositories.url.allowed_urls: http://snapshot.test*
+action.destructive_requires_name: false
+ingest.geoip.downloader.enabled: false
+
+xpack.license.self_generated.type: basic
+xpack.security.enabled: true
+xpack.security.http.ssl.enabled: true
+xpack.security.http.ssl.verification_mode: certificate
+xpack.security.http.ssl.key: certs/testnode.key
+xpack.security.http.ssl.certificate: certs/testnode.crt
+xpack.security.http.ssl.certificate_authorities: certs/ca.crt
+xpack.security.transport.ssl.enabled: true
+xpack.security.transport.ssl.verification_mode: certificate
+xpack.security.transport.ssl.key: certs/testnode.key
+xpack.security.transport.ssl.certificate: certs/testnode.crt
+xpack.security.transport.ssl.certificate_authorities: certs/ca.crt
+EOF
+
+		# Set password in keystore
+		printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die
+
+		# Deselect tests which require a non-free license in the server to succeed
+		EPYTEST_DESELECT+=(
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/11_invalidation[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[{1..4}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_record[{1..6}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencer[{1..8}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/datafeed_cat_apis[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/filter_crud[10]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_data_frame_analytics[{3..5}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/custom_all_field[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_crud[{1,5,6,13,29,38,39,40,42,62,76,77,78,80,81,82,83}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/start_data_frame_analytics[{0,1,2,3,4,6,7,8}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_categories[{0,1,2,3,4,5,6,7}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/forecast[{1,2,3,4,5,6}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/explain_data_frame_analytics[{3,5,6,7,8}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/delete_expired_data[{0,1,2,3}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/upgrade_job_snapshot[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/inference_processor[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_buckets[{0,1,2,3,4,5,6,7,8,9,10,11}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/trained_model_cat_apis[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/revert_model_snapshot[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/calendar_crud[{0,7,8,12,13,17,18}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/stop_data_frame_analytics[{0,1,2,3,4,5}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get[{0,1,2,3,4}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_datafeed[{0,1,2,3,7,8,9}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_cat_apis[{0,1,2,3}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/reset_job[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/ml_anomalies_default_mappings[{0,1}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_model_snapshots[{0,1,2,3,4,5,6,7}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_datafeeds[{0,1,2,3}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/job_cat_apis[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[change_password/11_token[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[searchable_snapshots/10_usage[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[graph/10_basic[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[data_stream/10_data_stream_resolvability[4]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[xpack/20_info[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[authenticate/10_field_level_security[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[set_security_user/10_small_users_one_index[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[terms_enum/10_basic[{0..9}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/14_security-tokens-7_read[{0,1,2}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/13_security-tokens_read[{0,1,2}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_records[{0..6}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencers[{0..8}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/20_put_license[{5,7,8}]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/30_enterprise_license[0]
+			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[0]
+		)
+
+		use async || EPYTEST_DESELECT+=( test_elasticsearch/test_async test_elasticsearch/test_types/async_types.py )
+		export EPYTEST_DESELECT
+	fi
+}
+
+python_test() {
+	local es_instance="gentoo-py-test"
+	local es_log="${ES_DIR}/logs/${es_instance}-${EPYTHON}.log"
+	local es_temp="${T}/es_temp-${EPYTHON}"
+	local pid="${ES_DIR}/elasticsearch.pid"
+
+	mkdir ${es_temp} || die
+
+	# start local instance of elasticsearch
+	"${ES_DIR}"/bin/elasticsearch -d -p "${pid}" -Ecluster.name=${es_instance}-${EPYTHON} -Epath.repo=${es_temp}|| die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	epytest
+
+	pkill -F ${pid} || die
+}
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index eca5382633e0..94ef681d4bf7 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>erkiferenc@gmail.com</email>
-		<name>Ferenc Erki</name>
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
@@ -13,4 +13,7 @@
 		<remote-id type="github">elastic/elasticsearch-py</remote-id>
 		<remote-id type="pypi">elasticsearch7</remote-id>
 	</upstream>
+	<use>
+		<flag name="async">Add async support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index bfb3db711eb7..4d3aef4fefab 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,9 +1,3 @@
-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
+EBUILD elementpath-2.3.2.ebuild 694 BLAKE2B 4a419eb079c8a55860a694b1c641231d93caf82b850d25277a41962765519bb70d8c445320a27970e537401bb176f1e72b16d1372c5a9b7d4ae5c0644bc10daf SHA512 d3b94e6d141a705d00e922a4e026a0065c4c413a121db04cf48d4851c3a62f32a45ca2369aa6b37d2b28dc94abc7bc8f81576ecfea13772f799d392795287f59
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-2.2.3.ebuild b/dev-python/elementpath/elementpath-2.2.3.ebuild
deleted file mode 100644
index ea09e56ec873..000000000000
--- a/dev-python/elementpath/elementpath-2.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/elementpath/elementpath-2.3.0.ebuild b/dev-python/elementpath/elementpath-2.3.0.ebuild
deleted file mode 100644
index a236efdff839..000000000000
--- a/dev-python/elementpath/elementpath-2.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/elementpath/elementpath-2.3.1.ebuild b/dev-python/elementpath/elementpath-2.3.1.ebuild
deleted file mode 100644
index a236efdff839..000000000000
--- a/dev-python/elementpath/elementpath-2.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/elementpath/elementpath-2.3.2.ebuild b/dev-python/elementpath/elementpath-2.3.2.ebuild
index a236efdff839..2c234ebeccff 100644
--- a/dev-python/elementpath/elementpath-2.3.2.ebuild
+++ b/dev-python/elementpath/elementpath-2.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 229fd8e89ab4..776e6489483a 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,5 +1,7 @@
 DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
 DIST emoji-1.5.0.tar.gz 222904 BLAKE2B ea4f057f94ba06306d87b102598da5cd0d87038d61a45e7a44db1af107effb912040e9f2e318d7f8ebaa1ac854ef827af7703f0de72174689b5ca5c3c909b597 SHA512 9dc85a0e6ac2cb7e4156d54063380cce3048ad8ab38993a6d6f2608502299a3e5681afac8780cd14c44f7127c7e1805f69c9bb95460620ec0fe2fb0d52d2d87c
+DIST emoji-1.6.0.tar.gz 210598 BLAKE2B 13764d19093e22d3cc62f8b91f87ace3677bca947c15fbdec3df9da8dcdb41975ea111f6e61510342c6f2a029f2390e5274d8cd14ee319a1f83e8405620b5937 SHA512 d39f89dceca0ab040292a237dae81b33b098acac77a6fdcd444c87916224d4a83f4fa51f2e78d3b793cb87d12e78f29102767eb4ae58fa8eed5b69d59e009e31
 EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
 EBUILD emoji-1.5.0.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
+EBUILD emoji-1.6.0.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
 MISC metadata.xml 396 BLAKE2B 65f441554017bf19380e2309b4fa34926968ae4734961ec9c0f551d64e801c2ff05ccf89a35125870df499b63dfb4d04d092f2f236bc91f01eecadc7d0a90f72 SHA512 0c4f1b15a3f1aa4394f7f5d6ee12e48fa10344fe9b97b6253437556e95bb9b938bcf3158e07193fd66d722d38c927cc2013eed4da0a7ea2d50076edbf439bb38
diff --git a/dev-python/emoji/emoji-1.6.0.ebuild b/dev-python/emoji/emoji-1.6.0.ebuild
new file mode 100644
index 000000000000..d9c3bbe594f7
--- /dev/null
+++ b/dev-python/emoji/emoji-1.6.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 bc976fa807d3..2333043a3b24 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 581 BLAKE2B 82013d3ef7084cef8489da437d394de4f36d673271b90e776d533d5e3bd64fb7b7a99084c4471d83a3a8220944c0b6d8fa1ea878fd5bb37d1e298e849e52fd34 SHA512 1b3592afb20a80916c06299d87c10d0169e51b0c1b6c54d632fe2cf5ebf7a9778c7146aa7a302e26921be9331a97eacba2e37d8a37c002177532ce23f7bee374
-MISC metadata.xml 497 BLAKE2B 1ff82ce3199a3d67d53f9e724aa7b23eecf1625fc3cff0f971df8a7266fd3ce3f13347ef654cdb45c609e077f7ca9f73642fcc33eacfe8cf6d7748d3d302e7ca SHA512 cfbefa42e286d667291011efe9a843a80d927b680c3dc97f64c7e83bb58199bad1b2be4388eea182e634028eee04200481b9cc4ddb88071940ab89c1e4797097
+EBUILD enrich-1.2.6.ebuild 582 BLAKE2B c9a7d2a50b39a66d52381305559fd2b1bbdcfe3fad2481bde21e775743ab4d169350367a184a4a24fa4920921ef43d40700ad778df466d8f5bc47cce256c82de SHA512 a51c6c98f9b099136ec5bf9ce011dcb70961a75c092c17a422589ac61626c4fe833e27b23554370866abbfa60db904c95a09c4f186a04776bea68468fb4cfbfc
+MISC metadata.xml 391 BLAKE2B c8e2ab1ee58575e9cf34a6873a1507d4eba04a61de74156aee7d2c5e16897c11da16b9b2deecfaa3740c501f869bf1b54e4dc597e57d8ae49464acc987154226 SHA512 bd76efefd66c46d17e9b31f674a4cc934e00f4322b1d90c6040a06c637b44985420226eea3202b6fa734983911ac3d1eb2436949bb99edc412e0f633a55d8358
diff --git a/dev-python/enrich/enrich-1.2.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild
index aec4657d33c4..14f0c9fa5034 100644
--- a/dev-python/enrich/enrich-1.2.6.ebuild
+++ b/dev-python/enrich/enrich-1.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
diff --git a/dev-python/enrich/metadata.xml b/dev-python/enrich/metadata.xml
index d3a2d3a9f74d..c1a6b97bc359 100644
--- a/dev-python/enrich/metadata.xml
+++ b/dev-python/enrich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 3f22037548db..ccd34639f103 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.1.0.ebuild 713 BLAKE2B 523cef04a1a20a7f58093ce5e931f3ea7179329519d9e8f74d76741bd74d2efe782b3b382a60fbe6bb42374c812991c024b0452ce1819e0b92561ad4044de16b SHA512 1d66a37ad73641c388cac4d6e81e85259d957b57585e9fe2e83938a5ffd1049cbb7d13a9832105da7fd28efc444059aa4a9e2845a6e9121878e4f994852e05dc
+EBUILD et_xmlfile-1.1.0.ebuild 712 BLAKE2B 8444758899400eccecb32f5c070f65543e647024010d05af06f27caa79e1d29c7c14d455413d8db0bef980b85c84714c77c03a4f64d472d82e2d15ee1eb27217 SHA512 28ab4e0e6ac0f73494575b667055bb84c7d97bf7bbfb839bebafbf341ea65099bd63db0123b70a1fcab2517b4c6aa85af307634725d58588543656431fc56579
 MISC metadata.xml 349 BLAKE2B 4f74359c66b9c0ae3dbce05a4b719a0f4498f66ae68d9fcfc9809253369d798006dff7d28f2cdf79335ece94314275eb1a16be9bc4419feea7d6d3123ff29dba SHA512 efdd054a65a9536d3da8b5cb4d065a1eb507e5ff5ce10242271cae34d6dc04fe12d17d07026f44c99504a18be9fdb42e064c07dfeafaf407713cf54cee445c61
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index 000386895c84..990ad88bb4de 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index e3f5cd57586a..f6ce049bc1b6 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,7 +1,9 @@
 DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
 DIST executing-0.8.0.gh.tar.gz 494306 BLAKE2B 37ce7c743380dcac85e6843e8ee708c8d876c5de883e49786da67d94dc9a7bf983bb36278a823ddb2bc9291e7219125cf870fac8c0c28979a4b49e951410d5e5 SHA512 6f88052f61479c5fe4aba1925e90f3daea3852f636c5c17d94a08dfa4de909fb3187650ff07c1dc66b4b3bec4a04cfdaf4cfe0c37903f67b2d716691d07a93d8
 DIST executing-0.8.1.gh.tar.gz 494735 BLAKE2B db57f01a6501b2c709140d806119a455db2294f410bb1602bbe96d3b45c4301b9517654fcdc00c31b6dcd3365476d29a944e38d340f82338ed1059f0a878753e SHA512 592035eeef74dc83fd72a08910e3cbacebe70f8206c55ba54661d8a11b7aee105de59487a957caf71799b0f3f5239e601a4de5d19553f33d21983c23a199c383
+DIST executing-0.8.2.gh.tar.gz 494836 BLAKE2B d6ade5658c8df656e80bb596f6c19493475d74ea10ddfc60b25eadb4a2f68d8afd2f437a6f82807932bba0469617fdac7a4dd90569623d1c8d7f96220e02ec9a SHA512 9a7fe4d3bae77d49725f35bae9d239bfb2a6e89d893d871d76f26fe4beffe0a07c6cbf50ea7b35b9ced66148d015c48106bc5774b26f201f9b40577f3380f5b3
 EBUILD executing-0.7.0.ebuild 926 BLAKE2B af3a3a46693dab57bbf32ff0513aefa47fe5ba7fc10c55b2e7799b6791b9e43f9346d4d7f013252a056778b6f2fa584f23a831500d23a27a66c5aff8e4c6c27e SHA512 d4358defbc23260b70705e3a1543331e8ba401dfc2a185c8f207d8d4fd65066721f9a4d011ac8bfcb96e6775311f7c41bbbbe1c1ff34171c17e27becd3655223
 EBUILD executing-0.8.0.ebuild 927 BLAKE2B eaccb4d24b7df50e1eb43ccceb657de45618d6f0fe204fe3429c4003baaac0c1617668686ed85fffa5d3670e588a002673caee3362911cd81b2658433698baf7 SHA512 2533cd48a63dc137087447f54329de94ce4a0fa39b2e45f847cc20d640952b059cbbf86fc15b4ce030a7d71a900cde36f3ce191ac4549f42d4d6f9f81762fd5e
 EBUILD executing-0.8.1.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
+EBUILD executing-0.8.2.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-0.8.2.ebuild b/dev-python/executing/executing-0.8.2.ebuild
new file mode 100644
index 000000000000..e01cf6c3100d
--- /dev/null
+++ b/dev-python/executing/executing-0.8.2.ebuild
@@ -0,0 +1,37 @@
+# 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="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 59b7ce0d103a..aed34a2723ce 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,7 +1,9 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
 DIST py-filelock-3.1.0.tar.gz 584958 BLAKE2B 29ce6c14ece7a45104ceda46bbb261730f7bf3e7df9d20be783a8e8324ca350e8b02a099f4273aff953281e10d305772c3572a72377f1039d0763c3d87173289 SHA512 cffca48f9e7b39a750bcecdbd4a1c8fd2a57c0eddd41fb735930ecb954550620ab89994cc159b6f0ada2cc0961a097e5e2c2ac380de424b59b111a3290682b86
 DIST py-filelock-3.2.0.tar.gz 584871 BLAKE2B 67c5d85dd030007c12f549e772eac8d028c9f0ee9abac4b5106bbcae91e5447e7c6394938877b718630c22323c53ebc28a8bff8b2e323401f027807f7447017b SHA512 8c2f3980090b798ca0103158731a816443bf461a40d79f337e1c102aee50b3885d2b30113d509a8457df20a2cef196e70b2313fbe3f5b44557b817e5a6154d80
+DIST py-filelock-3.3.0.tar.gz 200781 BLAKE2B b511e6f2780639cddaa0753b1812c44a32720d84af63ad503ea7843ee59f81555569ed828296ba89f0e42b88de3f62c9af9abea970848acb59f2ce59eafb9c64 SHA512 e0a1603f8056788223edb4e0a2b3a83d7dceba385ff14ed04966b47a29c659ef58f782383a3864b6ffa8edeb5be6e85ad3cc70abf3926514eccac5bc747c81ad
 EBUILD filelock-3.0.12-r1.ebuild 640 BLAKE2B 798ef67b1ee71b99c065b48a8d5b54f9407a32d742a02a8d86e0c5f978662b2370afdc72617af1ec7712882bba3a92afbece905631265c1491a83f28db8971a3 SHA512 027590809537070c19811c080177863b21233728fa8db3c590763600a695898744e777d2a7f3a6a3cd48b04c2d1e6817e44ff59721ba7d254e05d5b90620d922
 EBUILD filelock-3.1.0.ebuild 682 BLAKE2B 15dcf39ee226422f1c84059de265aa5ce6c7a8904dba2eeee5cd935533dec4075984daacc37724c78010f90b03683f59ac3b40cd4ddf0ef74f1e0d9526a9b3d0 SHA512 c823957d1340e507ec6c29a034f43f4c613e8af0b4a557a6f60df297c18b71db76cc81db9868122a5044b131f97f2e28ca87eddf507e1282702c976040378f21
 EBUILD filelock-3.2.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
+EBUILD filelock-3.3.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
 MISC metadata.xml 381 BLAKE2B 2a49a48af3a92fe1cdf2c124d1358793a3a54f77c81b1548e06ea4ecc98a8043570ed24786af5d750bd6146f79d5ea75b477c6465d12f1d4a29754002de5bdc0 SHA512 252752e2bf29b3530576ab1e8de05cebffd1ed36ea7b473cb6e51a99c9763f8caeb9851a432dc4e84ce96fa653ac08d087f7f275c89bd8e66f8b91348856bdef
diff --git a/dev-python/filelock/filelock-3.3.0.ebuild b/dev-python/filelock/filelock-3.3.0.ebuild
new file mode 100644
index 000000000000..5e3fcb6a7949
--- /dev/null
+++ b/dev-python/filelock/filelock-3.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2018-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=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="https://github.com/benediktschmitt/py-filelock
+	https://pypi.org/project/filelock/"
+SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index c1ec3b949b19..241bc02c64e4 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
-EBUILD flask-migrate-3.0.1-r2.ebuild 657 BLAKE2B 1167a915ce904d3e95a25fa5e93df907e08bc1f6125df14679fa2125f61dea0014a4eda96fde2c1abb894ac62fbff7034459e6cc727296cd0d3c359d41957922 SHA512 9b97500eccd64da049a69b46dc904ef6831b37c583ae3e671b3e128ca479a4acd34d334f55e39840186b198737cc7ec372707011a470a6087ae8298a040413dc
+DIST Flask-Migrate-3.1.0.gh.tar.gz 23752 BLAKE2B c668db793813658d1486dad662869b65fc5461bc7256e2ca42ca0d11da88fc3a40618946d03c7fd4f869d0eda21af2d9fe29f146dac4d364b4642c2cd26b6d96 SHA512 4e14fa04381c4217e78c3766c86891e88cd2ff4e2eb1ab3c3a51344cbbb192a083246e60cdb6cc4c1ef42bf8108420e3befa1b59c44fe0890e5202fd275b5805
+EBUILD flask-migrate-3.0.1-r2.ebuild 670 BLAKE2B e54cacf8f30f5ae24373229c2bd1c565b06c0c63dce39d504248a23e12cf840f2aa5e7b2e3b8f4ee68e9ff10bcb8b6c3ad851daaa1ff8720f0b9c7cc61bbc876 SHA512 79443643a767f75dd97e2a47e20942aaba8c333c427d5f8c1ffe67b56acaae6590d6736e874aceae45a608d78ac6ecf21f61bb640489c559eff10f786d467b26
+EBUILD flask-migrate-3.1.0.ebuild 701 BLAKE2B 475035429827c1b360c2bf5e81ef0f4d422731be3dd494503049d83ecab8ba92e299c1ae0df7b02a30f159553f75501835f6209ce684c2b3f04416bee0a4f3e9 SHA512 66342d5d5bdc051c34d338313b039eacf70dfb5a47bca59dce90edc61683eb57881c09c4aab087f86cd722834387c703b4b119dde468e85c38a748742f65b421
 MISC metadata.xml 341 BLAKE2B 36bf4bc39e85c6ef5a4b890960fb94146935404537b165ecd11265f307ad59c09be4fbbd9681d01e286cb6e0e7308431b617b0f9cb000d92bb4ee2076ecff8d5 SHA512 5d3cd5f90d06c26b8b996ffc9588e74cb4c98e10ce689cee3541a2012c3e62afe097ce9e66a8220e5ab8387401f6319753af3ec7b91c1ddaa0920315264e555f
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
index 4e81f2756a02..91b7022f89e5 100644
--- a/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-Migrate"
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
 HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,4 +24,4 @@ RDEPEND="
 	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
diff --git a/dev-python/flask-migrate/flask-migrate-3.1.0.ebuild b/dev-python/flask-migrate/flask-migrate-3.1.0.ebuild
new file mode 100644
index 000000000000..851f5f3715f2
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P="Flask-Migrate-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="
+	https://github.com/miguelgrinberg/Flask-Migrate/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install unittest
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 3cda02fc928a..6d45208f5faf 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST flask-mongoengine-1.0.0.gh.tar.gz 123516 BLAKE2B 5dd6cf1d774973ef1883d824bdf467b53306773eff5f7016f6440a7ec55648012755a1270b8fca0974aff00dfb189c0f3f7d6985a01c098729517c0018513c8b SHA512 bd95a8248a972a41c92dc2711f866420aabba56062322801e473e0b347c95ad47da39439992ba6cf23a0981c422ae84756af3af95d1171acd6b321f9cbc63085
-EBUILD flask-mongoengine-1.0.0.ebuild 1771 BLAKE2B 6c710e26ba5ad87ec17f50d86e15ed7c2a5f837b12db738071162a10719e9c87f6b2b3c51d874e18c7dffdd9d33573674f84e2f54dca271cd36fe569873f2eb5 SHA512 e21a5b17dbeca66056170401fc0d47343affcb828909c11482a30e7b1ccbe10ce6071e7ba196c8ea5c7d978eb2c001016b1226ba76eda9707ce2b2d799614d6c
-MISC metadata.xml 356 BLAKE2B 098b0639a5997a6e74eec5c7142342e1c28360066936749660fd673a2b3871a9674ac0c08585371ef956e099e3e2e92599cc1a23c10eb1cb5a28f0c28aec702f SHA512 ac1d2ff0db8fa5a364549d0fdeca5b5f3471bb980af0b2aab1a0d61c34ef0f6f2f98d12d155bc00b8bfbd39ad41f7787388e4b2adf3bc58596b8d30052056dc2
+EBUILD flask-mongoengine-1.0.0.ebuild 1829 BLAKE2B 793b3758c52b7aefb64735b77c92ccb755afa0444cbc7cc5767da37b77dbef066e5a0c2168b8f94b3aad148601b1ba3a5bf1c62bf553ac3d4c9529ac6e729f2e SHA512 97c83aa2fe0e8556b80b90a1dc1446ffb2710f15427fedc3c28a6bfe0defca0233e2bb205f36583732abda67876203f2ad37b41b6324fd77a089009573791f1c
+MISC metadata.xml 427 BLAKE2B da29ab5947546ea948c499cb651476a87db66f22787937d352be99964a8a44fa9c8d60cc2ac4b653d514f3c709cf3af96db8158da60df9be28d6a37ea62d7106 SHA512 3346c432c264cccf1b13f43cec0e84c3db602997caa40f2ee37e243b11c8617cd04a487227f8e42069d55df9e8401ccdf59f55bb3744dc9ab9d8d6f3a358d03f
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
index 333446b4453e..ea5a729c1b49 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Flask support for MongoDB and with WTF model forms"
@@ -31,35 +31,36 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	sed -i -e '/addopts/d' setup.cfg || die
 
-	# fails with mongomock installed
-	sed -e 's:test_connection__should_parse_mongo_mock_uri:_&:' \
-		-i tests/test_connection.py || die
-
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with mongomock installed
+		tests/test_connection.py::test_connection__should_parse_mongo_mock_uri__as_uri_and_as_settings
+	)
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
+	local DB_PORT=27017
 
 	mkdir -p "${dbpath}" || die
 	ebegin "Trying to start mongod on port ${DB_PORT}"
 
 	LC_ALL=C \
 	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port 27017 \
+		--bind_ip 127.0.0.1 --port ${DB_PORT} \
 		--unixSocketPrefix "${TMPDIR}" \
 		--logpath "${logpath}" --fork || die
 	sleep 2
 
 	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-27017.sock ]]; then
+	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
 		# yay!
 		eend 0
 	else
 		eend 1
-		eerror "Unable to start mongod for tests. See the server log:"
-		eerror "	${logpath}"
+		eerror "Unable to start mongod for tests. Here is the server log:"
+		cat "${logpath}"
 		die "Unable to start mongod for tests."
 	fi
 
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
index b85bbc768056..38e4f9e9b7fb 100644
--- a/dev-python/flask-mongoengine/metadata.xml
+++ b/dev-python/flask-mongoengine/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">flask-mongoengine</remote-id>
+    <remote-id type="github">MongoEngine/flask-mongoengine</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 11192d2e56b4..193b5be6d86c 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,4 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
 EBUILD flask-principal-0.4.0-r1.ebuild 592 BLAKE2B 1e0414a6557cfa77b6962908a5d9f174f9fad4f7431337cf402709ec3bc9a754030f6ac51b6620e3bafeef7ffc08525ae704efbc1b0f9010a4bf8910f4e90285 SHA512 87b13668beed681e8fc0b7f4fa1048ea47680d451e020d31659266a640acde6545fa52a7fc8ce0120cbe7570c54dbf1620851a7930effa0e7e80d5b7baf21926
+EBUILD flask-principal-0.4.0-r2.ebuild 607 BLAKE2B 8cfdb3e1e7c7a23e534504317c0f92b425678d30ed4cced9c08ad5f15c04e9458966468620d12f1a4bdcc1e21327a55edeadf1590657e445fc5bb28aba2b87df SHA512 3412a426b5db6dd72a0acb607a974d3a2771522b304620b34e84c20cdae4c68523bcda224fbf6e88c21f0562e269880fbf465433ab846ece25971f396c6e1bcb
 MISC metadata.xml 410 BLAKE2B 809c7f39bf13d57521f9fe79ff298be6384513da601b43996585a29c0daba49e813812f827ecc59a5193b53536bd247db88305d6233c782316ce21c5f85882ff SHA512 fc970bc0b9cc4f267b3c49153bcf253ffdb2e9197f6fa537eb5efd7215b269727624e64f5e5aa4f1fce1a03c142cd85142da33229d0a2065f680dd8ed63443d6
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..2e383cb425ed
--- /dev/null
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r2.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} )
+inherit distutils-r1
+
+DESCRIPTION="Identity management for flask"
+HOMEPAGE="https://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal/"
+SRC_URI="
+	https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+# pypi tarball is missing tests
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 5c5edc92e338..db35eb85ade7 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,7 +1,9 @@
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
+DIST Flask-2.0.2.tar.gz 628479 BLAKE2B 13555ce0602e685b5fe29ba51e05534263d70440c56c9096e95e0893e010d877154d3d1db1bff47209e6b70e91612a71e8aed149a067465f9e3a11486d843a86 SHA512 341be4e453dd5f682e465af356ff85ffe76f52a62e529e6cd251f95199e73b0f93414af093f899f61721e9bb351f09972a433a55beacc972b5e577b86e003081
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
 EBUILD flask-2.0.1-r1.ebuild 1254 BLAKE2B 4905978df3fa82a8c6d823348dd93886d894ded96a7d2086d27365c7b0c87633a20fbd698866d1b5b7ff0df1bb234be3cf2c225a716531a0fe5bbdbc4fb4f2fa SHA512 6e8889540ba701ae776da1c2c72f95839ae09d6e3cb224e65fabcbf49f4b073b8ec5a26cb2c8638e8508a63b30370acaad68dcee78c5505ce25aa33cde024396
 EBUILD flask-2.0.1.ebuild 1157 BLAKE2B 0bc463ef16344809f4fc20924a286d45263be516a5ba31e7f2b5177c0e839398cb0d0ede26374cff1ae74a2bde6b112f7b3c0c3ccb44323bab9fe8fddd200f3f SHA512 eff0a6235f8a7e7dc98976dea47be68aa65ea5a8f2fdbeb873540adb781bfbccd7415686d045c58d3ce49e50e0ee18c4e106c6dd6c6edaf29b04311860a76cbf
+EBUILD flask-2.0.2.ebuild 1462 BLAKE2B d4005fe93749cc7ef0284c41f7ccd3863395e8335d6f910853e2581d1333d32b2a3c66d130d1e2637c8e24a44de34cf47166459c732ed38d320626b46718f46c SHA512 f1b12e91afe42169b21c584c5454e00be059bd4ce8a669a491f60b49407f1221c57f0b8174d02d2cd79a065c54b6d63118b7f6e2eec6eda6f6ea29448f646264
 EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.0.2.ebuild b/dev-python/flask/flask-2.0.2.ebuild
new file mode 100644
index 000000000000..0d065b5c197f
--- /dev/null
+++ b/dev-python/flask/flask-2.0.2.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log_cabinet
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/pallets/flask/issues/4292
+		# (test xfailed in newer version)
+		tests/test_cli.py::test_lazy_load_error
+	)
+
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index f316b3ccb5f6..b9f8a707cca5 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
-EBUILD flatbuffers-2.0.ebuild 431 BLAKE2B 2893735c224064e02efdee6d3cdd99c5931f74993536f8b4a74435b42b4eb7697cf01e1944da0c5d60adc4a3d29d1f2d91d4fa5b5241b1cb69785449a405a38e SHA512 e87aa9561418333c6890069d54a368505687b4d0ce2af160c05e8db37bf1f2d9d934254dfc8d56e7e60de18647ee90b3772a9ef44a27bcc9003d9485275e1e3a
+EBUILD flatbuffers-2.0.ebuild 431 BLAKE2B e7420c8f66ba20ed210a4d6ec6f30c5e92050eb2e6c1632369a0fe4432e21c9c862ed0ababea673f0bf9738a74a6349f27c0314da80e5126323860dcd36e79fe SHA512 4b44d1cc187688cf749404717b1022c3dbfe9c51e473d28cf22f1e1a1c06e9546b407c8b7728e90884be974388c4d878b4cafa34aa22735526d050c42a2a4e55
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
index 806a74e479a1..cc7f8d257ac8 100644
--- a/dev-python/flatbuffers/flatbuffers-2.0.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
@@ -2,8 +2,8 @@
 # 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="RFC 7049 - Concise Binary Object Representation"
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 167c07d316a1..84c94625a9ab 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,11 +1,5 @@
-DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
-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.26.2.ebuild 1419 BLAKE2B 7f56ced1a78da81c4b8e006006c4137c4537f9b771371aa2d9a7605e2e52d2bd6aba8d8e59c2f3309eaaf10950cbe9b362d5c1909c84835ccbfbb5bc5344b387 SHA512 a91140bfd01e9b1f2bccfaefbf629413845bb6797ebfd4f7ec7e0d4cadc76ebf70543a39e0f366d63f2b11cec0eab93bddccffc8d4c191671bbaecfd28d73e5e
 EBUILD fonttools-4.27.1.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
deleted file mode 100644
index 7a8d7cff1de6..000000000000
--- a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-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}
-	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
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.26.1-r1.ebuild b/dev-python/fonttools/fonttools-4.26.1-r1.ebuild
deleted file mode 100644
index 2ed01e966da8..000000000000
--- a/dev-python/fonttools/fonttools-4.26.1-r1.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..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/fonttools/fonttools-4.26.2.ebuild b/dev-python/fonttools/fonttools-4.26.2.ebuild
index 2d39609d31e9..20aca96666b7 100644
--- a/dev-python/fonttools/fonttools-4.26.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.26.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/fonttools/fonttools-4.27.0.ebuild b/dev-python/fonttools/fonttools-4.27.0.ebuild
deleted file mode 100644
index 925c4733a1ac..000000000000
--- a/dev-python/fonttools/fonttools-4.27.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..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/fqdn/Manifest b/dev-python/fqdn/Manifest
index 71cbc553c28d..19b305048dfb 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,3 @@
 DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
-EBUILD fqdn-1.5.1.ebuild 581 BLAKE2B 5970d7e2183402a4b4424ad83e41951878f49d29e663883b16c6d9ed82feee879a534ec976360143a8412b6f173fbba22aaf91cda0a4a5774780bd6a53145aa1 SHA512 eb275893e159c2002322c0f06768b81a01d798872c03c2853564bbe4c579d8e8d33027ea5aeb7c73ed6b778c8fdaea3589165993ec7e95cc74d30d20c188900b
+EBUILD fqdn-1.5.1.ebuild 600 BLAKE2B bf9f60c30f511005cd41d1499eb581e1ffe75a7d177832c195821edbd078b12f4e9f1d1d96dbec871f4eb3acdcc469c7bdba34b8dc43a646372478ee299c4cfd SHA512 18ec13458596281361a9fa05a5c71bf6cbb32c4dede96a37addbadfcc910d2e798cb4f26fd1e1e98b26ecd6d3cfa5c7d9c53f61ea5d106d7ee34458a5e1f76d5
 MISC metadata.xml 652 BLAKE2B 59a8160abd347e18ea95c04143def0b8c0aed88e48fec0383ff973048a3913f43d51b854348ab279a3ce321fcbc0844bff9506e213b8e3936085a49d5ba7943c SHA512 de3fa18cb8d162fdbbbdcab61f9395c2da6c83c004925621b0ead1067ba8ccca25cd72997b00505221c0e5a1c3fc20e0a1c04fc488321bf25b3cd77c91f822e8
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
index 9bacbadb679a..75dd81bf59fd 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 7a9ed2cd3d91..09e710dd45f3 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,7 +1,9 @@
 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
+DIST filesystem_spec-2021.10.0.tar.gz 313863 BLAKE2B eaffcbf4b7ef1821406664062961f36e8490ffc36e6b64dbd3be820785c41742f741a8f0e76db5ee0a75e2dfc609000a572ebf5c02dc9118b2a45413a498de32 SHA512 2b478a88c0aa84fb55f8946923f79900350e36395bc6110181966404e6fb6d5fbdb3b6ea19e2e7077c8167f65266a68ac962af25dfb1cfe573f5e74c34329fe8
 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
+EBUILD fsspec-2021.10.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
 MISC metadata.xml 374 BLAKE2B e3c4cc3d3081e0ca2b3d6745d1920f128bae3d07a4bf47d29eaa2143024a9272e4837ee95e2f2829baa000250afde46279e71b031ef7c283fb47753e7e0a9c91 SHA512 c1ef25f5dbc85cad1bc5dec8efd5e0d8b56587d123464fe37f834a30eff03fbf5d605050322f88bfe3e4a2f1179577f63c2bd8b0257202d20f4a40cffe317537
diff --git a/dev-python/fsspec/fsspec-2021.10.0.ebuild b/dev-python/fsspec/fsspec-2021.10.0.ebuild
new file mode 100644
index 000000000000..2f83ce072601
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.10.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/gast/Manifest b/dev-python/gast/Manifest
index 4d1107cd441c..b6f195ca57b6 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7dec8da99b15078ce0f482ac8ec931b9c0acba3a405f2ab3c820a1c578ab93583f9f84740571dd85a3fcb45d SHA512 2a06245ba93f2c0715f662e32e0865732828deb672bc70c3d70a4969c8a2e4c518354a4a63760eddeba53932d4f8bf0ae0ffab64f1a1ad3b20d5b2d18285cd6a
-EBUILD gast-0.5.2.ebuild 494 BLAKE2B a305be1db62fc33ab224764831b5613c72f15f2193bd8975deda5ca72d049d171d1eb1f1077177ff96f4ae532a71d1a4cd1b148b4524aa17c402ee5ce1964113 SHA512 1d85abd88a29dc52c1a13de328ce715e07835921db1db0012bff3c1c08453a3b24d141b8002ac6704d8fd211d5959412f96fbe047ba88d8589355688804e5be4
+EBUILD gast-0.5.2.ebuild 508 BLAKE2B 10f9f2d7e961eb4fef0554a63cf6f15ec626c24f1742fc669ac2567b847de6153413c1c727976d10ebb584190cb5aa2ea127a2654d467555dd4eb89b4a55842d SHA512 e56fbc5fc12e2048ca19228685d32117c6da904c8e06ac678dfad02f883567421eb38455a30c852ddd8d726de59c1be8a54867dc1f4196514b1b34dd2b7761d0
 MISC metadata.xml 677 BLAKE2B 2c536c1a53fd3be71dae57488b28f71af9e27dadf2987ecf3967bd74e30ee688fcd598f995d7e0b1b74694668b92699036a8049c54698e389d71687a06df6587 SHA512 9330e92aebd0ca5ead979f70d86540c5b416b60580d45c6b7f8f02e4753bfab476d9b1a22dd7ba32f1167be5512983d275cfe07f57757c484aeb8619e836e13c
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
index f8d24cb607b3..9677483225b9 100644
--- a/dev-python/gast/gast-0.5.2.ebuild
+++ b/dev-python/gast/gast-0.5.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 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 94d12040fc40..77fc91875331 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,7 @@
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
 DIST geventhttpclient-1.5.1.tar.gz 58398 BLAKE2B 9995e14c635b06f729d342b19187d4c4b935f903038950fc05e8d9260a341d3a551750c1cd46798ac2d97603d1dba449d4db3a51a44e49a1720ec23b1526edf8 SHA512 46fa5333149b86f5c4b5d06adfe5d49402d0220266c27507da1645f1da8a50562e142e37435a029bb4184c417e8a4123301a7dfc8769ce419e841afebc11247c
+DIST geventhttpclient-1.5.2.tar.gz 58467 BLAKE2B ea9476038685458cade41150c33226b4355018b8a8c22623e96186ff922d7f6b9518ca4108afff3bcfd18167bf288ef7f6366528050e300d720ef0e7b15ef649 SHA512 1edf153f88b9a7a954f9acc316ac76f06f2599bd3cf11b4a8f1df7b500e884f304601aae6a1dca8cedf24d4f78793176814eadc8b2c60fa90769df649723146e
 EBUILD geventhttpclient-1.4.5.ebuild 1477 BLAKE2B 35bfeb29334f743c0bd7ee2ed476f51c056606f14caeaa149ea4d0cae6e66a5868b804528fc60cc542b07474b5598f30e6b007985255e1bc9b2798ab0497cb91 SHA512 68b9ef7dd73a8aa1da5fff02fec0edbce304bd0d3c26dc1be96f06ec3cce39f16a98e636673034d78cbead3a578c7a81fe1350876908bfdf0c23543147813fcf
 EBUILD geventhttpclient-1.5.1.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
+EBUILD geventhttpclient-1.5.2.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
 MISC metadata.xml 556 BLAKE2B b8a8f2fd8ff23ea4bf828d0dbf673da0345f832124a526f533e4beb36ca168acb13bd4fd92e7842a5361c38d9437960322a0c29f4c11a79696ede0544148d2da SHA512 c7bec846363a0fb54edeb145718d0acf56e6c2d0c1b2eed68f24412a9f328dac86f78e39d636e0b234cd556c334fd413b810bb1e5689651a17e2cd31cae7bd8d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.2.ebuild
new file mode 100644
index 000000000000..39d7cf97389c
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.2.ebuild
@@ -0,0 +1,49 @@
+# 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 high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[events(+),${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Avoid ModuleNotFoundError for tests we skip later
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# These SNI tests require dpkt which is not in the tree
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	# Append to sys.path to avoid ImportError
+	# https://bugs.gentoo.org/667758
+	# Skip tests which require internet access
+	epytest --import-mode=append -m "not online"
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 6660eb299bcc..86989a55d683 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,5 @@
-DIST google-api-core-1.31.2.tar.gz 135491 BLAKE2B d2567f628ac888b8f708b5e62c7a34cdad592e98689b3208041e48f08345da5df7da295d261af73c8e89041c91297a90af243b24c250095493af07c6d892459f SHA512 e819bbaadf1aedf78cb397c9a5a9677fbc625285a4f3d14620e5af0ec125f97eaabe18e34a669daee3bd51520de0818a4e2f451f83502ad78adf77e4c739fa67
-DIST google-api-core-2.0.0.tar.gz 134125 BLAKE2B 814d20f4b9d02c389768e184d8be4614cabe0efbf227c98574dacf0fb3bde6cae71c40d2a17a1353f5dd02aad4f19e49b7338038cf22a2e0ec4be450b2f70af9 SHA512 588dcdeb80c4cd53ebc9d1a76efc03bc3bff22aa850d48385edc0bc6a0d343b406d26e64d22c0befc06f6406bb6c8efcf07947c6e48c49e6f077b72b8414403f
 DIST google-api-core-2.0.1.tar.gz 134658 BLAKE2B 0fda61be3b069454b305656f7a5a9243467f4e129e2db661e997fde850d416a50df803af6e7e9d041b8473e5f1abd35f6d5a9b25067133be28bed90ec1cca7e4 SHA512 297af05cba4919423e15844ccddb821fd65076f787bd01f24022d8393fbf45cf276611ab471be17950d7fad4e58f9b823517a8aeeec931df5b1bb37c38fe8ec9
-EBUILD google-api-core-1.31.2.ebuild 1521 BLAKE2B ba93ad7c7fc37752d1b2f6f8f902e4ea68be5c25c6b86add03312906749241834709b6a82b1a481ee9a599482c4a2be6e949e285769bb3b8aea32cb5b98912b0 SHA512 7053d7ea4e6667a7f6c7aa72bbaeda48d764c4f8a95ea30dca60e8fbf8df31334230125eb81298c202c847f2f3bc9e6bc20f018c286385aa0d22e53f43b9c82a
-EBUILD google-api-core-2.0.0.ebuild 1435 BLAKE2B 4ae9ce19c8fce846b37ea13e96e690fc6accd6a7761958f13907fa32d7d4cff77b34d1dff19c1d4ce50817f589bf56262788ab23f1f8143c0e03a35bd6c8d70b SHA512 defab1f7fe70687560687a08a5c71c61877d6e318909019e9f5228170c33632c067bbc7025906cff1b51cb23ecf8be1083adbb9c1d92c47d18aee70e46e23b58
-EBUILD google-api-core-2.0.1.ebuild 1435 BLAKE2B 4ae9ce19c8fce846b37ea13e96e690fc6accd6a7761958f13907fa32d7d4cff77b34d1dff19c1d4ce50817f589bf56262788ab23f1f8143c0e03a35bd6c8d70b SHA512 defab1f7fe70687560687a08a5c71c61877d6e318909019e9f5228170c33632c067bbc7025906cff1b51cb23ecf8be1083adbb9c1d92c47d18aee70e46e23b58
+DIST google-api-core-2.1.0.tar.gz 138173 BLAKE2B 3ba5b5433a8a29ddf180315daed5587d113bde410697eb5f90713573f41b15b89f0a52e387515751c7702008b150ccc8b90cd7480ac0a26a5f9c73f94443915a SHA512 67688f2defa00df8039d964edeb2cb94aeab5124794fe95d1cba8b9e79aa57b7a191a4b51f91c7d7e293c7a550130cac294926552e47545a0f8222003d0ba076
+EBUILD google-api-core-2.0.1.ebuild 1433 BLAKE2B bd36019f050f4b5b7ffb15eaae6faa45f67c68a2fbbe5d3770dec31b4ee766f25cdfab0ba735bcacd55681c4b905ffcac829a05393f7d088b02d373f55193a79 SHA512 11a99d229a9a0cc000e04478ccbbbe4da10a3813048ef8474f427e26b0af7caf844d09e268496dde5c0dff54ed17aa74e8669c5c537a75f57ed5f65557debce0
+EBUILD google-api-core-2.1.0.ebuild 1435 BLAKE2B 4ae9ce19c8fce846b37ea13e96e690fc6accd6a7761958f13907fa32d7d4cff77b34d1dff19c1d4ce50817f589bf56262788ab23f1f8143c0e03a35bd6c8d70b SHA512 defab1f7fe70687560687a08a5c71c61877d6e318909019e9f5228170c33632c067bbc7025906cff1b51cb23ecf8be1083adbb9c1d92c47d18aee70e46e23b58
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-1.31.2.ebuild b/dev-python/google-api-core/google-api-core-1.31.2.ebuild
deleted file mode 100644
index 3d83697c28fb..000000000000
--- a/dev-python/google-api-core/google-api-core-1.31.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO: package proto-plus
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-2.0.1.ebuild b/dev-python/google-api-core/google-api-core-2.0.1.ebuild
index 6e1d986b70c6..f085a528eaa3 100644
--- a/dev-python/google-api-core/google-api-core-2.0.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-2.0.0.ebuild b/dev-python/google-api-core/google-api-core-2.1.0.ebuild
index 6e1d986b70c6..6e1d986b70c6 100644
--- a/dev-python/google-api-core/google-api-core-2.0.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.1.0.ebuild
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 965f959b61d6..9c3cd06b6ed6 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.20.0.tar.gz 26723285 BLAKE2B 3c0cb64ea8c58fe2035
 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
 DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5856c7b7683ceb7bf6f0f65400b2407195be7e30a0982288a0f7892e70b659c0984823d5dd0c3d4115eb781643a584091580ac1ed480b4 SHA512 da8515a0db759cfa4e9b991fd04811e9d213a35c184e993e2439e00860ce86857c2968da75dee3ec755a2f679ab44219d4cc1ed817e7ac24664e667412205566
+DIST google-api-python-client-2.24.0.tar.gz 27072085 BLAKE2B 285da09fff461ffd100a5fe603f970fab6d552197690279e0c0d411700b95109bde523c1cba84a3fbc04cdf7bc13237a4432014912e0c79aec0c1d82e42c8c69 SHA512 84f0e0f95de0bede13e76eac3885b2a40a61d3ad522cb11a59cd3ab1d7bf6a7368a21232f9a9f64905bfaa2bd7a9b359ee3dee2a53e1dc303e8aede14dbdd466
 EBUILD google-api-python-client-2.19.1.ebuild 1520 BLAKE2B c5a616793b25aa16ea7c56fee7e10dc489c9b6df073ad005f84c878f4be03f3aa2226dc81e1daadeb3bee337db1b786ac1afd300e24bb60ec50c208155933464 SHA512 4bb53282f81960a6dc2bb75a271d815113b01f3678e6fbb21760c2520069c6a5107fac50706a34bec4dac0ef94f6e1ae96cbd4872ac8eddbedc3b1ab3a570463
 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
 EBUILD google-api-python-client-2.23.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.24.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.24.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.24.0.ebuild
new file mode 100644
index 000000000000..2bf8009bdc63
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.24.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/google-auth/Manifest b/dev-python/google-auth/Manifest
index dd4364f56bfa..24c42b8f45ab 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-2.0.2.tar.gz 180445 BLAKE2B d4e9e7dcfd690f5eedf301e989c4a2dedf5
 DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
 DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
 DIST google-auth-2.2.1.tar.gz 183909 BLAKE2B 4c18f332f068573567af5100828b3902db17e46c47087569386ad3b012e45ecb841709376fae7f14920e3dfdb0124b9fd002b670b565b9c641dc9ff4ef5cc507 SHA512 245e6b8d27ff49e47093dc2f50e97a57031c93090900b5578a91ab335560b7fec1aced1faf822826263a00dfaf282eb147a4e389c13546f2e34d09f1ef1ca285
+DIST google-auth-2.3.0.tar.gz 184993 BLAKE2B ac1392ca61e092e3e53c9e936e2d0bd11aeb8f33cace2458e80055734a96a05294335a9273acfcc3f385f423ed537d544404e41599cb6a75b21a10998fd72562 SHA512 cf0040d238880ea4bbad64f0a47311f2ed3922a7301a0d5287319b39ea8e76dca66dc78fd860cc12386b078bd2147a1cba01de97381420ef94cc44fca0c90ad1
 EBUILD google-auth-2.0.2.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
 EBUILD google-auth-2.1.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
 EBUILD google-auth-2.2.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
 EBUILD google-auth-2.2.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+EBUILD google-auth-2.3.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.3.0.ebuild b/dev-python/google-auth/google-auth-2.3.0.ebuild
new file mode 100644
index 000000000000..cd44f928efdd
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 210e72ee0597..e1f7852407a1 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-testing-1.38.1.tar.gz 16862 BLAKE2B fad99b35851e36b4e80e8d5d1ec91fd5f22e21a37596b3240aa81128fc77b73c95ce83f0d0423a047c85b9dba428e94f9a2c1681971776c1a141c756026b7ce1 SHA512 2814247be309498ef9605d630afd4bdf1843b21e89a7d6742b27107499ac73ca60c2bbcbe9b76d2be765505025e887af9a2b2159b324f10e3d85960759aba23c
+DIST grpcio-testing-1.41.0.tar.gz 16777 BLAKE2B 143b543f713c5d92d016cb428e06503fc92f33a9ae758eddae25b5d815222bff7d045d0330a148b072638adff3157b7accbc5fc0eb9c99c981499acd1916f37c SHA512 107bd368a10112cb9bfd0ea0cde8c245ac3131e7db4c14884ec9cd768cf510986dd06ed84b922df81542273951a8f25ef6b75954c3c6e5b42b3b80475508303b
 EBUILD grpcio-testing-1.38.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
+EBUILD grpcio-testing-1.41.0.ebuild 488 BLAKE2B 3f303bf15b800b01c999ff7b283137facaa78d47adaf511ec456cab179c306f40ace6a0fb5f7684f66f3cbe2ba8f17c0f533b7620471bc562c5bcb4a0aa2bb6c SHA512 f65e2cc4411436daa412a0bc5dd073c8942dc456b7bf9daaa709eae338f94fc3cad577e4d0989ae841c2866c7b6140d417fdf289afb69d22b6c5c2a503508d5e
 MISC metadata.xml 378 BLAKE2B bd4fcbd45d6b8892ced059de5457506a61573264ec9533ffa06f3076e0c72908e3565930e8cf200f87def824d26fb8e184dd358ad04e02b5642f7cc24b087e9f SHA512 73109d9926eb1dfa38add772e095d8765a8cfee436168cf6bb4541ed58cf441dbb84075c72d2d33e4535af3661948ace21657b7814456a5f708d6d612faa3386
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.41.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.41.0.ebuild
new file mode 100644
index 000000000000..dd036f46ba69
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.41.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index cf8b34b557d4..902edaf4c303 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-tools-1.38.1.tar.gz 2128280 BLAKE2B bd8f8a371e89c096ce0e7f458e88c7d00ee6d75f18c008e8e0daef37559afea1792cf874829e1a8bda315ae49cd6e453406a75705672032811b059c2189b6aee SHA512 7498443a42da8077b91972ccf78bc64d9906a4344d8f4ce17ae8e45f32c952baf0c84d20771f572e7c883a26022be32f6e0a46f1d0e79dc651f90193987892e5
+DIST grpcio-tools-1.41.0.tar.gz 2172949 BLAKE2B 42c4eee8a5b2f815681fb45fdc681bc713c113d9251acdc1f2fa897756e96a058d83fe75abdafd446d9fe61cec280b6db7e62cb15278882b964c0ed57dbb7beb SHA512 67b293fdbace63d3031372594d57a22194b6d257704279c12b227dabd8feb6de0acd5ba36f6296da7d82c8eac0ca4aa7cc3b12ea01ca9ffa0d15ed8181eb46ee
 EBUILD grpcio-tools-1.38.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
+EBUILD grpcio-tools-1.41.0.ebuild 791 BLAKE2B 04b759212d5f7e62e2fdad154a261cc071895e9bd3bb47ca84d44867a29135e0a234d7e56d5d561568bf964ec8b777f91a2fe9484bd36210fdb9d09b36428529 SHA512 aa28e6ee249ef8bfb85a751bd930aa6a7d0f47baf0e8867eaa4b652e299caa7ccd8ea26c4cb53dbb58dc42d5c7f52180fb2b1e3c93d69f206c48d23ab9ecf8a4
 MISC metadata.xml 376 BLAKE2B e5cdaf58121264aa01fca1e7466b497ebdfccebcebef9ff8a6eab4378e5031115c3cf64469dfdd0902b8b1f76ab2ccbe460239627d3d0590e6ddd772c04d7639 SHA512 a55fa742c61014334fb41be9dba20bc42caf767bdddbcc92e227ac643d368668603a3b4f4402cb2393e0ae4af0fcb74fd5a6784c3a7be17afed8c21ab338b0bb
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild
new file mode 100644
index 000000000000..e37b35397828
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild
@@ -0,0 +1,35 @@
+# 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 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 7d3ba3587f67..2f50d630e538 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1,6 @@
 AUX 1.37.1-cc-flag-test-fix.patch 1053 BLAKE2B c2f6b0a506fc2d074e656db3081447b3a0521a2ed2bd14a19104b962e0ad45b0068116384403eaf199d2bb8027b4a260dfaa7ed274974ad0bb6ca56b9ad19e8b SHA512 72dc39d549a008d137db29aa446ab7fc0add575103e941a969bed0124ce3b285f27edc31ca06db71b2dd3232c77c280755de3d3ef257792ead0516122f0a9b3f
 DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
+DIST grpcio-1.41.0.tar.gz 21214188 BLAKE2B ac534e34cc5ccf810c1d2006d11d18dd067f0eff68724375f68710dcfe63f016adc467d2c1453e310ac531ec03f2dfd5b0dd8ccc14a6dab94b1c5815b6e3a0ee SHA512 714c1da865864df994540ccc48e73e709f63ceb8617119e67b463f647783d65222b8ef760e2ac1ebaab0fe43442382c2859d796c8a30d6e1eaf511b7dac515a7
 EBUILD grpcio-1.38.1.ebuild 1263 BLAKE2B 41c0a00756aa4354a5cba8fb3da44c2a4073b0b4325d5fd188186dbda0050e0d8bb0b16e321827b1421f6d687490c7ea923add840397c2bafde291c1c961dc21 SHA512 8ad606a485f52a6e9dc6f3916538e08dc4fe548cbecfcd4d8ecec91bff6d3181eca381b02d373211fbd24d9d51abe314a79c6adaa86e2843ffdaf57e9a6d18ed
+EBUILD grpcio-1.41.0.ebuild 1266 BLAKE2B dd2fa2f88447011fdb75e498363632cf47f5b22991ad96eed67216bafc7764bf85a29285a59e2e6214710cd1ceb87ff20463517866a2ca32a3421c01fcd90108 SHA512 4a405acfb9a7fb306c0a8e924f5c99728a68b6472c5146af96c5c659db6f30de8ef0ded10ba44433f5e30ac96a6dfd140a804fa60573b95c2219acc44ce9ad20
 MISC metadata.xml 370 BLAKE2B bbd9d12e5aa11226329f88cdbe81b254078778ec32656c0e8e07728ae8e88a631031075111fa172ac7977164f928ab5b4d7a6fccdb05fe382bbbcfc3db0fcb48 SHA512 8452b06521b0d315bb7e2ceb8ded673383a5364e5b46c494083a7f92129d3ac1c607197679111157716dfc3c5d7bbb60459cd4f1d7c23d9fe2bb5b2ef2792383
diff --git a/dev-python/grpcio/grpcio-1.41.0.ebuild b/dev-python/grpcio/grpcio-1.41.0.ebuild
new file mode 100644
index 000000000000..cf5915184db5
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.41.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.37.1-cc-flag-test-fix.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
+	export GRPC_BUILD_WITH_BORING_SSL_ASM=
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/h2/Manifest
index 5a543b584f74..ddf9b37abf93 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/h2/Manifest
@@ -1,6 +1,8 @@
 AUX hyper-h2-3.2.0-failed-healthcheck.patch 3381 BLAKE2B 0eef97897e58ca0b580371e1cd8dfeb4c85d3e333aea4566121bbabd08cee5a46070360e3f40f244058082c5949f3fc1ed8c5a9d80bdc6f9c7ce741a9dfa915f SHA512 0e5e9a6f3380e3a2b54f63c9894e3fd5c5987b7e55834200b051e6d8ed13219f9784340275ff136ba273eb5b989b5bed80e85460bc7b25049974150f0340911e
+DIST h2-4.1.0.tar.gz 2143812 BLAKE2B b9d9a771340b4bde1675b9fd65c242732a1a262456f84a409662cf2b57326e24e0583160ba0531c0b105b79342578714127dddb560d2a27de58af34d1052c698 SHA512 4e9cf88b3ae702a8a42bded775ad337809787fe8172d501c230d55abbf1edd764acf3b227f2e58756d882499661ffcf6bbdd4812a4d938c04fac3f1aa2390b28
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 DIST hyper-h2-4.0.0.tar.gz 2142185 BLAKE2B e5ae692c1f21b6e3ea8695ec269a4d02f72b8d385b6f9c523775f3db2200379f9af5accb70fa06a357575728a6a5b2644dd1225cfdf458fffa80e84c7b1c7b2f SHA512 84578174a13782897f9286c62d450eaf11aa71c01c96b8660179cd2df77618dc1a6c4b354b2bc5731cd21c4709c8c0a8282a859a98c4a62a7295b6dfd1b5cfb2
-EBUILD hyper-h2-3.2.0.ebuild 1525 BLAKE2B b84bf5d10d75fba77829b49066e0f6086bd2793afeedaec1cbc6da8a408f28c46106ff26a96c91ec6f1c47d7d8698b308bd72fa5ab94e54445dff8a958339556 SHA512 09aeff21748797a137cee17cd49d8087e5c23d4dd99c545474da2e4ee97225964e4181ed0674db210d7e8a996d338826f36d260bfe30968f8776fa7863445b7e
-EBUILD hyper-h2-4.0.0.ebuild 1492 BLAKE2B ddc3845d611093e9c192a46b61776bd23576f733bf6527a51b32f2e2b5633f84526759266c65c3797f86d1f90c46627d035be846713f8cf90450ffaaf2626920 SHA512 65797119e25ba069926f454cc96c8de1718d134b1bc68fefb7fe483ef65897e9195e81e62defb387242f737b780b934f197434a0ecc86b3463b2d63abeb5d921
+EBUILD h2-3.2.0.ebuild 1579 BLAKE2B 7b3de7a68a59e1bb7399b61a1e5163b50e1948e4c3385a0264e6fb1083d5c933e6a8832c26b9cfe0452a852de7cb488ccb1bc85d1916692843ce7d84bab0e850 SHA512 8c2ec8963172a42596c4881806e5b9173bf223666d4efcf0b81342bc66c0d6c382747e62284557805e236971f5392a3693a301ad208cbb60fb5786e9dbb52788
+EBUILD h2-4.0.0.ebuild 1539 BLAKE2B c2dd2ff2704e80b8a0e023af334d012b2f047d5582a494ce6703570bea5cb972973afb4e20f26af114980840e58ee42b306d3403c92b397524d699239d6c4d04 SHA512 56cd91ac6565f022aa69cba77b1b33d01ef55e7bc100ec1c9d40673c99acee6a30ebf92506c626763aad795738010870c37e37f5a09339f94a391fd2a69ea9bb
+EBUILD h2-4.1.0.ebuild 796 BLAKE2B 0dfb4db9d1c3a99fbd91a81dc3bbbb937d57e6f20ddf1b34a109f26facfe67318080ebe8a58f72de045005224af14c55750465d40c81788931be0e82f050617b SHA512 38c4bbb22682709687c838fe88a86405b44025c9774b78ad1621254f80a67006b0b73aed8a3a3b331b68d1d6feb01d1b1ebc4f9583cd4ed8203fa58a96f1958f
 MISC metadata.xml 694 BLAKE2B 8e3c231ed6263fd0feba3f8f3ef0d5cf0345e2de092e4a50de3d6b9dc3b009570b896dc5a7804f9b99e9ffd75ae6a8387d139f0db1dc3ce213c4e7bca63061e2 SHA512 713b15d6f84180c861d1487f2ee7a377acd9403876385e064bfb103b5961cc53655953602dfc809cef648444ea9e201991e2de00203d0ab5a36c3d13b1764e2a
diff --git a/dev-python/hyper-h2/files/hyper-h2-3.2.0-failed-healthcheck.patch b/dev-python/h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
index 04adc2748c21..04adc2748c21 100644
--- a/dev-python/hyper-h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
+++ b/dev-python/h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/h2/h2-3.2.0.ebuild
index 819953993d97..830e6c2dc91c 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/h2/h2-3.2.0.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
+MY_P=hyper-h2-${PV}
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
 HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
-SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -31,7 +33,7 @@ distutils_enable_tests pytest
 PATCHES=(
 	# From https://github.com/python-hyper/h2/pull/1248
 	# Disables some failing healthchecks
-	"${FILESDIR}/${P}-failed-healthcheck.patch"
+	"${FILESDIR}/hyper-h2-3.2.0-failed-healthcheck.patch"
 )
 
 python_test() {
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/h2/h2-4.0.0.ebuild
index a133fd58b9c7..410e17cd3adb 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/h2/h2-4.0.0.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
+MY_P=hyper-h2-${PV}
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
 HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
-SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -31,7 +33,7 @@ distutils_enable_tests pytest
 PATCHES=(
 	# From https://github.com/python-hyper/h2/pull/1248
 	# Disables some failing healthchecks
-	"${FILESDIR}/${PN}-3.2.0-failed-healthcheck.patch"
+	"${FILESDIR}/hyper-h2-3.2.0-failed-healthcheck.patch"
 )
 
 python_test() {
diff --git a/dev-python/h2/h2-4.1.0.ebuild b/dev-python/h2/h2-4.1.0.ebuild
new file mode 100644
index 000000000000..1cfe581ac95d
--- /dev/null
+++ b/dev-python/h2/h2-4.1.0.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="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-7[${PYTHON_USEDEP}]
+	>=dev-python/hpack-4.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hyper-h2/metadata.xml b/dev-python/h2/metadata.xml
index 37d794cfe83c..37d794cfe83c 100644
--- a/dev-python/hyper-h2/metadata.xml
+++ b/dev-python/h2/metadata.xml
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index ac2eb3af4c38..234bee4cc417 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -9,7 +9,7 @@ EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 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 2313 BLAKE2B bec729a55a448e66108301a4a633e714d4677dee633827d5bb11b2088105115656b91be5738d62e83f77c6f719c1c27876bf7ca5feb23cf7b5221f5b9ab3e928 SHA512 6510c2444ce791da1fc7b625721ea86d02fc429a3bfd84b6faec30322ba4a65edd6cf8c51f1315bbafbc8ebb5c0420a37bce36f4a00211a716e00afbc720f0b6
-EBUILD httpcore-0.13.7.ebuild 2314 BLAKE2B 351d9fd827e9b131b8727dd6f545c464d276f95ceadb1bae3a8c351f122f9ad6e2978a15a8f97dc1ebe6b0ef6f4ae1c6fa69d7e310d12380bac660b0434e582c SHA512 b620e5517121b03b9ec30677b59f6a93303cb7f551b1f6018b144874dbc9c504d98f8502660c8120272c92a81767bec0a509ebd9c01501222b5ae126c434b86c
+EBUILD httpcore-0.13.3.ebuild 2194 BLAKE2B 1986b5ecbc242a10b743e1430a4487a9de1aea662fb0e689f1d831b2664e473b08953284fb9b1607802dcaceda0e7f666e222c767d1b733f2efdd4f2b0a4e8c0 SHA512 063f2ba77c746d22a1c38ff0b3bc2e69140bb75e07cc0a2999d3041ccbb7ce9a2c91b017ad338ea3a56b8418a58d905b980b05988d88ca38163de728a801e526
+EBUILD httpcore-0.13.6.ebuild 2307 BLAKE2B b2e612777e3a11c486cb89d2da96c718c1d5c2a3b56e8645ca822bfe543cf85f4d6bab4cd25a94bcae0875875e937cd4c7dcc3771712395c8107274e2b7af62e SHA512 63db67965b10ec08875d2218a12eef5f4a6e7e93120a75716154b5d9954b78145ee3371aace13018fd9b26e19de4fc0e9c7172779d36e9535e57961bc3b6febe
+EBUILD httpcore-0.13.7.ebuild 2308 BLAKE2B 624dcd9e8dc5ae5a81aea176cd82e4a2b4e0508faf4e0c23af033a7251d15d221573344c756b5a6c363713feffd0aee3efc815a33bd6cfc2cf9e9f219ec7bf23 SHA512 b65207499eba9b2e95f90d5c23ea7bede060d84c9be04b9fd3475ac96d6f642169d4b78ebba9f726df15b79dd8748be1f285ef0cd3eb2e145a4429f2597077b2
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index afee6091fbc1..23125e851e56 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/hyper-h2-5[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
 	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 03948f3d96f1..bc75307b013c 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/hyper-h2-5[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
 	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/httpcore/httpcore-0.13.7.ebuild b/dev-python/httpcore/httpcore-0.13.7.ebuild
index 1d04b3d28c9d..ca35f76a1619 100644
--- a/dev-python/httpcore/httpcore-0.13.7.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.7.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
-	<dev-python/hyper-h2-5[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
 	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 2ae842e2a363..43d12d87050e 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,3 @@
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
-EBUILD httpx-0.19.0.ebuild 1634 BLAKE2B f94f2c428f6c516651c66b4ae37e65d5b34c0f548dee88a984a9eb716c97c89b6fa540a3b3a3e894f9ddc3a9ff83eda37bbbaee640bab5684b621cedfc15de1d SHA512 3b084ac8cfeb5cfdd63880925b3413e5604e0387724288780ba9a23ca5963c4d8ccbc2c7ba1d3f64af4d5c0813b991dbb06315bb682e81f02439d08fb38d6a60
+EBUILD httpx-0.19.0.ebuild 1628 BLAKE2B 99df3bbe0cae1f2cc014b2a77d6bb76690002e4e2548ddbb240507c17ec939815b67a2bad2b3744a82f8919908338448543804b8a96757d3f1a7e1933697544d SHA512 90c2fba934a8a483df50e848839184bfe1a452dff8aa7abe451f80196ec02b6fb17ab2a23b3996865002feaaa66193ecb6c1a1eb07253357c5b32a10a586a36d
 MISC metadata.xml 445 BLAKE2B ad37f769e6ead3490624a9a4ce9eab3ba0c040adcb11c52e306fa13dcae8e3ae779efae6b5b3528890de6a9d440657d3bd3fce2004a1774ae88920a7cd05c66b SHA512 73af0d42f1735eecd27559c58514a20d85d775f59500cfc6e7b87d759a4b9951317c62eae2a990df63b80747255510bf970f05295c4548d1a81cd1cc7b7c2b81
diff --git a/dev-python/httpx/httpx-0.19.0.ebuild b/dev-python/httpx/httpx-0.19.0.ebuild
index 37c507397757..f5ee2bdc0bc9 100644
--- a/dev-python/httpx/httpx-0.19.0.ebuild
+++ b/dev-python/httpx/httpx-0.19.0.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	test? (
 		dev-python/brotlicffi[${PYTHON_USEDEP}]
 		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 9faf9dd87566..9a508dbbac7c 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-3.11.0.tar.gz 67034 BLAKE2B 9e10582139578e8e041d1ce60c9c5d7e071c4c093a64cf620df6ff38f0567e8b2f3134f10722cb724d13343373db0fa2a1ae5bd68700ff85fb58ee318feb0fd0 SHA512 7aa3c513c6702de0e099865f787858de4c9c65cfe95af61fd0204ff6df64e7359474b4067b4672546936beae6c8c512dd9c75f555d7075c94819e81143c21ce9
+DIST humanize-3.12.0.tar.gz 67112 BLAKE2B 248458d337c8411261b1078b3ebc040c133bd6310d89ac6809e36e55b46c644ab1308255015e9530c0b1d5d5a0c6ba3b02fbdcb8a48f48c02802ec8314c68210 SHA512 339cd392c9fd022714dfa54920b24522eee37ec24711fea8016f6a95728a500eaf9cc4dde76e542886f6c5b570a77beeb6dbc5047a475496f99199d793ab2e44
 EBUILD humanize-3.11.0.ebuild 547 BLAKE2B 375bb638f185ef84aadbf1e7ce6860d10467c092ea73115023288599cb5694c1477de757e7744a4a8cdaf3c99da66e2e1773513c1e872f68d81c4604a49aa83d SHA512 b5d990dd004d16060dc070ded1b5ebf90d6dc26c126843a55d96e8eacedf4fc12037f93c9d0aa8a1064c84e8a345f1ac20565bd48a2e4feb11d698150f818e8f
+EBUILD humanize-3.12.0-r1.ebuild 701 BLAKE2B 94ac5d4da9553381dd0c4fb6d668b1ce7744b601470448005c2ab76635be958484508bd49c8d26801d7b476a1d779971cc9d9bdd99af775f3778c520a3266fce SHA512 f903153be5e76a86ddb8e3697c1259f9a2637f93cfc806ea2682ff6384347831a6187f3623999b35dfe648104c8ee2892551cb1d655e0015524131d62127cc63
 MISC metadata.xml 562 BLAKE2B ce0b2a0c9ab597016fe05c7f74e3aba7ead2f807fdbaead57533d8e1a6bc67f9749afc2788d6fa66178c5b8efdfcdde256f03a478c2a34fac168b6c1fe57e7a7 SHA512 fbe0c4536f4e2fff5516f806e848438ff6eacf526df3753095ab6f034a6103bbcaf2e2c7f468e442f2e1538d93aa9c73d034a812705c39fd2c9d1e34e66f2216
diff --git a/dev-python/humanize/humanize-3.12.0-r1.ebuild b/dev-python/humanize/humanize-3.12.0-r1.ebuild
new file mode 100644
index 000000000000..e01d205acf43
--- /dev/null
+++ b/dev-python/humanize/humanize-3.12.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	sed -e '/setuptools/d' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index aa83716aaf8c..c9ff3b683f57 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,5 @@
 DIST icalendar-4.0.7.tar.gz 78569 BLAKE2B b5d980335b1a9d8135ad9ec037e140f3ae49c3e8db6736b9e469748e3bd51c43f39fc5f9dc443de46d4d4c5856ec74bb548a8d1b47b7e52278fdc2e269be0cbe SHA512 97f7184ddc42ade2a447af5112f5bd18ea9a89ef25ea3983cc2213fefe2c59255102b7babcd49b3e04cbe435d75d2712dd57eebc1bf1c20c54aae7081ba24379
+DIST icalendar-4.0.8.tar.gz 78761 BLAKE2B b1e9aa01319eab769f5b93635e6ff019ed2cf4b7d00bf4a68b9cabe76c70fb18c64fbb8851e0f4920d53dc444fd0ba7518b84f6ca424488a89377f35c133ea12 SHA512 0cc636d7009f808d64cd3255757974d4d52b79139f79db09124ef3e7f9ce1d29eb3e007428e884a58ee3434dbbca8289a05692c593ea3cc68ae10c7c4320a9c3
 EBUILD icalendar-4.0.7.ebuild 780 BLAKE2B 4af53a4a7097671c7c183b9c8f4ce63d0d4966d2004b1ab94e5d030d4c58430f1474d0d77bd039f59e5f19be769cebac272dd6e15ae92e500e621f5f83588fe8 SHA512 8dd4217823dd431e944f72b52cd8fc5a0037be61041fef3f59c55ba34468046260f5e77403cae3faa5eb4b5a06c746fc4fa4b9cd10b16f115e6261052acc9596
+EBUILD icalendar-4.0.8.ebuild 780 BLAKE2B 63101f89cceb95300c5d6a5b73a51140482e02a85df7942240051427fae9bec94b1aaee2214d8b97ae733a3d2261fe55a88f134aa4841397f875f90160b64a92 SHA512 360e5fc672ea4535a67d2d268716fefb0a491ae6e687ecce0c06fae61164158677335fe2e7683a865d4a830eedbb33e42b02a4f23e6f3b5da1b05dbc2d7106a0
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-4.0.8.ebuild b/dev-python/icalendar/icalendar-4.0.8.ebuild
new file mode 100644
index 000000000000..1baac6524fe2
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.8.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="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 426b1093771e..29e50d2676ef 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,7 +1,9 @@
 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
+DIST identify-2.3.0.tar.gz 101179 BLAKE2B d51911a69a9845d136c0b5ce50a3ed94c50d80d6d8c89a2c823f1a85cafef373dab68716c5b38907bc920ca5f4d67ef969d598539e59e32bc2c36a0427d37765 SHA512 356e3c983273a771c06863a63fb53bdca9e3df3a50382f47da0d5ef7cee1b83d9279eb0d1e6c28409b2550f6e16eb793901147983582d792cdd39bb4d4c6e9f1
 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
+EBUILD identify-2.3.0.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.3.0.ebuild b/dev-python/identify/identify-2.3.0.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.3.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} )
+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/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 59c0734d1674..2c9af5efbad7 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,3 @@
-DIST importlib_metadata-4.6.4.tar.gz 39881 BLAKE2B b7ae57ee18506807a4a0c03d657408047548535e5b6be5f654ba70eb34a1f92701a063a39f4bbc4c67fee3afbda5bb76e87caf588c2915416113547edbdab57a SHA512 20aad4adbea8bc417a77cd67a6e22e690e95913ee34822d79e4bb0472f396ece2137ab4cabc455a8154251fe563ed7f56a68bdb7b08a91c8a32f735608cb4a7c
 DIST importlib_metadata-4.8.1.tar.gz 41779 BLAKE2B c6aab81784f45770eef3be14257a30111d30fa8f6c1f7d30722ca93bd4d548b826fc4a4ea54eb627d55d5ff3b539d96d3c0968ac3edf5e4dad013ef83d271618 SHA512 ad9ab435d4a49a12c9440d1d53cfc835fd889fee032db6ad1dded59b6e453f26ef97bca303e22d945124295ec7c50fa55837a13e7790dea01562a1724571f9fe
-EBUILD importlib_metadata-4.6.4.ebuild 1262 BLAKE2B a8401a6616ba91b845462f23b946e8e4e7df3dcce133b7095361c7b24607156f79e9c6703142a5260669ca58cb9ed1597bbfac7b981fa9c3487c35402b0ffd4c SHA512 84b882707654b4302dc1785f4525ca2b53bed5aafa294d03694dc40928574c8b69aab59ea404ed3f4e79578e027630325d04fe1222dbb1b346e230a68f8b3420
-EBUILD importlib_metadata-4.8.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.8.1.ebuild 1262 BLAKE2B a8401a6616ba91b845462f23b946e8e4e7df3dcce133b7095361c7b24607156f79e9c6703142a5260669ca58cb9ed1597bbfac7b981fa9c3487c35402b0ffd4c SHA512 84b882707654b4302dc1785f4525ca2b53bed5aafa294d03694dc40928574c8b69aab59ea404ed3f4e79578e027630325d04fe1222dbb1b346e230a68f8b3420
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild
deleted file mode 100644
index 43ba518da14d..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild
index 2c120eefe434..43ba518da14d 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 3f88a06e25b6..a6026b94bb2c 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
 DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
-EBUILD ipykernel-5.5.4-r1.ebuild 1442 BLAKE2B befb1691f7fa5e80845011c47c77531351fa67b775fd558327c277ba551a74973da07f2d2531795d2e53eddd504e824d3618e78c8602d137de9eef2aab55fba2 SHA512 92c850c80ccf686b0dc16f447ff56aa042fb09ffac5bb62765ab94744060a48ef3ce09fd2ccfa6d09c05ed3e1d4d9524efc680b0b3a861c5f0fd1a27d4a90371
-EBUILD ipykernel-6.2.0.ebuild 1285 BLAKE2B 8723f468ab16284c60a1ef1eaa1508055b263da422add975d2d1e1282663a9979af29587dafc09d66572b820c703739110a486e25a06deefad332514731de6f4 SHA512 9acbc6fc3fb76bd40c755d6993dde68b37f566dc2d2d55eafa3fa4d3e70f507296f22040a8812f92ae0092803278642968d0f52220b520895dc170beb4b959ec
+EBUILD ipykernel-5.5.4-r1.ebuild 1533 BLAKE2B 5a3d2bacbd430b1b575370c3901dc507c9e2930e59e141064455dd71114b1d3b58373009b85242480fbc9a93ca4b5d68dadbf0730965a0ccc98ed28b14c1b920 SHA512 3b62c83b0580c3457f9d24471b09172cc56f25cdfcc0348cb8961c269af3caf85a8a4119a11a3c890558b73ec9c09dbfa2d4191035dfad69641e2a9c8f333bb3
+EBUILD ipykernel-6.2.0.ebuild 1376 BLAKE2B aa3e29c9a21223034347fce81267feaca02f8f3825d41f04ef2585f3c8e523b8fdb51aeee59c7728570bfc85ce84f6fa3bf773a7ba6dba87c29d647ed708138a SHA512 2ae9d19becbc05690e0903657d20e4ad8c0f8d7b0a2963a7adc1777b594a72214c58d59d52c4d77a56cbfa1192a27877d8c49ba9329aec2be980267b493d10c2
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index ee57f42cedfc..cabbd9e137fe 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -22,7 +22,10 @@ RDEPEND="
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
 BDEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
index c446c7eaed82..c74ae593e65a 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
 	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
 "
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
 BDEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 5f3202013269..d19e20d3c02a 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,12 +1,4 @@
 AUX ipywidgets-7.6.3-py310.patch 1526 BLAKE2B 102af6c7656f938aa6019a3e1cb82868d879f8bd233ec5ee6df99bb6e7f2f06bc9b4b90f13813844bf607f4b72908ad98823e7e2714b0919e9f61bb469471a90 SHA512 6a539b3c1d617facb0e9ebe0121c390d524a2181e4bfa11c59494a56f41265483bcedda06b9b3b6f60d81eccea971bf94a108014baa4aef78712f624ce0b956d
-DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
-DIST ipywidgets-7.6.2.tar.gz 4066260 BLAKE2B b0d75d83108336bac204c24d2a67e88a200939cd8308d99bdb3842916387266f24607726ce0b8781b4a8b6330b9e26bf1eeeeebcaf7588b74980d5bc6603e1b8 SHA512 a8c25ee82e0b0752f850a314fd9a05bbcdd098c9fbe8a0cf0b23e097380beaf7fc916e555fe1597a45bd0085efebc40593da66ef1408114fc6d3085467d95183
-DIST ipywidgets-7.6.3.tar.gz 4072376 BLAKE2B 095226ef6a9ee0821b875dc117afe4155132b6b2d94da71b937959c1c4e9f33fa2837d8b736a47caed77c4c52fbb95d8afb5db9e58e99e567a34d6c8cf39afa3 SHA512 7b3506b43214948d73f4f2c55af81ceacff3d7cccc167dd32c72df6bffb8b1b1f8bdbfac7162d343858f723e7b3f3a1cd78f20c2f93b14a8eb39125ae2aee7b4
-DIST ipywidgets-7.6.4.tar.gz 4072522 BLAKE2B ab2c778f369fd3457b384b92680ccb77cc421cabf23907c504219fb0dfc71b10d1afee721b6430c3a4dc1a71930fb300324231a8fd55174a8b69a76f65eedfc5 SHA512 aed320f55946896469e22ab06b3a64541671f5b2e29b2b94d4339a1a108757fbafc7dc8bc9ca4d81e8cf9c4b759a95ed8f3d447aa530e85cf22899c1ad01fe3c
 DIST ipywidgets-7.6.5.tar.gz 4072535 BLAKE2B bc2347863af42254e740454e1d91ca8b7fc03de9dc6a2fdddaf9dbb13da2fe7af0f429733166865ebcdda9840189fc65dc677b7181b34f1c0dc697905aa3af4f SHA512 4952f1cd293f1a4bf1721222579273c95f59adfa9385963617924f5f28232e1940ec045e18aeae83ad138176e4d887e952fe875b960279f3e0b7d982a790a4dc
-EBUILD ipywidgets-7.5.1-r1.ebuild 662 BLAKE2B 59d22bbe2c5149799509cdb5bf95592b6e4eaadb687fb8a6337ba39b111aece352e86fc44cc811ec45c174ca8e83bdc7c0c17a933312e355f5a355b19413516e SHA512 3f7c57a8e75fdd19b6a718cc09f6bb5b296070f22e2fff8a4a231633c0dd201bb2c96e8083389950086145584f592c670197fc7808fac4d96f4c7c1292e00c61
-EBUILD ipywidgets-7.6.2.ebuild 692 BLAKE2B 050bb849c9300a5ffc23659c29624a989034907527b297997517c3704ca63feba144ca276f2903d8d683db54be73cb28e3e4f333abbd23d3fc9799c48ccbc9f3 SHA512 53de75afe4494284a17082d230651f707d64e09f338b10c4523d442e4d887e5277efd5b31ddf1bcb81029ba19d73af2bde942aa9d44f06fdbb763e90f9e6d037
-EBUILD ipywidgets-7.6.3.ebuild 760 BLAKE2B 5d53306cdc91c9ab9a6b67c9ab85444e1ce7f54629eb907060c456f4ef35102a6bf5a97430806428a11b1414a4390aef16ae93f0e7fcb31886a5a7e884cdc42d SHA512 bd3247829049a427158640a8fe7b8a8559ddb7f30c961e1371008788887b1f2509603e574535d38ae197c36f1b26c9c429d8ae26f2fa5fdf81cf529821e4b9be
-EBUILD ipywidgets-7.6.4.ebuild 837 BLAKE2B c8d3d8ad13d6b788b7aec629604d490cbc00084c6310e68932d11be5fcacd539757c55fbeebf3abd4e8804b1f55e6130442105c74a4907b53480f9c46001268c SHA512 cf40df847ac1b592aaf6ff6f2b017bf3bebfba7963b18949b4293251cf419e38a1903d8e0d35c3bbd1d6ae41c8d2f6e396b164223845f1158aea6baf9a51130b
-EBUILD ipywidgets-7.6.5.ebuild 837 BLAKE2B c8d3d8ad13d6b788b7aec629604d490cbc00084c6310e68932d11be5fcacd539757c55fbeebf3abd4e8804b1f55e6130442105c74a4907b53480f9c46001268c SHA512 cf40df847ac1b592aaf6ff6f2b017bf3bebfba7963b18949b4293251cf419e38a1903d8e0d35c3bbd1d6ae41c8d2f6e396b164223845f1158aea6baf9a51130b
+EBUILD ipywidgets-7.6.5.ebuild 835 BLAKE2B 0a59553a50e9eae3838fc93ea0abd90eec23cae798cd89b57a38d39ad1f91db4177996d833943246234f45c4546ac7412e5c1c419696598b8509061da7a6402c SHA512 4284a2a731370d0ae36691260551a4396436ac6dad367de3660876002f6e9bb6253dcf0bea990ca305a41b1d5702e346c58bea6cb867f76d42f5cb47f7933ac7
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
deleted file mode 100644
index 4557f0f48e95..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
deleted file mode 100644
index cb2bddc2fb38..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
deleted file mode 100644
index 360a60569d88..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.3.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-py310.patch"
-)
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.4.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.4.ebuild
deleted file mode 100644
index 1ffbbe7f9c02..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.6.3-py310.patch"
-)
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
index 1ffbbe7f9c02..428e238e8aaf 100644
--- a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isoduration/Manifest b/dev-python/isoduration/Manifest
index da8ac75b6bb6..02b0fc27082e 100644
--- a/dev-python/isoduration/Manifest
+++ b/dev-python/isoduration/Manifest
@@ -1,3 +1,3 @@
 DIST isoduration-20.11.0.gh.tar.gz 15909 BLAKE2B fb5c3c383aa000c4650490b701fc091c740e45cf782aa929824e3f3e5601d4de82a68a9430f450b42da3658105c87cb293a98b94c77fdf03a1702e6d103a257a SHA512 9b3dd5cc540bba35a73aab01bf1f0274871b93b03ff72f8cc63fa0d2ec43e1f54deb95bad2323aa4cb8066b1b5401f426175792c062cf46449c087601dbe0420
-EBUILD isoduration-20.11.0.ebuild 685 BLAKE2B 059029ad6a5336ee2a72e3ca5a56143c6a15d56c6ffe52da56578616d0446440cd0d5b0f84a6903225f55bbf84138f5c559787ca1d10f3c044956b380f1581c6 SHA512 783447cbc99e0d4358d8b6a89af0ccc91669c66f888cd675f8c1ed9d0d8feb866ff2a728b4274ffb67411301c3372d58ffe27bb00c82b295756b752f1f93a86c
+EBUILD isoduration-20.11.0.ebuild 704 BLAKE2B 8d195917daf8880301cd2b62a77cf2a29f320b2fbd5a19822e70cca0c73a62bc76db1621d5f2ead0852fba926f9d94e8964875aeeedc956fdaa9e239d807e702 SHA512 57ccd984beb2c5bde862bbe7747d8b479df4758d0231fadfafc94da17886b6b8c2ef63f659e33e5b41034b7bdc45ef251f6b4f91ae005c4ed3186644eb8f79b5
 MISC metadata.xml 397 BLAKE2B 88efa16ab2f656b04592484218f5289838a1e3f6f2f9eaf74f3a836f950d59e25d4d179ad87f6c780b768cd536d3360342c91e3d3082abd417bd398585f409c0 SHA512 ffd673f9fe8cfb45fc4fef014fa2c8de7ebbe0237cc06a6b570f099eea97dbcbc8012c1ba11108b61b0e3ab43077c544db8634775f1675a6e704fe20110e3180
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
index 23bcc266e689..a5807d6ccb45 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index d04d4f0f0837..055fa850652d 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.collections-3.3.0.tar.gz 18563 BLAKE2B 80e8463324598cdd6025984c6ab304b108521a606de87fa7aeacbb2234aec5fce20319d7cd288caa5a46b1fefb7e7686a2d00e668e90c38b943082267e6b4ceb SHA512 23fea645226bcfbd5f034877aff7846960ad99d65d451bdbf5b8abb166356074d07780ea8e2e25d31fd03343929596dcd64a9ec949c1ff056c11862e043a8b7e
 DIST jaraco.collections-3.4.0.tar.gz 14887 BLAKE2B 2c1e87b18dc3ca68fb5b849b30cc0284b8a8daed9b6b2b075a753f7ccf91feb487734a38bb7fc88d29020b0b1980346109551a8bba5d0b3a7f4a491c0dcb1615 SHA512 8e427f98dbcfad3f9042d1f080b2bf8012fdaaf084e230f9b46ff078623b047c2d9dab41ed0303df5dd070abce2a25289281113a97e8ab8d819048d30b8d314a
-EBUILD jaraco-collections-3.3.0.ebuild 782 BLAKE2B 1bcaf7ea216ab85bae6852411861f6f137992b944051e0d887b63c41ba034020475cc8fdf0d6dbeb1da7c4689c133487a8d70e5f844716dfc5b594335fcd7d3b SHA512 d233f09eb2cd552d9ae89509d9fc4531a5558e280df1f28787c85df2fbd1253981d5d5c4cbf50eb644840c54da289e839679c41611ecd517e653cdd848f88796
-EBUILD jaraco-collections-3.4.0.ebuild 794 BLAKE2B dc8cb71c29243657859f706aa893842aec51300485528e250f8a3ba0d4e2ad50c69b9218db4824ad3746f038ff599a46d45350a0fe269d367130c41219e3e25e SHA512 ebb7d3c5092c27ca23d3c58dc7838c52a3d6067212afa5cebedb1be3e5e80ea85d7c3e4086a73e6d41f53232680bfedc4e257ec263ec276840285b2ff4d80791
+EBUILD jaraco-collections-3.4.0.ebuild 789 BLAKE2B c7833c57621d2c522a6fff4a80a214720a055073a51eee68604000beb38ef1ba8e40eb744d5b57c65edb19e1e83d119e4f4629006889b39e26123f4b7b2e6bc8 SHA512 f5ee37a6a33ad54eaad6496733e3fcceb377af67b1b557ac8463cd45487df54f166ea61cd0279321125e2725c46a977bc554726a8df088b2ad4b75f64e1e549e
 MISC metadata.xml 684 BLAKE2B 2da0cbb4ee979b83d045c4c402ff420db27d1a4176c7009bf56027b9b3a7df9395e67f881dce945849870955998e65dcd13c4e77926a8e2e7d1084b475a71ddc SHA512 30743b4d3616dc141a9ce814262304d21ac20475fa70414679dd5f028dcf83021c4cf9b39b3817957f5feb623076f94df1e7a951b0ab6cf57cf635b7eaf3ef8e
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
deleted file mode 100644
index 29c60505c72e..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
+++ /dev/null
@@ -1,29 +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
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild
index f6d1f46b9fc3..14343e15c7f1 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index b3f2033abcbe..a1b08fe4be9d 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
 DIST jaraco.stream-3.0.2.tar.gz 12784 BLAKE2B c9a9a1f940cd29cde67b624b0b7ac2dd426888f71d29f4bc4920eab5a7ba15713e5d5e57504e9f4f69f25d08a8cb2e2a1024c91c89b8c3aa8bb16023d84f33c6 SHA512 fce486caa9f27f3cfe7775858892d2865fe1c1656a8d369ef9321057716f25d7a737abf2a28fe7827efbeba2daa3b7992ec4fd18807751bf1fee6f48b238ab01
+DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
 EBUILD jaraco-stream-3.0.0-r1.ebuild 1288 BLAKE2B 68a93e0bf746149b7e0c8c3c9fe591453922e02fd6f988396a8351abafafd4d61afe4b86eaf6a49c6d84145719fac4ce1b363d70270d0c1e2134146619c7d08b SHA512 4f33d6cb1918011727d1e65671aee9f66da9b2aa6846e3764b16c8efe97423f04d16f177a0722df3577ce70e89b3e95f80663f65cb58e9cb2ad0c47336423805
 EBUILD jaraco-stream-3.0.2.ebuild 710 BLAKE2B 8eb07c06ca6d4d9e4396bdf98c6c2c12c8ac4f86538fabba9acad500da0fb166a50bcb510774ed9cef325b4ba8f6b4b0e22b36119d24f278f989621c4f369534 SHA512 9516d8bbbe8dcf80b3643f1eb204bc84140c904d56831fcff298ca7c1a200948a9917dbe2864c80d66e07fd93552cf826bef1e95af2cf3137f82bea72b9f3fc8
+EBUILD jaraco-stream-3.0.3.ebuild 711 BLAKE2B 5802c0a97c0c43c0f447f761dbc0b7c101c4e25127fcefc7aed2d60f333b5c8df56b2d338e9298030ae6a7019e17858b1307b9381fd73282ec558aa38796c6a7 SHA512 682b9bb9bd462f11e8e82877081cf85650d8c0f9d897a20d6c811558a793841be99ba46eeca5ff6218145601cc6ed7eeea0073c17c5f1d6eb060328811b87cb2
 MISC metadata.xml 627 BLAKE2B d7df9690741346d8a29c40010368b230b29fcafc7be80971615ead75459146b385db8a2c1e8aa2dbfbeda0a9d74ddcd18030a3cc541685dc161201fc26d2207b SHA512 5d92fae956277e67da1f399fa0058421a5ae39f3f633ab4ecaf80f8303303e8da2fcd0ba07edeb833784936c580033e3ca614fe5899d459717ce29fcecefd531
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
new file mode 100644
index 000000000000..202efd87e748
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3.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
+
+MY_P=${P/-/.}
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 96da1ab494bb..0f88ad812fc8 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,7 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
+DIST jinja-3.0.2.tar.gz 273251 BLAKE2B 69ef01fdce0be5d1df8eec01606c4fde72232aac2e089aed9a3a7e549a3ed283881c7c864aadb50d53eb5f1324781e3a89c2398e8c30e27dbed14d5917154513 SHA512 e6cf8b8e9fb3efc57806c9a17e71444f6e01f4d039c4894ee31aa4a042e63c31c9a68c85ce9400a7a840dc01ac8c46d88cdcc6ed15a28f662565b8ca9c1145b1
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
 EBUILD jinja-3.0.1.ebuild 1316 BLAKE2B ff37ce0c64da5e4d1bb14e05ebc012680673d6da585ec8d23904ee52a95f2c72ebadfdfeae5f2769ce28c4439f9d9ba32ad8318538071f395cb1de334b6c2c11 SHA512 4f22e89c2a0fba6e83d96df17f5f25ef003394dcc57d1c8a274ab8f58c31ec4bfbc5817c213625ee8bca43536c505c34db8d0dce9b35ad2dfa22d9862771aae5
+EBUILD jinja-3.0.2.ebuild 1324 BLAKE2B f73506ec63fdad8dc740980d9318d411f299cab562155b05a4320dadf852036faa18847c61b17cec76c871747ca6b4fa76eddd45401eb8f325d9852a0aad86d6 SHA512 bc575fc48e1f08729a53fd2052fb9a0c96beda07fc3be3de40c3132f021422574d1c978f7603be6a77bf06fc167271fe9c625796ffe55572e181ce75b4080655
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja/jinja-3.0.2.ebuild b/dev-python/jinja/jinja-3.0.2.ebuild
new file mode 100644
index 000000000000..6decc5afc7a1
--- /dev/null
+++ b/dev-python/jinja/jinja-3.0.2.ebuild
@@ -0,0 +1,52 @@
+# 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 full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 6268410eef4a..4349c90bfbc4 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,5 @@
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
+DIST joblib-1.1.0.tar.gz 350428 BLAKE2B 6b9b449e012752e561b267c8e27475252fee8d56406430bc570abc6da22b913bb09b7ad8708c29c7d7c338e4f541144b4514976a9f4ce017c3764b4d717eaba8 SHA512 5efcf9fc6dd4e2cf30599dc50373e40580be38fa15c2295519eb8c3b94a07b0fe2d1a9960ec4a67846aa3176335a2634b21107664032966166b973dcbded0cea
 EBUILD joblib-1.0.1.ebuild 1173 BLAKE2B 4f82f452f67f405d4a6456a906e5aef4aa305ac6165c673335f5e98c72f0adf7b68c33b05501f1ad602c73ea1bbca87cc6d93e371359b3a12654391bbcd31a73 SHA512 f356c8a2d6db0be3249f548adb9a2bf0bfc9db5b2d022e54e9f08a0ecdc7d4e89916e70a417c382c3ff7e96dda1b00260fea80d4adb59d5c233b2264fc6d8c81
+EBUILD joblib-1.1.0.ebuild 1175 BLAKE2B 63733aff3305252d465427abb2974d7ed8ef63607f964a79c93cb86d6b09413b673135b42e93925d7a5159bcb7b4f81428f147e39093526db742b5db6090e700 SHA512 aa1fc469094f37a62d839b5c1a75f6b5780e6b03b7c9af3961f67475ee1faf3c26e97bb2cb9003b39ade562a5865c56671941987128eab90691765d82e3a9749
 MISC metadata.xml 858 BLAKE2B e141cefc3f64a2d853994352590d9edb2dfcf8406e64de688b5ee077e7577ec255f214134ff04cccdd90bb08410495ca0c39081b9f530763735c12214e66c871 SHA512 4938b0a8200be169056c19816c9f6753fb19e2d89a5799de9ee9e04e48d815aec84049c480a0844e391aef1647af8b3ea70186d5a6b10be1b3dbffc13711d3ba
diff --git a/dev-python/joblib/joblib-1.1.0.ebuild b/dev-python/joblib/joblib-1.1.0.ebuild
new file mode 100644
index 000000000000..4f96b96a5b16
--- /dev/null
+++ b/dev-python/joblib/joblib-1.1.0.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="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+# joblib is imported by setup.py so we need ${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	# https://github.com/joblib/joblib/issues/1115
+	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
+		-i joblib/test/test_memory.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index addf46cf8d14..96004eb8ec1a 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,7 +1,7 @@
 DIST josepy-1.10.0.tar.gz 58662 BLAKE2B 367d97a316c3adb33b9e3e2cc8400fc95fef09c5640c9747da852c0c1913dc6db3341e5b40bf1bd54d5f4619ee05642de1a72566f0d41c44aed731da8e341540 SHA512 517476c4b4df35b066f48e20e2c31bf458b998553a740dbfa4a682a94353db1cc9d706cee9429cb34b9347e8d78b97bf4a8f930334b86febfe56f5c9f779b42f
 DIST josepy-1.8.0.tar.gz 57507 BLAKE2B d395f08db9c46d37555f2cc540ab7af79356e32b60763acfa2116cdc08a46e51d75f56e6d393dd28c7dfda5f2012db5f4d5b5cddecf74809a01ca3dfebeb598d SHA512 50cdedfa4cf67055ae65dfeef2328ba7bb369fb8b763b425e4ca73108555c9cd04f12a644309c2f2e1db50e1d227be3bdbd00037e509d2b2d82565c213b81e4e
 DIST josepy-1.9.0.tar.gz 56932 BLAKE2B 0de67823c5015f3665323d33c96a97a8611d333e98a8229e847f41ebb6bb81c948001ecd3cbd46220237f40270dbb0e0418676b3c130f1765fe8d420abbd73b7 SHA512 b3a64a579d23aa87323f01ae3859fcb2cd9a699f160e43ebe58c93e11e5d5c5031cd257af1fd0400d982929eb4c06495c9d4fa09580ffcb4f6a4c09d0f191bd8
-EBUILD josepy-1.10.0.ebuild 787 BLAKE2B 61162986a2e20ba565ea145ba679afa973e25833a2e5956e5e020006abaa1ff096e8a686c4273d24a62f45efb2ded2529402f6bcc6e1e4b08a0a4415a985766d SHA512 2449d55ff461a3fbf3fa0f05b3a78daf9d17570350e5710e02b5440ccd15bb9a2e7c50c278d973e5ed15c8ff1fe8affd1a8917ddaff9cf92d67472abed42a4ab
+EBUILD josepy-1.10.0.ebuild 794 BLAKE2B 2e0a5334cd9f69780fbb1142ebd535325e17dcd15c31661755344c2ff017e844721518aeaa8824620e0191010c6f978ce1b7aafe63d73131042583f08ad72a91 SHA512 5b0fd8e0dc211ce8d57b1faa520817aeea4217cfc4bb6ac23d70032512dadf892cf94ca00935c30562115cd685f431469ea56e6d06f938ea439906247d407ca2
 EBUILD josepy-1.8.0.ebuild 785 BLAKE2B f6af24b68c94abcd4895914eb09b551ca7c4547144a1b3521b6b16a241e02609a9e33afb36015f63534e2999b500128c0e5890e3a9e8fb08a9ceaf976db671da SHA512 adc17aa849287d6ff8defce9bbfaf29d7d60c642cc2a476d7a1bbbc09d645c3fceda2130ac155c439ddb9f7a422d124952a628704945f7fcead6a620ad85480b
 EBUILD josepy-1.9.0.ebuild 787 BLAKE2B 61162986a2e20ba565ea145ba679afa973e25833a2e5956e5e020006abaa1ff096e8a686c4273d24a62f45efb2ded2529402f6bcc6e1e4b08a0a4415a985766d SHA512 2449d55ff461a3fbf3fa0f05b3a78daf9d17570350e5710e02b5440ccd15bb9a2e7c50c278d973e5ed15c8ff1fe8affd1a8917ddaff9cf92d67472abed42a4ab
 MISC metadata.xml 720 BLAKE2B bfe4668c6be6fcd57f41af649d31ebe5e4d96db8a0d851ca9c8365f42f1752e820f7dcd04da9ab974f8e9c99ab443bc7b516005ca510f4dac9390616b9135269 SHA512 be0b55bee1d51c91cda3893a2751ac9e8440b61c106daa9223ac6ecb3cd20e06b41dbad892e0e647e899a7a1eef1e985f29ea9a355a8c0d50524f599aec3cc88
diff --git a/dev-python/josepy/josepy-1.10.0.ebuild b/dev-python/josepy/josepy-1.10.0.ebuild
index 80ada4d0e18a..c74c9cdf5565 100644
--- a/dev-python/josepy/josepy-1.10.0.ebuild
+++ b/dev-python/josepy/josepy-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 48f5f67e4fd5..4df9eac6aa2f 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,6 +1,6 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-DIST jsonschema-4.0.0.tar.gz 290808 BLAKE2B 29b53fcdedd170d1ea8602dd706d671b78394b8d5e5f54ae3443269394bb7a4d8399a2d99a87dfbb4d27d6613b47e0d5a1c6caea9b679cfd1d21cb4ee0f4e45c SHA512 5decad39032a229f992bf25555473171a19ae076a0726b73fcc284cecf788bcd29e8662ad48405ee5a93df812b87e5846a640dafc32157c3742f2abf7f7a9c97
+DIST jsonschema-4.0.1.tar.gz 290999 BLAKE2B d693a33ef705a401187bdf603aacfd0336eab16afc0e38c5133ff6a74e4f0b323172d5abac0959163e40f546eedb75fe2b71f2ca53e7bbe1bf4f00ad977873b9 SHA512 50a2dd6423e8aca76e0a33e33a63bb7d1500abac891076426112c4577277d1f0322d06ec0ba5a9f47c65e5981f0cce768801e55e2f03ab6b0b6d2f884249b5fb
 EBUILD jsonschema-3.2.0.ebuild 1283 BLAKE2B 213785899c5e9ed46d98791ce02b45eeb96db799b3c26efe2285246bbd7e377a00522c1cba770f4e139736faab06d3aecc850edf2e5da2c561fd55f45f15666e SHA512 ca901919c61d47765752600d2b8390076d9a94a19a73e02e9d6259473e876e0aa84a0c7237b49bdecfef4b0d5ef449303dfa90afee63b910b900183e73823b87
-EBUILD jsonschema-4.0.0.ebuild 1167 BLAKE2B 6024460fb0d033d2f750be6a52415511cadc9bb3aebf03cadea6f133651bb70068f7cc5ed3f74dbcf6d47498f91d67b7dfe23f20ebaa1a0b927522103716018f SHA512 00496cd729d710df5474646e2d191b748efad9e7cd210fd5309f0780f906ca91c496a83743ce02bae523336cc8617023fd6b3ecf32d55e15f3725db53ed4831e
+EBUILD jsonschema-4.0.1.ebuild 1186 BLAKE2B a17535666c010838f512df54d8f8a33825947b6fb4323f1e5cd0e3a72337f9fec50aab0ed48ec3fddab0649f1e31115cf9d15414ffa0a34be18b57c53482ab13 SHA512 c4602d9c81f7b13b0c4018b0756a2c754f85ecfa5ca82480aad2a7a03c64fdbb5637ff0fe4e5f12510779c230e93053c16baaa68f6b6d560e93d74e83d6669a3
 MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
diff --git a/dev-python/jsonschema/jsonschema-4.0.0.ebuild b/dev-python/jsonschema/jsonschema-4.0.1.ebuild
index 12bde460051f..8c008cd513e4 100644
--- a/dev-python/jsonschema/jsonschema-4.0.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.0.1.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 ~arm ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 102968b1fa87..9aaab2030722 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -4,10 +4,12 @@ DIST jupyter_client-7.0.2.tar.gz 317686 BLAKE2B f837d60c1013d6f7db7185112820bc40
 DIST jupyter_client-7.0.3.tar.gz 318420 BLAKE2B 151cac17dd965f5a151e0de90cffda35d06943ef7548518f6bac9e977fa3efd02cceb30fc23b252c440541ac74a84396dc7a8787fffbbade8d91dcbc2d51781a SHA512 eae57dd9c2fdd0301cdb53204dfc043a228fa606236ee1eca9e37f4d9d213efd080ec1292567431e24d73899db0833984ed4db933998817d03aff1f674217362
 DIST jupyter_client-7.0.4.tar.gz 319415 BLAKE2B 795e10680b0183e6628978cfe2633eaac9d1acf62ca8f72c17cd9d808e9971ec63a251adb7e2f5faaf98f51b06508b55a27686d5a77020cebd858daf61954de1 SHA512 47d17b1369edfe7cac7f2450299558122d88e341515b46992bee716c4bc23f870c131ca1fe86ec8f48f558c2c3ab5c26b05d473b37fd2dcd19c24bc44ba60c03
 DIST jupyter_client-7.0.5.tar.gz 319487 BLAKE2B d8c4e518fb165fbbe6b2de8bd8623d37c9fda6c002753b8a115d615b0c338a6411c4713b974210af45fc40a021bf687b3bc1e7e4f0717c510f569cb7eaf6d793 SHA512 37eba11585d40f52ca5c7a3bf275ee7cd86b2222049abee4b92b32eb6e667e6e5234b8c1dfeb1f67e8bd0d80ee1be1ccf87ffea9f5b5a5e60f217b07063a085c
+DIST jupyter_client-7.0.6.tar.gz 320572 BLAKE2B 5c853fbdad3bc044ffaba27534d9bc4682797660cdb5d45121ae8f6cbf0fc5511c6a9fad14d26bd82daef17b32be14e51bf86c2ae672ed9b310141b29307ff9c SHA512 c836ba061da0461d6d27eb0405ba295ff67bf2c99011a21c9695da139c0a14513de292cdfff3ee00c2e1029c2a51f95094ad875a5f9cdec2fd99c3c079526e3b
 EBUILD jupyter_client-6.1.12.ebuild 1195 BLAKE2B a0f657674fc053873f7286634f54118c7fd17099871e95a63fb81b118e94841a2902e84568aeb5d9c1ff44dd9602ee9b8ea20c6e86750d0e4474a07a580d8a5e SHA512 b3ad2f9740ce824f6d03f4087a336fd11fc14286d70d6484c3e30ea752068168caccc3f749324155ca4f127e9e6dc73a4a9a1b45fd3b17736135347be0a76211
 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
 EBUILD jupyter_client-7.0.4.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
 EBUILD jupyter_client-7.0.5.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
+EBUILD jupyter_client-7.0.6.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.6.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.6.ebuild
new file mode 100644
index 000000000000..737c392b7525
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.0.6.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_server/Manifest b/dev-python/jupyter_server/Manifest
index e7258cc6d997..a56771646b32 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_server-1.11.0.tar.gz 419795 BLAKE2B 992bcadfd10cebc9d2c14ecc1489af91c161edc4fd8386d4b3e30c087737b3de723b5fa8d7f2cbb537e6f20568e6ed15f110e70781bc90cdc699fe6374ed3277 SHA512 9c8afb86af3669270e3103485500b635eb2dda35d731fb1adf3db997bb76ac61a769858525aacc6fb32ede7a299f0fc21991d0b64d009f506af232733b47b141
+DIST jupyter_server-1.11.1.tar.gz 420035 BLAKE2B 0676b0e126752ebeaa45e2325c34fe787756265f5ad35e356660485e5e7fd98a9ecaa029badf4c45815f25425e5a8a44133b6595698dca212f871b898c6ef76c SHA512 537bb9dbacabe396761a17be3280ecc0d28d63116a72386a7ff69bd8467f38909b7c2491eeb1f6b8bb7618b7fe661cd583d9efb8597ecbe88941c35096e0b1a8
 DIST jupyter_server-1.8.0.tar.gz 408312 BLAKE2B db385085a1a660d707cc84570627e754dc19105af5157bc42e259822c9e98364ab77a9a16403d9b43757a6e175102632e83dd21466dff3487101771b51fdeb5f SHA512 3c4c9d64b7f0e26a79b38bc95106e062f1c363a13fc3b32c3897bbb15a7d91a64e46926b35c07f8c5bd440f55e3d01ec57c54c8b244969b6af7f7e18347030cd
 EBUILD jupyter_server-1.11.0.ebuild 1879 BLAKE2B 85e16f835227bc659c4368840ad2ffd0cb6f713bf3170641dd0e8bf1f8c4f5deffed566d0bb50b333e5904b2b5a37fa3e725e9ec3b8633b8243de19fe1e06dba SHA512 b0c000cbbe2a0576497c3d8f0ee6243125d84a3728183c4fd8a4ebcd42f396dc2273a5b5e1fc93f2120f650884434d603391b6ccac79708d46a8b0e364212652
+EBUILD jupyter_server-1.11.1.ebuild 1878 BLAKE2B a9986b28f9888fb7a2f14c26985f1aab1765a3dbd6a77045a912256033ce7f407d3abd04241673a398459c4da41a5a6463680a76732009f50ab2ce7a41b55909 SHA512 62e47a7fddaa89fe5238fb24f7bd7145307fdbe7f7faecd76b78bf8368e936d99f51ffff2bc25a59d060e85257edb2a5e446d7310319a5a1f4fa5631423e4d10
 EBUILD jupyter_server-1.8.0.ebuild 1706 BLAKE2B f2cfda244b923780f94ae46b710667ab8ed6df65e839d598709cc6a68189c1415e5fde5586220bc95c9177d94f7770263a467ee91665b601d07c66e570c1968b SHA512 58c51546a0e9b1e81ed99702959c974bfdeafd89d135a5df7ad2566b4c0b627d12fdc656edfad267d0aa1696e391d56bb4877fb4c5d3d29ed4af3b47b27cae3c
 MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
diff --git a/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild
new file mode 100644
index 000000000000..8d81f28043df
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild
@@ -0,0 +1,60 @@
+# 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 services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/anyio[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	)"
+
+# TODO: Package 'myst_parser'
+# distutils_enable_sphinx docs/source
+# 	dev-python/pydata-sphinx-theme
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv jupyter_server/conftest.py . || die
+
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	sed -i \
+		-e 's:est_terminal_create_with_cwd:_&:' \
+		-e 's:test_culling:_&:' \
+		jupyter_server/tests/test_terminal.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index dbe28fad83f2..0ba4b48bdddb 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,8 +1,5 @@
-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.6.ebuild 657 BLAKE2B 0771db52d3446f853c5400bc1394708e6c336b021960314ea6cbff890219420f4dd03002eecbf56e1c20d8d9ec136059ed1a608abcf9a03f0a5e364997469a3f SHA512 32cac3c2b5c3ca08206ecebf4249cdb6b6117f6f1a7b2a76e31cbae6e9f0ada5db06520f456428fba84eaadc21bcf73bd72f1b96ba15a84e792c9fa53b96856a
 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/files/mechanize-0.4.5-py310.patch b/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
deleted file mode 100644
index 98656b65425f..000000000000
--- a/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/mechanize/_clientcookie.py b/mechanize/_clientcookie.py
-index ebd2773..6c89cbf 100644
---- a/mechanize/_clientcookie.py
-+++ b/mechanize/_clientcookie.py
-@@ -188,13 +188,22 @@ class CookieJar(CJ):
-         raise IndexError()
- 
- 
-+try:
-+    from http.cookiejar import NETSCAPE_MAGIC_RGX, NETSCAPE_HEADER_TEXT
-+except ImportError:  # python < 3.10
-+    NETSCAPE_MAGIC_RGX = MCJ.magic_re
-+    NETSCAPE_HEADER_TEXT = MCJ.header
-+else:
-+    MCJ.header = NETSCAPE_HEADER_TEXT  # needed for tests
-+
-+
- class MozillaCookieJar(MCJ):
- 
-     def _really_load(self, f, filename, ignore_discard, ignore_expires):
-         now = time.time()
- 
-         magic = f.readline()
--        if not re.search(self.magic_re, magic):
-+        if not re.search(NETSCAPE_MAGIC_RGX, magic):
-             f.close()
-             raise LoadError(
-                 "%r does not look like a Netscape format cookies file" %
diff --git a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild b/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
deleted file mode 100644
index 50942d696a0a..000000000000
--- a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..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}
-	)
-"
-
-PATCHES=(
-	# https://github.com/python-mechanize/mechanize/commit/2a563ec4fbc394ec5976dda0f528db43d28a2706
-	# https://github.com/python-mechanize/mechanize/commit/bc6a2ca7b17e11f2533ada67f0bf92124d4a3cac
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.6.ebuild b/dev-python/mechanize/mechanize-0.4.6.ebuild
index 02ef35521fce..0dbed48e2d13 100644
--- a/dev-python/mechanize/mechanize-0.4.6.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.6.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 8f8b1c5f088c..87f3257e8ae0 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,5 +1,3 @@
-DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
 DIST memory_profiler-0.58.0.gh.tar.gz 140692 BLAKE2B 2f3917d833dfcc722b61871c7e704e869527a389b10a81b473989b8455630f5defa5f5b21a172708070b89468c7dd66682cd3b9c0bf435e9be49651b69b50137 SHA512 5c02933acffc05f42d2ae98a069d36563e1d26515d439d94ad3903960dd06cd378faae3000b26c022770e71e83db6f770ceaf63cabb92f4159bda0ff9cc4e849
-EBUILD memory_profiler-0.57.ebuild 1761 BLAKE2B 11620de24512de621dec0c7724653fa1e875781355abc083ea3c932be8c86b31391d6d60744a8f4351b4485b9402234895730de118ca47d60649dfe2495687ec SHA512 91df54c1f7ee42ce9c743f38683810337d32385e4f1ee944f0947d5c7573c01b9ba84a0ff59630020127231865d26d9f515a791170162d9231d3a3e7694a43ef
-EBUILD memory_profiler-0.58.0.ebuild 1753 BLAKE2B 84d8ca6a8b9e848da8470a1887b8f6c84274cf08e420515d25e3fadf463bf1c2cc9ccf00b6da3796d807273c5609495c776c5abb33a98a157247b9ef333ed46a SHA512 4443b1699eca0b0aa7da8b0042b0b67bccd128d1cd7c12b0f3f3b8c2a1de7808105a7d687a4a8776437895da13e38599b43d5499408badcf45563d56bf1e16da
+EBUILD memory_profiler-0.58.0.ebuild 1751 BLAKE2B edb594384f4f40a11e7feb47545639ab76f9381c8bcc16275e9b5f37c944d6d62cf294e50dda49846e7cebb4971f2696b62b541f3e5e86f0c3e1a52b19c8d8f9 SHA512 13db72b90c2e48c8e9282d47b9535a8d9fdd1257b131514c161a81568396229af68f3b55881e7a20b562ae085b942b87c8605e0de96adce93cb0c54d99d2a11f
 MISC metadata.xml 548 BLAKE2B 3b982d0f121b61b7654698307937b141ac038d27bcfc5337208bcfd2405fc3a155e2b2e69dbe6a682d4ac47e9f46c86d580bf59b72db956caddeec7ab7b2fd17 SHA512 000ec311494385bdd28557e894267525980f2650f63ffb45581d08a2e32a77a9a65cbe5a07c0c2796d563ab7e557a2b3f371a96c27bbc3627b77d9c992e78ede
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
deleted file mode 100644
index 4571a26aa141..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.57.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
-SRC_URI="https://github.com/pythonprofilers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="examples"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-# dev-lang/mercury: collision on 'mprof'
-# https://bugs.gentoo.org/571176
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	!dev-lang/mercury"
-
-distutils_enable_tests pytest
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_loop_decorated.py || die
-	${EPYTHON} -m memory_profiler test/test_mprofile.py || die
-	${EPYTHON} -m memory_profiler test/test_nested.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_unicode.py || die
-
-	${EPYTHON} test/test_exception.py || die
-	${EPYTHON} test/test_exit_code.py || die
-	${EPYTHON} test/test_global.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_mprof.py || die
-	${EPYTHON} test/test_precision_import.py || die
-	${EPYTHON} test/test_stream_unicode.py || die
-	${EPYTHON} test/test_tracemalloc.py || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
index 6103471407d7..fb5f53ccb4a9 100644
--- a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
@@ -17,7 +17,7 @@ IUSE="examples"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # dev-lang/mercury: collision on 'mprof'
 # https://bugs.gentoo.org/571176
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index d7b22372c207..387bd7bce236 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-material-7.2.4.tar.gz 6803091 BLAKE2B 377adcdaa2d24248f0430327a2a4b23fdae6f379ac23f6f609d50dc9c1699e13a92e925d9df24ec8298384228abd8c66c487afafc357edfc83da9c0e2897f422 SHA512 ba5c3a2e95eb32d2f2a3027a1cec7a54c9bdf655b51308e519e57d06fc8475ab74e2905dfeaef9bd1029e7814e5bc6c7610cce0526773bfcd3a92a995ba25c40
 DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
-EBUILD mkdocs-material-7.2.4.ebuild 815 BLAKE2B e569e3d6db88f9dcf46137796ffca1e56c362d5bf4bffe9238c7e67ab5c99e2f06c55ce4080313164c7bba4269866068d5722d5636daf2c7a0ca9e44d1d51e90 SHA512 764be13848db96b3da3f4c695e68721e9aa20129a79a637d621f31fa5e43a5af142a9e634d55507af163d9fc0cb51fab88be07a41255241f1921bb5676a956e5
-EBUILD mkdocs-material-7.2.6.ebuild 827 BLAKE2B 3e9dbb3b33685644b10f1d9ab8f5fcba80125f5e3d8250d799866553d746f02c52c6d82f939fda7a0577148683e18e7fc5daa94fcd13936c24934d5d1dfe4dcb SHA512 16cec7ae4ed6ee0c41eb479dfedc44b00f44ce97f1b160663e54c37b62c23ee5cdc0374e99f7484249b561cf9d0aef7be04565cfd0ee57c946bbdd7a84f92775
+EBUILD mkdocs-material-7.2.6.ebuild 825 BLAKE2B e51fc6267ee7458a7d73d743034d45e689dacc9163d04a1015d1e50e268ecb129100cc73b03ebeba51c19ccd6f3c316f7cccd7a15af5c4ff299278c2af75d745 SHA512 c787602a1101f5b7c944eb472088b0b27af2c28c61ed42a1b6dbf5d8def24cddb6d08d753631212120f72e974051cbb1ff0b0a92ce386a688de994f3e79249f1
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.4.ebuild
deleted file mode 100644
index f353f649d7ea..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.4.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..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
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 489883a278a4..83fdee9db73c 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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 3e4dc8a2620b..3e800e99d6ac 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
-EBUILD mongoengine-0.23.1.ebuild 2098 BLAKE2B 7364b9ad290bd83dbb1fd2f528679cd2b594aaa4dc158c1856177176341393e7ca2fa624547ab029a27f374033f5751e954672c40db3a2368030a6ea9865f3c2 SHA512 bb828275d6d21750e7637fd4cf4666579602982d2e7ba989f365128085a7ec691ec4340ca9eea10aa3dff1e043169f1bdac5adfb24efbdd677fd2f678be1130a
+EBUILD mongoengine-0.23.1.ebuild 2385 BLAKE2B c1b8ba665fcb94b271229e18971fc72eb23d2f434413ed6ccbdfe0d8d349dacdfcc79283f642a42288d59fd310e5d5afbd15c72246c56afdddc155afc3d81ef6 SHA512 2b75b872bad8b035b32fe7e3c0334deabb280d6309f72d8be4e88ffa75881ada64612a60e7ff5c3fd3b5abe31a6173e8890f28b88bd9937fb1100bf71c5589af
 MISC metadata.xml 402 BLAKE2B cdca7f343f9a264c7c565fb4b99cee9dd4e1869ab6068b8b1da6c1ad657d16fea05716d34b3fbec028527e8948dd1fd4e1aa3e272fc814af6646259be381093c SHA512 c5eb1eb9118bf5165146ef41755be092b39a7bb2d6cafbf5cce11066a5a0e15233556ea3a6a2fd250eb8c71cb7a725df37ed32b3018568aef746585c5109efa7
diff --git a/dev-python/mongoengine/mongoengine-0.23.1.ebuild b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
index 8bc583611f98..299f1c980342 100644
--- a/dev-python/mongoengine/mongoengine-0.23.1.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
@@ -25,48 +25,46 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# TODO: investigate
-	sed -e 's:test_covered_index:_&:' \
-		-i tests/document/test_indexes.py || die
-	# no $eval
-	sed -e 's:test_exec_js_field_sub:_&:' \
-		-e 's:test_exec_js_query:_&:' \
-		-e 's:test_item_frequencies_normalize:_&:' \
-		-e 's:test_item_frequencies_with_0_values:_&:' \
-		-e 's:test_item_frequencies_with_False_values:_&:' \
-		-e 's:test_item_frequencies_with_null_embedded:_&:' \
-		-i tests/queryset/test_queryset.py || die
-	# TODO: investigate (wrong order? bad comparison?)
-	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
-		-i tests/queryset/test_queryset.py || die
-
-	distutils-r1_src_prepare
-}
-
 python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: investigate
+		tests/document/test_indexes.py::TestIndexes::test_collation
+		tests/document/test_indexes.py::TestIndexes::test_covered_index
+		tests/document/test_indexes.py::TestIndexes::test_create_geohaystack_index
+		# no $eval
+		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_query
+		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_field_sub
+		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_normalize
+		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_0_values
+		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_False_values
+		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_null_embedded
+		# TODO: investigate (wrong order? bad comparison?)
+		tests/queryset/test_queryset.py::TestQueryset::test_distinct_ListField_EmbeddedDocumentField
+	)
+
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
+	local DB_PORT=27017
 
 	mkdir -p "${dbpath}" || die
 	ebegin "Trying to start mongod on port ${DB_PORT}"
 
 	LC_ALL=C \
 	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port 27017 \
+		--bind_ip 127.0.0.1 --port ${DB_PORT} \
 		--unixSocketPrefix "${TMPDIR}" \
 		--logpath "${logpath}" --fork || die
 	sleep 2
 
 	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-27017.sock ]]; then
+	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
 		# yay!
 		eend 0
 	else
 		eend 1
-		eerror "Unable to start mongod for tests. See the server log:"
-		eerror "	${logpath}"
-		die "Unable to start mongod for tests."
+		eerror "Unable to start mongod for tests. Here is the server log:"
+		cat "${logpath}"
+		die "Unable to start mongod for tests"
 	fi
 
 	local failed
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index dd16fdef7aeb..f6e59dcf52c6 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
 DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
-EBUILD mongomock-3.23.0.ebuild 852 BLAKE2B a2187f0eb4d75639f632b76578c38854f58c3033998de599c621601d35a4eea8eacf0d2d9e0ab21e490eaeb3c527b4a56c375d260cd41cd3e5934a7d81212e5b SHA512 34600bcb6719444f155ee72d2a3f8656b0fdbab4623601d47f509570e1dc60ab2248c1d2243f2d9d9e6611b121d5cd341276d6e3f2b59f1a36e6ca50871fc199
+EBUILD mongomock-3.23.0.ebuild 853 BLAKE2B 40f41a059f159ec6d94de0ab938cb3733825990e02284ec4f31d35d19faff33e7f678fae81a77fca53edc1cbc761b10eb65325e492b687eb405117f45046e4ab SHA512 a23436bc9122f188108cf43feb3bdb42a13624603d8407f1463d53a66239eb88d0da77d96578571a57f3bfec7c5b462843f062e10db6dc6158b198ffcd833e52
 MISC metadata.xml 396 BLAKE2B 8a8168fa634a76d7bd5d134b5fddf01b1d11fa83055503f096e8c3fc8fe22dca1f601534af6d9fad70e331bd4ca23d041eb4dc7ae2cc0f899db1d23c73a5b0d6 SHA512 6135b3022dd6145d8fe56d4bd7702d335f1d876e3eeacc4ca1c811a374b31dba541db1475849346ca94445a1a5489fcdd08875369b1f6f52fa8bc49750a92682
diff --git a/dev-python/mongomock/mongomock-3.23.0.ebuild b/dev-python/mongomock/mongomock-3.23.0.ebuild
index 16470a32ad6a..6b1fcf34bcca 100644
--- a/dev-python/mongomock/mongomock-3.23.0.ebuild
+++ b/dev-python/mongomock/mongomock-3.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index f3754edc303e..fe67358903fd 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,5 @@
 DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
+DIST multidict-5.2.0.tar.gz 56984 BLAKE2B 3580e3f53b3ec581d338676647f2e8dd78387fdad5730fe703c02b3cd4182d69e3b6896d71bd969413dd27974e07272cc541701a2145a517d9bacea45000e9c8 SHA512 508b6db9219c3dae76da5e89a398f4541beff2a875030c2f11da9aaa1e001324d069d7a291148c510fe555cb3a33288ef297c9baa863e42d3d09d60588bebd7e
 EBUILD multidict-5.1.0.ebuild 747 BLAKE2B 761f0c4187f333cd82c81a953a3b6c0ae1ffb0dc76aca4a5ccf951a9101af8e05c8b0f71b481af77067f78d60e29cdf6b99c85ab6dfcbe5552e60ef69bf6b926 SHA512 d1dae1fbadb15eaa4e3489e4dc787f0d07e853da92456f7b077912cd07f78d1a995012d1d602708fbaaee1567d83c99fca0e16624b1ee5078070a09317d8a3a7
+EBUILD multidict-5.2.0.ebuild 754 BLAKE2B 6ca8f5036f748f7cea8d6d066fbab489bc4b59c9bc9ca876e9f6531dc79083894b21f6e01e7066a54870350818677d5481375d9b7e09cb8032def76280fedfcc SHA512 1bfc39ac02129db1900dbd88058a8e86776da693130e124fce9ed06830c5c98ac99580872495ba1029b75607f3cc863b72c1b48615b6dea34ba01be820b4962f
 MISC metadata.xml 476 BLAKE2B 4cc6b7b2d709459ddec7c0eace1cf5dc418a0953746816135ac5ad3d8a8aba4c5086ce13b4282326de9ec9db9ffb88eec7612748bdfaf29059252f97fd56692a SHA512 88215f090cf407903b6de7139c9dca5892f58111c8d1da9b52e91b4dac18fe212140868a05ec5ffa2231519f062b4499a25b05e99eef1a81bb9655ea61387338
diff --git a/dev-python/multidict/multidict-5.2.0.ebuild b/dev-python/multidict/multidict-5.2.0.ebuild
new file mode 100644
index 000000000000..f2f50b751720
--- /dev/null
+++ b/dev-python/multidict/multidict-5.2.0.ebuild
@@ -0,0 +1,27 @@
+# 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="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e 's:--cov.*::' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 92d78b127c02..c4e60bee2191 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,3 @@
-DIST nbclient-0.5.3.gh.tar.gz 69340 BLAKE2B ef2908037b350879b4494a9676550754b51c218c0b344c8f26882fac63d3de65b37329fc8aa586f71f0fcb24d0508c2aec81d1066021abd4c66ee1b220574ef8 SHA512 16a92bdab931c2cec133389bfd491c9f3f4ca7ff3b11a3eb70fcdb568a0aecb8cca65d5a1fb25ff9a6ed6d581bed04de8e51ac2d856fad386b22aa6a2424c991
 DIST nbclient-0.5.4.gh.tar.gz 69711 BLAKE2B d229cf7a20df622f87984460735a6817d8bc50243b2980b2a14ce84b4f9b97336cc9fd0d4259cfa6700279eb555debf1a0bb57d9d28d78447e6a227097b77feb SHA512 1dcee18a13f143f4a688ed1d9baaca91b1753bfabac9ea97eadfa4a96fc8cd6462f471645da586a3c5c4b03550cbf5948c7320a26a299807ae09cc823cd7ff86
-EBUILD nbclient-0.5.3.ebuild 991 BLAKE2B 986b5db59ca3de152b88febfeb9a1438f7efbda407f80d8d98bde2651823c945858919f50fef0f59998c7828569687cc19037cad2b685c2848e87e5308105033 SHA512 0d1603dd385cdcd3430f535a08b5a7d2af40aed1305950ab53d4b1513e76e06df1a44c69c49c368733b7a40b37100dfa6ab1c50335f287d73bd64eda45bb3bc4
-EBUILD nbclient-0.5.4.ebuild 960 BLAKE2B 7dd6e0eed28d58695dccf853d2db247310929865adbf34324384e04e08ae059392f955d00a695662bd24adbdb06c613892bf9fdbaf2e7330d43c8b8126c19720 SHA512 e5d0c2b816d7c4e5bd878501a470e37ffd0cd00140c23647d43216e4913fd411225c5578ce84ac786a681a9077a3461fb1dd1844a21979f0c8b41da8f24227e1
+EBUILD nbclient-0.5.4.ebuild 958 BLAKE2B 4d391fc8531aea8b14737ad92253c9aa20d8ffaeb73cb6d985747bb7f100724a8012436505ec5085c4ca7fb9015c4c65cc1f97a52f827d9d1f465cbe9fb82b10 SHA512 16beb68c4eb141dff1342a61577b1b741d5b46147208be4cb4c4fba2ec03941973125c80ad02b32bfc15dda66b7aad39dbcf14cb16fbcd64604ec465a7e2fe90
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.5.3.ebuild b/dev-python/nbclient/nbclient-0.5.3.ebuild
deleted file mode 100644
index 9a6e3e26d921..000000000000
--- a/dev-python/nbclient/nbclient-0.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/async_generator[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.5.4.ebuild b/dev-python/nbclient/nbclient-0.5.4.ebuild
index 28d2acc95455..ceecd1402efa 100644
--- a/dev-python/nbclient/nbclient-0.5.4.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 1e068831ee1d..3e727aea34ce 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,4 +1,4 @@
 AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.5.1.ebuild 1136 BLAKE2B dc81f671c414596ab8ec01221976a843d3c86beb012561c11a8079dcbc8963387fe3fbc2e64ceed10753d509d055b333e4113e6415214e6812830350194ed4c9 SHA512 15d9a3b57389ad7aab3c299770a98de838965bcbfe99f54f1c8ffed3e973bd908785e15d41ab75d98e476da9220acd53cffd8c6990079ca569a0c0c1bdafc1b8
+EBUILD ndg-httpsclient-0.5.1.ebuild 1142 BLAKE2B 2855e46139c6eb7735038bb673d08c4e7dd09f249a8db4997c1ca0f79bf178094379967aa7cfb2c7b4a716a569e187410f1a7417952386fb1cf3ef87dcd753d3 SHA512 99815f44340b95aa93ddd86032fa7b8bdb1d757de122fc158d031876cd16d742727b5ae8d7d2fc62a4027aeb97641262ac7c2e96f262c2ca69017c61c92e49b1
 MISC metadata.xml 419 BLAKE2B 60193b41119296983c604afd02ba7e6d42a8629685436e59c7998c6751d6d03c7ee396d06b5a24f36730ff1aac6fdb8635291dd69ff173ca47ee1e5666ec6118 SHA512 522d2ee170450b69e190a6a6e1b87615a56ca253f128799aa2d3c4327d40e2530fb350162b212a5382ee712ffc3caa3ddd351e6bdea92ed40b0b82e4aa96fbb2
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 99202b1c9470..0d41d3fb2b83 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 0fe72cd73914..d12669622f4e 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,8 +1,4 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
-DIST notebook-6.4.2.tar.gz 14133763 BLAKE2B 2c4f9677b014f484f7c975344f6e3aa29476b3b3bf2dd329ee527be653573f199c6d66078bc1f0787227414fb818df8df3d38e5f1bea9d3f2605f796a391cb37 SHA512 d9914c2924b7a0837295a7cfe2bdf551e1d71f35bab43bd6d12e798562c7e103f28cfdff6692e6ac5de394867071b8e1eae7a26bfd0a76b4a9304b7bea29f119
-DIST notebook-6.4.3.tar.gz 14344061 BLAKE2B a6d12df889015801a47061b40c320f659adda19cdf37832de1fd2b0257e7b1e22439aa4fd7663595c798b4b04c8c8e720a3799bcb20b93a0229ccf26622eee04 SHA512 14bb5c1a858c2d48f19f6a9907c4e3a053e77586a9ce78f3116752a02c39056bfa02fac5ef37404b742861a66751ca765b1d329a530b09752cf54fa464ab565b
 DIST notebook-6.4.4.tar.gz 14349204 BLAKE2B 3ea06a6433933e0de34be33bc681776a17fec05da643268a262f65146bd707f08ea6acbfe1154ba9158ac76211de78552daec22293a54ba5e0edb848790ccbbd SHA512 c78869b7d75244409cb890d43d05eb5391c27e0de29874f48aef1c22379cdcb5dc7f69969eccd6c0f1ed057ed17f85d39e43cd482866dfe6277b6a981eee39f6
-EBUILD notebook-6.4.2.ebuild 3235 BLAKE2B 99f3820a192f74b44b0f6e128621d00920a03072f0e433a77002b412bc05f21c4866ba74c20743918a9bcc6d42c7524de601e96525d47c26747ac5781aa9e7ba SHA512 9e09082e03757b0c0e519c2b1166d89e8cea981f91bf8a157ec3e0ee796e94dbe213ffdf71f448b01a16b1c26485816f807b918c3d41b0c369a67f6089de1665
-EBUILD notebook-6.4.3.ebuild 3250 BLAKE2B 114ac2b6b6b5cb9ab34389d9b2485932437652f35776a38fca62e875e1df2994b38048f5278107b407683549b827fa76db9a969c4db5b2fd6d47c5a5f38a283b SHA512 65bf6380532020026259c2674c0f764727f60be7e4fd5b4c3a2f4f8abeb52c2f86b02bd55c6318fc1d7d7136c9f0e3327fb21a3fde5164685c3da7c3feac8b82
-EBUILD notebook-6.4.4.ebuild 3250 BLAKE2B 114ac2b6b6b5cb9ab34389d9b2485932437652f35776a38fca62e875e1df2994b38048f5278107b407683549b827fa76db9a969c4db5b2fd6d47c5a5f38a283b SHA512 65bf6380532020026259c2674c0f764727f60be7e4fd5b4c3a2f4f8abeb52c2f86b02bd55c6318fc1d7d7136c9f0e3327fb21a3fde5164685c3da7c3feac8b82
+EBUILD notebook-6.4.4.ebuild 3248 BLAKE2B c1878c7836fbd3d54591293b30f7c898341cb16cd76ef98bb8a0bbb9652085452e47438f75d3924f84d8c9fc89a326d5fa24b02bc3303ee29cfdc9b230345e4f SHA512 2de294ff6a18aff1ee3a7541708eb0bba2fbdb3beb3c9604cef1718dcd67b07e3c18697ce85a91392e76320793a9c0f1eb2468cd6f7983e252537ec56a52cb20
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.2.ebuild b/dev-python/notebook/notebook-6.4.2.ebuild
deleted file mode 100644
index 4bec7083e14c..000000000000
--- a/dev-python/notebook/notebook-6.4.2.ebuild
+++ /dev/null
@@ -1,100 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# trash doesn't seem to work for us
-		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
-		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-		# TODO
-		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	)
-
-	# selenium tests require geckodriver
-	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-6.4.3.ebuild b/dev-python/notebook/notebook-6.4.3.ebuild
deleted file mode 100644
index cacbe7d854e3..000000000000
--- a/dev-python/notebook/notebook-6.4.3.ebuild
+++ /dev/null
@@ -1,100 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# trash doesn't seem to work for us
-		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
-		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-		# TODO
-		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	)
-
-	# selenium tests require geckodriver
-	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-6.4.4.ebuild b/dev-python/notebook/notebook-6.4.4.ebuild
index cacbe7d854e3..9a4c0befb9cd 100644
--- a/dev-python/notebook/notebook-6.4.4.ebuild
+++ b/dev-python/notebook/notebook-6.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index d40116824644..175d001233e9 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,11 @@
 DIST Nuitka-0.6.16.3.tar.gz 2965278 BLAKE2B fc015f78912688e3d3b0833e7c126833352aeda7ac2599685a007445c43a7099407c4797eba47d5254fb5befde9482c210b920f4c7e38a2d82dbb5331125abee SHA512 a46af040774fd3523b64c1a113f6d0251c8d45108686017dae07429107f5057025bbcfefc7ed2b86da32c69516285d3af55fe234d25d6949562a96b0eb3f5293
 DIST Nuitka-0.6.16.4.tar.gz 2963879 BLAKE2B a6a0029f06aac5ea8fb0fec81ac5b1c5b7bb0ed85bdd0f0308ac74140792360684f42cf79f7ff7e604de3729584b335671ff57f0805aac2154ef1ea88bbbf245 SHA512 e2c73b19e459c31b85adf79270e258ca3c431364ec90b51682a7a324aebfeab1ab7703421e8646e18e0bef62f5f5636bbbda74d0ec0e4666e1571d71d41971b2
 DIST Nuitka-0.6.17.1.tar.gz 3144303 BLAKE2B 999a391830459fbfd20c52b3d640070bf4b69000ffcaaf0e86d1a0ccbd4602ce7cfb3a47658a5a94a8935f0dba4658f2616a2d7c4c176d5553ad3a488cd7645c SHA512 7d121a03539357f480ffd940699bd5df5ebb038f6914820b3185e0bcf8955ab005e2eacd49c837b94a2f5396a751264cf950764482a523e90a32d321e89ea2d2
+DIST Nuitka-0.6.17.2.tar.gz 3144669 BLAKE2B 0b098c9cad1cea08241026f8bf43242fb8a1f1790edafd9b54fb3a49a00590465222898a5edbb403b0d82f30bb6a9baa8a8b5292ed4b40e77cd7de236b44c200 SHA512 99b60bf447bff7203c6f18bc7f98ceab102f74562494244e9e514b076a6f1bf37357b478bc07dd6d800be7903801e6e499d17312bbb47a961924a0b1526ec33d
 DIST Nuitka-0.6.17.tar.gz 3144123 BLAKE2B 07d95a987eb6c772cd58f8bd0bb7aca638c475e4e90b6a58af890e63b5d3bec9125efa54ba54925311a38cc06b3c8e60a86ce18be7f189da111798fe77da3bd5 SHA512 8678cb9cbc30d9a9a139f98ae94d7f881295bbfb5f450faafb335cce7243979ad3dbf81946024a67edea177f2baae9d694d9e93abc5389f34dddd06595158eff
 EBUILD nuitka-0.6.16.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.16.4.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 EBUILD nuitka-0.6.17.1.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
+EBUILD nuitka-0.6.17.2.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 EBUILD nuitka-0.6.17.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.6.17.2.ebuild b/dev-python/nuitka/nuitka-0.6.17.2.ebuild
new file mode 100644
index 000000000000..758649696b8e
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.17.2.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 7fcc0ac781e7..c6ec05ebdffc 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.3.ebuild 1253 BLAKE2B 603af32801a63ba17b20e6bc35434a9ede2b86cb934b19fa69dcb8ed660454939f79a1621f838596c3d98698365bf0c15300d0db1ebb0f3128ee7151ed5856cc SHA512 df17b627574376a072783a8165eafc918172674e713dd36d8febfde067edffbcbc3a5bb8f519e6c19d6d252c85206d3783f13e5094eee8f114f1e97bd0bdf382
+EBUILD numexpr-2.7.3.ebuild 1252 BLAKE2B 43ddca2762c79bd7e101e55d532bb38236fbde53c9e4c76cb54f045a2beb6cd7ec0ef530e9a724efa40c509a569414771b99bf5dbd1ac310b4de55c94cbfe072 SHA512 9eaa3ce41bab2aaf3b8c02619f0c50412561730aef28f7f95a4b7193a4923a34df4fd075b9a04153522c236e685696dcc02d679824b0f519ee38a9460d2cfd3e
 MISC metadata.xml 1087 BLAKE2B e8577eb0003f4e1f922e3d55b3d69420d296bee1045ab0940cb689e36478e6bf855226cd6ef441b95089d0d4be387447461734522fb0407e80995520a36c2d10 SHA512 8d9e918be571a024d23ecf8a9dceae02f8b507dc77bd59c55817e1b0fe21d844443fde424cbcc23a49780f2527de000474c3cddd650759ae24d80467d6937361
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 324307876080..965a7d617b67 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index a70ace93b214..e30c16cda74d 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -2,7 +2,7 @@ AUX openpyxl-3.0.7-metadata.patch 361 BLAKE2B 7a5322e9fd568124bc2271f015fa284300
 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.7-r1.ebuild 797 BLAKE2B 48128dbc0eac6f021d57fb05386f136b62d864ee66374f1538fbfdff2650358a4fcddadaac4c1ab13e8d4ea6589e19c001742b9d0c5dafdbaad43eb99c73b03e SHA512 1770a46808e4432cbdd5525bb041abd547c9638b088b94f9ceb219d58278fe2f40805b48ec64d443bb9b8bd4b48e78ef44136e233612843002dcde70e97ac692
 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 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
index 471a0e28b832..83804875c020 100644
--- a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index c9a4f24896ac..030bfd820dc3 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,3 @@
-DIST openstacksdk-0.58.0.tar.gz 1021818 BLAKE2B 530ec940b958d5c9b1a1caba71716201172e1141ebac208b26ea512732be152ccc6e928d20e38964eb455ff47fd6f42756d3f9af19800a45104b631d45d312c9 SHA512 94bb317e9f79ab419e5a0e7def4510d6686e3b8585721c15bd1f03eced5e8f45509cf925ed2b3e51a19ecd2d3e28469343cdae5a3df549f35bb61c448add5caa
 DIST openstacksdk-0.59.0.tar.gz 1021995 BLAKE2B be57afcdc707547e2cd69774de1b7d0dc4b84ffe58bdaa4f063b85996e8ee08ded60004d3211f827d7b4a5239d1420485ce2fae92b550722c959274a18ed2753 SHA512 02f8f8f174896417f0cf4ce1c65c87ea705664fa7a1c6383ad1791f5d94cb818b5b0bfee331bd0d07d724df59859ccef91c507b0c39522115f9549d6258a3eb7
-EBUILD openstacksdk-0.58.0.ebuild 2638 BLAKE2B ab1d7b59ce18a6120ba724081fce20dd1d285db7b41b94102bdf0257d76e0a9d4c4a5d87320ed0c88a14b4e89433c0da81798c87b0779f67541fbc07ae918706 SHA512 0f2a96b33252c16ce0460d5ad4c771f617199e5d6c3e912ff8947488569db931dd993063be5469ede6d1ac50c21af3d99967f28c2df69c858856ebc3aef163f7
-EBUILD openstacksdk-0.59.0.ebuild 2592 BLAKE2B 7b171af6a3462346958e98bb5b479eb7d90635ce7f826ffad58fd9ef34513ed43ffecf4b2becf02be770271fa0574e75bab743e3474a5d5e1e7b8d140563d58c SHA512 de48308c8ebe5018da32eed3b9bdf92bb2100423fd5a0e8982dbdbfb480f5eee5cdf2f44ded557372630a9f6ef82a2923f9de61c71a5f9a9b2a3ad260a4fcb42
+EBUILD openstacksdk-0.59.0.ebuild 2589 BLAKE2B 3be816b0e648b2bebecc8ea44350f69fe70c65d6becfb31f67a9cdb3eb3cc157d2bb85b9ea6951fd073558a5e2d9f5d0887568742772a82c9c8ec6e08fe30e91 SHA512 c5f33e25209094fc6ea8194bf57a614fd916e0634276e0490ed50eb81a54df41e436f9b16142a0ec5601c689b0cc2d607fc3cdbb1d50c0ce264130a1d8326988
 MISC metadata.xml 524 BLAKE2B c0761a68f0744c605e0fd5e565052e83a7788a6ac532ce69bc0b31abe5465aae34762fb258248c0ee98d05bfd3eefdedd38d7e6431c0d5263739f9c5f737f62a SHA512 c5aa5c8cfb7ca0c7956877fc806fff6d4b000324fa9e005cdf246fc839bc8e20a6e6cf904afdf0d3d13efd034643978eea35410e9e30fcea8b18bc448b509272
diff --git a/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild
deleted file mode 100644
index f7cceb81974e..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
-	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-
-	# broken with the current version of dogpile.cache?
-	rm openstack/tests/unit/cloud/test_caching.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
index 00e5891929b7..0c64508591fc 100644
--- a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index bf43a71b0370..b07068f69720 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.concurrency-4.4.1.tar.gz 58399 BLAKE2B ea28cdd53ae124fe458c0d901b305d99b7a5b5525835e6a04ca856177876fa6c6a1eff74842dcf260c78c205d95f353cd1b70f0cb6205e7bec841bae2d6ecd0d SHA512 1b7e6a2cb2e3ee0710f652489522c7a9e47a5292c46041f21a2ffe4c61a6bbae48b43e93507465013704b89778deec860da06fec32b4d3778e05cade9a6d39a1
-EBUILD oslo-concurrency-4.4.1.ebuild 937 BLAKE2B c2eb9d0b1292d0c2de0f2d28a7af15604bac6ac58440c9214711dada90f0dd085e663052837fb196add0f1fd6b7c867878bb2b9e6401030d9529f138959f5cd9 SHA512 7863eb4344bdecbd0011b00fd2a7150d14b83df073e6998ae3fb996537b090d79094172933cac41ea961ce1d765c5bf9498a7e412c4d1334da24afd98d536102
+EBUILD oslo-concurrency-4.4.1.ebuild 942 BLAKE2B c3887289a90a3995134f1ed05fe94ee06ec680181dcb08f3c9f67286613ea019b8e213db6b04b824ce41def70dbdb588fa6722abfbbcde18cdcdb26776a4f599 SHA512 7da4b3cf75c8ce9b8f626790ccf1a4dce04b4f80290064ba69cc8e5179527dd8a382b65585a4471f751bdc3fe73df4c17a697a82d53f462ebd0be3f71fde9b9c
 MISC metadata.xml 539 BLAKE2B 243e21ae592bc6063b27bd2da21e7c9b7caf5127ecfa616dac4e36f34a74c0a8d221a83659596faaf5981451feb79553f4dfb94dbdd35916dafc32c5c6d6f279 SHA512 5d1bdc934197cf39dda7e8b14d573c7e401c4b18c09da4447e1ab0ec97fff0f24f90908819a0a3e03956bcdcd58af9beb95511346346c29d59eea8f752751a1b
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
index 1d4915b303dc..6ee2324081d6 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 354404b48e47..61a6dd0949db 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.context-3.3.1.tar.gz 32676 BLAKE2B 38d5eaf7a3162fdb6a8887f2c627ee192950d743a9de929ea332495099bcc76e27a192ce6e8a3b010e190ef749ea67dcf168476bc84ede99d43c1ec8b11e1734 SHA512 40f3418020246066841e62e5579ac4a1c761c92c5f439b07059cd0b6b2e8984d2e1dacfa57af7c6d9c97c2fda8eeb5cfde76f2110a36ef21513b42d0d3bffc73
-EBUILD oslo-context-3.3.1.ebuild 795 BLAKE2B 4e31a233efae683ea1136c37761a15f4c3db3c7e0af0c16f44987707265d8484032aebc9887c01160929e3f5b826cb8a860e4a0c40e14d7830871f0a1b8e5a8d SHA512 3d4098cf23ee179e97353ea3d09c584717029497d11b37fa80761f8c1034d3fa120dd82171f7e1f5b7fef642e4c87111b292d987323b3222a2023a2d9e1f76db
+EBUILD oslo-context-3.3.1.ebuild 832 BLAKE2B 22bf2f0eaec63f241ac637f06e965aa13a775efe332df4ab112cd1dfdc0da4623ee3663c0715f7e44673606a760487dbe407616cc28251166839975154a8c3e7 SHA512 0b3e767934cfc76524d1cbe2723638432e8b9cccedb73da5c2469a42c6b1c750f90404aaf1a3d75f0bbf97b7bbd72f4d7ae38f338a5196f9737ad742933b050f
 MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/oslo-context-3.3.1.ebuild b/dev-python/oslo-context/oslo-context-3.3.1.ebuild
index 6a0c34e72178..e6c16586c809 100644
--- a/dev-python/oslo-context/oslo-context-3.3.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.3.1.ebuild
@@ -15,14 +15,16 @@ 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[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 614de161cb53..9eb774c76a1a 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.log-4.6.0.tar.gz 92331 BLAKE2B 974f8fef0f132c5429b6512c39b770206947eae9e7a195d7a570b9da6b5bdca675440c800b6ec969ab950e375d4d4ae722d08cf662fe644949322ddc80df01df SHA512 991b661be12b2d16060b621e743fb65809f753b240d5039cd4d51f13a95d6852404156d46507fc611b612cb656d68960026c8735f4f91b32caf89e09499a3c7b
-EBUILD oslo-log-4.6.0.ebuild 1232 BLAKE2B aa3f4ed7abeeab203987cfa60a218da982700942bbc7b742d71beaf5af8084b7cc3eafb167f1d5e28b1459023e39ae62b680b6fa7fb22166cefe100e9f4fcd1e SHA512 aa06d8cc517167cf7ddacc5386fafb7d8a337fb39d72db90b5d9a22aef721aa82224beeafa6b357adf7c123eb37f225d46817d59f1254b3ab70b179798c378e2
+EBUILD oslo-log-4.6.0.ebuild 1326 BLAKE2B 3d8b6202928973b3e6c8142f5f6e00b8764dcc5fa1a12ebecb5a73ac43e6c2dd7967745194df7a3476b94d7e8fe2a728bb28fc984dc0a06cfc429f34493c9403 SHA512 b7d86f9bc6e6b1b098bed3d27073efc4c50f853a8f007117e5d85252f8ea3957ad595a111fbf333ad7d6e640b815115ddb20cb048ff7f97ae18c54342b37ac1a
 MISC metadata.xml 908 BLAKE2B 49c859acb4b62996a3f4a9beb659b8e1169e700cb4da456d030da25d9c38f05de603e03e5e6a7fe56486b0d5dff6ba2953825d95358b32f53f1e66ce76b9e57e SHA512 9eb901e9f165d84402bcbfc048d2ca08533dd2f6450da96586ec536269662ae68518f50abd5413dc65f9bd817798e2cc10b219f6b5c0805a38d7992ef82cf7db
diff --git a/dev-python/oslo-log/oslo-log-4.6.0.ebuild b/dev-python/oslo-log/oslo-log-4.6.0.ebuild
index cda3ee03da73..9981bd727ad1 100644
--- a/dev-python/oslo-log/oslo-log-4.6.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.6.0.ebuild
@@ -32,6 +32,9 @@ BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
 
 python_test() {
 	eunittest -b
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 7ece16932801..98f255d0a680 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.serialization-4.2.0.tar.gz 34024 BLAKE2B 709c71abeb9cf84d68dddbb5fc404401408b17eaeace13935bfd5e567899d087d4e5d5521546c3791e03c24591f64b182337d78f2d54d74e71e50922099bf4d7 SHA512 2a2c51d03432c35bf872b2da9c51f6deb764e38d86d5561843fe4f7a39af8383500b214039acb37f0e972141e7c9e5f20c457084e287498d4c93a89207bdd938
-EBUILD oslo-serialization-4.2.0.ebuild 1049 BLAKE2B d299b999296966b2209f078a308b349477dd33c6dce84630da47a99bd2f5af255e6dab76c517a40148983b9b31d4da7698f8037606474f54f036e19c04a2565b SHA512 0ef2402a3328e76aa075b821ad7476ea6954e08942d72c81e844d19bff3bb1c901a7bfc9266bf2c439d8bb0923a6f03b9850212500f309b2af7a04772d204825
+EBUILD oslo-serialization-4.2.0.ebuild 1007 BLAKE2B 9cd8b00bc48bac106718bb72fbddf97354f4c604250ce4505ecfaf52adb48948c9be5847a9e76f4aee690f4a240bc5fce81ac5c55e947d2175a29c73efaa2250 SHA512 4a6a92ea4a6c1ae298f6f961235387597f9b26b9e29c0ac2f8b67937caebd87b758c4f095d7ee2b81fe9fc6149c90b1e1a56550dcfb943d13e13634ad508921a
 MISC metadata.xml 615 BLAKE2B e25d338d3ea1f94f81bfa5d225b1883ac14eeecb217ab0b4d8687bb8a7ddb35bd33e39d894444655f67bdf346cd394ad280aa511b8c291c4525265877ab75942 SHA512 a95c2e689c9f7d5a60fe1c4bdb9b78eaca78d78cac5ccb765696204122f65a21ea5285f6bbfb88cdbbe1042e69998872bc545bd2af1ab8765317f3a042860778
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
index 276f78b8a82f..6e7d6b1f95c8 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
@@ -6,17 +6,16 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
-MY_PN=${PN/-/.}
+MY_P=${P/-/.}
 
 DESCRIPTION="Oslo Serialization library"
 HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
@@ -33,10 +32,10 @@ BDEPEND="
 "
 
 distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme
 
 python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i -e '/^msgpack/d' requirements.txt || die
 	# remove spurious rdep on pbr
 	sed -i -e '/pbr/d' requirements.txt || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/pafy/Manifest b/dev-python/pafy/Manifest
index 64bdaafc85ea..5bca52384ded 100644
--- a/dev-python/pafy/Manifest
+++ b/dev-python/pafy/Manifest
@@ -1,4 +1,4 @@
 DIST pafy-0.5.5.tar.gz 29769 BLAKE2B 84c9bfac18fb668327103341cc01229c7c77fda5b5edaecdb662b891fcf4390c578466364b81d4bcdb1abdbe0cb32641ec6320fbbca8779621fafc011cbde20d SHA512 3b7e02bc9cc541bd66718469c7a743be5da3b0822d7cc63ec82f49c2721fe6b3bdbb87cdd9dd26b0bf05fa8bb9566ff6cc59b37baa17ccb7aae12c881faa884c
-EBUILD pafy-0.5.5.ebuild 612 BLAKE2B d7a0ae09070862fcc82b52959723c8fe255f4b9bc901c361de01166c7c3a828408bca9dbf1f3da9ce6ceb8c24803ebf75f98b6a339441ee08574bf1721788963 SHA512 04a108ce08576ab4c60a3cfdad5b84d09d1bb298dcc43370535a174873296e0ea0e9820bb3b88c16bc591b984d360e80d0ea86666f34645818f20df85d24d49a
-EBUILD pafy-9999.ebuild 612 BLAKE2B d7a0ae09070862fcc82b52959723c8fe255f4b9bc901c361de01166c7c3a828408bca9dbf1f3da9ce6ceb8c24803ebf75f98b6a339441ee08574bf1721788963 SHA512 04a108ce08576ab4c60a3cfdad5b84d09d1bb298dcc43370535a174873296e0ea0e9820bb3b88c16bc591b984d360e80d0ea86666f34645818f20df85d24d49a
+EBUILD pafy-0.5.5.ebuild 579 BLAKE2B 27febd5014d2d5ac13c14fca65f98fd622c4943196fcfc2f358c0bde72f14d8a9de8011db4ce23b18029f70db34a7edcaccff909ad97882d8925ebb778902012 SHA512 94eda89dc10f5bae9d2bcf8bbcc9c19acc7a298a86bce2dd5b3ec2bc976ed7fe4bf0e920a159fa620594a9d67ae4b768c74836d16b8c78ff40900dd0f7b6bd4e
+EBUILD pafy-9999.ebuild 579 BLAKE2B 27febd5014d2d5ac13c14fca65f98fd622c4943196fcfc2f358c0bde72f14d8a9de8011db4ce23b18029f70db34a7edcaccff909ad97882d8925ebb778902012 SHA512 94eda89dc10f5bae9d2bcf8bbcc9c19acc7a298a86bce2dd5b3ec2bc976ed7fe4bf0e920a159fa620594a9d67ae4b768c74836d16b8c78ff40900dd0f7b6bd4e
 MISC metadata.xml 364 BLAKE2B d420db52fe29a01d3bfb9a901e4670b42bb7dc9a06e36afa839eb61714a379843161ca8c7eb9a0a99b11394be6f2ae44f64c46baf12a02d9f848757290bf4a3b SHA512 7d0444d739581760828d1796de65cac2118d178495b54796562ea7f19e53ff55c878bed562e0f9b2f35af582b637ae86e2897c3f8fb72e46efb2f1311b1ddbf9
diff --git a/dev-python/pafy/pafy-0.5.5.ebuild b/dev-python/pafy/pafy-0.5.5.ebuild
index 57aea55fcae7..348baedd9e97 100644
--- a/dev-python/pafy/pafy-0.5.5.ebuild
+++ b/dev-python/pafy/pafy-0.5.5.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
index 57aea55fcae7..348baedd9e97 100644
--- a/dev-python/pafy/pafy-9999.ebuild
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index bbbb8a7aab1d..d7e21232dca3 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -10,6 +10,6 @@ EBUILD pandas-1.2.4.ebuild 6149 BLAKE2B a0e8c74bf270a1c8d2a074aae53cfe231a10c4fa
 EBUILD pandas-1.2.5.ebuild 6175 BLAKE2B d384feaf94326c3e5c48f73ee55a97e81ab008a703c12a9e14f5bbb2f63c0fe25d064037c82b67b10ce525b6950484c70faf979a78e79374b0a038fb88ea86c7 SHA512 829e0a5039902beefdc5cecef2cc883d8e61968ec3e2f79b709a0d020c8cec1d04fe788b168ccbf39085e0a1a0aaa450799f5b477de587caaf220b6ecf1906c3
 EBUILD pandas-1.3.0.ebuild 6406 BLAKE2B f0952945c6cb5cc702e3a220993c05ea22429505aa3559170a417d60e16e917c87e609192968b56831b843bbd7ebbdd7120d74b4ef07319bbc39a81277a8a8d2 SHA512 87fd5f381e512647b038d6de4c5af9317b844c069c502fbef5fd28f815df1aaaf263d7524413984d209c7521860ff30008d50423de7766438c77c814274eac80
 EBUILD pandas-1.3.1.ebuild 6405 BLAKE2B 023e70409effee1c72c78b0759f8282e9a6e1aeed40abce41bedf87a0818c7aa5d4142b615fe4ded77f5e32b3cd92e7ce6b535846eede53777a50ed5d8e6b80d SHA512 243dd3339e8bc5b223ff17c2ff7f9ba3caacab10bd2b825d038d9bd57296f6b3928b8457614bd3aff4929d54112cf88c52c4b1ca5b00e944941a607d75054dac
-EBUILD pandas-1.3.2.ebuild 6424 BLAKE2B c31739a77e05a31a47ceadaf2805612333039a03745fdaaa184d1d405062083bf29f81783b1c18c2234dafe08ba3179c2a5c7ae77777bc8876054b2a9bc0716a SHA512 cae23fe13d33b1df25fff7dfbd5eb0531391bf851d529335b3be43b67d57111159fc564b9afcfe5f2827d0d23e7ec96ed014693d319eef148be031ec1cc5e537
+EBUILD pandas-1.3.2.ebuild 6423 BLAKE2B 8b167992a2e5426d7311085e5ba1c30fcc2337feceefa1bc2a143adf72cc6927638265343737cd8153f7c19c3b92cc8ff3142e3b6d3219ae02ea3b8439ba930b SHA512 a75790eec03fc3b823dfc176ada1e08eb4b50d92c91d5ff3032e122003542705a254eb60c6a61051104077f344a718df5f67fb64b8f1c59fbaa9a0469faa459d
 EBUILD pandas-1.3.3.ebuild 6411 BLAKE2B ca12bc44db2191b206012770dd88cbae5ae012fae95a58912c8cf66c3c1f0b4a38a077e07aedf379bec085be66f0c2c874bfa22153e775a243f7baa8d4b1c16c SHA512 fd0940269b2debd7b0f95f1fae4217b9576eaf61765ad8f5b798e27182ed7c52ba84e2d1a1b409fb182de3ff479c0b9cf1b71ed28ca5a14c2d5042e99c6dbc0f
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.3.2.ebuild b/dev-python/pandas/pandas-1.3.2.ebuild
index dd278f44e3eb..4045ea29992b 100644
--- a/dev-python/pandas/pandas-1.3.2.ebuild
+++ b/dev-python/pandas/pandas-1.3.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index fe17e8be2cb8..da16cbcb714e 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,3 +1,3 @@
 DIST parsedatetime-2.6.tar.gz 70732 BLAKE2B 099b2d4d434fabf3e3d587923a037608a982eee7986f5843f7a463acc52a736a0661261da557a16cfb310414778ef49b1d2bcde62bbf53807132004b526aa175 SHA512 ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543
-EBUILD parsedatetime-2.6.ebuild 547 BLAKE2B 4dd08a584d4bb839d9b42d507e92d0569f44d90d4fcb9534a35809100856dc0d907a99e6a70624b097ed7c826e096b1c712e013e9450c90931b8bd7dff42e1b6 SHA512 87c87ba136b168b1c82e3f431b632dafad0d1578f3c229f83fcd8427ac181a962699919f57db4bf9825321b82934945f702d4794d2b7502f257c54f487e51e3a
+EBUILD parsedatetime-2.6.ebuild 554 BLAKE2B 94315e4bd91ef50da5b5c82a367859afb0acd2b78ffa5c26836378d45b7652bfb54a96cb446d613ad93a1b586bfff59d814b2a1e7ecc8ac4b03c99d476528dd1 SHA512 50810d5b069edb8bd5003df7ed36c9e1db26a4de49ee6e379091f4fbed2c3b56e7e5be0167330f62960594926cc057997ba7d24946836ebe7d2c7b9a47969ca8
 MISC metadata.xml 465 BLAKE2B 5e3487abd250c58c950ac03390ac0f62456552e5b7de1f17265df08dce01fb693d677aa8c8b0b27c789f2ae08d75cd6d9520a2ba4756db81109447d452e3601f SHA512 655e257c64c529b1ac34cd7a6ad466ff0eca85fed3a395e0bbbfc7f12c0df34ba0325ffb9f690dff23020b058ec2f5e9721b5f720708240e8d71afdfa9e14ed5
diff --git a/dev-python/parsedatetime/parsedatetime-2.6.ebuild b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
index 56311cece76b..0f8a12dce664 100644
--- a/dev-python/parsedatetime/parsedatetime-2.6.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 63a8bdb4f9a1..b9d7b613ba98 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,6 +1,6 @@
 AUX patsy-0.5.1-py310.patch 1159 BLAKE2B 6b734bf60d74f071cae590658b613c36fef694d99362fa30f4e6651a14c4f8063c8a67f93e756447712146d89b8f3371a8d08604a40edfb29f31c60b1e7a24b8 SHA512 843cac6b873114de82f784d3bd1ab4d317c73d4ae125088d303a976d15ca38eb6a0e2598e4758eb06a984c3c3820814b0b66380b3f7138eceef0d4730ca2fb8c
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
-EBUILD patsy-0.5.1.ebuild 668 BLAKE2B 033448e97e8f2f889d43bdce7a099dce9bfdadf6dd137586800f34d632b156f910f6643cd5d6bcf27cd08dac8f318fc0e88fe5a6400fb60bb27d86bae0b3e232 SHA512 47db98de6b64287ffd59c3994fae0d2fc31e9c024782aa3811cb7daec8d2a0395816cbab4226026b4acc478b2a7b45f2379602960ecf98f08f3c8d8dc3aa0df2
+EBUILD patsy-0.5.1.ebuild 667 BLAKE2B 0249733194901698b023e2e7bd54c34ca136c04db8585a888ba3abb684bd1e8dff35b38fb94c783c02091d7ff02782792c757e66ce789ea35a2b89a80fd40919 SHA512 664320dff982e19758d65649af2c400f13448a0cad6ebb4e9d6c11f8a42116e9596cea7f709877ca08c9c56631bc0d59fc62b09975407f4c47aaff8edec012c8
 EBUILD patsy-0.5.2.ebuild 626 BLAKE2B 7b110d367ea1e319659f889b6292f08cc5b05b25ccd0645c54f605961fd0611508a20d7eb5a58f4b6536ac98d203790da722898b7e77ec30232d17fcc54c7a85 SHA512 aba6f4d0d064a902a7adbdbe8984955f8a1315df8ce8dfcce88c2cb1d3a4f2fca439a623bd12835022f710487a1fad1daad32b3fc023704147a1504213074852
 MISC metadata.xml 569 BLAKE2B c7e5c84214d6630ee67fc867db27979aefae315267eb1689750506c5ab39189dfcc39bafac886ae3319a6a0417b68141eb60ef19c257fa4048ca8cdd0e4c1709 SHA512 ba4bd3cb646d50fa3388e3fa138f9dafa78e171e1be114c63f122ae982a27702a9319a953a697e7de3beca10d8a642ab35070017048bbee89c5e5d729fa70d57
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 7fdac08852e2..46086874471b 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~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/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 1eae6e754800..f9320aed42c3 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,4 +1,5 @@
+AUX pexpect-4.8.0-fix-PS1.patch 662 BLAKE2B 93bf985deee0b14690fe08abbb21be09044e0c7da372a3c0162b5fabbb6a12a9bdb37d67df94c2e3695e8ee4cf1559eaa88b39a3a82d1579fe3044218e9e8ad7 SHA512 91b5897a0dd45bf85854fa89c59cf218d166fa6565384443fdd061819350ea5a6b7fb9c05f686099e2ac3c4dd741a84931e40a81bbf76869a5e55b75443ece5c
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.8.0-r1.ebuild 1446 BLAKE2B 5ea6ec7103f50f4ee6ffefa942fa9cb50901cc479cc41289f2f6a3e7f5db0bcfb39746b4018df9061734f8502f9f8413db047e9ea3563c971fc6ae93bd182e09 SHA512 38aeb4d355fe871123c425061c3426437f54069620adef43a5a820b4c60944ea18a436a634660ad76bf5f56f16bebceb1ca2f0d7781f14541cc724d214b46349
+EBUILD pexpect-4.8.0-r2.ebuild 1182 BLAKE2B fdc67f66d369333f3f8b356c2e16d800311ccc4b38e2a53d5ee850cfee53a78d67cee56a217820e6f5befec113ba7d36c21a49be914325d76a19914c4a1a9854 SHA512 a215279bd237b49cdc12af2c4a7957649fddff7247ab351b302a674288bbfd913a439d953ed2f66efcc51c499d654f816058822d040a2c13cd11f3f0ebb03ae1
 MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch b/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
new file mode 100644
index 000000000000..903b742f71d3
--- /dev/null
+++ b/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
@@ -0,0 +1,16 @@
+From: whitley-delamora <62795654+whitley-delamora@users.noreply.github.com>
+Date: Sat, 28 Mar 2020 13:46:47 +0100
+Subject: [PATCH] REPLWrapTestCase.test_bash_env(): export variable PS1
+
+https://github.com/pexpect/pexpect/commit/51c0b09f92f140eda10b62d234710f65ad56dee2
+
+--- a/tests/test_replwrap.py
++++ b/tests/test_replwrap.py
+@@ -45,6 +45,7 @@ def test_bash_env(self):
+         """env, which displays PS1=..., should not mess up finding the prompt.
+         """
+         bash = replwrap.bash()
++        res = bash.run_command("export PS1")
+         res = bash.run_command("env")
+         self.assertIn('PS1', res)
+         res = bash.run_command("echo $HOME")
diff --git a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r2.ebuild
index 7baa9ab2af81..9e985d413abf 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -16,21 +16,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( dev-python/sphinx )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sphinx-3.patch
+	"${FILESDIR}"/${P}-fix-PS1.patch
 )
 
 distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
+distutils_enable_sphinx doc
 
 src_test() {
 	# workaround new readline defaults
@@ -39,16 +35,7 @@ src_test() {
 	distutils-r1_src_test
 }
 
-python_install() {
-	distutils-r1_python_install
-	if ! python_is_python3; then
-		# https://bugs.gentoo.org/703100
-		rm "${D}$(python_get_sitedir)/pexpect/_async.py" || die
-	fi
-}
-
 python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/pgzero/Manifest b/dev-python/pgzero/Manifest
index e147f1b58efb..b67baf92571a 100644
--- a/dev-python/pgzero/Manifest
+++ b/dev-python/pgzero/Manifest
@@ -1,3 +1,3 @@
 DIST pgzero-1.2.1.tar.gz 2503205 BLAKE2B 616129da20cc5db67bfe826816bd454a76016d80a155296bbbe8e6febbb48aa2070fac1701b22ce7a522597f85b2e272151828f9dfbac367e33e3e0b35e9d260 SHA512 7988d114f6c037fe5ef4690ded878c63f73589e56fb7f79fa3604a7b4bc8433d75aabb80229159921a3dd6af4e3fe6740520a33f2a6b29aba034a63e6e154c33
-EBUILD pgzero-1.2.1-r1.ebuild 814 BLAKE2B 345375234b1dd048c90e2a856b729ff6d136721b461d4eef8b5173f94af741b6607444459f11144b379adcc90f8dd70716f8875610d4576ceb1599ddd446c583 SHA512 3ea463ecd72c1a92a2b2ba7093c6f86c98ec6ca71142b5551f9e5b19b812904aa9d36a03b1c4eb90e7c178ffda3a334cd5c0c6d8442a7b703829afa40a38252e
+EBUILD pgzero-1.2.1-r1.ebuild 839 BLAKE2B 04f2074c80d38a9b1fccc5dd3fd8b7cfff29c8bd1fdedb61f4093f857789684b011c2dbb0c2299c04793d664e9d1f455e096e24b4f9e54df1ab96625be26ccee SHA512 70def9b9cba8b3db00f5514f6731e07bf6c69c6c761cfaf8865f070108ba3dcf36f1723be4eccaafafa21b1b476f5befe24d7f63109f34c79f277df9f73c386c
 MISC metadata.xml 373 BLAKE2B 283390d9823aff5b03d6338acbe36718260ffcb64b0d46d1ac81e764b90c445d25daec60939a21b95aa769cf5b8f6a50971a625dcbae896dfa3f1094a7d50cb2 SHA512 7852f071fa301d7973072e7fe8c27c154567e75a66cb5f35d056f5b23a1fb7f259540b98e2e76ccd1114224e3121190944fa3762cc7888684c70c856230e4460
diff --git a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild b/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
index abeeb71b78ed..fe32cc7764fa 100644
--- a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
+++ b/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
-distutils_enable_tests unittest
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="A zero-boilerplate games programming framework based on Pygame"
 HOMEPAGE="https://pygame-zero.readthedocs.io/"
 SRC_URI="https://github.com/lordmauve/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -22,15 +24,16 @@ RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
 
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	test? (
 		media-libs/sdl2-image[png]
 		media-libs/sdl2-mixer[vorbis]
 	)
 "
+distutils_enable_tests unittest
 
-S="${WORKDIR}/${MY_P}"
-
-# Allow the tests to pass without real audio or video.
-export SDL_AUDIODRIVER=dummy SDL_VIDEODRIVER=dummy
+python_test() {
+	# Allow the tests to pass without real audio or video.
+	local -x SDL_AUDIODRIVER=dummy SDL_VIDEODRIVER=dummy
+	eunittest
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d9f6e386572e..2d140db99140 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
 DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
+DIST phonenumbers-8.12.34.tar.gz 2268424 BLAKE2B c7094d0bdd11ee6d797314efc7d3353acf2711e6f7ac1c2861b611e98b7b7183af14ac8f0252772ccbd50f6b6e135143429cbe6191de85f3900e336ec1534a09 SHA512 9a751ce7748bb5fa19c3b25697599c07e169a136f10eb149e839f97bcb803f6ea79213152b4cc900ad288227b576f1ccaca443a97b06d7c12651cc9134771026
 EBUILD phonenumbers-8.12.31.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.33.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.34.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.34.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.34.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.34.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 0f3b1a8f99fe..c532f7355ce8 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,5 +1,7 @@
 DIST pikepdf-2.16.1.tar.gz 2312177 BLAKE2B a7695ecc71621c1e64ab919e76dabd3a94ff16d401861fe50f29f00832dda8be01f3e67c811756ef89573345b49ec6c880635309f859624b9df42cf6eff7b43b SHA512 d2c73a0a69c6cf0ed22dc2dc949187464abd4194a5d917e5681de033d6a8ce4c089efd49eb110c9fa11f9dead292aa6ab7ed71a01f7cbaadc51d1f37a773c936
 DIST pikepdf-3.1.0.tar.gz 2334496 BLAKE2B f92385a9317e88b00586f6900b4ef2a296e6960e8a587d2b6bf7f12e5354d9de48b537cb5cdd220187860c852e0ee538d533902311d70c7d44e6fe700fc10ca8 SHA512 c3ef18f287ba873d6e35114137228028a81af8ba4d59ffe5c486716b298757fe6f5b5d3d67dcc4230ed10543849a8d6370e43d99527d7cfd1decd4a84b59781f
+DIST pikepdf-3.1.1.tar.gz 2334617 BLAKE2B 2f223b8104df0dae31c09e660d1123c2384daf0d6990f537378773eab260248d5b547ce1bae3583f711e69aa54f370e97a62f0167d89386c965ea21c9f0ce89e SHA512 8a5c0fe92c06ff09fd2a7b08ae94f9f608a71c517482e0457c07b1300c65fe5ba57dd5aec3b60fd9ebaee100591198afdba493e5e53bd5655b4b8dee11475106
 EBUILD pikepdf-2.16.1.ebuild 1540 BLAKE2B fd8b5c1985b0971583ce83b0400719c33fa87cb7a9d3e3d3321a4c07baddfb681d406ddd579ee17d3ea41fce780d4d291c0977c006ab98fd7b0ab8ea1aad52e7 SHA512 8f9c2b0c5cec84cfd95c331d19d8fc43df526aa37e7e8d4ecb8bf85d91707d66089b3c05428e627b61685bac85426c3c768bd2956e3f69f08bc3f523c5cf5881
 EBUILD pikepdf-3.1.0.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
+EBUILD pikepdf-3.1.1.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-3.1.1.ebuild b/dev-python/pikepdf/pikepdf-3.1.1.ebuild
new file mode 100644
index 000000000000..80dd3fd26a41
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-3.1.1.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 e4ec080ba5e2..8c79d64cf14c 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 2633 BLAKE2B 63932c919cdfbf5094e4ef05ab07a1ece2dd9ad455ebc497093e40cc8540260b8e4e202ae2589f7e7be2d6251a53df70f872b8cb480d28741a101910a27d0822 SHA512 7a0ffdd1fcf2ac5f5b3ecad6ee0cd9db2c8eedb9651da56bcf23f7eaac249dacbbd6860e1be84716e6d363c4d2efeb2f172e3081c86ec42d37caab7159bf2d95
+EBUILD pillow-8.3.2.ebuild 2632 BLAKE2B 2f056c2150720870dbb29f91e928548c8b86629b65836a3f42061429901d379484f1c2d253a892f4096ad483f149f08acbed82ea921634b694ac46a0258df030 SHA512 dd1370ee8d86ceab15ef2393ef32bb0197a1b9a7392b0d43d94e43ccc17c3fe3771b99321c6176fc60edfbeaefaefe1ba8a5e0e68aed0e3790baa4a872e69414
 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 b43b3eb235de..5d13c531fa69 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/pluggy/Manifest b/dev-python/pluggy/Manifest
index 28679fb0d76c..f41121b60336 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,5 +2,5 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 DIST pluggy-1.0.0.tar.gz 51510 BLAKE2B 8107df9a91a843166a602e7518dd1d4167304464a8cc80180b60b03a2ac803be9b1ba190df9189907addd34a92b93a6b271d3d6b7485aa563203ce733c6a656c SHA512 cf0bcbb4330c24ce473614befa19548f33fb39fa0ad094e1eae786202d7adadc28e16499f80ab96b630091765404ca5c5b6f9a55bc605e03514d8ab50cf9ae00
 EBUILD pluggy-0.13.1-r1.ebuild 745 BLAKE2B 1fad71bed4d8bf1387763ec11a68085d7b06a8ef3b795b92848f3d2485c3010333faf6c3d4969aa1cbc554cad94937067c1b5d1aa4fc9f204d3d3ce3fc5fa406 SHA512 33eca15334d5cf080f1846a43ed371145ed4eb964a2f1ec15a07e152aa712913083dcc6e9a8b6ee4b85b159ae176e19eb58cb17ebbb717c32a7af0e943f45552
-EBUILD pluggy-1.0.0.ebuild 711 BLAKE2B c98d2dd15396d967d14276b786dea8d8ac015f51cc27b3e1bde25f14a277205a097d7252ff94430496e0ba15cf3b3d4cd960238125cfe92a9a35eed45238732f SHA512 09a974a5be934adb4dd7727a93e365b3546a1222e80fbaa77652dc372969ceb4950da3b29199cd1f287d3905051dd17e7be3c916eb9ff802c70fff7e188df68f
+EBUILD pluggy-1.0.0.ebuild 706 BLAKE2B 390541237c2bce438b6a931dc72b8ebd0b4a8e276bc97b00d0ce5a79b955937b36ac9820e51816fe43297e7d9737f54e7ff304c324d48099230862dcd450350c SHA512 859b59664c6c0d70e80528539a4b321e4c37838ce6ba618850207f185231b73b13ca3e4ce48604fb88fcdeea6312b039a531800bcbd9e2d8ce8a124eabd06dce
 MISC metadata.xml 482 BLAKE2B dc5208a3cebab580dba3e991dca209ef9b73041116512857c8e0f5f8ec77b38f01497e3b5886a61df9c47d1d180229501f2bf6c17341960ee97e042a64885463 SHA512 21aeab147cba9a5348c1dc386bca81784b5f17f44f55c4c5d26189c936cbe411005070fb93ffa25ad4d0af6ee5117d02e4f36f0ebc298f4464fa5d6ddfdda6a0
diff --git a/dev-python/pluggy/pluggy-1.0.0.ebuild b/dev-python/pluggy/pluggy-1.0.0.ebuild
index f6228c328efc..2688ee3f8d2b 100644
--- a/dev-python/pluggy/pluggy-1.0.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 9c69f0a75eb1..24acf887eefa 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,5 @@
 DIST pocketlint-0.21.tar.gz 23524 BLAKE2B b5ec01cba8b73356f08720149125abe1427561b499b53409e5eb41dc2e5c6dc894b51fc8d7655eb94a6b7ec43a3cd94067d170e2a7f985e251497f253c57f6a3 SHA512 af5f3d9ebd67102a3c2b793ff550c6626ead48da7043ac86d4129f6746532fb6c8ce34540b255e649c936c5d8d7dadc116ddc03f86b2a85311327eb10af14ad8
+DIST pocketlint-0.22.tar.gz 23779 BLAKE2B 3698927cc4a3f6ee6de74d205b5a7f937405e7ce2e9d987e34b35ce209635cab37357d0221a6762deb66350cd2b991420a9b12af2c9e6792f713e5c95dfedb59 SHA512 7ee9e6b969975274e7697d1d16fadaac82fa0a1855401d9f240aaae123831dc32e381dd24f88a3f004ab45df9f0251c408ed8f60a08fe99caf629af617c80ea0
 EBUILD pocketlint-0.21.ebuild 486 BLAKE2B 14b03199cae1f854f143cd97bd9454d7c482040e8bc40b1e4eb957c9411f94a8ccd607165c745be95981919f910bb6b77e8c1d08352161b39239eb97e5d98ff1 SHA512 149c1bc6d1492123dcf1840f73226afd06f441f28e082f9841ba2c5882af73143818db33166a5fb14094c8ff7f59311b6698e503d22a4646be8470e8d5ac4812
+EBUILD pocketlint-0.22.ebuild 494 BLAKE2B e493aabbc2240b123d8417a47effde40d4229ab8378c91d6614f27d05672fb5b12c7aa0de210f7ea059f706794f8668375489a930343c156cbfa9987c565f67c SHA512 b20f1d1d98c6a3423e1109cb9b1de1fc226b8c49d267541647e6c3e42eddef8a25a46fcdda336e9ad8c6134f9a9fcc07ba5ed172dfa911b7f9c8cd45275e0f2b
 MISC metadata.xml 387 BLAKE2B 0cfd731b291e082282acf0d1a6163c2cfe0b6a1a0292de8859b871cab274d4b2789f57f67c198e7659981b05c7323c0c282fde9ccd6182759df26370ff58c723 SHA512 307396f65c4a925b5d8dd8a37ed5f36787af7d9f065da79ccc04858cfe67fe086bc3e765cf95f27db1f3fb0e4cba1b1af9422478a68155384f50c22ed3b287be
diff --git a/dev-python/pocketlint/pocketlint-0.22.ebuild b/dev-python/pocketlint/pocketlint-0.22.ebuild
new file mode 100644
index 000000000000..12082aa8ed7e
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.22.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="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="https://github.com/rhinstaller/pocketlint"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 6a8506da0747..c905c1f154bd 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,5 @@
 DIST portend-2.7.1.tar.gz 13538 BLAKE2B 56e9b7ae4fb9371322cbecf12d9367fc48f0138cf9fa8cb25cf7f0b7977d83852f328d89e93ee2e266e77b393bbabe75d091ce85f688e1ee146edf64e470aa60 SHA512 079bfc286491753e980b5000ee716031225439523a8d9a79c2571359adee74ee024dd680c41adb966487dc39eea3d0dbeb928c5c72fa21ab897283310ef21906
+DIST portend-3.0.0.tar.gz 9439 BLAKE2B 50c6455c8d5ad51e1b523d4aa150ffc5a607a35d3c6fed4d2f686f2fa7fd7eefbe00bf0a033b9178b205e5bba5650e3de484c66d824f41b259ea031b985d2ccd SHA512 7228d454e7d22317de3462edb1e2f1b7fcf29e4601c9373709d80260ea5964c0dd4fbc39543e27a7f375b478ca119b285e47fac6ffda41401399cbe7bf485c8c
 EBUILD portend-2.7.1.ebuild 626 BLAKE2B 69f1a66ca0d3493e177a4702e6dce50a299cc9d06684b46153a7ba896c459f00d90c35a2bca10f366c97ff7b3a77e4ffd29f92cd640982ae330c0cfcf37e3b31 SHA512 9812832570a8c36fee8c651768fef3ac61e14efd6d7406f495174817fba669064a0e42110601f8c9308cbebb696e650cc1134373edd517991cc5c9cd68ff99a5
+EBUILD portend-3.0.0.ebuild 687 BLAKE2B 15dc1add33fbce40bdcf255b9b9cc89560ef56eff8a1d41085c9b9e088a92254305f01c3b18cf260409f1f636a857ae3da4ac567472bd2ce8a19058fc9ed12d3 SHA512 9781a4c43d1a07874848c239f4348f2ed9ff1056e8f81f682f2e6657c33d88121ee6d6a2216e214824b8b9a58c6ced9ff178fc9684df2acb178b2bd5c82ebb7e
 MISC metadata.xml 494 BLAKE2B 00d31a220312e6d69d0a037174e45cc0e5ecbd963de8e513b6b0358ff40acbedc73e316801daad373e4007ec978f5097b4c00e25f2198ce86d5dcd879c4f2e2d SHA512 ca046a5e36611bd83928b4202c24af68aa7cc1cafbf2bd62a86ad4751226389885ef3aab6be8a25ba17513c89924901d5ac2a31ff27a2798506bbf2f09df2ed2
diff --git a/dev-python/portend/portend-3.0.0.ebuild b/dev-python/portend/portend-3.0.0.ebuild
new file mode 100644
index 000000000000..9fab7d4fe38b
--- /dev/null
+++ b/dev-python/portend/portend-3.0.0.ebuild
@@ -0,0 +1,25 @@
+# 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="TCP port monitoring utilities"
+HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index fcaf4184c6dc..5fdb871879be 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,9 +1,7 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
 DIST prettytable-2.2.0.tar.gz 44939 BLAKE2B eff6eeb98b6accdb5089cfd1ceb09db2e4a0897e9675a07b744a12ab15fb1cb43bd4a411788d8e22662089f68a31c346d79cfaaca44c7f14f452870a7039bdb6 SHA512 df8ae2a1103a4965a351ba16a95ef9659107075bb023090bd9bffd69805ce647dcb26f49164f07f5af0c0b03503373c0353935b32a0fb18edf969dc984aecda7
 DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e2c7249923d5299c967db74dbd37baef9557d8d5511defe54f64e3f4625ef45635cf2f00a051a599177a3774da1a5 SHA512 5496b1525342b9df4b88cc2cd6079d8c329787b20f7e581465dcdf447b90f78aad764c6505aab8a0e3c4cbb44c943720672373cf754d6f7313b68c28005a707c
 EBUILD prettytable-0.7.2-r1.ebuild 606 BLAKE2B 5ee8d1567cbcc4ba9ac75bc7ade72ee37f9dd658bcbcd8097ad3104b021e121b02fc93dfa31ffd711afceca065b4b9557ef8668e7b6da73fc01379a16f152ae0 SHA512 1a1016c21f70ef304875c21a1a2660c0433c2e68ff2d630695a123b581b15d0846a97d705f7f91ec1a4f3010fa90baf28e4c7fc29c42fb3ed63d709f10ccbae8
-EBUILD prettytable-2.1.0.ebuild 718 BLAKE2B 7609f8e3ab0c836631cba6942243a8058428eb8b78c1e05d3c2ccb97439b61e74d0621d61a4471131b466b334f3be750eb2b52227531cedbc25237afb025da2e SHA512 a9538a82e439b8372eb0ec32f28b1bca1030f74dd3e8d80dcb50517fd90978300bad2fbc04937ff58ee94b40cc01c3dffdadab72e7bc84ddf46701fc1a3c5463
-EBUILD prettytable-2.2.0.ebuild 814 BLAKE2B f545600336ae8beda699ea9f51bef6fcef71d8d656a84a2167b1a1d57c80cbcc767ed2fae31e9a8b26307d0c5d61ca6c3aeb0f68abccafe4293b9b6cb1635bc4 SHA512 d91f2bc87046647cf019739e851f05e0fc15f72214c2a7a97a9f225b9607006903293dfc42896a2ed1d6710471419e888dc23da4d540953bda3c472e2f8b5499
+EBUILD prettytable-2.2.0.ebuild 809 BLAKE2B 90b9f97cb7f30cc80d59bc6b7055ed536c395fc4b93d4d481e340ae358bc8bc67b793dc37471fc0f67cdbcbcc6c63fc9bcf471a90c1c691a8d7302ca274eff6f SHA512 7c2fa538d1e7d9d9a34a3d30ab6c4299c39adeb37d0e8ea51b839679d30384dddf580d2945d2c39f7ac56b684ff470441bd70e1d19ae6c8805b4029052b6b049
 EBUILD prettytable-2.2.1.ebuild 814 BLAKE2B f545600336ae8beda699ea9f51bef6fcef71d8d656a84a2167b1a1d57c80cbcc767ed2fae31e9a8b26307d0c5d61ca6c3aeb0f68abccafe4293b9b6cb1635bc4 SHA512 d91f2bc87046647cf019739e851f05e0fc15f72214c2a7a97a9f225b9607006903293dfc42896a2ed1d6710471419e888dc23da4d540953bda3c472e2f8b5499
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-2.1.0.ebuild b/dev-python/prettytable/prettytable-2.1.0.ebuild
deleted file mode 100644
index 23c045b88890..000000000000
--- a/dev-python/prettytable/prettytable-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +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="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/prettytable/prettytable-2.2.0.ebuild b/dev-python/prettytable/prettytable-2.2.0.ebuild
index f2e0a92613a6..b9595bc3c5ae 100644
--- a/dev-python/prettytable/prettytable-2.2.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 6c4addd450da..4c1391dd4e5b 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -2,4 +2,4 @@ DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e12
 DIST progressbar2-3.53.3.tar.gz 240718 BLAKE2B 01f0d0cf6c546855d2cac10cc1164fb68308b60e1095499f8838d7c82127860235f65d742a137db5acdce6ac50e65aff7580a6f6a344942d4c78375cc23085b4 SHA512 6399d8fa8270fc0241969d94ce284161516b42c0fdc3fbf2dfe8a0dfcca72933d23ec9b99c4118cebbca376f5821337aacd11fcee6eee5988d6caf73d1f3112d
 EBUILD progressbar2-3.53.1.ebuild 709 BLAKE2B e94d7955407d1a1909aded633a2b8cadb5a83fae24c87b68875e1b18354583b83b6bffff6022c2ec10f4f1f67f12efc4f77113e13c1846e0a75b9478099ba77c SHA512 99507009a42edc4c970be2edde4d14b2cad3eae2cc4184397c99c34fd08c94e0858552c2e40bddbfd7bf2957675fbc56303836f29ec4474183c87cff275f1c57
 EBUILD progressbar2-3.53.3.ebuild 710 BLAKE2B 1bcce3334eac729e2e12b414b44adbf17b949d8bff5d554699fa10950f515767703bf0e74c3de61b9105ae9bf1f8f56562ae87e998fe4ce6b54c3c482c953cb8 SHA512 17f5bd65eb5c042303b78a54815b93c66309d8035c7a1a94fddbbe59fc5eb3e3df2293c6a7ebb993187435a2b0ad33b5ba9bbff8ae12f483aa428bda8633aa30
-MISC metadata.xml 409 BLAKE2B f8981902660476a84998cb27cd70a2b0aac34d710d5a4b7cffa2fd299471804c4037375b4843dfed06f11ab0ee20101ddf663471d9bf3decbb2c5b7312c0f14a SHA512 2d56c41c8d6f34c2414eeba90b7e1702b05000712ee84265455ac7309035fbcc52d58fce4dec9086d3e1adb624a5e8c497e2a1fd8662c08c1ac071d78bfc5f9b
+MISC metadata.xml 331 BLAKE2B d2dac5a8c7f9c61da26e79aa470a02db594999812eaec2915c46039eb2b616d4575fc24aa40b6526201782d5fcc66c4558629636f584276f6087280c74da450d SHA512 bc73b6b943bd29892d00a18b0018ed79f8eb727f4f359234920adfb35db95b6becd79735ee10b473932a63f37e869fa0379414b9532f7360caddfa057b609446
diff --git a/dev-python/progressbar2/metadata.xml b/dev-python/progressbar2/metadata.xml
index 97ce598eefb3..1785de8d3372 100644
--- a/dev-python/progressbar2/metadata.xml
+++ b/dev-python/progressbar2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">progressbar2</remote-id>
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
new file mode 100644
index 000000000000..1fdb75c1bee4
--- /dev/null
+++ b/dev-python/proto-plus/Manifest
@@ -0,0 +1,3 @@
+DIST proto-plus-1.19.2.gh.tar.gz 61183 BLAKE2B 8c1c0a70ae573fc8c64004e4bd923f403bf82dbb3f9aef19239770fcd316e513ba11e6e47c56bda65c88e476072f0d90af02c83eb0fe8a4045cf3ceeccca3fc7 SHA512 c3cfb1b6aabeb4eab7f6c2c16551c1f9fbf29dc3199b496bc4b47b4b80cbe4684e5c97abe26fa4c1afd03c844a2e8f006f16c24932d2a7cf8190452943c2fad0
+EBUILD proto-plus-1.19.2.ebuild 796 BLAKE2B febdcd4febceb93400eceaa862b7142656ca78c33bce0fe616de0e6a285da6fb046bc04dcbb765a6dac56871d1863fe48e42c07d9cb4c9354cea0fcafa0492d6 SHA512 f6945c6740a07b2fd687cd7d11829395b715ef7093a78a39e80863acbb4b7e36cbdc8b42a6cb2f1cd880870f8645f0b972a6011d3e26d35a35970db2c53915cf
+MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/metadata.xml b/dev-python/proto-plus/metadata.xml
new file mode 100644
index 000000000000..8ccb394b4380
--- /dev/null
+++ b/dev-python/proto-plus/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">googleapis/proto-plus-python</remote-id>
+		<remote-id type="pypi">proto-plus</remote-id>
+		<doc>https://proto-plus-python.readthedocs.io/en/latest/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/proto-plus/proto-plus-1.19.2.ebuild b/dev-python/proto-plus/proto-plus-1.19.2.ebuild
new file mode 100644
index 000000000000..762787eae60d
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.19.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/google-api-core[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 09843896359b..1220f4837d1b 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,9 +1,4 @@
-AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
 AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b
-DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
-DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
-EBUILD psutil-5.7.0-r1.ebuild 1140 BLAKE2B 95af4642e5489c02e92536181bc65ac814ee5b48aef220f8a54b8e7e70d53cfcf3a9a31d592c5233b4a2de8180f4018a8759a43aa731bc6a9d327b3db3c3d78b SHA512 7622f810bac7d26ca1a9eef9558e0749b1a506ffc316d4dc253d966d1fb7c14a191b54b3bbae17938dffba157c739526ebe650789d1f063ebd6e1a92963fcd09
-EBUILD psutil-5.7.2-r1.ebuild 1153 BLAKE2B e48b32b47313c8041b518e61a81441a5ad477347371e6156b23eff2e4eddfa859317700d6b03e366484b4c3fba2c2300dfe31d720a03de3d8566070576f27c01 SHA512 70c177b24471ef79854eba6673d66aa558a9ea376c11b502c7c8228f25dfb6e8ecfe96d926938a66ceab9303ff703749084f7ea4c997356ae32a89138b8a3c9f
-EBUILD psutil-5.7.3.ebuild 1161 BLAKE2B 1fefed698955a9dfc48e1a61992a3f8c1d8a9395d26327fafdad7237e0c9baa5f966a798f0c2a30553f0adba6b799daa1d1f07357bc67c6d8070d70b5ce759e5 SHA512 b8490a41703a6bc04983a69944c884e7264ed2a5784aaf9f9e9a6e7fc73e10b58a68f96478ee1834df1c06e2e6a564e3c511ed9c34eac47e0c21e76149449ce8
+EBUILD psutil-5.7.3.ebuild 1159 BLAKE2B 4fa7f8b093a37f710ce13ef630afa8086774d7a2b01bafd38c73f423480bf44ac8bffcaae38af7f2ffb5e7e4115d1703adabeeba3de454f5fe420b9cac404928 SHA512 6303bce4bfeab4a1aded7dc91ef498a4beb4a92d48484421c650f92909d29964bd63e105f6ba96621ad9e80b79c87b5cc77f32bae9a268e71bf5b72dda738a70
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch
deleted file mode 100644
index 9097e90535a5..000000000000
--- a/dev-python/psutil/files/psutil-5.7.0-tests.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 19 Feb 2020 07:27:32 +0100
-Subject: [PATCH] Skip broken tests on Gentoo
-
----
- psutil/tests/test_linux.py   | 8 ++++++++
- psutil/tests/test_posix.py   | 1 +
- psutil/tests/test_process.py | 2 ++
- psutil/tests/test_system.py  | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index e51f8bd5..48527ccb 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -17,6 +17,7 @@ import re
- import shutil
- import socket
- import struct
-+import sys
- import tempfile
- import textwrap
- import time
-@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                 ret = psutil.virtual_memory()
-             assert m.called
-             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
-+            if sys.version_info < (3,):
-+                return
-             w = ws[0]
-             self.assertIn(
-                 "inactive memory stats couldn't be determined", str(w.message))
-@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                     ret = psutil.virtual_memory()
-                     self.assertEqual(
-                         ret.available, 2057400 * 1024 + 4818144 * 1024)
-+                    if sys.version_info < (3,):
-+                        return
-                     w = ws[0]
-                     self.assertIn(
-                         "inactive memory stats couldn't be determined",
-@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase):
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemNetIfAddrs(unittest.TestCase):
- 
-+    @unittest.skip("broken on Gentoo")
-     def test_ips(self):
-         for name, addrs in psutil.net_if_addrs().items():
-             for addr in addrs:
-@@ -1364,6 +1370,7 @@ class TestMisc(unittest.TestCase):
-             psutil.PROCFS_PATH = "/proc"
-             os.rmdir(tdir)
- 
-+    @unittest.skip("broken on Gentoo")
-     def test_issue_687(self):
-         # In case of thread ID:
-         # - pid_exists() is supposed to return False
-@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase):
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skip("broken on Gentoo")
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
-index a96b310f..70199203 100755
---- a/psutil/tests/test_posix.py
-+++ b/psutil/tests/test_posix.py
-@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase):
-                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
-                         nic, output))
- 
-+    @unittest.skip("broken on Gentoo")
-     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-     @retry_on_failure()
-     def test_users(self):
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index 987bdf38..cb04f3ef 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase):
-             self.assertGreaterEqual(io2[i], 0)
-             self.assertGreaterEqual(io2[i], 0)
- 
-+    @unittest.skip("fails if builder is ioniced already")
-     @unittest.skipIf(not HAS_IONICE, "not supported")
-     @unittest.skipIf(not LINUX, "linux only")
-     def test_ionice_linux(self):
-@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase):
-         d2 = clean_dict(os.environ.copy())
-         self.assertEqual(d1, d2)
- 
-+    @unittest.skip("broken by sandbox")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index 3834209f..b07b5883 100755
---- a/psutil/tests/test_system.py
-+++ b/psutil/tests/test_system.py
-@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase):
-         self.assertGreater(bt, 0)
-         self.assertLess(bt, time.time())
- 
-+    @unittest.skip("broken on Gentoo")
-     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-     def test_users(self):
-         users = psutil.users()
--- 
-2.25.1
-
-From 026e4b0076a352fcb1e8de71f1393ae0d50ac06d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 12:28:59 +0200
-Subject: [PATCH] Sort results in test_cpu_affinity_all_combinations
-
-Fix test_cpu_affinity_all_combinations to permit any CPU order
-in results.  This fixes test failure due to affinity being reported
-out of order:
-
-    ======================================================================
-    FAIL: psutil.tests.test_process.TestProcess.test_cpu_affinity_all_combinations
-    ----------------------------------------------------------------------
-    Traceback (most recent call last):
-      File "/tmp/psutil/psutil/tests/test_process.py", line 940, in test_cpu_affinity_all_combinations
-        self.assertEqual(p.cpu_affinity(), combo)
-    AssertionError: Lists differ: [8, 1] != [1, 8]
-
-    First differing element 0:
-    8
-    1
-
-    - [8, 1]
-    + [1, 8]
-
-    ----------------------------------------------------------------------
----
- psutil/tests/test_process.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index a0b21c6e..e3394799 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -937,7 +937,7 @@ class TestProcess(PsutilTestCase):
- 
-         for combo in combos:
-             p.cpu_affinity(combo)
--            self.assertEqual(p.cpu_affinity(), combo)
-+            self.assertEqual(sorted(p.cpu_affinity()), sorted(combo))
- 
-     # TODO: #595
-     @unittest.skipIf(BSD, "broken on BSD")
--- 
-2.26.2
-
diff --git a/dev-python/psutil/psutil-5.7.0-r1.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild
deleted file mode 100644
index bba7bd27b88f..000000000000
--- a/dev-python/psutil/psutil-5.7.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/psutil-5.7.0-tests.patch"
-)
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Not running tests on ${EPYTHON} since they are broken"
-		return 0
-	fi
-
-	# since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disable for CI
-	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-5.7.2-r1.ebuild b/dev-python/psutil/psutil-5.7.2-r1.ebuild
deleted file mode 100644
index 8022b3522812..000000000000
--- a/dev-python/psutil/psutil-5.7.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/psutil-5.7.2-tests.patch"
-)
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Not running tests on ${EPYTHON} since they are broken"
-		return 0
-	fi
-
-	# since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disable for CI
-	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index 40677b1a3599..ddf8240254b4 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
index b7b793673b4c..655b3366262b 100644
--- a/dev-python/publicsuffix/Manifest
+++ b/dev-python/publicsuffix/Manifest
@@ -1,5 +1,3 @@
 DIST publicsuffix-2.20191221.gh.tar.gz 98142 BLAKE2B 21b0dabb253175ecf427a51bcc7df2de7fa3fc9fe7d9032cc378160c4c53e75efa4c0e657efc93d48bb58f786160d89cb2fd7301e3c270f73802a926c31ea378 SHA512 983bdb17b76d10eb73cf69f0ba7590806bf6786ae0c30526593ce1ab97f3b22c967f9acae83b880dd56be41a29eae9cca5726926667eb74013d0d1078433bf05
-DIST publicsuffix2-2.20191221.tar.gz 99592 BLAKE2B 3e96f2b1d23a70827758eb4440892719deabdb9a67a2144fefd2d4b23e26dec0d19f6d9fd4de504d5d52c0250719ef85e929b4a2b92b7ba8896ed4055480d0d8 SHA512 d863f0937b340958ef7c8bd07d62054aead993ba31b0c2753631f2e75e48f7cea412c6501d8a94d98bf6a97a13eb0716c24a89e336787d5570e9af0386c58320
-EBUILD publicsuffix-2.20191221-r1.ebuild 617 BLAKE2B b463ad6a48e5d5d78488fe3eb16bee48d166fe7267ecc324223ac6fb717a7ad0f45c7bbd6a7bb9ed1d4886676a4d53198364a208700fddb21e8ddc89de9db32b SHA512 399aa658964a8694ffed482130aacb4f7fba9cbcd359835664ce621d251af2b6556e2730b1039c6264bb94b9edbad2b39921696ba632039d841b795d628deb63
-EBUILD publicsuffix-2.20191221.ebuild 585 BLAKE2B a2ab68bf83c321475d65f6825a0079bb3367300960f9b9caf30aacb6e864dc4bc7ed7a264fe707f43c957a8dfed597a194f172a491df502597927b09cf001309 SHA512 889c28d7fc8fc5075a3fcda04860671d006b66658085fea07ff68da09c27f77732cfb72488b69a93435643ee0cc762c0c566b1771ce8ca609fe8cc54fe92f117
+EBUILD publicsuffix-2.20191221-r1.ebuild 616 BLAKE2B 9843578981895f72052ca315ecbbbe8073aadcafa43d9cc3c584b7a7bf5f52185de3a34313e405f3310d0b59586394b6e600ae076a7e7721038abdda22e7bc6b SHA512 fcb7a9954256b3004fb3c59f340b276e57e6840c85f7d6005af0058b7d56ea8c6667b522067d4030d17a364481a4e831ed5d1e1592e0d3a74907a8d782ad2a2c
 MISC metadata.xml 673 BLAKE2B 25e985020585574027e1fff595ea2ec21edfacdcbf3a5ee0f41d4d8dac9b256eb5e9392ca00bffb54811418201c56dbc95d45b6fabe1737c76b1dcdbbb48effd SHA512 5e6803d5a53783af3fb10ea0de3c8900107024b3e320118c3163b4f33267a416cd330c7ffb86d3dde014e31aaf0910e400ea263872735f21e0983a15566e4207
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
index b42bc58bf1af..31198616efe8 100644
--- a/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
+++ b/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/python-${PN}2-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND=">=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
deleted file mode 100644
index 70e340f60a4a..000000000000
--- a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Get a public suffix for a domain name using the Public Suffix List."
-HOMEPAGE="https://github.com/nexB/python-publicsuffix2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}2/${PN}2-${PV}.tar.gz"
-S="${WORKDIR}/${PN}2-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
-BDEPEND=""
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 0a804ada5060..846f5fde0c7c 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,3 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r2.ebuild 776 BLAKE2B 4ddcfde90687ee8f5bf061b3b4146f36a19a716337a0cb3120c6a97bb1bbe767f79a11d04bd02d41d900ad016d690d41e07943df71a490f2f78e692935860861 SHA512 e78714107e17c15ffc7b4edf5a20073de9786bc89897cf283af979af69868f88d54796ecfcc1763d4548459bf35c0900fb24d65e513e4d3311381ce8fdcfef3d
+EBUILD pyaes-1.6.1-r2.ebuild 782 BLAKE2B b0bac260b30f4f710e0b5621f632ad70f44afbeb63c65799a55c255973bdaeba3738e8032290487d97c65bc6b0cf737a847c08c3d78c28c7150727d28a4d2588 SHA512 0ca2a053ba76da199e6d902d664a749d4495baea7b52a1ba46f7446b70a24858ce3a74e577c943570fb6d5f0660b397eb0ed9365eaf03d19a972c938cb9457bb
 MISC metadata.xml 439 BLAKE2B 3106536a0f46c9b8fcf3a1247fea58bccd871d1e4d25ef501dc18bd6ba6bc7f38b2dc050de59b2bd721069d848edfca018ddbeeef3869ffa56121231d0f89582 SHA512 676609865bf42cac05d966d2d72c8410fbe1f9c4e307bcdf0994225f4bc950f15083f2263210d506245b7be55e09da8479c7134160d5624d739299ca2c69dea7
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 2cba9a7fdc7b..4d6982727dc9 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index c9601d84e592..9c5f6fb4906e 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,5 @@
 DIST pybind11-2.7.1.tar.gz 668217 BLAKE2B 92d857f14290ee0717bd9f9b871dcecd6c0b36209bb9879f107c8542326fb0cc42c051f3bc12a8be50df892f1e26c26b710f60ed275f0dff206e30149547f2b4 SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305
-EBUILD pybind11-2.7.1.ebuild 1056 BLAKE2B 52fc83c133e528cd20f13a05a301445be47eb072565df795e6c8c4aab192466e003a73c470bf1a6f9bf05d0979608caebb6140e898b7a32fdfd01ca250b7de84 SHA512 73574286615b450c33f6cf73ee2719642e53b3afcbf19ba5f16c29995bba17734f0a96e0e51f56f1786449ac069e3a13c87f51e22f2424ca37a178f0395a79e9
+DIST pybind11-2.8.0.tar.gz 688544 BLAKE2B 3652ebf56cdec9c50a431915b4b59cd7c61d58be5a521dd2bea20ea9a0e56ae8782400d4460a5e32f3c3ec086709ee466b6b39c6adc5cd712da05b4016f9f2e1 SHA512 2f066ab1a3d4a22513625f52b55d7722f953007876e800b4a08d6341b9ae70f73a3b0fd57f76cee443e7b8cf0eecdaafc032a23ddad2b8bca2c8108ac4090a82
+EBUILD pybind11-2.7.1.ebuild 1055 BLAKE2B bcd6c5016c6ab9d01d275c77796885019a785633cb916d78fb206b581803f7adda6390788a565c30a3f127712b057a3ffb10a22eb5548b3027ba827fdaaec3b5 SHA512 feaceb8704a2e11f17008f3e81066d21e2e5fcc541710b1eab2be491ee6d65e1b25a7e42830058a5a2ece6b24db00f3c928d47549427071d90dd35aa91d1b688
+EBUILD pybind11-2.8.0.ebuild 1060 BLAKE2B 0ecc2b21f13ed213230f3553247f65456d4521978c51f62569bda8f15becc105e5280eb202ee999b73cfe11cf8be7952f814b1d557f7c225cf504f9dbe38dc28 SHA512 bc2dd7fb50b877e49ad723f145a5c8107db3024a4a808c190aab3083014c906121e096f078051d14aa900f1aa2f9bcf5b1425269ba4a8d48f20b8fa84deca07c
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.7.1.ebuild b/dev-python/pybind11/pybind11-2.7.1.ebuild
index 4311dad05d21..6d6438979eca 100644
--- a/dev-python/pybind11/pybind11-2.7.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybind11/pybind11-2.8.0.ebuild b/dev-python/pybind11/pybind11-2.8.0.ebuild
new file mode 100644
index 000000000000..3edf9adb8aa7
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.8.0.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 cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 5aaa52f6315a..319b94003fc4 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,6 +2,8 @@ AUX pycryptodome-3.10.1-parallel-make.patch 837 BLAKE2B 9d7b3088d547d294dab498db
 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
+DIST pycryptodome-3.11.0.tar.gz 15555515 BLAKE2B fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5 SHA512 9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
 EBUILD pycryptodome-3.10.1.ebuild 1533 BLAKE2B 93b9523336f06fa12c19140fc4dbfe1e1aa2c0be7e7d48955b3e86b0ca461a0b8b4d360e9e6e37448cb9434426db78ff3a7d7ee646a8d04fe2349c945f60e903 SHA512 671ceadeb8fd10c0fb8a4bdba29f082f192f03f4163b92fbe753fd46c7fe1b9a3c9371f6460dac44552e5485fbb337726098bf1c0e24d4777763777ac60bc9c3
 EBUILD pycryptodome-3.10.4.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
+EBUILD pycryptodome-3.11.0.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
new file mode 100644
index 000000000000..9bf29ac5892e
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.11.0.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 ~m68k ~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/pycups/Manifest b/dev-python/pycups/Manifest
index 4604ce6fa28a..9fa9df8085e0 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,6 +1,4 @@
 AUX pycups-2.0.1-py3.10.patch 576 BLAKE2B de0c617d24d18290c23fa7938a62db451dff69075ef180a781c285a7b6a6b4c6fdeb4010a0994c56dcff5c21cc902a59cede52aadc523b9d642c49cde0272a89 SHA512 31f025e9ee09530836a6efac6d7cbb39d2311fe4264dc245dc8f80314a3d03416395f66759f505d63119975a443a286b703b6e21f68dd0eedf320595d8ce68c4
-DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
 DIST pycups-2.0.1.tar.gz 62968 BLAKE2B c9d955b89f2e9746827721c875dfc97538bb4575ee3f78c41a94f06b361cd3d22c14d453bfbea210160026d33c6e161b1d14c4dffeaddd644c260779f56e1db7 SHA512 fdebf1cac8cc4fffb8a76a938aa91965dae4a3dcdb6d8ee26e8e6054809d26dd3fb20b10c2351fb9265c03b16d6bde011815111c452ccb058518372f22d9d617
-EBUILD pycups-1.9.73-r2.ebuild 659 BLAKE2B bd06f65fd93995b9a6874762a67c47d936745141f393e40bc13c9935f47c2b4cba9a0830de4d478a0ab9b3bcd15432f1ca9e58f0ee9aeb376c673d7f5863c024 SHA512 79c5657bb659d2d0377a9b20a91851435535b2cc485675133872088d96c7f1664eeb2ed8bea98ef4b693663298ab2817832261f5afdec8c8349faab187ac5ebb
-EBUILD pycups-2.0.1.ebuild 797 BLAKE2B 5585adc846020aa06d543df859b2e18654342645e47716e3388cd7430ce567a6b4f672b9c2d64a18ead660e81e22209c9c391428ac9b6698c02b79ba5be81cc4 SHA512 1f9c06746e7d0291c510d62b7df0c7da6ed90e1af80dc6a54fb2dd011189dbf140f5fa363f141f7c3101988b45ccb312fede598e7c3b7af372adc6d50d5b1b8b
+EBUILD pycups-2.0.1.ebuild 796 BLAKE2B fadd43e4df9caa92b806e4da91a7bfeb7fa1bc3e27c95e3cca0700f161e344485eb30e468d93fe17656a5abd81cc4e59d8d57d07e7c9d4f7563237de89e74ff1 SHA512 e1513e5d1efc610877b5d8cf79c072d6b9e88986d2586c5f5d03ac030a1edcbc36dec56e7aedda8e1b81f6771270037c84b66fcfe16c10c5ec9cbbfc359855e9
 MISC metadata.xml 567 BLAKE2B e0f8590318ffd3bf0963973f947ade6be086cf99f5f09b49cbc6ecef7ce397aecffd3cb534339a3a86ae98b88da8c60619a610bb8eac9ec1ccebfdcbc329408b SHA512 63e388902a77c052d0944b84805ec0905598e7f0126eb67813e4c75f3a11a51c2ba8ae46e0f8c3bd64f5c96806e0784c23b2b3e35d3261aba65b267fd28f6c71
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
deleted file mode 100644
index c1a3a1bc7f46..000000000000
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the CUPS API"
-HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}"
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycups/pycups-2.0.1.ebuild b/dev-python/pycups/pycups-2.0.1.ebuild
index fb6c859e8a30..004718662f1b 100644
--- a/dev-python/pycups/pycups-2.0.1.ebuild
+++ b/dev-python/pycups/pycups-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="net-print/cups"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 72a2c486aa73..fdba082adcf7 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,3 @@
-DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-DIST pycurl-7.44.0.tar.gz 227443 BLAKE2B b0c19058f3df74702221d01320d6c2c389f67b41c1fa5728aba50266f4120d736d38e510ee20f66e163fad14957e8ec38c9cfcd217845b4a5c4d2253afaec175 SHA512 9e371796650cd698ec50236714cba203782d793154f8325c8b2f106d2ce9b1a60766d7641b84702ec32dc83fa6e3ffe16cb774cb9ccba9747cfb089d9caec8e6
 DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
-EBUILD pycurl-7.43.0.6.ebuild 2945 BLAKE2B 91ab9abecb719a80f7bad6f55fdf65494760ac46b1ce46890ffec7d4b65f06cefda60b22a0163a664f4a4b22ffe0458f29955e290ebfcc6fcd134a6e894bd1ab SHA512 c195ea3d041ce9924306e54bcb15158a142df057c3c0bcdebd8d6c2712bd26b64eab858509b414649e4befb433d8a5e8e52b1df87572b0450e688814d4cee9d7
-EBUILD pycurl-7.44.0.ebuild 2690 BLAKE2B 4e13f13dfec1d1eaafad487d630eb05d0899a86726599046641da11c9f027ac70207700d84c8149fb8505b88e35a4a6c3404457261e906d2dc41bd50aec91abd SHA512 74ced6873d82f6242b39b433958b266746d0d742788b9e712e6ec651830321979924422345cacbc716ecb22ba0c02e37899d1e6bc824050211ea43f5496f2fe7
-EBUILD pycurl-7.44.1.ebuild 2512 BLAKE2B adc2a93ff741466645133f598d45503b6e964bbc2c704ad9f28a222cbcc429a4e58e25371c0cf68063f59d0dbb2d4e5dffc8d119aa8bc034a2714db8b0602a9c SHA512 d511f6e797b1538efc9ece91bc022d95c240814703c743b7b7ef49be28173748dc4a6c4a079d0e6d621955caab57ce6c406e55820f728c0d6b0bba2695b98208
+EBUILD pycurl-7.44.1.ebuild 2511 BLAKE2B c349a8028162b7d8857b754c0d9464283f34870ed83625dbd9914e60a91a990c88c61c3bf50f09c4c5bd6764fe17c6d4922d9090150b8188529f09d19cf7d3b2 SHA512 38d116b1b1ab6268de519edc9223ba118ce4dc5d5da50d8391b1a2c0edadf9e4e97800c7e71cbf9c991f009e9f98e8cf3fe61988e525b320b4a6c5a30b77198c
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
deleted file mode 100644
index 7c6638790163..000000000000
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	https://github.com/pycurl/pycurl
-	https://pypi.org/project/pycurl/
-	http://pycurl.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# disable automagic use of setuptools
-	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
-	# these tests are broken with newer versions of bottle
-	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
-	# these tests break with newer version of curl, because they rely
-	# on specific error messages
-	rm tests/failonerror_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.44.0.ebuild b/dev-python/pycurl/pycurl-7.44.0.ebuild
deleted file mode 100644
index 1355dca8d709..000000000000
--- a/dev-python/pycurl/pycurl-7.44.0.ebuild
+++ /dev/null
@@ -1,80 +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 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	https://github.com/pycurl/pycurl
-	https://pypi.org/project/pycurl/
-	http://pycurl.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# a cheap hack to make setuptools usage not depend on wheel
-	# -- replace wheel with random standard module that is used anyway
-	sed -e 's:wheel:sys:' -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.44.1.ebuild b/dev-python/pycurl/pycurl-7.44.1.ebuild
index 11089461b8b9..92d80f17d663 100644
--- a/dev-python/pycurl/pycurl-7.44.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 2c7d538be668..cc682d99aebd 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,3 +1,7 @@
 DIST pydata-sphinx-theme-0.6.3.tar.gz 2617286 BLAKE2B caac09add734ab3127461f3b54069cf9bbb22b00b54e6d0ed999ff6d7783f68d2d97bf31d19ce99bdefa0e1d754e6194e5ead8347d89c5d704dc38e148fff619 SHA512 0106accc2f7b64899d09d1da5b39fccd074732c07db78a924aceb403923b3d67cdc0592834211ab1fcc2788ef55616da63e9eb058a7909b2486006061b6d367b
+DIST pydata-sphinx-theme-0.7.0.tar.gz 2632049 BLAKE2B 0226c06c31703518cfe570514ac2332a43db189b2044218d9135e33f3509f995835ed51b401d52e5ce4e4ca779a4cb98eea1e1966ed66199bdef2b84184ee8da SHA512 0f5d4647e35e4a74d0c64e24fa8aa6d1ba98a76218d8ebc9c96c9bb0c6336ff78f0fcc9f6d5191ce0b8d7707ca5069c89fc263ab85448e574f12b25fa3cdcc4a
+DIST pydata-sphinx-theme-0.7.1.tar.gz 2632065 BLAKE2B 6289c61ba6634ba2b98263bf1319d36e9742a3c6dca811eec016b7172e0c780ef1e0ce1201ffd5bdce398a2a988a01dea56414ddb514ec63a424d11f63968f16 SHA512 b3ced8be8ed48d7efc51bd8334cf359f5f581e75990fca96ae87a3cc51cfa61f9aedd610124f5a92227ddd2d7a55810ef4a6857726582c38b2251130b4cdb674
 EBUILD pydata-sphinx-theme-0.6.3.ebuild 969 BLAKE2B 06c98f5932cdeab8e807808b25904304ba7f2643f205d9e4426a39fd96f6bc2920d6fa3fb611a06241c6009e2abb18a1ee60801fae026df03628d2d745b19c91 SHA512 6af20113409a75aacf83f681c9259873709bcfd7033d381ce1f8ac787ba33566157fc30c486cd939db9ed71d74526693e2aeb943ced9964be65880103ad2a3c7
+EBUILD pydata-sphinx-theme-0.7.0.ebuild 905 BLAKE2B 65168e5d2b4ca7129a64acda02c43c3374f5e2df3fb7ba4c3e49f0f0900c16997b697158e9f0118504c47edd757011ae6c74a99adc61bdcaa84556b8102b8a30 SHA512 0be1ac26361de48a25a8e78d40775ddc391d7985e578234975c921f6cf11fe4808257d1309259cbbfbfe5e1b7360ac72862a5b9235ee2de29c01cae939acf2b6
+EBUILD pydata-sphinx-theme-0.7.1.ebuild 905 BLAKE2B 65168e5d2b4ca7129a64acda02c43c3374f5e2df3fb7ba4c3e49f0f0900c16997b697158e9f0118504c47edd757011ae6c74a99adc61bdcaa84556b8102b8a30 SHA512 0be1ac26361de48a25a8e78d40775ddc391d7985e578234975c921f6cf11fe4808257d1309259cbbfbfe5e1b7360ac72862a5b9235ee2de29c01cae939acf2b6
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.0.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.0.ebuild
new file mode 100644
index 000000000000..66be2db1eeeb
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.0.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=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pydata/pydata-sphinx-theme"
+SRC_URI="https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+
+# TODO: fix this: Sandbox violation to /usr/local/share
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly dev-python/xarray
+distutils_enable_tests pytest
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.1.ebuild
new file mode 100644
index 000000000000..66be2db1eeeb
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.1.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=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pydata/pydata-sphinx-theme"
+SRC_URI="https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+
+# TODO: fix this: Sandbox violation to /usr/local/share
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly dev-python/xarray
+distutils_enable_tests pytest
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 56f872bae210..962f1ec259e2 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,5 @@
 DIST pyenchant-3.2.1.gh.tar.gz 75501 BLAKE2B b70a47484a7f242ff42aa0018f495544f9e7bdab904f835bd52533c93bc28b06ab155132158d2551b9c32eadee83418b6bcb70becee769653196a9bb0d13f130 SHA512 3d1229307b070fa83bd8a287a787b40edfba31e748ca37a94f71caa4b355a9de829f3133db9772a57f0aa922fbd4f32c67c986e86c8905633b3940dd20be32ed
+DIST pyenchant-3.2.2.gh.tar.gz 75565 BLAKE2B 150bdca0d316b2242d60d8c42baf2e5e8cee3df2c57bf47be61170af956cb8c4ee1a584ad2aedd1ed8f203028938c8c0ada40ea45045746deeb4e67c53dc5c70 SHA512 42ab2e0cc38af4223ec0233c9e22cd151aa9bda5b56b7bd642e39e3a323ab3c034391123af5d3a5399551533ba1c1746abd6bc9ee2ab4c7879b9bf0ac91e056d
 EBUILD pyenchant-3.2.1.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
+EBUILD pyenchant-3.2.2.ebuild 638 BLAKE2B 1b017395a129bf8c6f92d21a2f775dda2cdf7a81656e1d829ef48595a0da46109f0aaf2718a54d32698b684ffd436007d198c97c5a5a93b17ce6b37077bb5660 SHA512 9777e886f87763f7d43498c19497be9901b4e2910cc41e8c2f3798d2cb1c8dfa11b2f2df2485855e826f7e8f4730236343b9ba9a0ace3fca58eecb7a05a26b2b
 MISC metadata.xml 877 BLAKE2B 69ac0276b96f09795cb434b9f8f56ac243a740d1ec4aa70d66d135c29e0385334e7b48ff57aa10b618105b5330d5134eef4e34dc68fbbdbfa8b89a772b3a928c SHA512 aca40895f3ee12669a04065a65e14d638dbe9a7730d38768fbeeff07ffee4c816ecd4ed38190656578d429f31bc9c3d253e0183524a1f4bf933e58117b8095c7
diff --git a/dev-python/pyenchant/pyenchant-3.2.2.ebuild b/dev-python/pyenchant/pyenchant-3.2.2.ebuild
new file mode 100644
index 000000000000..6af05a8eb115
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.2.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=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 3805f199f7bf..eab212aada62 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,5 +1,3 @@
-DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
 DIST pyfakefs-4.5.1.tar.gz 203478 BLAKE2B 4f7fdd9a9ee80dc814b854b1e1ab6fca49c398733ea3c61369ed1f88c9e66c3f007e5270f9ea276c9eca4c268036a6cd2f2d05832bea94a0de0d947b5cab63f7 SHA512 2c4b0f4b9cef9866f12bf5d35462ab565f82a7cfb986e78eae07b8e77be67fd523b093ce4f88b34d817f36d04891f128af723be880c8072f6b593ceb31d65367
-EBUILD pyfakefs-4.5.0.ebuild 708 BLAKE2B 02def91440e97caf02b12247f2ee7ebef8409f574f58cbd0c82ed02c0f0532037843bf5f63aab26f63d505db731f7b5f2a0de3fd2f21de0762d83e001fc554a3 SHA512 d88d36a2f8a045a487ece7d1a18c2d3202368e666b0528d3e0a21b46d67533d8541c9d28c989cc84e312fe9276b14a37e049fb45cfe2ca0f04c103869419f9ec
-EBUILD pyfakefs-4.5.1.ebuild 716 BLAKE2B 7a55a9b757ef823a6c503f2ac8a83763d7994f4e38e11c0d684920b2fb389b6fb5f2a9a160a7ea8a53079dbed175fe6fc9668c2931e8c0e4d83118e94c2b2493 SHA512 661753b7aff5630e335d348ce2d39cc026759cce653a246a2b234b629d533f555e102867ab039c6884727fe3cf4c66904aeecb9f19447a8710c837585c5cbb60
+EBUILD pyfakefs-4.5.1.ebuild 708 BLAKE2B a290ed95962f2d59ad583ca5efc2e18c6b373ad1df38a539264bb4ee71b3bfa38b507c24818573b6d19177350e043af27fe58ecd764997a22be764e8459ec4c5 SHA512 94d24e2a46ea2c8c775505821330cbb91553b4d5782ea1608f8f813e40d575ed93bc07739abbb4adc3e3d56025b375c80a1fcc9cd791ffa12c6b848f75aef241
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
deleted file mode 100644
index 0eb0423563d4..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
index 1746a5e9e29e..17892f635d1e 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 3538a5dad203..1682a45ddd69 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -2,6 +2,8 @@ AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a
 AUX pyflakes-2.3.1-fix-py3.10-tests.patch 3166 BLAKE2B 9950380f37f84e6c6356a62cb4566a12517cdaf57c48c146b922dc2188c8d2f938691ee909b70e4b10a8f7cfbf35240659a10832295d87be483d1a5a1a12db24 SHA512 f67ce0684e9b1fc269845a8b43ac5f99243d8060674c90958cdd0b2781196aeeff96eb504cdf9a14a5b77dd658e0ff0f3ee70c955dadcf0b36c16148721dcbdc
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
+DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B 852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21 SHA512 f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577
 EBUILD pyflakes-2.2.0.ebuild 739 BLAKE2B a13889d951d54c49dca0df763c347390c69c1bc6e7471d8ad9b1a1c932340096874c2ec09cca6ec9ca23472d2bbbac90924a6be8ad06bb7b7f4b731d7d712bd8 SHA512 dab20e9ed9a1ba53a50c72466d5093a3a214dce230348910a91b91473b7bcd8370355a47d438612129a798d087b1ce55b7c21c881d06e740e461848ff8991271
 EBUILD pyflakes-2.3.1.ebuild 665 BLAKE2B 1f45b820bab9fab2fcb7cf744471d1caefc5c5c6c5ce50ed286d8baf5976e81d26f7a971880edf8791b3c17a3f47f5d0de0ec77d88cf7e437a5d29aebb6ca719 SHA512 adac3b53362f3a56bfdfdf05e7e65d6c3c641bcf7488eb2612cfba2daa0727dbd2a25ed9ba567c070f0e858ab9fb6a1d18ac538e0d7f3d58980b4da7cb3773ef
+EBUILD pyflakes-2.4.0.ebuild 616 BLAKE2B c1e47ba6fe51eb9a67d3dfbb9cf02ef358932dfc3a697e1530bac14cab29018bf2abf317a52252cfc11025c30d4cd64944d88578ef7fe976a6935d6ef283c0f5 SHA512 a86c27bf5760c0f345fc1484ae3478f43561cb4962be03d6704dd8852792f8919d8340b1d625451ed5dac3eedfc693dc1c388887e6591fe59c6649d9fcc16f90
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/pyflakes-2.4.0.ebuild b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
new file mode 100644
index 000000000000..30f7fa7ac54e
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.4.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=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_tests unittest
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 4eb8f065ba7a..8558aa52b10e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -6,6 +6,6 @@ DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60c
 EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B 32d2a0539d064892d65ded4f4977c6c1e52f632ddf32d4e138a3a5a1a29a293a5762608e394d236bc0aeee71b041f184f2b05f86760c16d67dc07c0a230b5a16 SHA512 e39987d08942f0cfd5c26f482e28fa2ba39210a4acba7ff7f8b409bffcaeacb8937152e4d4aca1c807d7c4b05d8aa9c2b0a57f54296f9933fdddbf95e094fd71
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
-EBUILD pygame-2.0.1-r1.ebuild 2076 BLAKE2B 80c29bcdf2b865ca7eff1cc9d2238d34c367d52aa5e5b147de9a7f0f6a11d0dab71635db702c3419f7b0f3c8f41ae640d9fe6b14fe342ca661ddbcaf18af9666 SHA512 3f5a4c956b2c2b9c9447b4f7f2c0296dd8f8100ac293b5f61d1df7e073fe8cf2f7f33addc7121eb747747f0e90a8b6e932fcce0c78cd12aec58222b4713f065d
-EBUILD pygame-9999.ebuild 1737 BLAKE2B 54a56dda9bda27773deb654df0f280b239993068497be42aefeada5e7d78eecc5e325b5d7cbdec7f4abe9c9c8618263f6d5e1d0f26fc364f8321c82246472f26 SHA512 bcd9a20d10734b3ce5ecd3ea8a9e36d9474d92598ab8825eb13aabf80357c8a89fc8c91808ddec07620b4f3cc29e176535ff8098b9c3a99c2531dcbe74d46b08
-MISC metadata.xml 409 BLAKE2B 4fadba193b3a2c42fc0ed0717cbf9c68e35254864ed1107ce5e46104db37f8e0c17a47d97af1a94d8aa6a423fb9cf29e700256c1811a6ff932a2ae1d4c4e9f90 SHA512 f393fc8aba144b080f1c0c90d3611d3fe0e253d736b7bbfef334f6c0ea075ef417ec2a28a0f66b60496e60d463a6e6be97fdbf019a7225e1c60a7a57d3bb328c
+EBUILD pygame-2.0.1-r1.ebuild 2202 BLAKE2B 6b7ec8d20bc629a07d200958f5a4d09f1330933c60ca0ad191b673ef78e950cc27ba4ff456df4b31f50b3b326f42bd020e38d8801ee9e663ce4fa7acfc7645ca SHA512 8b7298c8b5cf5b6635008caac567d0331d7b614535cef88a5aa6813e2df1d97aded32e112275188924bcd3b6f53d52d7fb3f009c164074d0870d579de4119f87
+EBUILD pygame-9999.ebuild 1739 BLAKE2B b5e8dea0169ba2ebf0bcfc3f7fa9f140b9c6a95fbec59c82442403c89f35f7416888d736c1ef1d98c4f434b83682cacae507037fc33cdeeb3fc570d2c9855983 SHA512 0e378c44353b0165c452561643fee5c9d6622de4e79b1fddd6ad554e1a9fa39bec18c84907a6c2e9868d0c75d1568f0935660c838f2921c7e5ce0df87c157946
+MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index 32059e4d86c9..4ce54800af77 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">pygame</remote-id>
+		<remote-id type="github">pygame/pygame</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygame/pygame-2.0.1-r1.ebuild b/dev-python/pygame/pygame-2.0.1-r1.ebuild
index 9fc9d5a9db70..b8c0c5f73b53 100644
--- a/dev-python/pygame/pygame-2.0.1-r1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1-r1.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
 
@@ -51,6 +52,10 @@ src_prepare() {
 	if ! use midi; then
 		rm test/midi_test.py || die
 	fi
+	# Fixed in next release
+	sed -e 's/++Py_REFCNT/Py_INCREF/' \
+		-e 's/--Py_REFCNT/Py_DECREF/' \
+		-i src_c/_sdl2/*.c || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
index 8d4ba88cd460..7207ee8e45a9 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-9999.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..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 95669c18cdbf..3610e89bfdb2 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,7 @@
 AUX pygit2-1.6.1-libgit2-1.2.0.patch 1870 BLAKE2B ab6d4884c5330e98f5e889f4605d8b1d9527033603707e8c3414944261aade3dfc3c8d8a0bcf7efa0d73ddee9d1390db47325d52205ee6d00ce95f39dd0b01ed SHA512 f5fb9217812057e62db50fa4f10ae0d845c031565956c60bc2b498209b11effcbf4dbd2f253c303f4b2b7192403fc777e4854ae472dc6c3e2178c19a62acfdfa
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
+DIST pygit2-1.7.0.tar.gz 276292 BLAKE2B 6091e2916c4986cb545f23d3a31f262666f0349661ccc48769414e888d0ede48af3a80483b4638a3a2275b74ed9b42113bdeae678f03d76caa7e796c6011b50c SHA512 3a8654036d0ab875898ce60e81bcab48bdb6d6bd63c29dc98272c71b5c82391e3186da61083fba09faf722e176fed5c592a36edb53ae0b957726e74646d25616
 EBUILD pygit2-1.6.1-r1.ebuild 945 BLAKE2B 79cfd82aaf7395b5adddd3b4a791f6c848221a2948d02fc75d239d77f5aa4e456a3163b5682db51ab2f8181cfc5aaec1f29c999fcec83ac26bdf77e674761160 SHA512 b0ebb0bd047fd0b1d2b58f970ed7cec2d63ec86c1b01e2461fd14fb85edc29824372b92cae3a0fdd52c22aef30d4b2ca03d401749a9ed500e543df606133a3cc
 EBUILD pygit2-1.6.1-r2.ebuild 999 BLAKE2B 5f8e1ab0c9a4041cd80821c858904debee9221ffffaf44d5933f31b73122a300e1566b4def0779dcedb0b636f54762c4b86fd656a8e3142630cd82d222adbb58 SHA512 b8bebfb9341ebbeab1daeb6207c27a131140b278dea2e8431f8dbb6140853ffc42176ab338c1fe45dd7e06a9c12423c4b7483519096e374cccdf9a1be3e5a33c
+EBUILD pygit2-1.7.0.ebuild 937 BLAKE2B 177001c8f5f504376195c864073b8f10ad34ad068b7d922877d88d149ebfbdcb336ff1e72f662d90746a58edb37db0a9f77710f76cb202f60c25c883552cf37b SHA512 6ee94941cc982672358f254ffffec7723a26c02f7a15ef78b1ee953e70c19656d224b69d00ff54a08c9c78a21d2470c7fdac946299631c7ee817772386be375b
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.7.0.ebuild b/dev-python/pygit2/pygit2-1.7.0.ebuild
new file mode 100644
index 000000000000..3e42e86427ee
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.7.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 bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-1.3*:=
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	epytest hack/test
+}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index f06ecf9fa8e9..71eb2b99226f 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,8 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
+DIST PyJWT-2.2.0.tar.gz 62200 BLAKE2B d527442cfafb8b540062f879e7c4a4f15acd9d88ff472764cfc077a220f42bd56e13d2aca9660008a118a9232071a45157c684f95987771c38cc631ee4745961 SHA512 e1cd8ba4fbde2adc906e18b04a925101f28091b4b23e39a1335ca6b933ab63132d07b2a4865399216ada17285b09f03bcf7fd1a12c238e7d4f15e7c9c1e32c75
 EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
 EBUILD pyjwt-2.1.0.ebuild 740 BLAKE2B 0c7fe5da929b1b6bfc1b3e87b918ca8ea7e89c26c6a21527c411cd036f0bbabdfd90d0f23e94092b5cfe4453215e08634083cbc61e517570fc78b42f76e614b4 SHA512 52f4a644f4e87fcb29faa993d7d035ebe52fa9b19f5410c3e58dfeee2cb9b02b1276ae80746389688a4d6ddf94f9fcc84eb862d0bde855c1db13d9bf93910bab
+EBUILD pyjwt-2.2.0.ebuild 744 BLAKE2B ac66e823786dc9c27789cfa608d58af934fbcfa41cdcc0a6fad3f6b633166b6972abe85820752e1a4b8aad5ebd498a1516d2f761f00522fd2ca3332fb9e818e2 SHA512 77039a65f25102ce9f7b923b459872f94e9dfbc4bd64484ed3617387f800eccaa0b2b26a64452f73cc13ba0fdc54cd6843541c48a70952504232c2696d6bea82
 MISC metadata.xml 450 BLAKE2B e0a5244140aed7eb1dbc7d1bedf41b64f999ada11a82d5a7c3720501d824c789590e5339d5855fa4d0f96ff1b572e86af41859f8f14105f2f9b1a715d9d71d87 SHA512 83bce7997e724867cf1962ce75d8bb8e7a4e7a8dcdb42b95d9d323ca3a3ea4584020d4b700885e1afcb753d4fcacee23ec7b25066e93c0ac5eb614f65d140f29
diff --git a/dev-python/pyjwt/pyjwt-2.2.0.ebuild b/dev-python/pyjwt/pyjwt-2.2.0.ebuild
new file mode 100644
index 000000000000..df78ba88b34c
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.2.0.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 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/python-jwt"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 60a04c2d04c9..543b55c87b78 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,7 +1,9 @@
 DIST Pykka-2.0.2.tar.gz 51858 BLAKE2B 62132a3ded257d44d9504258418abc73ec9cc09353ab8e1948c9910fc11f67f770510b2dc7cf122db9af9ff62091757b648dce69cbdab0ffc17567169749d0d2 SHA512 98b2e6122dc5158da489265cf7cf9e358bfa432d0a0eaab9f50a07c0050083afb19aad494e4cd27347c376947eafb7d9796909c18e3648ef1bf0685bd6384e5b
 DIST Pykka-2.0.3.tar.gz 55749 BLAKE2B 5da98dcc786c2bb7728485e16090b8dad7a96858aa86f024564286bb03d3faa93673ed3db87882e3dc6555a5b64c9c62433ab782ceb94e89965fa870bbb78d2f SHA512 0f4d6d9e0c92a7e7cafb340f343afa1e78bcefdd0454341d3f457fa202acdd3de979881689cb3cd5f2cbd3a08f80177f6470db4fb895b20d9c1b4d0b9ef627ee
 DIST pykka-3.0.1.gh.tar.gz 59252 BLAKE2B fd0ca0742f3c372a5983d01929b34587390929fae28b70e0ee939f651f7655bb924ae08fac039225a8040c9bf523177af7bf3fa7c1db6ea1f04ec460cc3a1c6a SHA512 c96503019a190663cd4054c2488668143ff5d0d92b0c2d1ab3df577ab9fc9f0f2f575677a9f955a7b940e725d588c0caa6097515f1236df9a453fb3b0a2cb8c8
+DIST pykka-3.0.2.gh.tar.gz 44440 BLAKE2B 8649e4b5134d902a459cd7f43ced59fb88bf6e9f7435aaf89a3c68fd349b941eea8154703107611a027c39b9eaca374d39497dd4f0dea72a1edfc4df99153539 SHA512 0e10366739839d792ac8866b2dc5f7a2d352b04f896ffa1c1922b215e8907f6fb9300ec955d5ed5f8c19d0714720b7f20569177cd1a9f2c98fbd27e42a9bd3f5
 EBUILD pykka-2.0.2.ebuild 615 BLAKE2B fc167ffc58b0f34729e86b20a9018229f0bc15b966931dbc8391a80584c5ddc32dfde4b77046d9fef4986207ab85b118b8c19d78236b848aea0ff6309baf7f58 SHA512 1cb8b7d4082a9b66f785d4b82d0aee100ca7ae7a4c6176bf8b9b7cf59d6cc430728607e035f62f9987dbc547fe0333f7b69d88f5a8228358c57320ff090e59ab
 EBUILD pykka-2.0.3.ebuild 648 BLAKE2B 295853a8ab55210e57732149f4dacf8073cfd9a20e56a97f39ff123255e295c1bac7fec93cfd676f50aaf360a25a80947c1e9dfbf00fa88ee61de78b6766fa8a SHA512 45c948675e006893b27369c8f308b537a6c287482de3608cc2882535b844b46ce2a3b149d520f69a2e159bea82d02761705d55c5a44a088537cfdf43d784925b
 EBUILD pykka-3.0.1.ebuild 678 BLAKE2B 1c0f1d8f6edf2e12dba53a00976bca7000a755e5ca16f1e727acf4808a35cb44dbacf5f1eb7923df0a4b506e1b245fcc7e2a72ad6e4e7d65cd8a7ebe2dd04d4e SHA512 b461bce6d611983e1323db1013ec44370c8a34c9fdef285f88788a87d0a4cca166a48b4883c83a901fcf8ea9ea74ce335b480bb6a22419cb4d84c980461aed39
+EBUILD pykka-3.0.2.ebuild 578 BLAKE2B 0121c6c643470a953c255bd4ef29b3e32965aa0ee3f8367433b83e8e0407048e5752e20cd92eede3ab642a887a00fa7fc3fd0c7d026c374407e0f625bca9a5c2 SHA512 7310b5513d859cfdc3885f3a0b74dcea3ce5e522961915c24b226f70110475ccc3e7c5630161d154f527b938b1c430762f5c702da7584624cd53d45aaaa05fb0
 MISC metadata.xml 360 BLAKE2B 41f09dcec8c459e443b0dcb907f2997b5a2a558c897bed152978530429f6493d44a720dc61b23840d489037769f797da9295faffab86be143e2e8f5224fde226 SHA512 13717275dbab6fe660af9c44f6462b33d1122f60b954b18bd99efa83320820c166e3f2c6e0d81825819d3232945cc0d1d755e7ba24e1a046d78e658c1b2a02d2
diff --git a/dev-python/pykka/pykka-3.0.2.ebuild b/dev-python/pykka/pykka-3.0.2.ebuild
new file mode 100644
index 000000000000..c2c6981f6e79
--- /dev/null
+++ b/dev-python/pykka/pykka-3.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
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="
+	https://www.pykka.org/en/latest/
+	https://github.com/jodal/pykka/"
+SRC_URI="
+	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 7e24d3388d26..d2fe7973a079 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,5 @@
 DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
+DIST pylast-4.3.0.tar.gz 39875 BLAKE2B 9b51c44295babc54207593e43d70ec121ddc4c4e5bea8a0936691d02c2cf996869cc3995f5b069bfe3a9208754705a716716cb6bb8aefef142723687dc07a16a SHA512 2880e142da2841775f2c48f2d5ad0adc39e6b65073a76dd6af24c65f420948755b25f7a630b95315ffbdd1f7536d9ac4570b3df01d6837f77faccf89aaf41f33
 EBUILD pylast-4.2.1.ebuild 697 BLAKE2B c36f3071349b584a4e63b4d916aac2af829d8be6674719c3a115aae759ba278baef78316529e22388e80677af0b938403aceb30672abfbf46f19bc4477bb3cf5 SHA512 b91d3154bcc386696fd6c022e544a343356c1111690c7d7f92543749b4dd540fdf8c38769a3c641d463bf9c4e74aaef2ba61711bf2d4428ecacd889c3a248118
+EBUILD pylast-4.3.0.ebuild 702 BLAKE2B 480dbc3ebfdc8892c8446abb398004a970e78490b55e198dafb4984e1d74a055baa413b259b9b2dbb86f4a2e68a81b9bcfcb0f3d1f0e55f83a07decdb549a8c6 SHA512 1ea8747f82b18cbf3423d3d2667d75cbcf01bc8cc997579e30785c45cdcc0338e68b013195c6ceec650b68187eaf5d0ec540f1f037bd2d6261403f2dba1ad433
 MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
diff --git a/dev-python/pylast/pylast-4.3.0.ebuild b/dev-python/pylast/pylast-4.3.0.ebuild
new file mode 100644
index 000000000000..95af06713180
--- /dev/null
+++ b/dev-python/pylast/pylast-4.3.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index a7045e39257a..097618ac8420 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,5 @@
 DIST mongo-python-driver-3.11.4.tar.gz 983009 BLAKE2B b2ca8d90a34b41c0991b545626853137b6a7f5f006dbb5d7a93fd8312759b53b99415583ca5ba982abb420db8502cb9de745f1ac0962efa05eb05ecb4289c323 SHA512 ecd2ff41ab902423dc58901cd9a8355e200f5b00a4eea4a8e950de75674fd59f7367df1ab7ee6c09bf515b8fa110cac0f7de084fbe14527486a9c38a0c8c9c27
+DIST mongo-python-driver-3.12.0.tar.gz 1062091 BLAKE2B 636a34a42d43a6ecd549c51e9e5b3a617291b64a1ba91d7473c365f8df88d59efd7b2906dd80147ffab4309d38cce30a3475bbe142e347312823236f8657c801 SHA512 fc2734b8821b42cca1b67930d5c7612526e51292144a376425627ea6254b09128ccd894af3be293184f940c7f8faa1c0cd3a0d069f9b4143a15cb32279c3bdb1
 EBUILD pymongo-3.11.4.ebuild 2709 BLAKE2B 9c805d2fdb0427c015d0dca59c4d718c10e3799d8f00745d109566f9e6a6c9f68a0d63137bcd5e1ca756eb889bd5a4d0fd01d8ac182a3bcdee0e96ae3dbbed36 SHA512 4fb36123d4b2c50362386f7ceb545fd756433781c033565ba4881e8570b2c69f2eaf45f2c93da589776b5fce5da40a9489bae1768c569e9c626543db3d96b679
+EBUILD pymongo-3.12.0.ebuild 2713 BLAKE2B 73c23556f161f9dcf0601026ef3f7d07b308d65e2c4c41aba631d0c6a7e21a11bc8789727f90b205eb0c1adce66ec5c883c740babd1affac4f99205bc9c9d4d4 SHA512 689f54b4e4db3c3d4ffa986d0a941201ad2948d1f9f9fb768706b88f01b979a35222cb75ef7edb84c0593f2222044635817791798cc0ad87a07e892cfc4f23c0
 MISC metadata.xml 673 BLAKE2B fb66f76592841f2647a94e24e07fafa8be2bc31583bac35dc3933a3feeea87f0c4105ab6b480bce5f2b8aeced8c113c8a3ce9714b22ff909f92eccceffa8f9a9 SHA512 9e758aa60153da583ed21bdf6addd001c560894fc6d429217405e7dfbdc673a9e22bc5a41afcc1281f7613ae1059c0824a7bba246006aa66c6eced75ab975e51
diff --git a/dev-python/pymongo/pymongo-3.12.0.ebuild b/dev-python/pymongo/pymongo-3.12.0.ebuild
new file mode 100644
index 000000000000..07abe794cd9d
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.12.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 999990f8c455..b8807ca62f6b 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2.ebuild 4198 BLAKE2B 541c542205fc7df7c5908ef2f998342efd51708a9a27636e012adddec8542132781c0ca1b76221d072c3093ffd68545da41eda69586d3d5c4034f3a6be393563 SHA512 36d399ef211fae7adf717577b4fa8bc750948773d68620ed9763806c63407bc28a3a93570dcaf9571b3f6ad68842b5607686619bcdfe269baa619de727db43c3
+EBUILD pymysql-1.0.2.ebuild 4197 BLAKE2B 13e437ed4b25b045b62262e0098e274435ddb4e608f51eac45f9811cf7f15c475e933dfe424eb145039295d970c237191458938ccb5be2378fef495a6d167fcc SHA512 624bbe54ce034a273f419a8101a6ccb30c8bb31ee5b6ae7b076cd796a51a5a49f1e9007e4d5b3da68bf2e431a435e6a29e4bd7aa891c2837fbfc2101707e0550
 MISC metadata.xml 494 BLAKE2B b77cafe43ba22f501e74de63e2629860f6d360e21533ce1b02593735f5a5bad5730f58bc05d3dbc94742cd26fda12092f66fb6d98b4a34d1a2ae9bced30c9631 SHA512 a8378d8970dc0fd8af8f9df6ed1e22b30b1c7901bc8f5a73e1180a3871d092b3afc16bdf939f05407533dd009c380f2301952cae93099b2b00d021b0aa8455ec
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index 640ab2983571..fdd07bb51aa4 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pynput/Manifest b/dev-python/pynput/Manifest
index fd2aab4f235f..7303086d1884 100644
--- a/dev-python/pynput/Manifest
+++ b/dev-python/pynput/Manifest
@@ -1,4 +1,6 @@
 DIST pynput-1.6.8.tar.gz 94483 BLAKE2B c04714fb9cdda9527ed6d3c0e7c25214a7678ee908f1a638023b95c2f63242fa7dc28f193b2055338a9cce10c26399eb4f4af0ec69a6ffaa1be0b7e85481ecc4 SHA512 23cf2e47e0a284aeb2e294529a1f47a01a42bccae146500eee2ff74704cb5ef7ff33327cca5d6ebec338369b1341c489431891d9f034801cc6be9aac2af90442
+DIST pynput-1.7.3.gh.tar.gz 101244 BLAKE2B 9f0468b4f94c825e4a093cbfab1ede6988352c4fa3f04f7cc29948d353e0aaaac8bd446f758d79916c2801c7d30ac8f04060e6b27ee29af705a61627ce0c6a5b SHA512 ee8d4439716ddd34765114ca111292d6ec6aca133c18256b378afa4efaae9146280f146dfa9ebb40f0371cb13d449ac5cb87b8fde1f6a2d7fcab456718dae683
 EBUILD pynput-1.6.8.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
+EBUILD pynput-1.7.3.ebuild 713 BLAKE2B 6ea70c3b18b8a9098d557f37b66766533e241b405f8972855fdf876db801adaf55770a55d8c64ad08c507b1e5652001b92238f2ee6c2b6a3a44e357606cc07ad SHA512 997ebc16b3fdbb64d7f8f55bb6e0f607c6a84b42156e838fb083521e39f68f39821fe9d53b5366425acc619811295e95c939db1cf557b3caa136dbfcde798217
 EBUILD pynput-9999.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
 MISC metadata.xml 317 BLAKE2B 638786df37c0c7f94ec16e16cb4770c1c1b5cfb6ac7ed492cd1c38bcb22ead3a07717574fa945fb8cf73afb3d5625716acbde6e27fa78326791759aa7c39d64e SHA512 f201385820099d3d37f4637a3b2ec8b2229db5201324a0cd6652030cd18bf101cd8c68ab8f9787afe3b1e85826621942990095448c2182ceb75f3565d84aa7b1
diff --git a/dev-python/pynput/pynput-1.7.3.ebuild b/dev-python/pynput/pynput-1.7.3.ebuild
new file mode 100644
index 000000000000..3232b52315ec
--- /dev/null
+++ b/dev-python/pynput/pynput-1.7.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sends virtual input commands"
+HOMEPAGE="https://github.com/moses-palmer/pynput"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/moses-palmer/pynput.git"
+else
+	SRC_URI="
+		https://github.com/moses-palmer/pynput/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	sed -e "s/ + SETUP_PACKAGES,/,/g" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index a279c299c69c..4135cfff79d3 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
-EBUILD pyopengl-3.1.5.ebuild 1221 BLAKE2B efdd2cbcca74f94c54f624b58739db2bde57b137b6b5526803edc8317c748d821dab17cf975f2978b24e2435afe61415f897b9ad15b4fbeccaebbdec20f81b26 SHA512 33d83f09185ecaf70cd42b9f96329db8347c1b88d7dceed946f779104849d83ea1cc0df151b5b49160c9d7b54c2ea38bf324bd529e4baeaadc3a9ea471aee7c7
+EBUILD pyopengl-3.1.5.ebuild 1183 BLAKE2B 0e3c7bdd8dfbd8085f40db9af606f41c80fdc78e56496faaab00b61e654b9207868ecb1f0c5399b4083d8a81f4a391b94ba6eca636b5f4f24b7589cd5bcab5ee SHA512 ccfabba236734d24beafc29c8b02d8f773835a3a1eee78d44bcab273d7e032fec12e20b787b6c45be4fd9629d8354f1f65e425de330f71889c6cf1b893993556
 MISC metadata.xml 365 BLAKE2B 4f4ed59d889195fb5f979daa14ace3f8a77f9ae1330fda3eb454fca4aa5447e285a4f31c5993358d20ecc413b368cf70a7f5e55796b9b81557cff06bc7a4a5fb SHA512 2059e35cf4377763e16007e867897acfdba791681687ec0c45c9c78ea8cf89889e71dc3f4fe6720618f5adf6fe26a3440aaf938a5c1b592654fadcca7ff5ee3b
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index aef96f75fb09..3ba7738a27e0 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
@@ -39,7 +39,6 @@ BDEPEND="
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		!prefix? (
 			media-libs/mesa[llvm]
 			x11-base/xorg-server[-minimal,xorg]
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 2c0864ab3498..7dea98d9a6ca 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,6 +1,3 @@
-AUX pypng-0.0.20-py39.patch 1171 BLAKE2B e84a74ab9a783bca54d198a3d1ac9eda54e2c1229969c4a6d4b19ace752a50f9aa2b09d59ad15048db08a894290788978d6022fcb890f15ba6fea0e0bac6cea5 SHA512 c3a162e77a0d3ff9b153ba26379fffacf0e1683c5e4230af1c8a1c5392889e68d74334661cb19b6076fb7cf3ce48b1d1f1339d02b7167bff42bba44097d2155e
-DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
 DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
-EBUILD pypng-0.0.20.ebuild 563 BLAKE2B d93263c9c134d47cd2f079291d443a5210f4e027360fc99bb633156538a793a4ac065132a87beca7962f4328e3b87496f5c111fc3b8dae27abec7135510d8d6a SHA512 75cee33db0a5dcfb6882cf3d1cab3376b8441ce419791cb459fd09f0a6381f270acba15d5bbf749603cfa120e489a86081d11eecc45ac5828c6f6d7a48490012
-EBUILD pypng-0.0.21.ebuild 573 BLAKE2B 1114ae656d7278efe402cad9ad95fbde0ffc3a21459ce3046f8795e187eeba169bbdfd750ee251643f0d5017a7cc041dabea432d9fc87dff8c33be1d31429df9 SHA512 f61b0f3c6e5a469672a4e307a1203e9aacdfcb0890107467138164d7ccd680e59a896825fa98e3433d6e85bd637c9945100fccc2f9b47778e40345412a079778
+EBUILD pypng-0.0.21.ebuild 569 BLAKE2B 3c48903ec49b7c9fc657a9a5e1b4d8eba6a6a2f60f453ea067fe6778bc898148b4ef254df50d81f6bc677138961ddb3e5105fb1ddb469c7743ded2f914b75524 SHA512 cdd61aff4ee27ae0f63e3630829e2c09cc26587b54654d1feb4007c335ea7f8bf8f60bc43d9ece23701542645ac04dec1744a41841688519811a8be39a46b0e2
 MISC metadata.xml 451 BLAKE2B 75c7df259e2f4bfceb7b7abf4302169b5b423d9a9818238b06df0b69270a953ea590f4026774c2fbba4aa24c1e100c3ea40aeeae8a0625390f12c8aab1c173c1 SHA512 b7139dd634bc093222cbd6f7acba8f6ed7856c3b84a101cd3f5703b960d52aa9ef9b388b33cd7b997bf32405fb6bd67771663022da254c7a88fab56d515f4758
diff --git a/dev-python/pypng/files/pypng-0.0.20-py39.patch b/dev-python/pypng/files/pypng-0.0.20-py39.patch
deleted file mode 100644
index e4c738ee3137..000000000000
--- a/dev-python/pypng/files/pypng-0.0.20-py39.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fe9c973c5e92f24746dfa1be8796c14a2befec4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Jul 2020 07:54:53 +0200
-Subject: [PATCH] test_png: Use array.tobytes to fix py3.9 compatibility
-
-The deprecated array.tostring() method has been removed in Python 3.9.
-Use .tobytes() instead.
----
- code/test_png.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/code/test_png.py b/code/test_png.py
-index c858d18..447c314 100644
---- a/code/test_png.py
-+++ b/code/test_png.py
-@@ -448,13 +448,13 @@ class Test(unittest.TestCase):
-     def test_interlaced_array(self):
-         """Reading an interlaced PNG yields each row as an array."""
-         r = png.Reader(bytes=pngsuite.basi0g08)
--        list(r.read()[2])[0].tostring
-+        list(r.read()[2])[0].tobytes
- 
-     def test_trns_array(self):
-         """A type 2 PNG with tRNS chunk yields each row
-         as an array (using asDirect)."""
-         r = png.Reader(bytes=pngsuite.tbrn2c08)
--        list(r.asDirect()[2])[0].tostring
-+        list(r.asDirect()[2])[0].tobytes
- 
-     def test_flat(self):
-         """Test read_flat."""
--- 
-2.27.0
-
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
deleted file mode 100644
index 040f2abb119f..000000000000
--- a/dev-python/pypng/pypng-0.0.20.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypng/pypng-0.0.21.ebuild b/dev-python/pypng/pypng-0.0.21.ebuild
index da8290ca6532..cc3fad22146b 100644
--- a/dev-python/pypng/pypng-0.0.21.ebuild
+++ b/dev-python/pypng/pypng-0.0.21.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/pypng-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index bf2b81ceeff1..c4f0e0915e76 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,7 +1,3 @@
-DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
-DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff579e965585db338587557d7bbf78ff346e6dc9d6cd20abee332ef7675f3246f175c4a1694bfefc434ffe1563c1158e4 SHA512 1f18f39779e4078d9e3fabebfa8cb279cab80b97ce9aa4dfe5a84019b16bf6bb973dfeb0feb360f36fd93f8106d847602e21589859ca3d7837a78ce1572ea6ea
 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 794 BLAKE2B 75603adafa8605bc645b01b8020190124d1b17f718feaf9f1dfe39e9976b0680f1d0ffc9f9e577457bf74618d26671b1d8fb5e5c8b6166dfdd4296714ca8dc3d SHA512 0af7676ab338b487ac2dc431b64e9a0aa5f174de1286f0b80c59696a06b13b0c8a715410deae1e29fcaa025b96ba5fcea767af0e0924bf77e0fef077d91bb0d4
+EBUILD pyproject2setuppy-20.ebuild 793 BLAKE2B 266bd09d807c0cfb9e01154b72c8afb343727cfe739f8020d97d65776b1dc94912314323537ec88fd54d2898a58cfcb7129d1ca707e32464f13d75597d8823b1 SHA512 1b2b4cd357c26c29f1a56dd5423b9229c17f648b402fab94d7ff58ec5ce7608f2cbbafb50f3880ebac472fe3ec7c7d17e3f41d1c8404e7372922a35e4a4443ea
 MISC metadata.xml 431 BLAKE2B 6403b7a6b11b6d90ce2a2978e3a57bf7c837d0ef5d2af3e5fe45f105aceb0c32e1a76cafb9dcf8040b0ce2bd884739a66aff2bd318cab35799e26efd1426c73c SHA512 6638d532a2ff39492b13f9114f4ed22c0ffd2bbe1c28f53fe1f9f9ae6731a4dd05ecea612b65d3bff830f5aadf5c87241f0cb84b2403513707ed453c4e091f37
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
deleted file mode 100644
index 3c9e175ff5df..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
deleted file mode 100644
index 5416aefca7b7..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
index 8def81edd086..d6dcc5868fe8 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index db26ccb33b9e..7c6c64463cbb 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -2,6 +2,9 @@ DIST pypy-exe-7.3.5-1.amd64.xpak 13646862 BLAKE2B ac2aecdb15d5b73cbd27b8a295ef5f
 DIST pypy-exe-7.3.5-1.x86.xpak 10297092 BLAKE2B 149672f5714959deeb790b575e7980c1281b1cf37c0853e3ddf8c150104b2da0b8d32736eacc31f67d4d522902599e64bec7427727e560d8d54bbe7c5bd9a06e SHA512 48e4858489e928d44dd8570b783623eb33ce7a1fb62b2a054cd2841ca2be8ab7dd3bbd00c3aff770c1f8dc42ef52f52da3d18c5c27ebd08d19e78bdf56081e96
 DIST pypy-exe-7.3.6_rc1-1.amd64.xpak 13661837 BLAKE2B ff1b886fd963691acd063c6a1f0336b48af15cf2f59dd5236be9985f6d5c417e935ea59aca3f7d30cb1ec11f18912dcb5c43b40fb05c6a1ff71f51a8e0d05f35 SHA512 1273b355d6a76504f156f6602f12ce01a9f02aa5bb8e18dc85c7690a4aebb683942bde05347e0f1cd735a35ffef5b69268abcf17209dfb2c70fe6da7ab76370f
 DIST pypy-exe-7.3.6_rc1-1.x86.xpak 10314897 BLAKE2B 70343d0ebddf72784435c164e99a8ea484eb6302f2522e84770055b1e12e50db92fb1e65af1642f473e47edf71b1739b4bd07e5d1437611411ef878fd8dbff8f SHA512 7c387be4687fad42b6e3d8bf86a551c323011a894b3d7d3e6d70e52e92e02902425dc5b4c84fbf283fb305751d8277c9fce009489bcbc3abfa71a71bc3c3114a
+DIST pypy-exe-7.3.6_rc2-1.amd64.xpak 13690548 BLAKE2B c23513c41880f1c44af91f6aba233119cbf6e273b43c35d060fc01b89f36a3df8161c8a07b7c50289a65128a2a87db367632388ddf30ed4d4c3b08e3c2ccca18 SHA512 7b7755d9f63fc85b16284ffb320d4f39e452327bf6d22328208e23fcab5cbc1e23df072c7b54b63210bb69b827dd3264653451e5af84f8e60dfe7e6da2f5cc1c
+DIST pypy-exe-7.3.6_rc2-1.x86.xpak 10299348 BLAKE2B 5ac603f3f7dded12f5bb0d60d8c7d6cb674299a4bd0a0819f64ce76dc69d5864d945650b1935549734abca1ac848ca91ebd5558e83b23595108367aa2aa3d4be SHA512 f700a85db2af89092056f98aa08b1a5194ecd2118dc4c36bdc9bc0b0e0bbbdea4f98f5485a52da7e5c4fda97bd61cd0c229accd402f117eac2cbc50bcde2f530
 EBUILD pypy-exe-bin-7.3.5.ebuild 1126 BLAKE2B bd04e885a90a599f9e64d86460ec8f74abf622d83cd8eefccfcde349ed06f67ecc956770133af99fb48533fd2b8235e54bcef2a719fcab696759213a009c950e SHA512 eb58e00a86ede3626a7c8410ea2e6edcd7bd074f6095d44ad3cac985f9fd94ebc575606fbf31aba375cbeede04f2f8adc2d0aabb3019bae74ec362fa0d26f0b6
 EBUILD pypy-exe-bin-7.3.6_rc1.ebuild 1117 BLAKE2B 3245da9497a9489f3b737c97290c3b5eaf050dd942182da56760fc2ce05826504a9cdcae6c4f9ff6302613311976d993b157ec7277dd4364e24f3292d1d0b782 SHA512 e45616d1e90e70bdd2a9cabca8ddf5e4eaa64acdc33c3e16df70e5cd89e3a3eda4cad43d5b98dc9f4fa9b603d36aef4f1407a718d71f96bade7dd031bca5762e
+EBUILD pypy-exe-bin-7.3.6_rc2.ebuild 1117 BLAKE2B 3245da9497a9489f3b737c97290c3b5eaf050dd942182da56760fc2ce05826504a9cdcae6c4f9ff6302613311976d993b157ec7277dd4364e24f3292d1d0b782 SHA512 e45616d1e90e70bdd2a9cabca8ddf5e4eaa64acdc33c3e16df70e5cd89e3a3eda4cad43d5b98dc9f4fa9b603d36aef4f1407a718d71f96bade7dd031bca5762e
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6_rc2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..38bb6c580304
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6_rc2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 039da5c51369..35adc122166d 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
 DIST pypy2.7-gentoo-patches-7.3.6rc1.tar.xz 7904 BLAKE2B 3a5b8efaa67d5a1b4f65a56c6256a3b1efa765079e0fb2c2d380b325175f2e8f3a7d7c4886f734374b6069b3ebf3ac63483f90ada0ece72ff5d8e5c82940c875 SHA512 820d6155e3451b22076719eb3ffc29fab74965761faeade52013d3928fd63cd00b8c5d045f0da0bc1f303a9d2998cd210cd6bec05b2ca01c8b281a61c9a4a73c
+DIST pypy2.7-gentoo-patches-7.3.6rc2.tar.xz 7900 BLAKE2B 66861532418a35f0f926fdd85dbf701ed06f6edef0dd82313302f899bd7c0049572ae069bafe1b927053f342f965341b28eeef913e9342af3c592721fd2c8fb5 SHA512 f727d73fa51737685eff9ea933c7bb3684a942abddd891e7c4d90f3185556954aefb0a04f543578c79f2fe2fea275b98e6e7857ac5d7c8774f9fd6ff893fa3e9
 DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.6rc1-src.tar.bz2 21617621 BLAKE2B 659dd16920b157dae94c5d1f7a9346c7b933ec8c6a3019e36aaa6911bd01d5c9d064a75baa3d8f3df423db4d5a1de5d4f3c8fb63c8d5188d23401b07cc7611be SHA512 f8b949488c3af8acc5533d92238b7bca9ce59c24e93413e0db88094eaf58af5f92a9c9a941f3b7184d2761af2c2c4775891353df053a0762519606a4ce7ca544
+DIST pypy2.7-v7.3.6rc2-src.tar.bz2 21621430 BLAKE2B 2e8f5c41b4c79bd47a43c5ad38a4478ee6e7df7a20929e9be1315534a3b55c28d29bde5b46ff728aeba5cc05a0ed332045a4c114864d8b34746341a0023d1984 SHA512 e6354261f949cd042ba63988dff6a52dbc15c9a86be098b014c146218eaca9caffd76697134a5d4e4a18319b45229dfa73a617588f914dbee649b11197f296a0
 EBUILD pypy-exe-7.3.5.ebuild 4304 BLAKE2B 23387e2cabe080c84c97fddd49d750c173d0e4f73206c1bd5da7b5bab2f18d52b4ec02e01f79da17a5d6b01ad98a3933df996659f126e07143a06d9dd08da76f SHA512 7f3ab03fb5d0631079244afaff23064d84d02f4409fa0000a36b570ad6a63f438381cb4a5e94320e794725c31dbc4d614f6e8de71217ff01533f3caf67d3d529
 EBUILD pypy-exe-7.3.6_rc1.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
+EBUILD pypy-exe-7.3.6_rc2.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.6_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..8678327f1313
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.6_rc2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index fac8c42f292d..561fb3f33922 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,10 @@
 DIST pypy2.7-gentoo-patches-7.3.5_p2.tar.xz 8976 BLAKE2B 4bd12fa964da45a516b6d8cee8f2b9b1cd4cac9ee2e6369de1e8be5be2abab77e60a0fdc9416a76624b22f385135659b84edf7c64aa98f59a1c94f837c7e0d20 SHA512 ab47d5a0199997501f246399c3650919cc20423cc7e9517f16d1640e1863819016a944659e10af3e8ca803060f983546603feaba7c8f4cc3fb4996506fe59919
 DIST pypy2.7-gentoo-patches-7.3.6rc1.tar.xz 7904 BLAKE2B 3a5b8efaa67d5a1b4f65a56c6256a3b1efa765079e0fb2c2d380b325175f2e8f3a7d7c4886f734374b6069b3ebf3ac63483f90ada0ece72ff5d8e5c82940c875 SHA512 820d6155e3451b22076719eb3ffc29fab74965761faeade52013d3928fd63cd00b8c5d045f0da0bc1f303a9d2998cd210cd6bec05b2ca01c8b281a61c9a4a73c
+DIST pypy2.7-gentoo-patches-7.3.6rc2.tar.xz 7900 BLAKE2B 66861532418a35f0f926fdd85dbf701ed06f6edef0dd82313302f899bd7c0049572ae069bafe1b927053f342f965341b28eeef913e9342af3c592721fd2c8fb5 SHA512 f727d73fa51737685eff9ea933c7bb3684a942abddd891e7c4d90f3185556954aefb0a04f543578c79f2fe2fea275b98e6e7857ac5d7c8774f9fd6ff893fa3e9
 DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.6rc1-src.tar.bz2 21617621 BLAKE2B 659dd16920b157dae94c5d1f7a9346c7b933ec8c6a3019e36aaa6911bd01d5c9d064a75baa3d8f3df423db4d5a1de5d4f3c8fb63c8d5188d23401b07cc7611be SHA512 f8b949488c3af8acc5533d92238b7bca9ce59c24e93413e0db88094eaf58af5f92a9c9a941f3b7184d2761af2c2c4775891353df053a0762519606a4ce7ca544
+DIST pypy2.7-v7.3.6rc2-src.tar.bz2 21621430 BLAKE2B 2e8f5c41b4c79bd47a43c5ad38a4478ee6e7df7a20929e9be1315534a3b55c28d29bde5b46ff728aeba5cc05a0ed332045a4c114864d8b34746341a0023d1984 SHA512 e6354261f949cd042ba63988dff6a52dbc15c9a86be098b014c146218eaca9caffd76697134a5d4e4a18319b45229dfa73a617588f914dbee649b11197f296a0
 EBUILD pypy-7.3.5_p2.ebuild 4832 BLAKE2B 862e40dcfbab64b8cec4c44fbdafacafc2411037ae74e0601fc0d71dda70c376d868f71b19ceecc21bd2556d0cd02a6d009ae30454e85d5be5a2af7df007dde5 SHA512 835173f9ea59e57ceb7162d320ab38372c0d9feb3548c5e2d0c7fab54c129d53f5fbe0c7ed5599e95e1301634fb04cb23da306ca7762f116dc1016f081f52f40
 EBUILD pypy-7.3.6_rc1.ebuild 4975 BLAKE2B 029e4bf65279cf79ac5ef4f26c68e124da1c2388bf5f5a9cabbf40d0069b18a5e55411ba20ef176db076caf860b42757f84ec27fd8968eef951a79f92bcb790e SHA512 99498536a6b1d0ddcde0241354728932059cedc74ce69240921d96a5b8c0e8aa4e2ba37b224e2576317a729d573b176668bf873dab1ea903e9e4908c4a841a4f
+EBUILD pypy-7.3.6_rc2.ebuild 4985 BLAKE2B 4a5d2b818a7ae4c3d7d710f187b8df68d624b21f661ffbc697f89796ad0a9234061e28d898b04d12fb0e660d7ec10a078ca15a5dec4a97533029fb0b4d2d5b7c SHA512 d1fab937e08da6d0953bc892ba093db79554f2f401cfcecc01caa071a51ddf4b2d3d50cd3ba076cee598f42e3e1c85b639c7a0f48b95007575d0e5488e1a0390
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy/pypy-7.3.6_rc2.ebuild b/dev-python/pypy/pypy-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..d813bbfe63a9
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.6_rc2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index bf738c1e3043..d0d4cee744aa 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -2,6 +2,9 @@ DIST pypy3-exe-7.3.5-1.amd64.xpak 12030139 BLAKE2B f9a76a2304b3a29985209910b2082
 DIST pypy3-exe-7.3.5-1.x86.xpak 9156096 BLAKE2B c3a3a329c2f8bd843fc4c882bbddc1ad124dc797d4915818769e79663e53e787b991b04b8006e8b8548249e4e76d8b68545b9d7470d8cf41bece2cd8e085066c SHA512 b58d48e1fde3ec12b497a30035b719a64a16de1292fb34df6a8e3ecddc277a477641d7781a3440ef2b73dfb1b50ca34cbdca702f27d6a5e00ad25e88bd8ebf34
 DIST pypy3-exe-7.3.6_rc1-1.amd64.xpak 12163491 BLAKE2B 0cdf8b2a4b7c740a9f8770a33df40969d8c1711e92b7673e7cd4c6916df59637740c80be0412b3c11ac3388c1d381d5e289e0d805c8e4e9933637fb1a0767d6c SHA512 fa471617e31b84601b94f40fc887a1f3870c18184a9d561dfc88e6f2bd694af1abaf48b9709c446720dd22a47801bb9b741bf6a7e16f603145e301b245ae532a
 DIST pypy3-exe-7.3.6_rc1-1.x86.xpak 9228355 BLAKE2B 4669af53c163a979e76ebbbae20897dde14f43bc261c67cfd43516c3f342cdd5c61f503599fadb8f2e7a1849d18d1d98d59030cf190cb70903bb741138cceb7d SHA512 a02ab10b18562b864d4b08e5891cad66aa5ec085edb22e5fb19ff5f7e1e863d3ac99041362c9bcdf46a62977e658c2d3aaf853f4dbf6eaf3eafd241edd6cad4e
+DIST pypy3-exe-7.3.6_rc2-1.amd64.xpak 12176943 BLAKE2B 79c13618136f1b47f38c5b29367ed72705716cd5f86a7b415c68ac838950eef6c43f2eb941cbba93a592929c325e0d107f6dcdad79015c82f0c765408e863aa5 SHA512 11966b96a9a164b8ffea64fd2bff0c46437a1ba24d085eeac3a818907fdfe27de0d530d6bfc00722be1d34102703d2672290d61ccbf86d9b60b1821172cf6cf5
+DIST pypy3-exe-7.3.6_rc2-1.x86.xpak 9214814 BLAKE2B 28965e43f62bb838006dd0c5085e3be2a16a70e6f0153b1f5b90fcacdf9bcb0ba86e28cfa44fe484063d27bcca06d4a724f393269ff78fc2951a690527b17565 SHA512 dab254a1f78058fecbf09bd522de978481ac1af774c06abd0a211e9ba9872c4f9a22f212b02e12f32c015fed63fef37f093cc41921e167ac01b46e47a9d6b22e
 EBUILD pypy3-exe-bin-7.3.5.ebuild 1162 BLAKE2B 5b49c04df2ba2eed082c45fc9976bb7a02ff9b5fcedb41b25806b012afabd5150ea69e864126193d072dc248540940078a6fedbb9cab1287cf4fb3a95297650c SHA512 272007a6ed553f258a4c12cf7860363620b19b3acc0f74a21b12008bc7efbcbb387f97fe52d690b2d7efe911b9a3e2fee5cfc9afe0edbcfae61c2011093b4ff4
 EBUILD pypy3-exe-bin-7.3.6_rc1.ebuild 1129 BLAKE2B fe4617965ebc360982e0c2206afa6c5e74ea4fea698f0096f259c57225df141cab18d2c97d79c8cbf1ac28f0ee856fef2a195a9623d2f0566aa407a5edd8edce SHA512 fa85190bcdef93361aabedf2dd4da8a585f09d4d4e8cc4b8d45c7f406cf4be383fe8421766d8b21b0ea0994ff43e1ac1ffe034e0360a5d8db5bdc50f76878724
+EBUILD pypy3-exe-bin-7.3.6_rc2.ebuild 1129 BLAKE2B fe4617965ebc360982e0c2206afa6c5e74ea4fea698f0096f259c57225df141cab18d2c97d79c8cbf1ac28f0ee856fef2a195a9623d2f0566aa407a5edd8edce SHA512 fa85190bcdef93361aabedf2dd4da8a585f09d4d4e8cc4b8d45c7f406cf4be383fe8421766d8b21b0ea0994ff43e1ac1ffe034e0360a5d8db5bdc50f76878724
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..869d5d6e4790
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/bin/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/bin/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 2ee78568f8ff..5bccb5c7abb5 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.8-gentoo-patches-7.3.6rc1.tar.xz 4660 BLAKE2B 2a1fff331707a29dfb232ce4c2c6d3cada127b4452036172c3aac7579d89b8e0d4ea41300ffcadf0ec04b9cde32044371d55d225a477f2178dddb03642aa569b SHA512 bb781369d4e0dd387659fc474c7a23d8c54ab88477fdd007d3552c95e870a1896a0628dbba876e870956c5a1efeb52efbfd343a08f8a70a4515f41b1dc8ed60d
+DIST pypy3.8-gentoo-patches-7.3.6rc2.tar.xz 4380 BLAKE2B 1ad68c088d4888d3579c0b48789be3a95413ab8f11d971f9f616a1701ceed2b8eba595612e28dbbdbc1732e4f8a7cd08cbbb89cdc413d1a3e9eabbcd78fdde76 SHA512 c2d68610b78ed33aaa67ce5244d289409256f66f2505ac19f0a679c0c10e6024993bbc7d37a59547daac38d321653b8b1a63c55e3f52d1409969f0961842fdd7
 DIST pypy3.8-v7.3.6rc1-src.tar.bz2 24320127 BLAKE2B 920738d1d9a346dca8e76602fc5a1502ff6f610897e1f5b841b5207a32f82c52770684ba4ea076209e18b664cb9ba5df555a21f838ae581b436cbff9e2adb506 SHA512 334baf973397f8068137382c29632afd1288b76b57f21047bef59397d2718d8c420ba68acc2f1082501aadf7fbf8ee6a9fa86405c2a54d720a9a02dd7a7371aa
+DIST pypy3.8-v7.3.6rc2-src.tar.bz2 24350986 BLAKE2B fe167b7e1f4f81e1737220bb679874a1e0faa8605b0ec7d10db275c08226e12f8fcff5b958a5a2c42efba5125d88dea150b707441af13bd9b7ef0c9ef36d9c1b SHA512 98715c4053d995a442877f93b32ecb976ffc4160df869d35843718bacfd97d2bbd697f85b5961c420f8130d22e64d740d8d180a4f9ff802250897b4b8c216a6a
 EBUILD pypy3-exe-7.3.5.ebuild 3871 BLAKE2B 40feb5472c324bb18ee06fba12a267f7374a9fe584b79665ade45873b3d4469a9ee8a415abc99d778e0ee21505a99f26a057280eb911995caf6b2c8fa505dc73 SHA512 39d6bace7b222097c756e33f4ef41a37d9c6565dda1595e6c8761bc45fb21e62b5b3b63127b00a938770707cb59cdb10504c61607845400f14b7b799e5346b9a
 EBUILD pypy3-exe-7.3.6_rc1.ebuild 3785 BLAKE2B aa2255d151055023901a7fbc0045d439743c24ab9d8350c93d7760de64ec044b4c41d066de94e63957f402a151cb6def4d01e9927a8c7459722d518e4e4bacc4 SHA512 048e760d7e563c72b6bef73510358c1b2b416951d3e48f9f823f7a8279ac9b773b9c38f8fcadeb8dac3003e3fbf35ae93337c4aa475144a77c2bb07567d8ad6b
+EBUILD pypy3-exe-7.3.6_rc2.ebuild 3785 BLAKE2B aa2255d151055023901a7fbc0045d439743c24ab9d8350c93d7760de64ec044b4c41d066de94e63957f402a151cb6def4d01e9927a8c7459722d518e4e4bacc4 SHA512 048e760d7e563c72b6bef73510358c1b2b416951d3e48f9f823f7a8279ac9b773b9c38f8fcadeb8dac3003e3fbf35ae93337c4aa475144a77c2bb07567d8ad6b
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..89b01acb0ce7
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto /usr/include/pypy3.8/${PYPY_PV}
+	doins pypy_*.h
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 63c748d3aa96..af1670327428 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.5_p1.tar.xz 9792 BLAKE2B c82869393c8a63462fa03c58822f95628093a64d2bb421aaa486ad8217d944ace641d9ea13f2b2a2c56ab16498824709fa35cf0a9704b728bac06646d8f2c15f SHA512 18643e28f137f62406ce4f2d448acb86329fd8566a31b90340c573e4205091ff5b15b77ac14796022968814f940cd9881fe4db9010609937b2a0a71d557531f2
 DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.8-gentoo-patches-7.3.6rc1.tar.xz 4660 BLAKE2B 2a1fff331707a29dfb232ce4c2c6d3cada127b4452036172c3aac7579d89b8e0d4ea41300ffcadf0ec04b9cde32044371d55d225a477f2178dddb03642aa569b SHA512 bb781369d4e0dd387659fc474c7a23d8c54ab88477fdd007d3552c95e870a1896a0628dbba876e870956c5a1efeb52efbfd343a08f8a70a4515f41b1dc8ed60d
+DIST pypy3.8-gentoo-patches-7.3.6rc2.tar.xz 4380 BLAKE2B 1ad68c088d4888d3579c0b48789be3a95413ab8f11d971f9f616a1701ceed2b8eba595612e28dbbdbc1732e4f8a7cd08cbbb89cdc413d1a3e9eabbcd78fdde76 SHA512 c2d68610b78ed33aaa67ce5244d289409256f66f2505ac19f0a679c0c10e6024993bbc7d37a59547daac38d321653b8b1a63c55e3f52d1409969f0961842fdd7
 DIST pypy3.8-v7.3.6rc1-src.tar.bz2 24320127 BLAKE2B 920738d1d9a346dca8e76602fc5a1502ff6f610897e1f5b841b5207a32f82c52770684ba4ea076209e18b664cb9ba5df555a21f838ae581b436cbff9e2adb506 SHA512 334baf973397f8068137382c29632afd1288b76b57f21047bef59397d2718d8c420ba68acc2f1082501aadf7fbf8ee6a9fa86405c2a54d720a9a02dd7a7371aa
+DIST pypy3.8-v7.3.6rc2-src.tar.bz2 24350986 BLAKE2B fe167b7e1f4f81e1737220bb679874a1e0faa8605b0ec7d10db275c08226e12f8fcff5b958a5a2c42efba5125d88dea150b707441af13bd9b7ef0c9ef36d9c1b SHA512 98715c4053d995a442877f93b32ecb976ffc4160df869d35843718bacfd97d2bbd697f85b5961c420f8130d22e64d740d8d180a4f9ff802250897b4b8c216a6a
 EBUILD pypy3-7.3.5_p1.ebuild 5273 BLAKE2B 1bd37ba70540a4c6be9a836c2126531ad80ccf414e6c4efedd9be76678405325a7dda8993f5698b4d56fbebf000fb7a61e071f0c76490ce65b6783fd273c3cc5 SHA512 34de7096ec5b30dc0fa6e2b22c69a16b6f111c1322ea0f916bb168924be7bf5ab52f3d328ca691275b9dd76aecdb2173efae69c95fafbd81fafd0e3030162e57
 EBUILD pypy3-7.3.6_rc1.ebuild 5800 BLAKE2B a5b0063de9493347d08662ee10dda34ab19a6b60c134d023be4151423a840cf1c94529af2cb9754d6e7f9bbe699df78e9b51cde053b63e88948a91d4e7fcfd8d SHA512 6e4ce1d9d0b260e29e26dcd9c5b5016e5927b3df804402d8eb87245a97dea6b47aee188399fb26c36b407d744b6af897850d0ca0bb709f300c21263f80b65abf
+EBUILD pypy3-7.3.6_rc2.ebuild 5784 BLAKE2B 196433d8ce17fa1af73d4ddee6ed41d5419fdc5ceccf222edee0c94afe63bdc74daae5ad6aacd980b5fdd033e6bff42a3df40f1a1dc5df50dc50e55455e35d14 SHA512 9b7425c36580da2b280c25a209ca5f89d0284b8d998d2be9226c6903fe0539f3c0165879c68a494cc33cfa42eeaed89821b5230a3c3303adc0cfdffa69b9e57a
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.6_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.6_rc2.ebuild
new file mode 100644
index 000000000000..35693dd577fd
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.6_rc2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.8) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy38-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.8 is in alpha state and many tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.8 || die
+	cp include/*.h include/pypy3.8/ || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/* include/pypy3.8/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.8/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.8/ || die
+	pax-mark m pypy3-c
+
+	# verify the subslot
+	local soabi=$(./pypy3-c -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	#cffi_build_scripts = collections.OrderedDict([
+	#    ("_ctypes._ctypes_cffi",
+	#     "_ctypes/_ctypes_build.py" if sys.platform == 'darwin' else None),
+	#    ("_blake2", "_blake2/_blake2_build.py"),
+	#    ("_ssl", "_ssl_build.py"),
+	#    ("sqlite3", "_sqlite3_build.py"),
+	#    ("audioop", "_audioop_build.py"),
+	#    ("_tkinter", "_tkinter/tklib_build.py"),
+	#    ("curses", "_curses_build.py" if sys.platform != "win32" else None),
+	#    ("syslog", "_syslog_build.py" if sys.platform != "win32" else None),
+	#    ("_gdbm", "_gdbm_build.py"  if sys.platform != "win32" else None),
+	#    ("grp", "_pwdgrp_build.py" if sys.platform != "win32" else None),
+	#    ("resource", "_resource_build.py" if sys.platform != "win32" else None),
+	#    ("lzma", "_lzma_build.py"),
+	#    # ("_decimal", "_decimal_build.py"),  # issue 3024
+	#    ("_sha3", "_sha3/_sha3_build.py"),
+	#    ("xx", None),    # for testing: 'None' should be completely ignored
+	#    ("_posixshmem", "_posixshmem_build.py" if sys.platform != "win32" else None),
+	#    ])
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3-c-${PYPY_PV} /usr/bin/pypy3
+	insinto /usr/lib/pypy3.8
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.8
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.8/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.8
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "${dest}"/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index a718e20bbc03..2b0fcfbaf5a6 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
-EBUILD pyrfc3339-1.1.ebuild 533 BLAKE2B 8b1bfc1848d4bf41b8f8db879c0815617c2de447d45e4076647a19747c0d197adf1f76864998bed1e093b68ee14f74640323e1e93a067bd71b75e8d9863da7a5 SHA512 457af5d53cbf7ff06ad7baef9b33bd8d32de85181d7ad33710aacec07871df7698bb2d5271a6344a790fd5d7ccc6aca2fdf0f9ec7ee516826d5fd95adae52848
+EBUILD pyrfc3339-1.1.ebuild 540 BLAKE2B 369ad23bf3b80756e102afac86e1b79a40d4de9ae545c151d2d8dabb19807bde153067d45276f3745db4bffe60083b135bd8257b18ebab68ea30835fbc549730 SHA512 b6d4a2f048412cbdbdccc5e827cdf0fd4237a8f598e78ebcaccd1dcbe35feb19d35a69235f81187a1328416935939e1aa8414ed4ddf68197eaf4a909576134c2
 MISC metadata.xml 374 BLAKE2B c78560e5a89c6217862b26e6d1034afbaa32f40f0d2cf0814be6b12cdd1545e6e359ca824789950cbbee57f84c0862b604ce8c93a31c912a8fdb8f2d6bc2f586 SHA512 23e62dfe15993f74a6bb366770b2a731c466441917fa61ed00dfee0e31786bf175318cda7a3fd641983a3fc158b67c302d385e278063b6b886d4a13057b580ab
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
index 0c9ca2a10c78..fc33290f5b6b 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index b9c16b6e5ffd..a59c5d52f50f 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1,3 @@
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
 EBUILD pysmi-0.3.4.ebuild 532 BLAKE2B 5bbe0c2ef8dff90a0658efe9a265ab2b4e9e58d61aa6a2e8234f0696e2091d9169b39715d0cfe6ab55bf1a3d518ed1b68f079626a74b4fd6dd2df7597dd72404 SHA512 78c1edd33f3db93137481fe1e71f7befdc56b536db2c3b41e55e6f722d3153ed98dd8c8a68f794c577753eefe30e00525124015258662d83b2add43a88cfac3c
-MISC metadata.xml 492 BLAKE2B af975d1d8beeae68b3c5cb3931646096644545344180be0938f6a5f058b705febd78af6d0ca329d75aea48edf2f1f3e5e5d5c7f02e41d05843989ed07a318805 SHA512 046f4470a5cdf3d4880c72a7389dde8d880ea7f6da832268dbfe2883b01d7f80b4089513da5a43249292d8a19313dccb2978d478174e42f677aaf4fc72302ac6
+MISC metadata.xml 386 BLAKE2B 4fec57cf0a5f257863620b805caace379e6a5810bad61d014a21adc05d4ad4f860481a52628afd573ccfc047d0c0820800ad3417f31df58c25ca62cbed6558c0 SHA512 7e016fbba698450d2edc5b8e7534cd5bde02f1e93323aad64092a6c7f7a948874014c190e910b11b684b83d6d88b11edc5fa97f535428683a155af3f6f4a6fd3
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index 15e238d5ee63..ee80585a75ed 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index ca57d0e09b51..b6416afcd3a4 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,5 @@
 DIST pysol_cards-0.10.2.tar.gz 20776 BLAKE2B b9f3f20e983453196a7db78ac81c17eb35f157e6419a9dd25e6286ab82763bf2a1601177e41abfe0f49367189a4a78ac66e4f77151c52acae006e3198ff8c524 SHA512 df8848c63ad12496c4346fc51fbac803b7a27c274147d458c78f937b70c804cddeeece8c6a980ef2a422bb17771ee1825c9824843e7d1cbc47e3678e506a30c5
+DIST pysol_cards-0.12.0.tar.gz 21337 BLAKE2B 5d31dc32b7b968366b34481623d2c71ae29f54ff497028f4300e0448dbc27c4529c0524fd33793b84e1f03bcacba3629c8476bf589511a5bb8c56ce7ef7a8fc5 SHA512 c40bd7398e6cdd4d0c10f5c8ffaa2c0d274acafdfeb7d7bdbf36420a650157412e25d270c4e8c03ca2a9e07a9fdca97f14d0175773613eb76b447e05aff942e1
 EBUILD pysol_cards-0.10.2.ebuild 588 BLAKE2B cbfbf3214dadb8712e11a7297d86f7a0268f66b5d2a7e6461253cb1d0b39470a45b6b9982bd5f56e0cd5c9ba68c00442497a543c00dc92fc877fe5e140507435 SHA512 b530e9205c2c15c5e8f7ae06444fbe6ab015fd0eaf20d277d84561ba5c502413af5aaa8a82e2d8e358abad29128d1508952d481cc3c1e548e3a7ebec0a6c1d5d
-MISC metadata.xml 314 BLAKE2B 8ce1a0f91285051b9c320936e58eed0732e60f57758fcd4c7460fae308791c6fca587ce4aad03bb0801b4f33402cba0982fe4fb9aab6eb0fd13f53c447b51371 SHA512 e03a0c868bfcd3718db0fd79a0daa025def13fedd90ae1228e32c9c8f0cc4c4813a515ebf220b6c1716a22941b6fd59cb1131d253c1adb43ac168b3a995fd132
+EBUILD pysol_cards-0.12.0.ebuild 593 BLAKE2B b6ed3e1b96e04a876905cea2d32440bd26e6a1a2ba9560c890b2e888ae53a48aaf413ce13646635f0170deb0f8e6b8019e5d552bbc84b12ecf137da938b32398 SHA512 6272be415feab8f36f9bf54edb9c601a2d7b32e40bb65872a8ef0971654ac81ea092a134f0c4ce8b9e2bc622c546a848381de1b143723b0e6645c330d8a70b39
+MISC metadata.xml 373 BLAKE2B 46901a318c0d1ded50b8b76a38fa58a226a039d6248787bee65af0665b78425626b0e1aa3c229822bb8df1e1a6c723584d74ad9c6eec9aff4389f5914ec1e8e8 SHA512 3c4ee2f2e97f67dad2026c64ca9be9dd486b7cc668c8e5c51da1c9dfcd11234c1c81685a1f3acf51ed537f7c9c118f484d2b95805ca2aa393a9d718859c05ded
diff --git a/dev-python/pysol_cards/metadata.xml b/dev-python/pysol_cards/metadata.xml
index dcea73ca5208..56773c363d07 100644
--- a/dev-python/pysol_cards/metadata.xml
+++ b/dev-python/pysol_cards/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pysol-cards</remote-id>
+		<remote-id type="github">shlomif/pysol_cards</remote-id>
 	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pysol_cards/pysol_cards-0.12.0.ebuild b/dev-python/pysol_cards/pysol_cards-0.12.0.ebuild
new file mode 100644
index 000000000000..5cfe9021a37f
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.12.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/oslotest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index ecb7d0048e8c..c4213b202c7f 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,5 @@
 AUX pytables-3.6.1-numpy-float.patch 7336 BLAKE2B 7322dea9dcc5d115dd7fe8a92e5547359c2496326f7195d6b14f596ea8eaf69b8b3e583a7de68bb22c9346073de31e46e9bf36babc423eecd1e36772d6a6e094 SHA512 2807aa3ddcb9a9e0cd086e621d9a906c6de9c49ac1668f261ac284b7b28841c36645e42557fbe3b45b21dab9c8551fc022d5496658d8ed267516d54021791ef5
 AUX pytables-3.6.1-py310.patch 1960 BLAKE2B fd0dede7bf5b515e03d7f936b2e512b815053aed8a4e5fad6f68844a3cb99b3d51a44d8c665d6113c79bb44cafd4f85d12142d1a94e70bef454970498b1909b3 SHA512 06d28a86fad569373304167440d364341a32121c6f7fb6d777d7c320c97c6e3903f862f5372dc85b5c6f953b168aa26029d0559004003526730e9b5af3284dda
 DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
-EBUILD pytables-3.6.1.ebuild 1796 BLAKE2B f1b2267798368f650503895bbecc9f62747c48207d6ed2a56f397f0e49220585ec1b0d71b75a51f57d69a4208ed192f4953974e6b3b17084403273ff445edc5a SHA512 f06f4900144c528bd8240bc6d1ed5a76ca722fcc5addbf45cc18c86a9dfa6980ee9bc3def2976c54b383b0fe7f1cee8fd83468e435a4da5b1da247157665cb0d
+EBUILD pytables-3.6.1.ebuild 1795 BLAKE2B e9608cfbb4a343dd5117d51daf2d5b750340134dd747aa19e6f4fd69483297cebc3bae0a9ff72b92112234ad85890ddc564045064b6204edfd88ee16f473c982 SHA512 632b81e04974223058ea88fadd870fb5b5d0314d5b80fe133a4fd3a0c218729078205f7f877335a0680d1a78d7e00d673bc9d853de74ae62ea909ef2746f4199
 MISC metadata.xml 895 BLAKE2B a6d5fd675fc62419446dcfb557f0f16d1f0a9b7552b5a9d05286486603fb038ae49d0df6ecc6214e8b18f64c168fd0fb0c12dd1d052cb66a4c54921bb529bd2f SHA512 412a0d2d5f90b7b73889f531b2759c2466a7effb507e38095810453237b6989e95a02f2fca102a43b9c088fa563fef3d761831b28633510e9318d6e50ec6a5b6
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index 8e81815b2126..970bd450453b 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
-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"
 LICENSE="BSD"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index b338209deecc..752c693323c0 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-cov-2.12.1.tar.gz 60395 BLAKE2B 42e817c63c9d787de9bfaf804217a1e020d5a38e564df0ce2d43d6b4f0631aee43ccae329f44c6d7ac9a5662776463456d72138fd20c65cf8d0accfe118e1e2b SHA512 4c234178febeba1ce93ec0804c3efe181d5d88db9ac02effe14e62eb3b0f7ca1f8757fb4f360551e0d3e35a3b6207892afea85611a49db6c71a2dbaacabc5375
+DIST pytest-cov-3.0.0.tar.gz 61440 BLAKE2B 85f0b079c4c373191553271e34e78af68ac69ea53e3721aa0d43eb9dd55be935570eb15c0f8b954e4c0de6201c004ddef435ea70b03cfda893ecdcc230c283e7 SHA512 289d1b1e29dcc3461276de4c1bbd3884e4ec957efb7dd4c330bc3f25f1b978cbee64c0e2882b419eee5f9ccf44c9d1a23ce47a1b7cc7e436b9ebe894e4c11ae8
 EBUILD pytest-cov-2.12.1.ebuild 1291 BLAKE2B a52a9688ae13e66a349fa326ef3fc90a3560571b454e0a03764224bb9aefb4808c17795ef193eda1f54a7bc931a23099e026ddaa0dee8efd533f8ba499b231bd SHA512 57fa47eaa32e2aa96d78f3968f32775f5009910d2dc97e95f321de0e1553d94970e306b89ac440865041861b6501c8df9bcb7d7fe13a282b0b539e440c2c1cbb
+EBUILD pytest-cov-3.0.0.ebuild 1216 BLAKE2B 46cfb251f8c7bc9ad0b4343c1a204d2585fc353f28b2ee50abdfe629d30e2d14eb591fb7160af264c24b48cf36b7e7116a51b403c0352aeafe23e8f4e23ca302 SHA512 af176d2a371098a0ed1f7a52030aa382563f653efa32e447c5dcf74f3cec229e4e73e7712fd40afaf8aa02b192f258368fdd3ee34f0dd79dc08e594f2554dfdc
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
new file mode 100644
index 000000000000..e8c8e479010f
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-3.0.0.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..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# TODO: figure out how to make tests work without pytest-cov installed
+# first
+BDEPEND="
+	test? (
+		~dev-python/pytest-cov-${PV}[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-py3doc-enhanced-theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# attempts to install packages via pip (network)
+	tests/test_pytest_cov.py::test_dist_missing_data
+)
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 97241baca0be..b8a7c654de3a 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -3,4 +3,4 @@ DIST pytest-flakes-4.0.2.tar.gz 7225 BLAKE2B 3a5ec59e3df90b6bf90daf5cf4abdf29468
 DIST pytest-flakes-4.0.3.tar.gz 7312 BLAKE2B cf62d7e11a0521592325492c76e67cd51384b31d8a6191f10940230014c9a8797b3603e24664c022add5cec18ff7c3b558cd7507af47e8c90a9e90499f39e583 SHA512 ca63d68063cf48789d86dee3707b3ea7c5076fc1f636e17f408ad6f444303fb3a701af8d1e464d49af745e350272bffe8596853a52c01baa0bdb0b6b0c0bb303
 EBUILD pytest-flakes-4.0.2-r1.ebuild 504 BLAKE2B 0f13610f981bb55bbf3bf835cc0a8e5cc10736b6db315b816285d177b8fb74daf28e9eefd10275ab22d0d8f005c7beadd5cfa68ba662e799f4fc6f73a7d0a1df SHA512 f0d6a0861840cc0a53c4f2b672ea05aa2b87d0c7563e100cd913d24c97ae0f0edda4afa0f9ecdf5b8f1c00530f0ed281847079fbc14a44fc4b8bf6773f32693b
 EBUILD pytest-flakes-4.0.3.ebuild 555 BLAKE2B 28f67239209928440a341b8d1171bccb85b60c47b46119af7f1320810598575b597ef85d6376a2f5c00d761178996d0d7dccab2848ee1ad567813d1bb5389069 SHA512 17decf5f132434923a17534af13c7597dcb6ee2e13803d8d916cf17c7ded539581c2f5a59a69ea9b2a7796899d7199067186d0aadbef6414bfea52d74193ef41
-MISC metadata.xml 408 BLAKE2B 4c16fb450015dd4b9893448ec3f6b40330bb0cb0d96c14135daa953998f95d1a16d270f51d0bb84bab21799160bb372874e91cbfa84ca075fceffe20ec83bc78 SHA512 52a9595262bb80667d09b7f1672f5e1450534fb2a8ea82c6e9e1d4010845c5295d7fe8ad9e5de14851b2c59538254b45d0c6dda67933dcbdee46673ec731e386
+MISC metadata.xml 330 BLAKE2B 27326dd6d6687ac291c21cabc5599cc765cd3e42fe3394497b0888c49ccc56cb92f82136f76655ac89e9aef270b9810e0afd5357f306cdc9e217a160f7affa7d SHA512 6728a8a8ae3432c021a9f599aa97a8a4d1ce3ab4aa035b179386f29e80dc98aa6345d3ee2e230bc437a2496feb8823868094c6b1b0444294023af244c35dd6b0
diff --git a/dev-python/pytest-flakes/metadata.xml b/dev-python/pytest-flakes/metadata.xml
index a0d4201ae0b3..78a876afdb61 100644
--- a/dev-python/pytest-flakes/metadata.xml
+++ b/dev-python/pytest-flakes/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-flakes</remote-id>
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index c62c14440d62..b05f0b812123 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch 1218 BLAKE2B 1126c43aa209aa989f969e9ef04e1ddbd9502b697f46f4920234f022b380f5098f06b12fd1b9aae42d29ee61480f0db617af261da01b6ce2cf749e4b20fc06b9 SHA512 67fac2cd8ff09b6e104ceb2c7c239316444a9ac9e361ca2dfb152118bf540ab64eb336dd6a02a2c30a1579d47f3aad64789a5f95f9298f28a696219312af1bc6
 DIST pytest-helpers-namespace-2021.3.24.gh.tar.gz 25881 BLAKE2B d13e82eebf09b4acb1d8fb9d3609f8814a49bfd0df56f23fe6f3fe3fa1508c4f1ac338b3f75e1e97ae90f71cae548dd100548d23cdbaa6c4bdb76cdb6e3d4a41 SHA512 1914427a4805a168d4067cd5db5663d28e3ff680f612e70a169a7efbc6c2c7ba0e2dc74132595aa70e13b651886bd10a6947e56558edf22b871618c967537073
-DIST pytest-helpers-namespace-v2019.1.8.tar.gz 10274 BLAKE2B 1d232817e99909738f7f37466ba22fbeadf75f4fbfdd9b61790dd79418bedbce4ee219e5102ee2db1709ba991e323ce6edffc68c4e3a657c58cb628b505de098 SHA512 d5f4db3ece8b0e1719c4d1213a5e07a3c53257b089d3d74f90cf86f21a7951983a95286c7753f5e9486acc7e482d79c2a95d5a7b8eb22e19c7048db99fa3c421
-EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 829 BLAKE2B 345691a4f76889eaf53383b98c90a4180928c1e30d5b1e392ed2f9105dfa6dea85d9a8e40ea12371681eea0ccdd3bd5774dd17c2ea52532aabeb807c5f3e561d SHA512 af664d73031b7474bbda6e117034cfd82a9a1c2291a5439cd8395d18041aac1dae2eadebfe976c4affc4ae752da3f6b5bda8ab513b1f80a5e62d02a69daa6479
-EBUILD pytest-helpers-namespace-2021.3.24.ebuild 814 BLAKE2B cfbca5b665932c27cd606e7e5423127a4752a0c5b8b88ff838f202d2ec605c386dccd368fb407d3411488327ee05d117cb7ed40d98480aa45aa6a3bcc0bea20b SHA512 21561af5a4eda4bb97d0da12b8a0830be0effbea5562ece6443a209da5d1fe1d831a6801cbb0c77aed5abfcacfb4459732e49ea6dbc1554b64f7360d7bcb1ec4
+EBUILD pytest-helpers-namespace-2021.3.24.ebuild 812 BLAKE2B 5bf07cbe8fcf78a703f8512b9614b33694066fbc704607339c2e885dc89f31b8aabe6c9703dc0f16b1589882194f811becc012eb7ad91217b83220dddc271750 SHA512 4f4ce789791bb86f282346c5d35a59710db31aa727c5a38849b1738e200bb3965bb5c7156aa504ffde37e988ac7d1c4587c9aa6fda7e2115b8abaff4cdbb2261
 MISC metadata.xml 514 BLAKE2B d2cf552d0b34b0556bffdb2afb6524b5c0ce81d503a6a1dc2b4957beea0c96c1eb3ea4f6e61bd4351a26fa2983d10b155a58bbf04fcfba1fe4e55f720a7db09a SHA512 9aa9a28164597c7a6bec22f6c07f269c5954b02a4a7523373866e60f2d6824c83dd4912ca2e05081a2257f7e01e135f2544a0732d3c2f51266b331c753314108
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
deleted file mode 100644
index 37fea95827a4..000000000000
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Provides a helpers pytest namespace"
-HOMEPAGE="https://github.com/saltstack/pytest-helpers-namespace"
-SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -e 's:(foo|bar):namespace_\1:g' \
-		-i tests/test_helpers_namespace.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --forked -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
index 68c0ee8e6852..b8308edaf17e 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 3ed441599541..7d40c9a6aaf2 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,11 +1,6 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
-AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5e1d5ac88b9e813f8456892839e3bbd63d6f8593989d7912b24bc552fe5f3a83c1cdee5161333721531b1e9d3c2 SHA512 715318d9b6520e31df6399957d14c7bba608288152359101a84b20b139d289be584f7b87856bbdef4eb4b2c85415ae679a6c018caeab4f9d228a4f1cf3a8d2ef
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
 DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
-EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
-EBUILD pytest-6.2.4-r1.ebuild 1719 BLAKE2B a6bb7f7cd393d8d5bff4d6f563f621328eaee18ed482e1dea2b14dcfc9540515868507eb769c2522d140285417f822db158c5f3598eeee62f001b73a9b37bf27 SHA512 71e8a53b22f5093b577be42a5a3cdebb1c2aefc77f4fac25ad8bf4d980c1c0b8cd1d09f7e9e6348df776814e180ca172a356ad4816f8f0ef05ad5cf5930d30db
-EBUILD pytest-6.2.5.ebuild 1550 BLAKE2B 1013687f0e76b7fe4cbd9de38fb74387d0c61198152d827015eeee6c2b64743dc88a3a836c9dc2c89b9679da0b5d7a0bd76c7ca3c86418756bc092769393ba25 SHA512 8f2e656fd12726497eff17782e9c452004a6d47492411ed096dfa7969904e2b7be45d7d61f30f6ee08a0ebbe76630b115ea570c4d86e6be8e717a9d686c22635
+EBUILD pytest-6.2.5.ebuild 1542 BLAKE2B 5edd074d7608a87dbcf7565ed84809359151de7f751b7ae9e599f7f26f57d955c5def9a2d6545a76e5bfd54684abe1d8673251f91ed33975856addc2293befed SHA512 be5f1a4ab957004f1595ef9ada0d3bbf6e1d2c677a286a0d6f03a5e8339e3d739963d060068e7b3760b65eae1afccf3b1719c73f0143ac6a99ada64fc73cb04f
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch
deleted file mode 100644
index 88c8f703f08a..000000000000
--- a/dev-python/pytest/files/pytest-6.2.4-py310.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001
-From: Petr Viktorin <encukou@gmail.com>
-Date: Wed, 6 Jan 2021 13:33:33 +0100
-Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive
-
-When line_index was a large negative number, get_source failed
-on `source.lines[line_index]`.
-Use the same dummy Source as with a large positive line_index.
----
- src/_pytest/_code/code.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
-index b85217560..af3bdf056 100644
---- a/src/_pytest/_code/code.py
-+++ b/src/_pytest/_code/code.py
-@@ -721,11 +721,11 @@ class FormattedExcinfo:
-     ) -> List[str]:
-         """Return formatted and marked up source lines."""
-         lines = []
--        if source is None or line_index >= len(source.lines):
-+        if source is not None and line_index < 0:
-+            line_index += len(source.lines)
-+        if source is None or line_index >= len(source.lines) or line_index < 0:
-             source = Source("???")
-             line_index = 0
--        if line_index < 0:
--            line_index += len(source)
-         space_prefix = "    "
-         if short:
-             lines.append(space_prefix + source.lines[line_index].strip())
--- 
-2.31.1
-
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
deleted file mode 100644
index 21b4753e5aa4..000000000000
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
deleted file mode 100644
index ac093bcc4d5a..000000000000
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' python3_{7..9} pypy3)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	[[ ${EPYTHON} == python3.10 ]] && return
-
-	distutils_install_for_testing --via-root
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.5.ebuild b/dev-python/pytest/pytest-6.2.5.ebuild
index 4cace9f6b7e0..9894800b747d 100644
--- a/dev-python/pytest/pytest-6.2.5.ebuild
+++ b/dev-python/pytest/pytest-6.2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 8a4d0062b0d0..3964fc3c55e4 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,5 +1,3 @@
-DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
 DIST python-dbusmock-0.24.0.tar.gz 81907 BLAKE2B 5fc8653228d9278c74e623d385c798ba078da5d8309a95e88a893d3ceb1736568f93196defcde1845bfee193ec2e7abb4197a663f612dfe4ff58ac9c0bb189e3 SHA512 531c2d427da28098d7dac91cd5be1c38be15dfc9495314a150523e56c10ffda846667dfda39cc47c8278ad41800fe39d6608f24da44ff2ae7d53f0413826d96c
-EBUILD python-dbusmock-0.23.1.ebuild 833 BLAKE2B 72f56445e7f261c2bec3edd777c9a5469ea8f77e509be07539a3fb9e31ffd0e501a7e4204451cc8f0d0e9401434129d68789c516e4d9b109e6d5b77f0ad04961 SHA512 25370c4a184a0828e4e02f900cc9a00798d0602f8759f18f276e0939d6cd2f4b287e136233da2b05f2af4f4953f3faa10d6d4ddc73ca16bb29f28125878d0b0e
-EBUILD python-dbusmock-0.24.0.ebuild 840 BLAKE2B 2e3a185989812753a4a232f4158d02baa6344d5b9d0848a4532963b84869e3998b18e2b3b51a30ca41fe367268d6e2fab7036e8d1a74daba4ca33870f8c58bae SHA512 6ff827cf08f2f67b0026ed2cc89172fc50a38ce141b751d4e9dae552f8dd580c50bc4ba7e767440080c8d61ec20489302e2b1c79ab14d03a608bb05f31a0c244
+EBUILD python-dbusmock-0.24.0.ebuild 833 BLAKE2B 788ebd32acb35c37362a6a8d2f54b714a3331e0bcd215bc4c3469b1225e3504980def80ff2bfcc079a743ad3d3ebbbd343bff0ddbf03b59fdda4588436ee07a4 SHA512 aa55b9d13d6973bf636e76577f6daeeef7996894e521e4958536bce72179ee40769d381eef32ec4fdc3079cca888f919134856d467ce28d5cc0004a8dbdb2089
 MISC metadata.xml 457 BLAKE2B 7c93de164cfb7badf62932420c9fff4eb07e2247ab2293f5299649e79fd1b8b8d51b30a3c685d9d88043e4e4067c557961be45d9cf2fdf1a13bee5547934eb98 SHA512 0b9ece97d74dc9a74fc9a3f55b1561c7f1473ce483ee7be53f875c740d433409b846161821d44e48c0a5988b5999e5704cf5f6afa2436f57fd1b654518ce1f87
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
deleted file mode 100644
index 082b1a20d912..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild
index aa54623eb206..d8828ee24c4e 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 8977a0cbf86f..bd91f294e9d3 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-ironicclient-4.4.0.tar.gz 205165 BLAKE2B eac0eea383890d9d9d70594300df5d8771217e0ba226a38da38544e715487c12d3fcace07651b84e180ee0601ae6bb3c17b6ed47130bd009ed351f1e4d270d64 SHA512 8d9325e464804503a504bbcc3211f0e6f50d4a1cccf652960d1020e1cd0141f8ac67ebcbab37ba7af417679fef3f25d5aa48b9e8134fffbc971cff34446fec3c
 DIST python-ironicclient-4.8.0.tar.gz 217915 BLAKE2B 6ef8636a063eaa344bd414aa5a75b08dc4ba4c615835defba522233127baa2454f9c54de40874cd5fde9de1748887ad0c1a002da31176059a5d8562a8ffeda87 SHA512 c784124e59ee836c3349e17f347b59bb96e28afd067b7de2d948563293c16d2f641c15d3312c56c9fed476e1c8c9de65949bfdc139cd9267cb210c5cc70ccbb3
 EBUILD python-ironicclient-4.4.0.ebuild 1247 BLAKE2B 220da8c65fcb58606a9d5a803d193d5c07c67c105330cd4c3cd1a3da4bd968770fd3dd208ea234f07da1d3a2e6c1e797974ce114b7c02fd6d81bacdc4f015827 SHA512 f890583c05a168285168d2753274f9b3e47df4728cb81a4a6e154163b036d84b7d5536d3ad228c3a1421be865c001cb69aaef2e5135d9d541bfa60f243ec0f29
-EBUILD python-ironicclient-4.8.0.ebuild 1398 BLAKE2B 29bf7085e2edd18903077b09f4e019339fda73f057d7c541dc1bb780b103f1694559b064605086a2231c28130ba38fd39d9b9e475c9b4cc5b6bfa3ab38613016 SHA512 1bbf21efbc97167161c5d7d153fe2b1387397d18af2c197e6dc6483b1398cdce4a490c2bb255d58cbcc9e8745e71bbf8bb0d5096fb188b72633d86ad66f0a204
+EBUILD python-ironicclient-4.8.0.ebuild 1403 BLAKE2B 861e0e278decacdfb65cb358d260d1b1552421a0ff5721196f2ef0c2451a00121472a6913cdb7b2a8e6450155100675e84805bec0d3256d23566b9a8fbb26090 SHA512 5bf97cfd3791733d1996e33bf2f9c9440014ff2c47c9123da10e7f8a68721a52a61a9bee72c1b6161ae347593709f1a01d12fc20933db6fadf0b78590e977dc9
 MISC metadata.xml 337 BLAKE2B 15cacc055a0d30f7e002d10388af0533f089c7b694b70a8bd2d9be2b74b093b87268e710b7c6be7a88cce3946882eef807203090f1c7484c895c8254b7ef959c SHA512 739d5e13560065dc8e4931a15e0a6af7c650209675b660d2571ee904184bef9fa7d5e27e0d73ea9976742b188b109d8634687e6d9b6b6acabc4dc3950ae995a6
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild
index fe7665bdc9ab..9b3498c6a046 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.8.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index f2ced255556f..8f552cc045e8 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
 DIST python-keystoneclient-4.3.0.tar.gz 324711 BLAKE2B ac32c2e4a2a86562cd694506c83e05a4373e86ff619c96772c8bc38329a4e1f52d2cf332b16cccd9690ffbd79c5046e08d44fe2dbc520ce2c2a9b92abe3cf634 SHA512 08131026648a03e03f5bea4505c7fc4922317c8e9d584729c569433a66416cb1584dc932132c5bb7b7d892b1d2545a731b0d77aadc321b1370e332c8fa9eb5ed
 EBUILD python-keystoneclient-4.1.1.ebuild 1066 BLAKE2B 722ed128639b4e17552819cfec52325b404f3c6fb6172135109cfe03fee81a84cb52048b0e2e372d64d2757b8d4afc98e146e6424023b409458b7e83c5700275 SHA512 1f239bd6bf7a1223cfcfdac2bb36aa5cc87c9ef46a596b43b1c83df4af7a4f0913fce50d6195093cc474f0ee67152b29494abfbc9420ccfa480f7446a8d6f701
-EBUILD python-keystoneclient-4.3.0.ebuild 1552 BLAKE2B 35df30485d210d99196d3b3e5200bc14c66f87c82bcff14202fdfec534b7e9491dbc0d87325a82f4ddd45379a54ae47e7aaad8225854f4035c136969f2a998ec SHA512 0a2003504298caf731840feb62ea9b6937c2a31799690c198edeed1f43144e8b1bf0ff91dfe94f6a74e1ae21b63400b2132f62a856a835d74e5987b23be0eeb6
+EBUILD python-keystoneclient-4.3.0.ebuild 1557 BLAKE2B 85d48d5a06985820db6ef11b2be6df03e7e444b0c43719f8132ad611f7bfbd05fee5b0eaefe6c151fb69e07c3c3429b07b225afebf428f6d8e08954df957738d SHA512 e49201f8862de64f819cce6bd6f88202fdb860801377295c64e50769a2a08ae8c0a880a10ddbf1250d7bee524b721f56e62252cf02ce4b62f2249df3205899a1
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
index 51f039cf6f1a..a286cf850a3b 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index b94192b819df..1673460b2a0f 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,3 +1,3 @@
 DIST python-linux-procfs-0.6.3.tar.xz 18808 BLAKE2B 02fdc0349dd456819f67f82d6836a44e3285e16d9654dd52b58ac7d86e48bc559feda18f105db7911ac5f670fd0e6cfd5c6cc69a958a3e8494813ff244f8b06f SHA512 18e42bf12456893740c5ec950ffcca86945b1ff202a6ea3ae6ac800145771a39b4ab7e8bbb440210d48d0fe9de646e334095afd0b20060e2e28ab3fa844f6140
-EBUILD python-linux-procfs-0.6.3.ebuild 591 BLAKE2B c457c5be2464cc6ca9238f060269da6056f06a57d5a19f125ecc6de03e230779afa4e07cfee1c003b32720b03d5fca40dafb87ff1e185b1ef8ceafe983659b3f SHA512 9b40b275c1dd2955bf9a1e9712a69937fdff8760db639b65e229c4efff0ec79f90cbc402bb64b71608a876a172060644d1e858a8ea0ee0479164d2e7e8ad959b
+EBUILD python-linux-procfs-0.6.3.ebuild 591 BLAKE2B 3dd5599b6ffba800721f2c083a86250bf189a1dd1d5b1642cf7f3503b0c9dfa26d2d573409262729b45e9ba6221d2817cd9e8b6d50b4e62f8d66bcfc341e84f2 SHA512 dbe3e75671ad573ee7718b2cac68859e530178f8ab87348ea4afa0d2ed0da0dad2cdfb34938e13494adfe9ae801835e9976a444cf729e132111a619c8a93b9fa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
index c6ed51b9373e..6e27e4516cb9 100644
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 6a6be43582b9..efc3127a3709 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,5 +1,5 @@
-DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
 DIST python-lsp-server-1.2.2.tar.gz 61742 BLAKE2B d0886549d9ebf79bf97be30abb361be1fdee243abf9ed4707e27857122e9721dcc59f968c4ad7d2904ba11f06e6e6dc34593e5255ce0c9c528defdab7b6e3b7e SHA512 afeb0798fef151ab7cb79b3a0b294a30111d4bb409a4a8ad5148f9cb3dfb9a56e0033541b44a2b683bf043fcb31a8d83a788b0c9c22587b6ae532abb288542a6
-EBUILD python-lsp-server-1.2.1.ebuild 2830 BLAKE2B f7a8697c2f8519407372cce585ef39f5997b86f9902790da3f4531865373e7f1b9905609ad40314024938aac97a659de1fdc4f9fd12b991bf12420ed40f6d751 SHA512 7b519fba430114c13b43e9164e1e669f22f240ae16519ce4adce6e7d58ce9f6a26ebe76e5bfae35084c022d64f7cdf9b626d86bc778b66442c3e3be3734589eb
-EBUILD python-lsp-server-1.2.2.ebuild 2924 BLAKE2B b5615b6116040f99318f6f689e177baf18dac40080e0457739e3c84c72d06dda1c93ae022380157a7c7d4221ad2d12b6244b50544efb0cb59d5731177822bdf0 SHA512 954a1648c3ccb3e7db3490e0f40c4ab51b3aa5ca5f9a5d48fdb91d2ea4a7c4ac2b1662d5e1dfcb5f82c20f62962315487f9ce4079e33f554ab8ce41f2e6028e2
+DIST python-lsp-server-1.2.3.tar.gz 62072 BLAKE2B 3d84e2d1eb77a706eee2da0e02bfab5e075faec9a0279070e2e43bd9dbfb973c6e343c5c2e3826fd64b55987603f7b1b27762d598bd1b5689f2013e3f5d06e90 SHA512 48b9441962d9d00010cee9b482f141259ff4944f737626630ef5051cac82578c9a37f62eea238c6e9df1b90dae739db335195a9eff4f50d0120721763791dad1
+EBUILD python-lsp-server-1.2.2.ebuild 2922 BLAKE2B 1f8b84df7f3fc22b86d60917f214b343d1fb6f2d95d56c60bb561c17c119e26ee93fd39f5dbbb74a39c00889fe662a4ff3f07225f9db1eddc3f398bb03e00148 SHA512 718abf67cfcfd700306c60e6e54a7b87738ba7b144015d7ff2501394ba37cfdd878897636e79286e40213757858d47265eebe2767cd6f03d81e0cd77b0bb27cc
+EBUILD python-lsp-server-1.2.3.ebuild 2924 BLAKE2B b5615b6116040f99318f6f689e177baf18dac40080e0457739e3c84c72d06dda1c93ae022380157a7c7d4221ad2d12b6244b50544efb0cb59d5731177822bdf0 SHA512 954a1648c3ccb3e7db3490e0f40c4ab51b3aa5ca5f9a5d48fdb91d2ea4a7c4ac2b1662d5e1dfcb5f82c20f62962315487f9ce4079e33f554ab8ce41f2e6028e2
 MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
index 422d457a5925..7486604609a4 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.3.ebuild
index c1af542c10de..422d457a5925 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="all-plugins"
 
@@ -33,6 +33,7 @@ BDEPEND="
 		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
 		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
 		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 		dev-python/yapf[${PYTHON_USEDEP}]
@@ -53,6 +54,7 @@ RDEPEND="
 		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
 		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 		dev-python/yapf[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index b0bc026c48df..6c1632b81e4a 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,3 @@
 DIST python-magic-0.4.24.gh.tar.gz 863700 BLAKE2B 09ecc8bea1696343ec2462e6989da8059c40f88e401390c8c491e531540ef0b38e5a8eac1fb8a3356203e25cf2e5caa6dad0c13d24eb34a7a299b5a071ae29b3 SHA512 b3ec148da398293465299938fabf691b56c4b3876f6abbb7a734a9c0a5180cc758a15f7085bbf1bf40ec6031697ec84d98c161db1fd04301133af09928c611fc
 EBUILD python-magic-0.4.24.ebuild 717 BLAKE2B 864aaaf0f3f31cb18c65983e1966f41603ecbb138d1c4f7a0d331c4eb96a6ca838081d917f8df8ee892a267c412fee6cb4b235727cb6b2bf1cc58cb5449ec456 SHA512 fbd19da973c7e7fb1f1344463b6baa6c869fe7fe6a8fb6a7c992ab9d5b22121d0fc92868b57a464bbddf4d50872acb0b18ab6bd23590d65b4b9c69e54d4ccc7b
-MISC metadata.xml 524 BLAKE2B fd6f77451b846b583706784fa0d516ad3cd0c855523ec036618e46958d0f57e18a48a59b397221e8f25e7c46c9f96f26f5d3c44beb5136a8a20a08cf67521243 SHA512 63f1f98b88899b5a514db17bdc8585a0fe1eacb292c57b0a032c5d025b3666df359c05864bb7487e99d8a52b244f0706aa47a8b37bdaae38b5a1fb7317307da3
+MISC metadata.xml 411 BLAKE2B 614256656c3be285f997a177b6239cc4f6c253c8708cdb7339dab99f6a21fdec0a36af90a5c8cbe39f29939cfb64b276abd572fd9687e609a26e1098bb1ceb69 SHA512 ff2c756d280d753fe614396f5dda04958b3a3d0a3d94586724d2580d5901af01ebe30e1cbb98e263ca6dd95e6043222311be375595653cbf7ccf54dff9cd971e
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
index e41a2b8af612..060f6a3504e0 100644
--- a/dev-python/python-magic/metadata.xml
+++ b/dev-python/python-magic/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 9f30e8724441..a4036fed322d 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-7.2.1.tar.gz 294034 BLAKE2B 46ddd29327a9c8c8cfa28b90585a6cddffd80a3892a97df53d6e3624570277525eee0e74aac4e9c70389d2abaa5fed4276e64a37df517c3903b649150cd0060f SHA512 7b05ed090e0c88e203b38ad536e303c5ee892938e9013750cb6c0bc1d5e14b50feb3ea3a6dd9534c99182b613d225d99b8aa432be3623617dae6a364bff7adfb
 DIST python-neutronclient-7.6.0.tar.gz 304124 BLAKE2B a7dce6092a66f1a6f84f17a8f2caf0d7f8cfa84a6a6dc5ac18a12186f155f04f23deaa2e23b0da62e538687a4e573e0e54ce0c78c6b2d572447a10a15ce6cd2a SHA512 f624b8de5ac7c157351518311c70ba111641b8e94c9230689c3bd3bdeee72d8173ef0bb9498fdb603eb3f01c3daddfc8f5b1b80ea0dade5c2b1d7257520fee0a
 EBUILD python-neutronclient-7.2.1.ebuild 1764 BLAKE2B 19bb35a07cc1d957a8745cabb19757eeb439220dffba48c5fec7f2997319f2afb37d1725f72232c10f4b8f67dbb4c3a4eec8cc06518870cb6f3a1b14d6e8b132 SHA512 bac032d155a7e5cbb0ba7802e7d934e00eb6afaa32219ee061c4cc00f67cb677e0e355d7538ed0d357cba8e183ef7ad4eec4de277df7ab415dd37a3e4a05f610
-EBUILD python-neutronclient-7.6.0.ebuild 2224 BLAKE2B 4a4c4d9bb274d997072251057a7a100b09f6014b094d088a576b800da86555b9831cdf12ae00782d894c3b34ea1e8a5eaf87172163cf69284126c9c7c0b885f1 SHA512 c9591676054cf17e654f28fc3c6b772fa3a966b3abc77f1ca70c48a2f4c91fbcadc5f90e516bf54ccdd8d5f937b555bbbb26b97e06bf3129d9fd429e6fd9a85e
+EBUILD python-neutronclient-7.6.0.ebuild 2229 BLAKE2B d827553b18ec964fb0404aa83ebddddd91f1c2a3aaa3021be3fc7533540ef8cd9438f1d53c448e2a5e9967ef1c43ec05c1a90e327cf11e4df63af95249b3ba96 SHA512 7f8f626b6a8e9f8a3d1605a6d4797a8e5bfc6a1907d7f51eec95da4c2a22002dceea46aa30b7cbd1b640abcec7e7541d9238df061bc75845c373ecbf36324283
 MISC metadata.xml 538 BLAKE2B 13ead632c3a584fb1e8393993fef34cf6e9e61c3d80b90ffea2ab5280abf61235c8823f62154741fc9dcb7bac9be9565c4e8a1e3c4aa4c24af9a6673b0fa2f79 SHA512 50378bab897481da3809a9d9c82d53d7b3e0470e1decd432ca18ea1e57875aed3ef5b8c993f23099529ab74d7e0575b664d53b4abf8d737a1c7933ff781cfee9
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
index 87d1631fe413..7b37124299a3 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 504b55dd8b04..fe25680d90c1 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-novaclient-17.2.1.tar.gz 323330 BLAKE2B a7dd4a7b134c09945c3549ce014060c95da07d9125d5b24e7c99369c33538cfe56cee9f90c17a1d8025ac74969af950dcdcf8b3f87197cbd099e84cca857e23a SHA512 d1a9966f7da80e0884a451b3b014c45a1b4057dbdf0d8bcd23665eee55b6f15872e8e1d2b79b3cdbfc78f51800ffa3536cf0ab4e30eebf3878ffc007c52913cd
 DIST python-novaclient-17.6.0.tar.gz 335297 BLAKE2B 24fcc869e71ef4ca382d6a684f5823331c49e84bced80e5f3e0a5e00efeeffc6cc6e554b7d97c571085dddcdd9bc6145442c5b7100bc9e833cb5bf883d860ba7 SHA512 54cc617e2698cdf50697b35153489f6fe64e84416d05987b7c60ed78241299631a0c03d893c462ad2f93788a5fc1336082acb5d22317d5733e9c033a91b1c34f
 EBUILD python-novaclient-17.2.1.ebuild 1166 BLAKE2B c209d1d5497c68fdab4ea9ca34befed2460d6514a7fffcedb0735ccb462fdaf487ec68e005e9e83950231914997d871027ed9a47e58106e97358ad6e45535001 SHA512 575ac26982ee6e7ab8452e24f29f40041b966ea11b253fc53364f25853a7f32b6f48ab054d0b97b9abdf7d943e6167c6fdaea7c354fc04c47764c4c8d61ee3f9
-EBUILD python-novaclient-17.6.0.ebuild 1694 BLAKE2B 40c6ec847cf37efd95fd88b522eb87f87eacc2233565437824635aa745e6ff886f63add8255b6ba6f4391533d3d224cd520d9525dca96dd9fcd16ee47ffebc5f SHA512 c6d12f8ed68c02673e874a965d7fc7b9ea561ff7b16721fcd19c231e49c7bad042fa96b25210bd808897427e596780fc38764867962a262369176a014a6d50a3
+EBUILD python-novaclient-17.6.0-r1.ebuild 1792 BLAKE2B 5dbe07b1f0908a1a3428095b9be6542a3704234fb62a586fcb1e5b32e1637df9696784de0c1dcd4dd573c407d343e36cd49ee7230318b8b7ba77ac9e43e638c2 SHA512 0f8ee81eb4211ed08573bae0426df864b8661bcaeb0f0b550110f9fb0b28fbd587a3f3df27bde26e08313877cfee799f908781ae46d7e05495b7f04428882bef
 MISC metadata.xml 786 BLAKE2B 8e3cf9379a274131833f3a6ad3f5582cd9517ac8361aed04e3a39f14da4074de9f462ab890107db966f553726067b4109aa18d21e747545dd4a25c8794366a80 SHA512 568595965bb99b0f0cfea9e502d1876652a3184e54a963ad3841e28ff5205479a525fbd8252998a4df5505b6a50bccd59bb10288cb0244851c47b967f58208d7
diff --git a/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.6.0-r1.ebuild
index 37fa0db2258c..5e34b6079280 100644
--- a/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-17.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
@@ -46,6 +46,7 @@ distutils_enable_tests unittest
 
 src_prepare() {
 	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
+	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 9a7bf68c9fc1..672c835caaa8 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-openstackclient-5.4.0.tar.gz 727289 BLAKE2B 15aff0e53034512618ee4624031618d44f24e8d639033b22eacd791d45150180b52e5ccc0e78e6ed9a5043076259c47bbf981fec0ee00129e838efdc9d4741a1 SHA512 76370c28e27bc1aa13f772721c1efaf1e5eec931fc6bb0653989d4a38b28426bbabe1e6bc6d4be9a902c0d8fb871bc63f37c5ea0fa57d6bd96a9a9a02630ddf5
 DIST python-openstackclient-5.6.0.tar.gz 815567 BLAKE2B 9421af19527d1aa004f9e8928c40896fc001960f12dce11d860185e0c2c396642972099823710bf21fd838ec78681601d4196ce99e16d90836f6117e8ff97c5f SHA512 821abe0f85e53d7f52fd01a87a4d77a63fae029d2f03901f3ed5e47a4dd52fb8d00452a53027a347f83d73851ee3b57da4b025fb799571be256e78cdc6b96f9c
 EBUILD python-openstackclient-5.4.0.ebuild 1129 BLAKE2B 65ed38d2f892f7e7e8b7e3dff1069d60261457f483f9dbd11ce9a53a18ebcfee9abe96aed9f1fbd7e7880ad0291196de673aa41f1db7b2006130915a2de24411 SHA512 6a6d14ca7cbb37f2247925f9fd5a9f685848b851c521bcb67483a754e1ce9b9e3fa461e417b51a2bfda50ff89822a310f0562b5182170c65af4d6f9ddd481ba9
-EBUILD python-openstackclient-5.6.0.ebuild 1669 BLAKE2B da59a000a7c3eda8df5fe5db9b290f40d453209097facde0b584b6860b4bfd61d40ed41c71731169f9ad33a5acc82f0fe0a65ea0866168bcbee63c44828f3b06 SHA512 b04a5ca658d161414455deee8ae703cb5ff61731d072f0c114e9621919a61a1845668a4febb01c175f39d45294d30ecb8cb384a8cccce5c7c9a2990f21faf2de
+EBUILD python-openstackclient-5.6.0.ebuild 1674 BLAKE2B 90404cfce7cd8f3027d2602900b98cf79d42d5783431d8c93b37d905c9905af23bdfcf2a2ad9398d00ffbfaf2ef850b2e3b5c86f1e461d3c02628760ef818ebc SHA512 7be9e733701a32c09ba5b43ebcc77b62e16788f1450188c4e9e9b4f3ec5e855b179448f66e6f795831a5fc8d0a567258c0f5bb2645b41dfc8a42a63f6624977a
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
index 84660b01dd12..e7dec8d94938 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index a7d267c59151..369a44dc5781 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,3 +1,5 @@
 DIST python-stdnum-1.16.tar.gz 1039599 BLAKE2B 98197fca412371757b7e7ec242d30d5fc43352b9eba7677aeb3a475dbe7a379c4f88797192b8e5de97493186562d1d21347703643be7798316e22f28c6a144bf SHA512 29ad92a8d1d3267c56e3d128700611cbfe3bc7a27a1420bfe62851f110f3f23b1d8927771588ef043aba366913bf7a5b0eb72896ee50343f3adf72cdb071415b
+DIST python-stdnum-1.17.tar.gz 1068804 BLAKE2B eaef8d0016f7e836226a6d83d4b54d507477d333af8572f59f24eba44f3a24bedc4d0b7d3492e7a5a64d9ceff77e296bda2876f976aab46cdb27989d0dd80df3 SHA512 9ddec525ea153e3066f205ee70602a59821e793f9ffde66a4b01511daf9a559a3a42082a99bddf69c1159a27b2d9e64d91f8a65ee283a2d7da473d766ce0e711
 EBUILD python-stdnum-1.16.ebuild 567 BLAKE2B 46fcc7014aa6fe5b8086e6cb4259de1af50f731cce5cf12c030d24214f424c763ae57a7321bee61e27c85c859404a61c0740af248828001d21f75627b8cc6a7b SHA512 9b2035fcaa3d1d4b72fa1cfca5ee1f2513f054c201dbc4aa221403cf6513670fe46fcddfddad89aaf557be9bbf2f679bb0b7f5180c4d1e06759379e0c1df95aa
+EBUILD python-stdnum-1.17.ebuild 630 BLAKE2B 4f28f56637774bf01acbd3e5f8e2130faca034edcafef3371536232725dbd1edd592a74aeb6eeee48971b87394011278fdd9ca125835d4686c35c458f6aeba2e SHA512 8b9cd0d863cba06523c65445c1a9335a3952584cc25c1069be6b92db2ec5467fa656b2c9b101410aba8972b834dac47808937623ae0c3e9f8fba22ad90d009f2
 MISC metadata.xml 395 BLAKE2B cc5c1669f2d1ea70021fa145fa3945d88942ad06bd9c5868fc963d033ee1cfbd84f20572814ab4e04516324174a1f31274832be9b314a7b4e17c202d09a943d4 SHA512 b34bb7351f17a33e339cad2ad51419d087783b1226ae20bea658a7cf9e1e43766e229bf428cb0f1b2d133d1a216bc5a9323322f7084728429b0cf5f0213474b1
diff --git a/dev-python/python-stdnum/python-stdnum-1.17.ebuild b/dev-python/python-stdnum/python-stdnum-1.17.ebuild
new file mode 100644
index 000000000000..cced3449d63b
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.17.ebuild
@@ -0,0 +1,31 @@
+# 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 module to handle standardized numbers and codes"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies"
+
+RDEPEND="
+	vies? (
+		|| (
+			dev-python/zeep[${PYTHON_USEDEP}]
+			dev-python/suds[${PYTHON_USEDEP}]
+		)
+	)"
+
+src_prepare() {
+	sed -i -e '/with-coverage/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+distutils_enable_tests nose
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index a4600ceecf4b..9ec8442edf2b 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,3 @@
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
 EBUILD python-utils-2.5.6.ebuild 574 BLAKE2B 49716b98a6d7a997149be3fb8b0daf5386c5ab180b9eb7c022fff18c73101314807f498f332db2a6b555bdbe67be68bddcf48ac28860727baa10f2c54cd1ea6a SHA512 6a91b1a761fe2f60d6810d6cd3b676dfb87a34982be3284a7d74fda7794874f358fcd4e97b89189e0db4839d6b0f126889abca8c0b6b926fc0db33c3849d3201
-MISC metadata.xml 446 BLAKE2B 28beca7d74f7e0583917455f30346be2f9f056c15a5cd2155cf658ace683b5cbf5e3e70f61d1ee9b3befcc22ae8d0335afff77ebd4978833d80cb1fa368a0182 SHA512 7da0afa494056ee87fd3cdf4bd0d8c71ce70d857f2ae0bb5c4c4dd47b3aaedb0f910ebfec2a06963458212d875f875c8532b0dfe846032ca0ae0f3795e4d2e8c
+MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/metadata.xml b/dev-python/python-utils/metadata.xml
index b9c15aac721b..b417f7302667 100644
--- a/dev-python/python-utils/metadata.xml
+++ b/dev-python/python-utils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index cc9c35703448..2068618e41c2 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,4 +1,6 @@
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
 DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b
+DIST pytz-2021.3.tar.gz 320512 BLAKE2B a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89 SHA512 c45099f319592976b7715d9973496a2c7438a1b958ef8b90a1ad1fb97e7035624fe6191796727d4b7edf3236271bea4d864e25d1d92431e8cf767ac798448882
 EBUILD pytz-2021.1.ebuild 872 BLAKE2B 9c9d196bc8b271bdeba3109d56bd5b73904cb121b5b04fa99265f48774196daebe45405e2ed958286a39ee8e97fbef35ab7027c427387565aa3fb21717a53f98 SHA512 49c0c8de8fe255953fa4975feefcea233cae8a0a575060d70ba3f1866e3c5524f0d47a0e6522fe082167967bc85e59b8d89d09330e11147e629e297ca4fc7653
+EBUILD pytz-2021.3.ebuild 879 BLAKE2B dc16b75893a5b23bcd6a4f149672667e6a5bbdef34a3ea6dbec54aa5561fe7d89665e0b100fecf61196d1dffddbb47d938087a5056f0ce4a290851db41dc7688 SHA512 f95e1245a0bbf9b69f8d011fdb67ce0fe28a2ec66dff286178b22c52f473c703d3a4a85a0ce6fe29880df7256c1b62bc5de34745ac04cf4ee7f07e85bfd99bcd
 MISC metadata.xml 765 BLAKE2B 437ebaaf2229928930ce99bed100856934d5dc4fcbbd5fda5b164041668404015421800f59c408168c83cdf8d8a5db126dc1f6261ac6a92398bdf0d733ca96d4 SHA512 dec5518cc05dc97ba6897a6d2f55933b2561153d55b60511183e4adf6d308e1a2213fd870b5ce7bae11c157d33ff1bcf0a37d7a2675e92a8b02eca0f660af29c
diff --git a/dev-python/pytz/pytz-2021.3.ebuild b/dev-python/pytz/pytz-2021.3.ebuild
new file mode 100644
index 000000000000..5f6844d5b808
--- /dev/null
+++ b/dev-python/pytz/pytz-2021.3.ebuild
@@ -0,0 +1,31 @@
+# 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="World timezone definitions for Python"
+HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index a0e482003676..164b26aeae4b 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,5 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
+DIST pyu2f-0.1.5.tar.gz 39008 BLAKE2B 475a47ad99bfbe8f85ebe246eb7c394d0855732fc6bf0dd887bb32ad02bacb1f34dadc5506d330add64bca5b353824e773d2b1e971e78d9cf9dc2438d12b4f62 SHA512 ddb15bb1d917117a2b19ad169ac0f8b8c7667d7ef8ee4c266cc30326429bb3627d41d84dc390ce0036d0b0f110e1d2da47d06d4e4d03a8be98cedb5ea3112246
 EBUILD pyu2f-0.1.4-r1.ebuild 902 BLAKE2B df29fffac4cbda3866ea9ca319cc794bfb19dc5e06d1d124aa4370a9a0ffd5ab8b6dd9eace90a6b1642f9de67ef15b74f564cd3389facb55f27cdddead488424 SHA512 599b7a8a053f9a07e428fa8f26cd0b56f6aa5f6cc61a704078d2e3d08eac1fc5068a80494779c15a049fdd1fa62c531306f86856bcfeaf0eba20deb519bd4f69
+EBUILD pyu2f-0.1.5.ebuild 672 BLAKE2B 6615d256433775b49af4fda8c0bc63b1b8c83016b709799e6c4578c38f2cf0412340c5ec5fac04e42eaf0f49399c905a40b38606b8de8797ab9971557d146f78 SHA512 347522ca90e906a1d0dbbec78b290bc719b168c089a355ad69475d241182168e705a35c8e5569700ce08a526b527b4bf67f9ae216aa4db951b284b357775e245
 MISC metadata.xml 365 BLAKE2B a79d187c19602699fa11ff064ca991aa5ceefeeaab5f8b2bb1c9888ead8e23dd3bd4566b17a8956390c0db1f04e4d4fd601a1a667491aed4c30959d312efef49 SHA512 03eae2c778e036e9ef06f25d2ff97ce1865a7b44edb32f59b751121e303a7774c78c258cce889fa4af1932f51abdedf282137c8ba573f5dce1a00066636463a9
diff --git a/dev-python/pyu2f/pyu2f-0.1.5.ebuild b/dev-python/pyu2f/pyu2f-0.1.5.ebuild
new file mode 100644
index 000000000000..380632e9054a
--- /dev/null
+++ b/dev-python/pyu2f/pyu2f-0.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python based U2F host library"
+HOMEPAGE="https://github.com/google/pyu2f"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 03c63a92743a..60f23909ac58 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,3 +1,5 @@
+DIST qrcode-7.3.1.tar.gz 43495 BLAKE2B 9986ee77752625e127008038c6c044b5adeb3bd526c27a55b23915190c3c9069adf1c6df1ce5f76cd0255f45319ecb66ebf226932666ea6c89872a46e13c1cd9 SHA512 9e0e508418164926a074d8c6d85419b39a36c01ac6d92415a15ce43d4aea79fa2a8d0167982f832970d2a68ec18d2b729f09e15d80b4f4c33b992999527d39f9
 DIST qrcode-7.3.tar.gz 43352 BLAKE2B 4520ffcf2c4b144c20d00d06947c65ac9d8eb283ab9e298d9fe1de023aa32e47e3c6d4d9144f928a12607b28415f40d666b68b920d81e18524c95813768ee2d7 SHA512 e4d06ace4e8146e294b10b1397e649cc56405ddac35dae499bf897e4a7eb37b15dee3f72e6a7bac98dd0f238ac71d1e0bab5ada6cd180b1e5e8df9c6cb23f073
+EBUILD qrcode-7.3.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 EBUILD qrcode-7.3.ebuild 616 BLAKE2B 304a02a68fd2468c37985b8565d54cddb957d773410ab1a430a8f4065a88db6027ff40f6aa0386e8da383466563e96213ccdd27c893a618d888101345d911f2b SHA512 edebb4044c8667918842dadd34cac2b82583ee087a110dc59afad111452b3d7d92db442af03c346e37fe3e55150db96080e33adf74cb77176816f8ac758856a2
 MISC metadata.xml 334 BLAKE2B 2b24f6601d29305978e939bc72895aadd12d9343f6178c454f807b17e8e90fb645df6d16e098c6b36343a4ab45d776fe1e274a188f6383904784bdc5271a921c SHA512 b6d35afd78cc9abb2f0b5e75b3267cb8b6d8cd9230fad7c808bc64d31d480f640d4a8f94aaa696c46d2f230b6e645a02f157d72f22456f62902012d7a820bf71
diff --git a/dev-python/qrcode/qrcode-7.3.1.ebuild b/dev-python/qrcode/qrcode-7.3.1.ebuild
new file mode 100644
index 000000000000..0185db078736
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.3.1.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="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index f4d530cf008f..1f4dda9fbe14 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,3 +1,6 @@
+AUX rarfile-4.0.patch 598 BLAKE2B bf53d965f61a693fd9e26d8d6f3c3305fe31371363ddfff6e21e48a98ea2386b7effdcce6f615c553b3a764da73b72791612b723e8432de1a156189e93e062f4 SHA512 2d3b37f7b58e04ac9f880eba0751f38486bfd17e3c96b6b6f4e08a6b8b70a5cb482af4b8b5ef3c46ccde8f7bb848c84e123d950687cb91930ab6304e7febba57
 DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
+DIST rarfile-4.0.tar.gz 148026 BLAKE2B 331548d54dcc3d81c690cc383e36e3f00515999c72abb54060e0dbb34691bb7e06736318a33ec349492e27e561ed2f4ff4446cc5254e9f341f4633adaab878aa SHA512 05e15acd749564288d4f069970ac196344c33fd2710e918b84afe4c388aa364a17c63f86577037524336e3a022f6db2c8619f9b526f89e00753a8ab0d89263d4
 EBUILD rarfile-3.1.ebuild 487 BLAKE2B 06f912bce26e798371f40e466996652717aed95dfa5c90233674475732a73b45002e815274322acdb7c6d13abba57186af9b2ccb3c1e83e7579118a359d0fbda SHA512 0b95b61f3683ac4819fe8855af0a275402d1032cfdcd84d65c7ac045ba87dfaa5cfc86fb3a0507333fc7456ca81dc78d324943303d2ceb0dd2074e675871f433
-MISC metadata.xml 531 BLAKE2B 7d87793306496eea6771262e58f86d69b04407ebf5436c54dfe16116f3c256cfa099fb346c39c8588ea3ea02adb104b560f78b9ba1c80d699fece4059c49aff7 SHA512 07002bfa872ea63f391d7116f7b220f5eb60b32c599dbaf32b8f527b3e1d323c08027becddb91b6e5c88e921e4ccea880744dbf16c05fbb412249289bf29c8cf
+EBUILD rarfile-4.0.ebuild 548 BLAKE2B 1a93a22caf04daeff48db7a48286d1c063f2b37ac7426550217c75f00cf3a3278962fb76f7de541d283d638f55a445b83aa08682527030443f5a13f718823c41 SHA512 75b55c53c75c381672a559bb4fb9782db45ef79753b73fff6a97b0a75308fad3216ee29fa0f15d1973a22fb101aebc657bb824542a59dfc51138cb273279261f
+MISC metadata.xml 531 BLAKE2B fa977e37331b11cf627c551ca3d0e579338cd3ac43d761e5d6f120caf1386cc18d602770376f1b64360911642767cb4b3456d235270137ebc772fc02791e8665 SHA512 8d2d3de2fc185c657aed70818abadcac021c679e352774f941bf6fa908dfc383139c2343f5695e21197553724f75f853ed03cafc9413640ca6a4257c6e1867b6
diff --git a/dev-python/rarfile/files/rarfile-4.0.patch b/dev-python/rarfile/files/rarfile-4.0.patch
new file mode 100644
index 000000000000..e9d3251b6da2
--- /dev/null
+++ b/dev-python/rarfile/files/rarfile-4.0.patch
@@ -0,0 +1,22 @@
+diff -r -U2 rarfile-4.0.orig/test/test_tool.py rarfile-4.0/test/test_tool.py
+--- rarfile-4.0.orig/test/test_tool.py	2020-08-01 01:25:50.000000000 +0700
++++ rarfile-4.0/test/test_tool.py	2021-10-03 22:35:22.329537879 +0700
+@@ -33,5 +33,5 @@
+ 
+ 
+-@pytest.mark.skipif(sys.platform == "win32", reason="unar not available on Windows")
++@pytest.mark.skip()
+ def test_unar_tool():
+     install_unar_tool()
+@@ -43,4 +43,5 @@
+ 
+ 
++@pytest.mark.skip()
+ def test_bsdtar_tool():
+     install_bsdtar_tool()
+@@ -114,4 +115,5 @@
+ 
+ 
++@pytest.mark.skip()
+ def test_cli_help(capsys):
+     assert cli("--help") == 0
diff --git a/dev-python/rarfile/metadata.xml b/dev-python/rarfile/metadata.xml
index cd828adbe9db..e9097a4a98f3 100644
--- a/dev-python/rarfile/metadata.xml
+++ b/dev-python/rarfile/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
   </maintainer>
   <use>
     <flag name="compressed">Enables the module to support compressed v3 archives by calling the <pkg>app-arch/unrar</pkg>.</flag>
diff --git a/dev-python/rarfile/rarfile-4.0.ebuild b/dev-python/rarfile/rarfile-4.0.ebuild
new file mode 100644
index 000000000000..31f35090b59c
--- /dev/null
+++ b/dev-python/rarfile/rarfile-4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+compressed test"
+REQUIRED_USE="test? ( compressed )"
+
+RDEPEND="compressed? ( app-arch/unrar )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 0341fcdc03e1..d25eedd5b115 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +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
+EBUILD rdflib-6.0.1.ebuild 1286 BLAKE2B c52c111bd158068abf694f730e77ad980803d1d89782358a9f36d8fbdc170f1b2a86640d929ca71999b662c602f4600f9d73e41dbda5d2b1c4392f8802416f86 SHA512 b14888a227bf488e3734cd36dc7c3473cd4a3ec1c75934461daaf303b23820ea87b92fb191cda17a0a4dde5fbda9b4e67099f21f7594b5a4ffef3eaae798867b
 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
index 30171ab9031c..43be31292b78 100644
--- a/dev-python/rdflib/rdflib-6.0.1.ebuild
+++ b/dev-python/rdflib/rdflib-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 7460af3824ef..7c1e8ebec440 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,13 +1,9 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-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
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
-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
+EBUILD regex-2021.8.28.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
+EBUILD regex-2021.8.3.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.9.30.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.7.6.ebuild b/dev-python/regex/regex-2021.7.6.ebuild
deleted file mode 100644
index 950e8b9bcee9..000000000000
--- a/dev-python/regex/regex-2021.7.6.ebuild
+++ /dev/null
@@ -1,34 +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="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/regex/regex-2021.8.28.ebuild b/dev-python/regex/regex-2021.8.28.ebuild
index 67c833d04b54..4a336d826c82 100644
--- a/dev-python/regex/regex-2021.8.28.ebuild
+++ b/dev-python/regex/regex-2021.8.28.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
index 4a336d826c82..950e8b9bcee9 100644
--- a/dev-python/regex/regex-2021.8.3.ebuild
+++ b/dev-python/regex/regex-2021.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2021.9.24.ebuild b/dev-python/regex/regex-2021.9.24.ebuild
deleted file mode 100644
index 67c833d04b54..000000000000
--- a/dev-python/regex/regex-2021.9.24.ebuild
+++ /dev/null
@@ -1,34 +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="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/reno/Manifest b/dev-python/reno/Manifest
index 22157c94aae6..0f230c54f167 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,5 @@
 DIST reno-3.4.0.tar.gz 82815 BLAKE2B aab374c48c1dcf25ba7a78d46069c5d659762bf01d25dc05f597f02098ee10e7b8c518a0afad186ecd93602782a7c50294183b7e33075f8bfe57cc0bc3c1d016 SHA512 cbfd5d9b41beb1599438e249b8082175c8bd2b8dca62d8e6fd1ef742bf889adf6490e1ed0fa78d8aca663a0fb6bbe70742815a6512c6d51fb8073745b6860d65
+DIST reno-3.5.0.tar.gz 83644 BLAKE2B 803d3d3c9ed572624b77d2851221edcd0a86241f86876970f1a64877d3083b39d8e574567f14dea52680538770a37bc70c55d74b66ddab6fda551209c32bb844 SHA512 4d48ec3faf26d046498edccc0dd6007dff36d8346395b5c62b2b85a8ff9bba5ac571cbdcb2aa8e522b6f4c155bd845a416cc715c30a29e8eae6d033ee1b52be7
 EBUILD reno-3.4.0.ebuild 1059 BLAKE2B bfa15189d46b0a786044480678d0b7d8f23fb73b5b28e380744bd2da6a19ed7cc07a3b125bc52a5d0259f9556eb3d8457470f21d9051327a2836187793ba4019 SHA512 0b71ee353dfe6a045c593de4586b0fe8e93be6cca44c47ee63660a688b400b14c5280d01b1755f2887e08adb88874c868790f4a14db90f00cecd252bebd04057
+EBUILD reno-3.5.0.ebuild 1062 BLAKE2B afff1c970166e30e1bde57963f603132eedae4723238a888668f493bf8d721456346bed82bec4b28dfe33c9a3354f7e43df9ad149048ea5ead21ce8f76ca7e09 SHA512 ff28df4fa601a32a55d462b9528c8166f31871ba5dc27158154b1b19ba555a30a45457f4b4b5a70a37521ab2b62faee9b197d881cf2d42b2925959c3f17a4992
 MISC metadata.xml 400 BLAKE2B 933415cb7e31bbcf30191336617ffb9adfa5c83c26164fca5f813015ad8cb9c5c6a88276e8b8ba37ba0dd0fd4e658861150fe80a6770a16bb419959ca1c9d924 SHA512 2dffa12ad580c59bc034d4788054a4184d713422ef658b031c0190ee8c5756f37db3872e1f3a26c60ecdf9138904f87552119ac5559236a7e4ab2081d7a8c5ed
diff --git a/dev-python/reno/reno-3.5.0.ebuild b/dev-python/reno/reno-3.5.0.ebuild
new file mode 100644
index 000000000000..d05d134d0ba7
--- /dev/null
+++ b/dev-python/reno/reno-3.5.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="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 051167d60199..bac13b877006 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-1.2.0.gh.tar.gz 23310 BLAKE2B 647dff76fbb47b9b972f403a9fb2a10ffab5e1915e32977e65b5f5c1cb206ec1b9fa884e12d687761087b2f7f4cb9e8bde631b68140cc50dbd9561a4999bdf55 SHA512 55458773cbf14a468d22d0b04186611385ff24fceda85052e69981bd6d4fd32a46f96b95fa36724b72fd9719485b2ed8906d1927284157e7bc685c0c42c2312c
 EBUILD requests-credssp-1.2.0.ebuild 885 BLAKE2B e491e7a93f7b35ef5f69889d0938f12fd4a1a4155b25187be025ca39212843292dbf8d404d3ad88b9b7b5f36b620595b45a285d07c6987a05a51e22c31333837 SHA512 cf9b9e1b1362a84be1fbfe9c4bd9c0d7303e2fa136d4eebbfc0a1aba7870a3d500eb0a88ab5692a9e0b402f511f78567f1382507059fb1af3b99afcd9ff7981e
-MISC metadata.xml 349 BLAKE2B 559f6b129b1e197ddf03f8c0b7e07ae7333d9e5071c1573a56b089133f3f2f424f4b729e205443064b0178036d4f38746432a6e69b5000cd0ade2c5b749099ef SHA512 2040ed85610d397bc10e36205a714e66d2bf2c4dcba74b66a5e4fa43096cb43a488c7bd485c77a25260166f0e7cec56c9ea9b6b560cc01c3aa19b5fb664c7610
+MISC metadata.xml 349 BLAKE2B 75b6f5159a74ace6c7fecccb0e0634839b8db1977c11bffa370afc4c514077e7870b530b7b22abbdb107e439a5bff39ca42c91fc591a1b2a634b25133c08be60 SHA512 1f4eee280ee2687ed3f99a8716fda702669454d856b9b1233c5a7d131d4792e4b7000b7d631852222c8d56dc6c2546411a9c372bed5303dc353ef547ae30ae1e
diff --git a/dev-python/requests-credssp/metadata.xml b/dev-python/requests-credssp/metadata.xml
index 28ad446ea614..8112911efa59 100644
--- a/dev-python/requests-credssp/metadata.xml
+++ b/dev-python/requests-credssp/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index ef697fcccb1a..b7bf8abedd06 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,5 +1,7 @@
 DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef26d5bffcfc9e0c8d9ba105b689654fdce7bf9068f71c49a2ce590f05c16b93c53bbe468fc1a339e7fa489adece2 SHA512 cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
 DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd212a2ee5068ff155526e17358e3bbe4c92c4d59817c17de152882a738c924c7f5ba389d2a7d13ee1b2dc0de54e8175c3b SHA512 de5c1c29790ce1eb4393021f17f1a19a0f2de29e5d8688fc307e412d80052319b822bb24fceca47fe550e21393ee38d58fa6e6cfefd207b7a88b632b9670d282
+DIST resolvelib-0.8.0.gh.tar.gz 765655 BLAKE2B cf10ebb01a01a5601091c5374da87ad55a057144d928106d7e9c19cb348277fd5f4d455acfb49ee1979842a68ecdb1f682a1d0948339533074a540a04294c226 SHA512 6cca8be16c36e5d8d60d41fab3ab9bb3aa82e1bb4d1887b5bcae3b21db90af9799676032c566a52e2026f14b19480c000f20482c87af326d8440d2c826eb5b1a
 EBUILD resolvelib-0.5.4.ebuild 504 BLAKE2B 509dc31e1d1946f599ebefa4f4099453911675de1127028b8a5da901e5777901b34cf14cb18552ea350ab9a9434efdde7f28be43c4eb0a246c8f26283bd1cad9 SHA512 ac1db9908009d7e50953ae916e1d4dadee14e41e823ef6172f92fb2561d29533872e5c627f03d2700da4dc169dc010bce24d798691acc197fc2a9314f710dc8d
 EBUILD resolvelib-0.7.1.ebuild 591 BLAKE2B d6f5fa848615a372e8cd31d8b4c3235167e0bdc03e5cf0bcff62d13d30fb85d52cbdc04bd61ac8735431610f2f2d09103319e9df03f07f7eb1f2f5a0d1028f52 SHA512 712efca5a988fe3ed234d8b5ceedc6111f98e8ffbdf4cf6ac3b8fe562391df3cd4898793f48892ba7812717b53ffee9e9234771e68c6a30cc286c19b0550948b
+EBUILD resolvelib-0.8.0.ebuild 594 BLAKE2B e71ebbc791091f1759801084a90e4f6e892551278a37ec46911f6df7de5a9427a6604bae91ecc0fc237b1b8914fb39f03a0f2d5d98af321a5a60680b740f08c6 SHA512 381f3b2a8a9cfa76bb2b19813fa5694284cb327c415524891ce0d8aa5732b588702cbc4660fddfcabe68389661b0720bdb6ab3e20dbac9fabc18902af2eed005
 MISC metadata.xml 854 BLAKE2B 133e7ab6d1721cdfc1cbaabaeaea73ab98fc159e6ffd2bc33e3688e2216a98b9ca48026fc90e36d0bebe06e1e44dde6d3b1fb5287bfa85bd101de67e30ca4dc5 SHA512 5924544364d9a846cde1181886eb83e1fb2feb049a3ccfd543a2e25993b84ffa3013e9b2cb6106caee21d5bb06520bb99eb09b330f32fdfb32026e5c71be3bdb
diff --git a/dev-python/resolvelib/resolvelib-0.8.0.ebuild b/dev-python/resolvelib/resolvelib-0.8.0.ebuild
new file mode 100644
index 000000000000..8e2ef9274528
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.8.0.ebuild
@@ -0,0 +1,25 @@
+# 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="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib/"
+SRC_URI="
+	https://github.com/sarugaku/resolvelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/commentjson[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 1ebdf9073e6b..82c926d708f3 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-10.10.0.tar.gz 16264680 BLAKE2B 5f57b7ea7a091b3478ddc17dfe29309f558f36e8795a66ea918141f42f2a9e5a655667a1db8420193f3f44ba070413ebb512601751a6a5663a87db775576ce65 SHA512 8b9f1348b0f55db90c17042a83e8317d4f00b5446a77334a12379676ef1fe526f40dc92425e4bafce22ee5f65bcb2fae2422b903c6f958feb5734c254813826e
 DIST rich-10.11.0.tar.gz 16266050 BLAKE2B 34081a127eacbc875fb5af1b00a195df4718eacb4e0371ac1367950fc8e102bc2a611d970364a1b02cb400137cb838aa30d9bcd757a4d4644ed976c49c9603c8 SHA512 34cdcad401dbda0763dfaa6f46e19e498b2da96ed9423a00a957d55f9e2833fabc6b2e6d65e411dcb5814c869a8670b5242e1a891835d6b6675d4da86b28f33d
+DIST rich-10.12.0.tar.gz 16265099 BLAKE2B c2249be5a5008e3e9fd5c301b10d7bc544e4805d4762e87481aa31716e38eb3cb2b81ce80f201fc0d3961574136f47b7b374d6bc7d18e4f55f1f757a7e17e5a2 SHA512 bb42ff24c9eeeae548a6e222ecc03f8b46d763c4b022964bd8fb11517f1a23a7aaa82a2155d5cd3d29cdd1af5fab6cc4f26840a84ce5e26dd740f8706961ce1f
 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
+EBUILD rich-10.12.0.ebuild 743 BLAKE2B 3f9b348de8da37dae056fdb7ac0284fda112d940a3b8e8a91cef075567f9d3243be1869d17eaeb570b64b113a5e3dbd523423c852971f464de55ff948a1b3687 SHA512 c9a18a846ec538dc6cf9f8763084d17e1c560b2ec9e62845c29ed85156362e497e79b447850e7a2b04a5ab67f732534aa037aca441d6be6b43a3b0bbf7f3004e
+MISC metadata.xml 388 BLAKE2B 9d57523a8babbcd81afad320ed91201aa1235a19bcd305b3102888f17d24666fbf94df2eae06af746a62e167c139258088d7116d52064ec022294c7ad4a9cb48 SHA512 a2a11fa0ab987f8b661176e88980dcf7335298d80a3cbe7c910accb9ecd9ee33e3add0389b23224fee88467092298db9176adde09935fd466ebbf97bdc58b8db
diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml
index 413d55ff06b6..f39155ecdf42 100644
--- a/dev-python/rich/metadata.xml
+++ b/dev-python/rich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/rich/rich-10.12.0.ebuild b/dev-python/rich/rich-10.12.0.ebuild
new file mode 100644
index 000000000000..05ddc3dab2e6
--- /dev/null
+++ b/dev-python/rich/rich-10.12.0.ebuild
@@ -0,0 +1,27 @@
+# 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 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 ~riscv ~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/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index eec41002ba93..236156ab6b10 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,7 +1,3 @@
-DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel.yaml-0.17.15.tar.xz 183820 BLAKE2B 901c08d05994a45cb9d8e7071244332c7b3f30fb83f22f9f2f9cfb769ec99ebc39fbdbcf652bc8e7ae8e5b9918aafbc229bcfcbeb1b7d64bd4bed2f8fe0d9ee7 SHA512 cd2fd4d0e2aba1f3f90bd54b355fa603045e913f90c7e460bcc4630619db027b1283af77c613fdc029f48300d8822ca349fb169e30679a1dd86beb1a3f75c49f
 DIST ruamel.yaml-0.17.16.tar.xz 183884 BLAKE2B 3f7b0995cfa49ed9e19b5dafbddc7514f58ab23186410b4a718027112be471d9136675259800e0136b21ad6d1645c364f14ac071dc10d12a5f60aefdc05bc56f SHA512 7da1e5c229b78ecdccd648fb6a734095c0a1e0848eaf46af93e6ce69f5e065cdd07eb65217f8b3e4c82ce383dc11de07a1345026c6782aa26c4ad0f5a85fd80f
-EBUILD ruamel-yaml-0.17.10.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
-EBUILD ruamel-yaml-0.17.15.ebuild 1278 BLAKE2B e0646bfd1057d47eff7e9b32471620a10d0688adf4c6b13e05cacae4b145d386a33fa739aa5c75a5f38932f3fb33efcfaff8874075b057f34098c7b96dcdeda5 SHA512 65411e5d043f8a58e2fafa71d5b9e63670f463bc5d6eb050e4a5aa7694f9b726a8c581b6b943b526831cfb75d4e4b6469ce4709f415ca8953f0053aeaefef4c2
-EBUILD ruamel-yaml-0.17.16.ebuild 1278 BLAKE2B e0646bfd1057d47eff7e9b32471620a10d0688adf4c6b13e05cacae4b145d386a33fa739aa5c75a5f38932f3fb33efcfaff8874075b057f34098c7b96dcdeda5 SHA512 65411e5d043f8a58e2fafa71d5b9e63670f463bc5d6eb050e4a5aa7694f9b726a8c581b6b943b526831cfb75d4e4b6469ce4709f415ca8953f0053aeaefef4c2
+EBUILD ruamel-yaml-0.17.16.ebuild 1271 BLAKE2B 818ff85d32e69a1d7a1a2c5e381cd9b96b107f29aa728188d6ccc3eff96a4249a69cedfe8b5995dfc5a0913bbfa43a96d19c3717fde1273d3245a1a549a7976e SHA512 d92b25c5406314c3e8fd7d572940262faf5a7fa4100407d6146e10c27611e7561e602c2324039a532409111079118b5eaff2ffd4b7f05cda7b4e958b16dc722e
 MISC metadata.xml 871 BLAKE2B 6564544cff4338a49a824966fba46176125f3318f3a53fd11a1983f3c2f08524dbb9479f3ddd16a58367e4e044aee1d9c14779a425b84a1d80e5e14a59a9eab7 SHA512 9edf1d1c08b976f51e8eae4582d56d99ea1e47a9da29c62e3e3a9402cc616bc587c7d9d8324660485a10f5547d18df270fa3aca21d198d56d886a53978c2ef75
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
deleted file mode 100644
index 86fa6a9be480..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.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=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.ebuild
deleted file mode 100644
index f87789872e5e..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.15.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=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
index f87789872e5e..d8b19befc6b1 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.16.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index e08a35f20c89..7ac2774e841e 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,4 +1,4 @@
 AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837da997024ee87bb3fd878a6492fbd63088aab294048e700652a82cd3e27bb8e55ea5fdeeda4240971a32b6c7644f2c51ab7c42da1abea SHA512 f52a6096a4840baa743b90296b98f55963c13990ce795cb0ff9ad11256196d9d5164d3118bb48e8e10779e55f2341309de71a3ee47cbde326280de0064f1b21a
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
-EBUILD scikit-build-0.12.0.ebuild 1519 BLAKE2B c6d562e747b6e5372c617a18d32f93af0a94569f62a08ee9fa8dfb7c12a72addfd1ada5624a185a1ad742b777dbe8281f842e71d6c897e35d2073f8b81e8b616 SHA512 41c09a5e160df37d63469e5211f9e9455eac81e913b173880e45c45d28ce098752dc324ff5e1c04539b9ac7f5187c208846bb078818690c60a1251e81cbf3afc
+EBUILD scikit-build-0.12.0.ebuild 1518 BLAKE2B 8211caa7420b570f71d4c34caeaefd93ec2dd1cf1bc3e306c3e29d34f744d9402ed589371205d5d7682c8ed9d9674f7912db5af3772ce6e909c4ad083aac6410 SHA512 5d2182598dd418aa8f4833b2f5e0bd550be1dd5c51550a0082bc4e03cf23190cce694bd7cd9612ba23da599ba9f4dd167c45b233ef1dfda0e8a8ce696a897ea4
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
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 19e0c60df628..71b1a4b6b7f9 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 6f4cc3072091..214e9322bca5 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,7 +5,7 @@ DIST scipy-html-1.6.1.zip 23946591 BLAKE2B d3464c342b1d4f43e17e214c7557737913bf4
 DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe023d1fd9f0f762695a0d93bc56e432e441e675ec3c7a7d6586a665f6127ce49d570f1716876e58afb402761f8e95 SHA512 119a2227a808c752a751bc7bec6463da739c68391ebac8d2451998d90ebe03b2af401adbf987f0b694244e715c0ef1fd86c2f4a36c48dbb1ff7cdf4d914875df
 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 4366 BLAKE2B fd4b6ed960d8cce4f035fc978bdc2270cc00480a292a9e3fca3d711b4f0361d3ad308d9c1a492c9faf1cfaee44ec12f457822650e88eccb2269307e3d8eaba4b SHA512 e57644101d43a91c8184778e965177df158d2a6844dd271cf049ce992a6e86d046ad215534cf3741148c24749845326cb6c0030ab8f93c7a000fdb05046a325a
-EBUILD scipy-1.7.1.ebuild 4250 BLAKE2B 9952ddb984511ff7ae5f75875f8f42bc5d3de3ae2e49003fc9c835e8cb1cfe28ee8b07102f3063e4d190aff358bb27dc9f0c8586519c6542c9de4bc91566ed18 SHA512 71586b4399dca8383dee6f92f892cef3cf3063109bbdff6a1863a2195b735e9f9431e2d811ba5c52bf36a3c066899984335bca09489e87c0402cffa817ef8ce3
+EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B ad4da15044f02436a9b736ecc41761b4700f2c35b57bbbb4c82cc78219c3bdee7024e4370b4c2627c484b0cc29bca26d6b6178abe19c6320532632966b451fa7 SHA512 eeeaa9bfb5312992d7d9528d60ac0831c5502b051783b85455c230a01fc889baa24ab44bac272c44e7dfc4072fd083fb5fb18c525c58c58c1657be5db9e37c5e
+EBUILD scipy-1.6.3.ebuild 4365 BLAKE2B 5b632315b3c539e3d859341bfaf1aa0dd7d5e8a7f5ff346255bca3a734830d9eea5df453ea61fc5778ae270c07c266883e2853ad6fd6fce9f47d6fbb55663b63 SHA512 d4cf1798cdc8bba3e4d95520be7418f7db158b485f6092c440930e1602f2d1c3a253acf338498e8ecb70d5ed7d02a4d22dbe9c53ac51f19401f977f3cf7c0e2b
+EBUILD scipy-1.7.1.ebuild 4250 BLAKE2B 988a2ae9c25b5a03dacd481ad6feea17bb861b816dbcf27a1cb96d510ae487ceb4aee14f6e408a5c4f9c985b7ca360308d94ba625e3967fd6356f4d7b1d23f93 SHA512 209c8efb61f632794f33291b5b75c48bfc584a17676fbf15a0891b09ce1d3de1eca6a22bcfea49fc7f552775ab4cd013543ce5c7bed2cef746401d0ef42a6f92
 MISC metadata.xml 1039 BLAKE2B 74d7919c947e4efbeb597dba51ce74b9e2ef995a1e06c0db7fc7c13dcfd0c175afd0b9bce04907274e4eeab2dfcc49f0eca81ab71f76873817f3b9a1ca8ca196 SHA512 c0024d9accbb563f13ba22b32c95881118fec0ec0a68ce498a39d6bc63e13cf2c7db903132481e3b4d085757c5aba8bb4959780d67fd33db5b161a149e18c643
diff --git a/dev-python/scipy/scipy-1.6.2.ebuild b/dev-python/scipy/scipy-1.6.2.ebuild
index 0230181c4d6a..2092f8ee820d 100644
--- a/dev-python/scipy/scipy-1.6.2.ebuild
+++ b/dev-python/scipy/scipy-1.6.2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 	dev-python/pillow[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index 8dec73bd4f25..b9286e427ab1 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 	dev-python/pillow[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild
index d4ada5b74484..aa46f916dca3 100644
--- a/dev-python/scipy/scipy-1.7.1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 	dev-python/pillow[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pythran[${PYTHON_USEDEP}]
 	virtual/pkgconfig
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 8276fea9d0f0..2fd6927c2032 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,3 @@
-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 554 BLAKE2B fba8c132cf3e6ed53fe699ea578c8d9e731750dc6fe2bec6326ec5eaf59c3891eed2a1afff87ad4fc14376872d7076e17c20398d3ea07700f3179f75802bfcd5 SHA512 dd12fd6f649410477811b9d2b66401fc7c4b19137f12622570c0185a6bfa9d3f5c9835c57f34f744a5a75a00e9336eaeb77493f24e2abaf0b3ed77f372709a68
+EBUILD scrypt-0.8.18.ebuild 552 BLAKE2B 6b41426d34fd7aabaaf7873d8ecd6bebf79352d9dd12ea75e605e5555deb3a7690eee2e5aed59e20f3b7ad3ff8856e37d8e7ff654974630d6dfe2c94254ae4db SHA512 575835b0439e7df0074cc35deaa4b55f3e6b9e682bfaf903273ee21d9850abec7bd7975ee00fa298df6f0533861fc5ea9188a05c6b06813ecb9d4916118a579c
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
deleted file mode 100644
index e171f4d2f015..000000000000
--- a/dev-python/scrypt/scrypt-0.8.16.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="Bindings for the scrypt key derivation function library"
-HOMEPAGE="https://github.com/holgern/py-scrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
index e6ba3ddc7a0c..3c2cefa54bf9 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/send2trash/Manifest b/dev-python/send2trash/Manifest
index 1f39e285facc..e6c8f1b48721 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,5 +1,3 @@
-DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
 DIST send2trash-1.8.0.gh.tar.gz 15040 BLAKE2B 06f6b0b9e4e9316bc60332ea76426922db6d35fa5d4e0602e91a58996bb55a2344d7d56547bdf21151641c5ec710b78b2b11c8fda158eb911155994c86d10078 SHA512 9dc15fbd262eb5a05a355b436c0e582e5ef9b484f859b53faafe6af5bd08ef88b9aa5121485c2fffb7dbe5aeeef29f6719035e08c61da273fd4fa51383b062fe
-EBUILD send2trash-1.5.0-r1.ebuild 551 BLAKE2B e61966f12d72114aec89bdbb72c2f5bc6f07a6e40bb1ec7bdec18793df2c0b1bf518d43ddd1f43577a18eddc42731a0085aa5e9a46f8a5a0991684856c96330e SHA512 1293535ffe8aa64fabbdc07b7823bb50bee4c3bd7e3d52656e845a2b6235ec407c3c4f9da9d28be5fabc225a2136597055626926bd6dd6fadaff6d68ee6aac7c
-EBUILD send2trash-1.8.0.ebuild 532 BLAKE2B e3c8104248ebfc3d4ab04ebeaa2bcbaef7d3517f5e8308da15aebeb46296c5831bd7930e0c5e73f1fdfcab1e1d51324fd666b3834f81e364db99a2957d8d19d9 SHA512 d2e6f65f46ea8455e882fe819dfaba550de32c465d98777241a2dda9054b3d41c6e16fa9e9c48a7bd288394e70229f670adc693d2b5ab05acc1a8a30faba2611
+EBUILD send2trash-1.8.0.ebuild 530 BLAKE2B de5eaf55a4d2de6c0e1165221b478926e965dd3d6b95cf74ab60742b0b0a8323875e7178524ac8722a5195873f6b480de84c0f3b0b248e7cbbbe958d888ec27b SHA512 5ee2704202bbe78eb474c271b9fd84c3d959c5f0985ba10824a6cc959ab15724b161b3d4ebb4bddd20a050283791f0e8a443ffe8a96139e40186f77ccfc70417
 MISC metadata.xml 386 BLAKE2B 8d3491151b576bcefca27dbbf49407a6599bbccfe37b1baf89d792201d84a6f809780e21cfc48a9ddca21fc9638d357efc6650bab88d93592b03c62bfd0102fc SHA512 a220c2cff85671ad34628bf119c8f0918c7ca048fb1de1ffec406c0165133fea3570b6b9764566518619308b36416d85fa764bef1923fb3fb0a60ca84e71e776
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
deleted file mode 100644
index e5ca02fb9175..000000000000
--- a/dev-python/send2trash/send2trash-1.5.0-r1.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} )
-
-inherit distutils-r1
-
-MY_PN="Send2Trash"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
-HOMEPAGE="
-	https://pypi.org/project/Send2Trash/
-	https://github.com/arsenetar/send2trash/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/send2trash/send2trash-1.8.0.ebuild b/dev-python/send2trash/send2trash-1.8.0.ebuild
index adeadf32f80a..2741150b31a4 100644
--- a/dev-python/send2trash/send2trash-1.8.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.8.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 50374c8cfc66..d9046f9d3798 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.17.3.tar.gz 82434 BLAKE2B ae6f303a204f0c5a6bc7a10aa8da3dadbd4fc3a257abb15e330d13299dcbd5bc6be97506f6d5b48f3a3fe24570ac28b331644870d03aa30f80d40e69f4d2ec15 SHA512 b4ccdff3df2c87ed6f5119e93560ea7ddf60fcc64f996efeef1f6077f3a559c8f9ea77fd217348c1cba2de50e40523714899de110614953baf8385bb78d10af6
 DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
 EBUILD simplejson-3.17.3.ebuild 622 BLAKE2B 5477f8ddb16abdb4f4902dec056dd52b0794c5d45a207211666d5644b4ada9dd021576a3fd5a1586bf4f4c5e3099a7a21bb5baf59dc9a36f237e97f5cf774f6e SHA512 fef504464ee8d265e47cf01f4ff5110d7800c2dae7a9cf82750e3c06a0997a1b7041807e0d16d2b8f1bdf46333ea4291d63c3876097dd1ee88ee7e6f79a97c42
-EBUILD simplejson-3.17.5.ebuild 624 BLAKE2B 977f8e1aae20533968ba28566c581a77ba159726b0ac8ae23cc76aa0d383c9705b235604b75a76f4b2bf4b8881d901ffd3299ba402dfc050e1bb6c7c78c78d6c SHA512 1ee4de325eb240a0b4ba9dc4cd324c812e54195c90bd041af83c752b735377a7d4134615155d28d66b795d4a88bdec5e031403cab3f5f8748580dae539d71de8
+EBUILD simplejson-3.17.5.ebuild 623 BLAKE2B 2b53a3e442396a72f77d04ea23bb2bdfb59f253dcd9a0705c03a3bd8c4d571b2af8d93ee71af27b704135fddcfe3115f2d26d83ca94d89d2223e47561aa58f40 SHA512 249725a1eeb220ab4edad29a6ef7299d70c76a61f6a0ec581e10dca23582bcd23085443598707f07b219381df3de556b6dc60f977143160dd31844b0aa068e69
 MISC metadata.xml 375 BLAKE2B 2c3a0f98ee3f6c9ba41edf3e8e4d6536ac518a59234e6c602d46cbfcb8a5c760c71997b3c169dd2c0b3f9c5dcbea1cb36967e4d050933bd5e31d6f609a835e83 SHA512 6ad418641e64295566aa5418b9bead66e7ea84e0ca7aa454bfedf613cde7ed4d1cd17dff962963c3dda62ad9050e6348f9f53da21ba25b53cdeba2d91b8c551d
diff --git a/dev-python/simplejson/simplejson-3.17.5.ebuild b/dev-python/simplejson/simplejson-3.17.5.ebuild
index 950b2eadf53d..24e18dc9313f 100644
--- a/dev-python/simplejson/simplejson-3.17.5.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 4f0d77a78a7d..b4e2ca65cab3 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2108241238.tar.gz 1180949 BLAKE2B 4d5eb427cfd786d7652b9860d2aa0468cdf7b5ab20d10da00f2b3e3c9c4b12710e2f8240c335f9e3d5802a995a848d6e85cfaf615640939456b8e4b866d9f5a4 SHA512 8299e96171cede2ca840086f09a2204d378f8ef97b05aa2a81aef1fc097bdcf363fbc585b36539f0280449cfbae859b1104a67ec6858ef8de19982d349389d3a
+DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3 SHA512 88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-5.5.0-r2.ebuild 873 BLAKE2B 6056c5ce42dfc77adfef3e38413eb91d150edfd33704dbd0434d4bebb6481b34376768e6b106c26e606094983a548155d5d62315f9cd9483ac49f6ba506a1eac SHA512 b7e8751fd35c0447502819f21600ce4fd7a62adb24c28510368fff1c5d1e21b1d6993aafe2c4b9bc863e44b4999b7ce42ccd67f06203a3aeb25d8e508ac80f39
-EBUILD sip-6.2.0_pre2108241238.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
+EBUILD sip-6.2.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.2.0_pre2108241238.ebuild b/dev-python/sip/sip-6.2.0.ebuild
index f917fbbbb011..f917fbbbb011 100644
--- a/dev-python/sip/sip-6.2.0_pre2108241238.ebuild
+++ b/dev-python/sip/sip-6.2.0.ebuild
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index b434e8407d10..2d7f9352a433 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,7 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
-DIST spyder-kernels-2.1.1.tar.gz 82493 BLAKE2B 23c59b6709ba6b1f21a1cc48d20115fba593c44b8b99d8c6f5bd83adcfcc9faae9fb1fe0f86df59f52c922da3c5951308e1c151c53487d33e39b0ddda065f95b SHA512 d1c7f47b02f18095d8584e6f6b3605419af1e016105c4f20bd70cce5d917651e387779d5f36c3ec72bdedd3febd8f7d56739c0cfd48081d448728acf7e3e3114
+DIST spyder-kernels-2.1.3.tar.gz 82801 BLAKE2B fc5217621f5d46194c222b53455fd716d25e74c67f0dd1fbe0ec870ab2daaa5d8c31df6b17f86cac1e7553355c1aa1ca22fd2d42103a3868aa14051b2077b334 SHA512 1a3d432425e8fdb8f66bf7177c4e207ea5a12d774e0d29fa008910f0c945cb892500d578ba2ea48d7a24977db0007cf137bc02777282b4bc8969e0708a3f6b2a
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
 EBUILD spyder-kernels-2.0.5.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
-EBUILD spyder-kernels-2.1.1.ebuild 1514 BLAKE2B d23e6b642b0bbea4296de46d29e4329857fab4ea42038e0d2388e68123be5222889daad1eb06194b964fd2b2da06cbbcdadf6e8c3102eaea5fd0dc9388b6208b SHA512 b2ee84ed236f929338186489059ccdb775190985d9ebac3ae7525dc8950a72c4509ebe3550789d349d69e777bcafaf05b65913a6194b3e8f41155e5f840e6240
+EBUILD spyder-kernels-2.1.3.ebuild 1514 BLAKE2B d3a3f4b74d66b4c6588eea4be70cf8782c01ee46192c463cca2cd958c9f1456f85d540ae5771babc6b875d91b51201d30a13ff3bbe6adc59a8d7517f8036af3b SHA512 a8ea853bcd73d3b7a7e54dd2a192cca7859559fd0c56755b4a0a99595ed5a9357050001b0310b38b53b070e3f50e0a9365d705928d8c46393e1bcee9c6764ead
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.1.3.ebuild
index 342592521f01..05835aa5ad3b 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
 
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 2673c1432fe6..9323c1cd0c91 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -8,7 +8,7 @@ DIST spyder-5.1.5.tar.gz 23849672 BLAKE2B a0a4db5105d4ecbb76bf3c996ea8ea17142bc4
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 DIST spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz 88791917 BLAKE2B bdcf52965b592f4a88ee988afcca71ed73b0499397c8c0b7ff36c38d4408f4b76ff285b3d9739d1c126322fdd8c1c6b93f3017edcaf30563da02d8f509d09fe4 SHA512 2717dad17db836330820578c9082505b7f1126fef2a76284d03a443f3317e3a9a294f69e50f075a29580c4ad1bfbd23dcd02fcef93f32645ae5d52ecfb0b8f10
-EBUILD spyder-4.2.5-r2.ebuild 9965 BLAKE2B f94f8de5c81eac740cb34912fd7aedf6f9768fa63c564c5869ab025068d558de4052c9990a95682a8045a5b5e7dbc7c705f4d8d992f978e0f9706888339e0277 SHA512 0e4c1d37d26ff4b02148b28254750cdf5e36f5440e575ae097deabb8606ae32c681e6666a47753c71f411a626d24f5333ab8b8d0c270a447a0723ae93b03d9da
-EBUILD spyder-5.0.5-r1.ebuild 7943 BLAKE2B 8564bf7aae20878fa68a6fa1d9b0abb71c76bd8c87364525808641b97d8da88f86c362cd3b1bae32f3875bf691c5b15ee8043537ddbf5ecd738750d58e69ec8a SHA512 9c206b76177eb1e76757d0586056f2201ae17f9760cfecf7458c0ca1029967b094270ee4302dc94eee09245b33d445f46128dbd3e20e1df9906da59d3964ae64
-EBUILD spyder-5.1.5-r1.ebuild 7224 BLAKE2B c65407ac7ab3b1edeee7fa7b0564785c69ee58eccf3fe83bcf97865e1a47367240e455fa8fa8647785dccef5c16e493f2400bfd01749a9171f0b3866f950c5d9 SHA512 d02ab7edbd213848183f9af6b72496621730a8c545d445d5499534ee459e0062db35af4913c785d8be566aecb6f7cde08ee2b974f459a3ccd345047d9646d837
+EBUILD spyder-4.2.5-r2.ebuild 9923 BLAKE2B c01997cf3dd097370a0db952fb4ecfeeed3f3c17c2db6698b0a4d04b228eda94e43013c8430b5a112b0ccf52393f3d4334e38f090519173e171213c368eeecc2 SHA512 9016a2f522e6f988d74aeb20242b3b02cb5c2686f5168c07c2406cc69bf203c2335cd19f09093ca769a2960f3b4745e63d07a8b370c501df076fbfd86583b10e
+EBUILD spyder-5.0.5-r1.ebuild 7900 BLAKE2B e2978c811f658356816fbd306853115094275945d4f0397dcc6700af0f8d76f7416f71702eae9fbe948361889295628d24fbc4066595c6c6a3033d75e7e5317f SHA512 c7b8000415eed95e979ed0d069748bf0be58b4768bd5782f6c9ae7d3996b3e058b984bf70fde77b32769a7079cd9b1fe2e3cf8705344b5971bd554a122ccec48
+EBUILD spyder-5.1.5-r1.ebuild 7181 BLAKE2B 1f290df854b33246fea089e8f0c4bb119c4b276ff9afdda76752fda332fe9483c101dc6e708ec7271b3894b991c74cded6eca2d38fdad97d26b81709f56fb4b7 SHA512 b97b0853e8c5c890f986796a93de605b13d56af423fb1b62d43f8b6def45ac6ba02662e25b46b27016cab764ca897f593c51f05023f1691bde05ca98fee103c7
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r2.ebuild
index 04d05d40e107..0656eb1aa38d 100644
--- a/dev-python/spyder/spyder-4.2.5-r2.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r2.ebuild
@@ -74,7 +74,6 @@ BDEPEND="test? (
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
 	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytest-ordering[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r1.ebuild
index 75ea2dbe52d6..15c28e9147d6 100644
--- a/dev-python/spyder/spyder-5.0.5-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.5-r1.ebuild
@@ -75,7 +75,6 @@ BDEPEND="
 		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-ordering[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r1.ebuild
index f5b6758981eb..b2318fa8c7e6 100644
--- a/dev-python/spyder/spyder-5.1.5-r1.ebuild
+++ b/dev-python/spyder/spyder-5.1.5-r1.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-ordering[${PYTHON_USEDEP}]
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 54f976c43457..3d2ac03f971b 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,7 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
 AUX statsmodels-0.12.2-new-pandas-scipy.patch 4730 BLAKE2B 2543000c15af63874a8d23ce8ef998e5a29ec8a6181181d22f84691cd6e258749dc202140d73d663d0a9f16cec5097df93d2e40e832e324a391f45f91613ea44 SHA512 51393795a79dda5a7d2a02b4ff7c0a0c669559774114ce5aa7030393eb25747671569331dcc48be9cae7dd98d53a95fd0368dd999e35619295182ddc434c49c5
 DIST statsmodels-0.12.2.tar.gz 17470078 BLAKE2B 7b2a17fe350489888fd05d2275b597ec7cb0f32dcea97daa5c06a973fa53a7b3af40d494c735e30cd65deec9b5dd314c0513454a7c2d2c40e22fd6de3aeb40c8 SHA512 ae4872bc7300ef564407daa8b4076fd70fc180965622ed2173871579e063e2143e000540089923fe171dbb191b7dd872077d8ba6794fe23390331375ec7ce810
-EBUILD statsmodels-0.12.2-r1.ebuild 2116 BLAKE2B de2a68b6fd3fa053ac5d82fad4cc276cd3f0c8cdb59f65ffada2d5235cdc2c68d299bdae77a636beff80c8aa19b55621e8d7b95d337171b640ce4650deb87fbd SHA512 073d871372c5574eee3cd4a761d79b3d872000ed134784b3b72645d5143c42d416837d084e7791c19c59fcf08ac533a22a23e1c51aa7cfe80785335e5d976dc8
+DIST statsmodels-0.13.0.tar.gz 17766215 BLAKE2B 54894a1061bbd90154ea81d599c913119a90f89dd37055f3e6c69b23bc265a424c08a2e5cb2c88edc9a3a82fd69a236e6eaf73c08a8201c31b1cdc5cc9ea0bd5 SHA512 829e927d146f6587ef545c2a5668d9ba60e1493eb0deb79754029128d419a6811ace17572e3c324d738a1a36e69b8b85d92030b187c85fa5be49003806ba6145
+EBUILD statsmodels-0.12.2-r1.ebuild 2131 BLAKE2B d81261a70f424ff304bd327262aae80a8f2bb61091fcc0e1c501d301c69bd0255c67e32b4d6e9f17b8944a371fba7fcc393f90c42e5054a1c0701a55aa13d563 SHA512 e81bd6345ff9d4db7a309f3a569c33b33a06ad597fc619bff706ccae9aecc95ba71b43518808b79c175465c2d47e8f2140a1c29f02e093a6dc6abc73a278f399
+EBUILD statsmodels-0.13.0.ebuild 2070 BLAKE2B 5c72e8af31951a548e050a3c87e752017b4b604d1a6b8092973f14c255f9868f23f1bd64bec7fbced6ea996f96d0659db37abd4e02aee6a6e58a9f3e635a0928 SHA512 17d53d8bd6f6cc978c91a0c6219042fe01436f57049f8b876b5a5628506b4b6c97e79ef27907d95b35e11a9e8e9956141a40a6146010c2a060f8e50b3f03f4ff
 MISC metadata.xml 1344 BLAKE2B 9bf8a6aea4058c34598e450ed56d15e86830819dafe3fadb98c0e9a986a431319291cdd48d6734014f99008d1ee4a434244e142b2412dc49eac74e312ab51f60 SHA512 e87e712b79b666ea207584ef647fb61dc9572a0a4ef2a94e9dd4eae30bca8347d12635fb568483dbbebc483238cfaacea155e7d9711617d7eff4e4624e738ad1
diff --git a/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild
index 6b264c763a8c..01dc02735203 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/statsmodels/statsmodels-0.13.0.ebuild b/dev-python/statsmodels/statsmodels-0.13.0.ebuild
new file mode 100644
index 000000000000..dca696dc7923
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.13.0.ebuild
@@ -0,0 +1,83 @@
+# 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 multiprocessing optfeature
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.3[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
+	>=dev-python/patsy-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter_client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	sed -e 's:test_combine:_&:' \
+		-i statsmodels/imputation/tests/test_mice.py || die
+	sed -e 's:test_mixedlm:_&:' \
+		-i statsmodels/stats/tests/test_mediation.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${EPYTHON}" -c "
+import statsmodels
+statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
+		|| die "tests fail with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+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 "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 29e11e12b275..481c588c2c15 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,5 +1,7 @@
 DIST subprocess-tee-0.3.2.tar.gz 14975 BLAKE2B 3198832f4c8bbf90e83038e39017cff1efc61ede84aded8220214e388a088777bdb861c044cddbf4b07c7b3172f8164e8bbf82b33de68d1fefea0f81bbacdfc9 SHA512 e681abc27623a3e05031bc05dc15e34f82c9cb544cd16742855411a9edb11fe8e38f9d11f8e651681d04081f121a47c38ebd172d70d282c8110a62699ef687d6
 DIST subprocess-tee-0.3.4.tar.gz 16013 BLAKE2B 6a98caa111a73ef7062f26796dd3e919d05103ae4de88e2c5ce3acc04d9fbde6b31e39a1cee1984fd8d59b8168ab33faf7ff15c916d52a226ff2cb760fd8c796 SHA512 6a97ddc75b7e7954bb7f5f3bf05807e8dd892869cc13e60344c5f40363bdff4ec5441f829cfbcb8c3c4ab7f7b2697c0b1d4a871be8164acd7cfb6fea5032ae4b
+DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4
 EBUILD subprocess-tee-0.3.2.ebuild 938 BLAKE2B 576413423fb1feacc51935ff572e77779f2b066b9fc453913bc39a5b4fa55573752e6e55f2c3b24044424faf6c7fe0ee576b7027ba45dd01e874b17266a9aa91 SHA512 68f45c038995b3141a6e8347f33cabcac27a6ee7493cb84836fde0cb5d2ca105e5b7382ec2635f9fe3c2a1e308db3ff967ffddb02bb19643d33ac0755df85601
 EBUILD subprocess-tee-0.3.4.ebuild 1223 BLAKE2B 5f9d6ad8551e43c838e1cc7e54bba2b4cce1c3865500d5642413eac01ead4115208932fcd9558166b24d05fbf44c1fa65096e497f005d3e3bafc9266061ce06f SHA512 eabc6f04f3788554ba4ecf656cec819b2540659750ccc651c2cd4540ed9fa1eabbb04153f714908004c150b30d15ce59c516d894b4bed9cf6924ed8eb9f4d06d
+EBUILD subprocess-tee-0.3.5.ebuild 905 BLAKE2B de2686e446d4b33872fd24c684efa8ec1267d4e3249b2f2b7277886d73199656ae1d2b5900f3b8c9ccb54e3b335f4c021da5d05daf1f7d493f3071ef283e9a05 SHA512 1ab63e698a0ecf79eca1fa1d11dd836790a4af3f7a513e68b194d368d0ecff784b8504d05a8978cc84b2930cd08cf9d065e23cb4b70829a56980069c3d835014
 MISC metadata.xml 632 BLAKE2B 5764da49dca8c701e0fc0c3446d82bc24b361450df134cf5abe1c72af30d124da17186bda4a775b101e9ff7def515b45a42936ffeb8baf25dec69dd5f6b887a3 SHA512 4d71f7ced279578327551ca7913f02c8a88be17a841c7adb8e2c3e931a879560e12b54f387a714dd8bb327181549c94fb0fd00028aecd7eb4dc6e4f35c4ad4c0
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
new file mode 100644
index 000000000000..c715a596b1ae
--- /dev/null
+++ b/dev-python/subprocess-tee/subprocess-tee-0.3.5.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} )
+inherit distutils-r1
+
+DESCRIPTION="subprocess.run replacement with tee(1)-like output"
+HOMEPAGE="https://github.com/pycontribs/subprocess-tee"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test-full"
+REQUIRED_USE="test-full? ( test )"
+
+# ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		dev-python/enrich[${PYTHON_USEDEP}]
+		test-full? ( app-admin/ansible-molecule )
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! use test-full; then
+		local -x EPYTEST_DESELECT=( "src/${PN/-/_}/test/test_func.py::test_molecule" )
+	fi
+	distutils-r1_python_test
+}
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 543fc5de2983..159ffa883ba3 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,3 @@
 DIST tempest-29.0.0.tar.gz 1090497 BLAKE2B 520e9de1fc326d9a64d7ab5e93887f3bd455d9c47d29e0774bfb362b1baff6c1dd13fc6df2c756f0e73dd2b33ecb02ea61abdca9ea1ae68474ba53271c6c9e93 SHA512 03049d6cf0e77bac1afafad88b5b0fd22abaa40ed24ffd2c0c989dbadf277c09d703f0d9f7b34f4f68a4b5858b061ea9586ef66e26749b0822af0e426d1b81a7
-EBUILD tempest-29.0.0-r1.ebuild 1818 BLAKE2B 1d62c5f400c9266589719b13a7c325f13089e002b77e229393e6fb84b0ead1ebd73ee75dfd6a02d4210594cd94bea87ea15e12b90e17f3a6ad4fd1290a8e8872 SHA512 2c7f8beaf6de7d9f9ed278f38fe63b4eee4cdbae0b3ccfa6e45f396fc668a78ee0c7515835a019a311dbea5f6ae7f1172b359155341c42f55c2ce1939d3cae5c
+EBUILD tempest-29.0.0-r1.ebuild 1823 BLAKE2B 5a0aa7ed6c9677176360a288a48eec07005e5d77afb5c42e75b75f1edd11605ce59e84e4770d4f3439f10e5c948dbfa3e36f78c2a4fefdb41206f903aff2efd0 SHA512 30306eb3b2436a8a2b445d2c95f87777e0f0429aa34fd3cd12c6a7dc47fd7c57f435a15f21d5a81f9f6d109395525e084c5a49cde943f1d87b1a27f018462097
 MISC metadata.xml 401 BLAKE2B 9a92d6bb9b20f86c1288c52b2a656367779e67602bf3bf1be4a21601f3141e4864916250418ca7bf1f13767f528cd4679fb6e1a18dca1143c3edde50b508cc0c SHA512 ba3015a097340042ba4580d59da46e12f6b34e2ee174c6ae775a5d7b71b4bcfbf04b52fcb871af76e0ec3bf592ec1485f1acdb4944a0a48ae77b6e8b958ac198
diff --git a/dev-python/tempest/tempest-29.0.0-r1.ebuild b/dev-python/tempest/tempest-29.0.0-r1.ebuild
index c8e27963678a..2653d4804578 100644
--- a/dev-python/tempest/tempest-29.0.0-r1.ebuild
+++ b/dev-python/tempest/tempest-29.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 835d9abdac10..8327e890c1a5 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,5 @@
 DIST tempora-4.1.1.tar.gz 19208 BLAKE2B 77901d1f4b19f2c88d4492788f8b351c70ffdb474769597bc2eefc85b4dd503e57876b687b600b49a381dd24133ae30ac547961e7cf8d7005e4cce5dc5049012 SHA512 a272980be5d4448bbd97d9e48d8a992c07cd1e970924f301fd3444834fe112453d5714ff8f3e7af6a5775d931b825601d7f1abf3cd9319b08d148a2a07d40d07
+DIST tempora-4.1.2.tar.gz 19243 BLAKE2B 4014fce1abf24231c79bfa80db7ecf80303bca43902aa68a880c3e0a29cb9d6f7bd1d9e02c4f93d43db2a7810f0fd7a26de31383057dcf63b5b8a42fe8e6810e SHA512 dc03db61af973645f8f89c13eb1a0b696275a7a2768f82cd61d1602891d4bb0d4b45725404f39da242362346eb0dc6c38892a117f150f32517a2ac8d3436f5db
 EBUILD tempora-4.1.1.ebuild 930 BLAKE2B f04652dbc13b57396172c0035fb0ed58a5d9702e396f35d913447563c51835a3ed84f865cc890bcc14b46ce9af83671e0768b043f0b5f4531972d862c45094ae SHA512 178af61237ffd54f19cd0474bd4de8c8b6a086f2b5f447b9d0c63ee351b3e1e9474a7d34af2264faa52aa5b306f9729522ab15867873b04e160bfd10871df98d
+EBUILD tempora-4.1.2.ebuild 938 BLAKE2B ab5c9d6e7f8c9155393c23faaf1cd294c052e9784ce2da681beec128d8728b91527459155aaf91d7739675418bbe06fe87acb31ce0e73e2da4855336c9330287 SHA512 c46567d4a75f3fab726f69578cc3d2879a3debca15acea3e681e0493cc6f5ed741ea1edb2a39ec26967ad71daa06e5e40bfe08485d1d98a47362b465abc8e6c3
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-4.1.2.ebuild b/dev-python/tempora/tempora-4.1.2.ebuild
new file mode 100644
index 000000000000..c187f41d73e5
--- /dev/null
+++ b/dev-python/tempora/tempora-4.1.2.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} )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index dd33c0d4258c..956ada2cd87c 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,5 @@
 DIST threadpoolctl-2.2.0.tar.gz 25875 BLAKE2B 4fc77efb181a91888d2d47cf1f9fa67157366e3ce33a958244b606019389624e83b1903581bfe88f8b4c798b4a8f07d0a50269282efaa323d3cae9f3d5ea8258 SHA512 edc310a9447b1782cedc98aadd065ce9291eca04518f6223090c1dd57f714b85f32293f16cfc1d95639130db47aa04806cac77a42922471e07582293416450fc
+DIST threadpoolctl-3.0.0.tar.gz 28486 BLAKE2B e49bf43ea272e353e1a5f864cd7f38978793489b2dba60a1c075a61f6dbfe0a75a456e1143c0f33d3222ff2e27c1ce6025579b00e3feb2d789c7be068f6e07ad SHA512 df0829d5bed15d5cbcd502810aff91c9dd0d4dafc11173aa762426e96a7ed5acb0fd3132161e5b2d234136156f2a599c3592fc0a8e20828db83882b840a939cc
 EBUILD threadpoolctl-2.2.0.ebuild 584 BLAKE2B 9c5699e69e84342ad78426f15fc4c4afb0904af8c9dad681235b00ddda8e4b4400b9bbb52c1be7fd41dd8e27c0275503dd44dc7a4ba866c570b138aa72ae2a74 SHA512 b9f71b88573b13398448e2405a19b53a3a8deb2600b26fbde3ac72f3e154f1d480bc262a115ac085d119e2b9ce8b1ba58b8164bbb9e48eab2943f5f1069e6005
+EBUILD threadpoolctl-3.0.0.ebuild 587 BLAKE2B e35081daaa4cb8024ad31b3f257fe5bda03de31b83755efd5b18db0e38252520fdf76577d4e4beddb1d70583d395185bfe329ec35ffa6ec07d1cc222f4752351 SHA512 500db06b5f0d52ccd8ff0a63b817ac4b89367606f4b317a124b86feaa4d138abe38e46dabd3d3a600f55174ee72996edaebbd81cd496fedbbb6bce1b7cd7b14e
 MISC metadata.xml 429 BLAKE2B 85d3a98dd9d79c2e11cc44fd2e474d1278ce744a8c36887e9d458125eef41a231cce19ddd8b9fbfdb605ed9e5c5c7bbf35f2844cdbb7d7e557693ded1c1663bc SHA512 f7d15360b5cec34491ea88db7919aeaa0c353bbeed2958a25c34aa93b23a9fdd97c8c910f2623454eb78d74766e0aecde58852b9528dfd0f635ea5c6aeb28f8b
diff --git a/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild
new file mode 100644
index 000000000000..4e259103e370
--- /dev/null
+++ b/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020-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="Limit the number of threads used in native libs that have their own threadpool"
+HOMEPAGE="https://github.com/joblib/threadpoolctl"
+SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 63e924931bfd..b5504da8531f 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,4 +1,4 @@
 AUX toolz-0.11.1-py310.patch 720 BLAKE2B e1612b5230fa0f11251957709d8841e423e7f3916506cf55416407689b5d23ae9ef8f9dafe81c68dff1d8bf1c287c7681416c6cfa59bc8062086de8a17e9f565 SHA512 26a4b641f74659c825dc89ed5b3390a09503d92f2e906f2eab167871e9b322d6db1f54c988633a79a36d2c0edb1a5de368031bafe786781a8e7d5b6de710a588
 DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
-EBUILD toolz-0.11.1.ebuild 573 BLAKE2B 5453f260a09e70c878abd6a17c6a8e09a526f0a89664ce4d40eb1b92e7bfbfb5951f56d19d99b89ae63e0ff8e1edaa80746e6cc811b9a03eff2a6356c2e84a53 SHA512 14f25f32f4f3f3d5decf7c4cf5f785014549ab85f155d56dbcd0b799a0d2bb3c2e94dfbdacde56806fee55bc4ab5b8dfd5a8c25ebebb57dd14a7fe8c5c6769ca
+EBUILD toolz-0.11.1.ebuild 572 BLAKE2B 80fbc27f2762dab7cf3a526c1528b9101c7199deb9475055af2bdc07d6920bf3c76664025657b36082cb857996b0c4ea5e66052a7135dc2bc42299fe3c1c5c51 SHA512 ca0eec1262c3e6753e05244e208e862beffca1b5649c032f6ba74e9b0d8be1ecf629cbbccfafb44da2987263b5a60fa6b5f9d5a2dd56dfa1c2b83cf0746b21de
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
index f1a38bcc48eb..68d260f072a6 100644
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ b/dev-python/toolz/toolz-0.11.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 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index b7bb75b9e639..30ebd3cd1884 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,5 +1,5 @@
-DIST transitions-0.8.8.tar.gz 1100609 BLAKE2B 18ebbb1d45e33e7933208b043b56dca40e8dcda936ffc2af4c38ad9325f3e19c0d3c9a35e4d728be05b97feb47eb922fd48317018761bc5c3243887d2f077e33 SHA512 ff6c039ed5ce9fe484c3469d2aee791010a99af7a9bc8777842f1514d7eca3fd7714694240cb57839754367c58228d59b41a88f12c2b7d75353f75e63768160d
+DIST transitions-0.8.10.tar.gz 1103547 BLAKE2B caeeb97406d1d2ba926f5ff14c4961acb7c2b9b979a1a20614e1017e4b20a664b069f384cfe878df95dffe832f00cfeb4c0ce96efe2156cc858e14eba5746137 SHA512 a598d65431a2d0241b5ea4c806631edf2e1f06537224e8716d531e86bcb10817d1cf32a62672147d1c1b398fd755a9ef046d884dcd0b4de6a9f8c1bfd04af62a
 DIST transitions-0.8.9.tar.gz 1103063 BLAKE2B 2f640ee9882817e1e8fbadcbdc726eff7bfd67f9aafd8afd5aecf2b7ee88e8fe7ae57345515235b74787a9ccff2f19062c90b9a5a70d0bf58dec4b9838ad0e0b SHA512 139a84658d422468fcd0c3ed501b608edeef12c15f2b6969eabb75f02d146c9f4a6857ebb0fc333cb9b51a985666cfd4879ccc89d9fb25e0f1f756c92094c941
-EBUILD transitions-0.8.8.ebuild 1004 BLAKE2B b296c0f1a80a7c13ecaca768698c7c6261383d36c65e582a75ef47aea39a57979aa641f298357119598188bacf09d6de37cd9334adaefeb6e006099bdea8797b SHA512 eea7909902ec9a3ba6cca45b09132e8bf7f1715d4d63cb3575c495f609f08f86b16f061599c41231982103d6b69bc89c3dae63e85b7d5d77c8c8d1cc1974a6a5
-EBUILD transitions-0.8.9.ebuild 851 BLAKE2B 4dacac5e86f20234787e579718830a5856a2c930cb720bda8f80ef134788f39781f8e8be59f40c2ff9dd6f03883e9af795d9f5b02b3fdcb5e811fda4697f1116 SHA512 a5f303217415602ac9afe148851fff4745cd4a1e8c9e67044b8eb4fd8a92c28b2423586671700533e3d8e880399e916c718d5eb18aa9f137e2a74ad201a3064e
+EBUILD transitions-0.8.10.ebuild 851 BLAKE2B 4dacac5e86f20234787e579718830a5856a2c930cb720bda8f80ef134788f39781f8e8be59f40c2ff9dd6f03883e9af795d9f5b02b3fdcb5e811fda4697f1116 SHA512 a5f303217415602ac9afe148851fff4745cd4a1e8c9e67044b8eb4fd8a92c28b2423586671700533e3d8e880399e916c718d5eb18aa9f137e2a74ad201a3064e
+EBUILD transitions-0.8.9.ebuild 849 BLAKE2B 0e98284db86f20f07ed26c2b70e214900d914a399638a5b22b9c6447703af784774c70d93a6f88c820b929802c138515944141730248f3f9c476caaa8d9305b6 SHA512 0fcb6deef7812447d30d04e3c6b323cbef1e1c01c1259ba3adcd46faf8f6ab2ae675af4c8434ac8dfe664201a24733f226e524bfe70c05d52c77353e1ea3d54c
 MISC metadata.xml 863 BLAKE2B 8ab7f50602ca6a7723c10c29c0bf436beb742e389fea5d4b98acf1828fb3287af27fed05f6c9e61cb65059d51a2290e0fe69515c1a67b138cfdac4cbaa7752bb SHA512 6e440169ae4a16c53f2a451d9f32e3d4831151b3af8a5f95f157e32a01cb2fde56bbab13e438c88f10e79fe37fa5ca6b48e18bfa9aaa81b96b7c703e2125356f
diff --git a/dev-python/transitions/transitions-0.8.8.ebuild b/dev-python/transitions/transitions-0.8.10.ebuild
index d1f71b2a5c26..b0e276abfbff 100644
--- a/dev-python/transitions/transitions-0.8.8.ebuild
+++ b/dev-python/transitions/transitions-0.8.10.ebuild
@@ -1,10 +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_{8..10} )
-
 inherit distutils-r1
 
 DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
@@ -13,7 +12,7 @@ SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
@@ -24,7 +23,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/dill[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -34,15 +33,7 @@ DEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	default
-
-	# https://github.com/pytransitions/transitions/pull/538
-	sed -e 's/description-file/description_file/g' -i setup.cfg || die
-}
-
 src_install() {
 	distutils-r1_src_install
-
 	use examples && dodoc examples/*.ipynb
 }
diff --git a/dev-python/transitions/transitions-0.8.9.ebuild b/dev-python/transitions/transitions-0.8.9.ebuild
index b0e276abfbff..ae88c5e1102b 100644
--- a/dev-python/transitions/transitions-0.8.9.ebuild
+++ b/dev-python/transitions/transitions-0.8.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index 2b9d42352fc6..f5adc094f59e 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,3 +1,3 @@
 DIST tvdb_api-3.0.2.tar.gz 20436 BLAKE2B d9df5f1e2e8dd26486ec5aa2fa542534e43e08ce9c19ae8f8e48a05b3167db856ccb7765bb7d7acb4adcf7a53f5deff299f69123d60c3495ec1cc4d849d3e0b5 SHA512 b6c3c04eb300f2a371f50ef0331ca1ae602c7ccda2a0d8ad52f5c89fac5cf4dff77ce11d0dc774aa2a8dc1e02798a4432262cbaafea9239693c300931213107c
 EBUILD tvdb_api-3.0.2.ebuild 465 BLAKE2B 8fc5319d6a930e654059b82611954c7e94c58008546f9c22f640d12dbd4fb69bf0fd93bef5c7ad6d19bc5d2ad9b26d1e238d4a678b0dc4367f11e613e6e1bc4f SHA512 2508133aa6eb8606a320a221ec7e488a60b267d94ec02e6c81ea04f23207a5ea9ce1514772994ed8af9d2bb5368b370408787128fd40525347d632531f36e9a2
-MISC metadata.xml 394 BLAKE2B f81bbacfe91c548958501fc5f7b7137aca71f27919f642864d9cbfcb7043fc6fa19180acbd1e80a8c9d2b11866901a8c519a04cf4e9b80cdd284356cc0962b55 SHA512 0f9c0230ee6e61e40baadef540a59caf336a4bf8380b238e8afdb2d91ae6b4b8c0470e9ead83bd90e6c541f7d88b935f768e6e682bd6fdc76a69665bde350614
+MISC metadata.xml 315 BLAKE2B c3449dd20fceb8f3f3e6a4d44a80c4f187ccc7eda5fa030828425ed06c28f95558250a834325e11c00285c3c5e587d1a1b6756f79fdcee3b811550238d437672 SHA512 96e0a4a6b68c1620f06a100f947309c6daef99f1ff246cb009e2b379ed3d236ca0e7e1417c340678382d0b20898a708d8136c4aa942f035848c7ea1e035140dd
diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
index 41fecdf32089..0573aff57f62 100644
--- a/dev-python/tvdb_api/metadata.xml
+++ b/dev-python/tvdb_api/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>thev00d00@gentoo.org</email>
-		<name>Ian Whyman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">dbr/tvdb_api</remote-id>
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 14a0ed9d2a4f..7df274e3ab17 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -7,6 +7,6 @@ AUX twisted-21.7.0-force-gtk3.patch 2759 BLAKE2B 65be4e948865a8de6cda3fbb9e90032
 DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
 DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B 510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728 SHA512 a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-21.2.0-r1.ebuild 5159 BLAKE2B 9a7bac0617c2416d67abd62716c0434111f6fad1eea367ad9ede428f12ecd09e2569202af6162861d7c4f7f2fd760f0eaa39e2fe87df10981f98f33b82a29d2a SHA512 f7d4a6f3ceabcf59154d4a56938315c5ac881b17474c251d947ecc7292661bf1ec42b82f59cfedbc1bbf6637918fe5748581a7912dfb20b29da59934349247a7
-EBUILD twisted-21.7.0.ebuild 4969 BLAKE2B 084463b5168e72452830709c3487057748a3667950081355b72fa9b36ecc88f78eebc9ca9f7fb204848fa1f0940dde4cd351211c32a1d65903c5bf1c94083ceb SHA512 b5ab2e92dcd7f8334f9214364349ebde6f2a90810343231df7efb06a5afe5595a5ceeade4440cb8debfb2c4bfd9c94cac9ec34918af50fd8533444debdd2e3be
+EBUILD twisted-21.2.0-r1.ebuild 5147 BLAKE2B 5e6b209a28d64fa65300d589ba162045aa9bd4caf72b3a5c887ba10680327900c91583fb4d16333bf38d9e5745ab4f70a4317ceec8d91bf6e5893e615bc0513c SHA512 83194e572d84783471362c29951e0c0f900136cf5b2f049daf3112d6e185a19ec1b8a16d33c9c54ce3e38bfb0ff42864ea4524f899488f3c725e575c201aec09
+EBUILD twisted-21.7.0.ebuild 4956 BLAKE2B 732dca1b98ffab5339c76a4b5ee1950ec027ba21b65c4299ae2e295e9bc4b991c6f9526dcaaa7ed289e62b2922128b95de2ccf8c90802d20b4d13ad62e5217de SHA512 d76eecf1a98de89be9e65fab05c29cd9db350fb3d96f936750db027cff406d5657c935ba9000a6d79762af8bde2f0b8d949b32ba27b5c2064f25a0f635d998fc
 MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild b/dev-python/twisted/twisted-21.2.0-r1.ebuild
index 296e07d25869..89ae1e3b8929 100644
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ b/dev-python/twisted/twisted-21.2.0-r1.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
 	)
 	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
 	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
 		<dev-python/priority-2.0[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index bf7fb53f03dd..3fc0dfad45de 100644
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
@@ -43,8 +43,8 @@ RDEPEND="
 	)
 	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
 	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
 		<dev-python/priority-2.0[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 26e4d368e096..afba7ce3573c 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,7 +1,5 @@
-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 545 BLAKE2B 45ae9d804e9b469cf22c911e47b809f2084aae6968dd46471bb34aa7589b01711b6f83198d6fef4dd19c3be9e9f7da661bd4ed67480735d9acf8bde1985b23c2 SHA512 5c7c5bd49359b956eb4fb76a570b1eab593b66feb859c7a0dd2ffcacd8187c69b8910f4ed46db9bb67ae3c8ac1a972c5313898f412163b6442c0cf3f493e74b4
+EBUILD ujson-4.1.0.ebuild 544 BLAKE2B 0c38370f6a502b4b0649af5950768ecb08e52e499fe6b10ef9250d8e2e7b5d9151d3a6b8847c29ecd606fa2877ddf2b3f89992c4aa1ecd268b98bfde81028e88 SHA512 eb9851665382569b44ab5d4bd156b0b4b3751254670282f436f24d524d476e0f49e975357c4e5e15fd49134e2f4871ab68f554ffb45ca6af807102a4f862ffe3
 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.0.2.ebuild b/dev-python/ujson/ujson-4.0.2.ebuild
deleted file mode 100644
index f7d4a69a2229..000000000000
--- a/dev-python/ujson/ujson-4.0.2.ebuild
+++ /dev/null
@@ -1,22 +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="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/ujson/ujson-4.1.0.ebuild b/dev-python/ujson/ujson-4.1.0.ebuild
index 630cfd49d413..f7d4a69a2229 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/unasync/Manifest b/dev-python/unasync/Manifest
new file mode 100644
index 000000000000..0329b7e330b4
--- /dev/null
+++ b/dev-python/unasync/Manifest
@@ -0,0 +1,3 @@
+DIST unasync-0.5.0.tar.gz 19060 BLAKE2B aa7a955aed98ab33cc1a12aa88a02ab38ef90f9494f04c3e032b66e56e033404e9b59a89834a1e07b224fb865af5d139c27ff91ae5fec8ad01b1e407d9c5c181 SHA512 5b68e9a70f487b2b0fcaf9a5c4240b366428154fda99d53120315382dc29d2cffbbed72e277cee1764f7b91158db3d8b394d4f4969cec1fd7e49f27f01c39440
+EBUILD unasync-0.5.0.ebuild 720 BLAKE2B cc561b982139da44aaa95152ff849189abf89dfa487bac16a53e799c514f71baeaaade6744fe13ee094b29f0e27d3fffa4ea488aff6a64dcd4953def45f16aef SHA512 fb8c9d88e105fc0c4d9e877ed5c802a29639923d98d6d0327e6a7082cc5cd485f1c88f5552f5bd73e611aafe636b57cd851fd6c413d3b57a36f17fb6092ac143
+MISC metadata.xml 398 BLAKE2B a026d901c5516e4cc96b2c27301f5645cda800ee33f28ad3be49aa97f0b8f7801519efc6abdaa902e805b08fceb7d8e1d197b278faa766957f4ef7013928aec2 SHA512 38e4b5c7d490ae36b8936064681b0549e12d56fbcf2fad4363c53c896f35bda9b23477009bea2a67b1d074b81cdb592243d714046bd04ccff6b47c288931f6da
diff --git a/dev-python/unasync/metadata.xml b/dev-python/unasync/metadata.xml
new file mode 100644
index 000000000000..6c4a91c7c7a2
--- /dev/null
+++ b/dev-python/unasync/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/unasync/unasync-0.5.0.ebuild b/dev-python/unasync/unasync-0.5.0.ebuild
new file mode 100644
index 000000000000..2d1854f67f00
--- /dev/null
+++ b/dev-python/unasync/unasync-0.5.0.ebuild
@@ -0,0 +1,24 @@
+# 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="The async transformation code."
+HOMEPAGE="https://github.com/python-trio/unasync"
+SRC_URI="https://github.com/python-trio/unasync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	# Stop test from breaking itself
+	sed -i 's/\(env\["PYTHONPATH"\] = os.path.realpath(os.path.join(TEST_DIR, ".."))\)/#\1/' "${S}/tests/test_unasync.py" || die
+	default_src_prepare
+}
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 100b9e61ab4e..b7f9292be4e1 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,3 +1,3 @@
 DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
-EBUILD uritemplate-3.0.1-r1.ebuild 664 BLAKE2B f3eb9b855dac55e57784bbd1e40b72805dc444ed8b972fe0f2528feacfec3556547b289c72fa8ab298efd1cb9eb50ecded14a9224ef2f13c4800ee2bbecab057 SHA512 62e8742772ef5aa364edd479813eddd0c44341d9c6989e8779943846445a437d533a8aca12039698903eb958cf500887cb163c2214b530c0f1ed2c53eb75a3d8
+EBUILD uritemplate-3.0.1-r1.ebuild 678 BLAKE2B 6ec19c68e7d5ee824f4e8c5e919f0db6943722e38da56dcbbb93f329288a4f7f48accc096885fbfd827d43e4330752d68a8d678d09911670b916c19d02f82b0d SHA512 9c96b47e67670a01e2b14b193ebedc9c7b889a554563f2dddda58dfdcb51875661b91d6fde8cc5433e230cdb626fda2b31489d0e73138cad136d3762098b69d9
 MISC metadata.xml 325 BLAKE2B 3f78902faa0347b112f36292a5da4d27915ea6d415c76feffbab8b7fb8361fcd8c9cd7045cd7155f6a7749a9d86335d600e094c2c326885f69ac5615a0be1b39 SHA512 908711f5d93c2c9cea94bdcdb072db8a47406e8c44459252d7166741dddebed2693f67ab5bbe6a6064b6fbb015d39b4be42a9bb7477cb931c6033569fcdcf37d
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index 67e0d2d5b696..bde32369e96c 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 12fb38e321f3..5c2eaa5b2a2b 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,9 +1,7 @@
 AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
-DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 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 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
-EBUILD uvloop-0.16.0.ebuild 1425 BLAKE2B a68a3b809d65174c8047eb7242de2962ef98f16b7164b6c7931ca8ed60c84d9c1f588b0da0f38afe166b3ca35bc20637c3cdcd80722df6c877e818b6af3ecc30 SHA512 bd67e3e5a2610145f631977b204a8c454d9360fa50ef7f8ce1ca9d42ee8ab98af0d2e7a02bc493e823c6d55e18bb5ddd03b68d5f7ac5f4866a23a719e58a63a1
+EBUILD uvloop-0.16.0.ebuild 1424 BLAKE2B 1b1b05b997d4a9cc11a85e5b282235996306a574a2124c942955ad7a7d10bccf470ef7d45500143876a01e03658b38816594df0fb8e7493ea0637bf13245e7e0 SHA512 55464c13ade2ac05ce2c97c784fdbc48bc59ec0414c7012d81d49d24698f081b9ddee364cc46caa5bc9df81fa3f4c94ae86691217b00bc55e7011d4662eff459
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
deleted file mode 100644
index b10e112d367d..000000000000
--- a/dev-python/uvloop/uvloop-0.15.2.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="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"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
index 3147c753015b..5c62d7d83df7 100644
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 56169d34c024..593c06b0f0fa 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,10 +1,5 @@
-AUX watchdog-2.1.2-big-endian.patch 2861 BLAKE2B 05849a6c6a23b4ef55c5f92a46ab57cf8a76cc34624e570287c966ab4911023383e776ba8c13c098994fe3a7088b8dbc984c11717dcf3bda4e7f6480dfeaa5b2 SHA512 8347eefea383db8ea9648560bba03103c3fbce640ad54c2da479ea3525b9e944deab10671dcdf100c7cfab9f6a3fd85987a16c07fca2e784416226e1ee862395
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
-DIST watchdog-2.1.4.tar.gz 98695 BLAKE2B 2a15b362c6e776146df4738096fe0cd8ec49894c6b767e86ed5749c2f97447fb890f172ec989a17140594070eefa1fa2b40275aff5ba9d212f77a059ac3ead25 SHA512 88bed725c045f59091902a1fe4673036a679d263c71269e36125df2a4c851864bddee0cf4f8c3f20bfc2d5f735804b7c7b1ff07a3d89d8649bfa16d3e7e1fe21
 DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2045f3cc06ccdff86e305fecc5b95c93048aae9f0a7b2629c2c4f10911ef21077a570b9fb0c3eb03e9597f555f SHA512 850feaf4f5d61b8c8f1521464853df65b72af80c86c63fa87769d17f2bc464112daf3e09a8d83e30474d398315ce854e5a45703c5eabad8b0f5f98f6840d2590
 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 1053 BLAKE2B a7ed523caeb5253b9e8ba12f648601b68e568adfce137e4bf2b53c1b5b214730afcf6b07460e197bf7f2f9c6463fd24b3531efafbc98b122131047d461388e53 SHA512 0f654bfb015629ef6d7e1dafe2f55d886234d7d67f62d39141c779fb02f73ec6f89f31ca3c8e6fc485caa7f8d40ae0b43cc16289e98046827b945c1a45c33a63
+EBUILD watchdog-2.1.5.ebuild 1058 BLAKE2B 5026b5d0cc5686afc160ad8a5bd566caf1d60b8bb3f0339fc0cb5194be33efd41c11e9cb2d16200e69f57ab635001bf39a54d76ff4b5e92a1ba0531bb016329f SHA512 47433d4c12ef0bb847d203d4cdda59ab6c03703bb4428014b3f4a13afebbfcbb92845101426ca2e8e05e4742556c09941a84407b4b4f8ec24a99c333901c3b1b
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch b/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch
deleted file mode 100644
index 61ddff816a88..000000000000
--- a/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From ab6508716f95fb65481ab6232301a095452e9b49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 19 Aug 2021 15:13:39 +0200
-Subject: [PATCH] Fix test mocks for big endian systems
-
-Fix the mocked inotify data to respect system endianness.  Instead of
-harcoding the raw data, reconstruct it using struct.pack(), respecting
-host endianness.  This should also benefit readability a bit.
-
-Closes #804
----
- tests/test_inotify_c.py | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test_inotify_c.py b/tests/test_inotify_c.py
-index 81f6586..dc336a3 100644
---- a/tests/test_inotify_c.py
-+++ b/tests/test_inotify_c.py
-@@ -10,6 +10,7 @@ import ctypes
- import errno
- import logging
- import os
-+import struct
- from functools import partial
- from queue import Queue
- 
-@@ -52,6 +53,19 @@ def teardown_function(function):
-         pass
- 
- 
-+def struct_inotify(wd, mask, cookie, length, name):
-+    assert len(name) <= length
-+    struct_format = (
-+        "=" # (native endianness, standard sizes)
-+        "i" # int      wd
-+        "i" # uint32_t mask
-+        "i" # uint32_t cookie
-+        "i" # uint32_t len
-+        "%ds" % (length,) # char[] name
-+    )
-+    return struct.pack(struct_format, wd, mask, cookie, length, name)
-+
-+
- def test_late_double_deletion(monkeypatch):
-     inotify_fd = type(str("FD"), (object,), {})()  # Empty object
-     inotify_fd.last = 0
-@@ -60,20 +74,18 @@ def test_late_double_deletion(monkeypatch):
-     # CREATE DELETE CREATE DELETE DELETE_SELF IGNORE DELETE_SELF IGNORE
-     inotify_fd.buf = (
-         # IN_CREATE|IS_DIR (wd = 1, path = subdir1)
--        b"\x01\x00\x00\x00\x00\x01\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00"
--        b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(1, 0x40000100, 0, 16, b"subdir1") +
-         # IN_DELETE|IS_DIR (wd = 1, path = subdir1)
--        b"\x01\x00\x00\x00\x00\x02\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00"
--        b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(1, 0x40000200, 0, 16, b"subdir1")
-     ) * 2 + (
-         # IN_DELETE_SELF (wd = 2)
--        b"\x02\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(2, 0x00000400, 0, 0, b"") +
-         # IN_IGNORE (wd = 2)
--        b"\x02\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(2, 0x00008000, 0, 0, b"") +
-         # IN_DELETE_SELF (wd = 3)
--        b"\x03\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(3, 0x00000400, 0, 0, b"") +
-         # IN_IGNORE (wd = 3)
--        b"\x03\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(3, 0x00008000, 0, 0, b"")
-     )
- 
-     os_read_bkp = os.read
--- 
-2.33.0
-
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
deleted file mode 100644
index cac5d8992dd1..000000000000
--- a/dev-python/watchdog/watchdog-2.1.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=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-big-endian.patch
-	)
-
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.4.ebuild b/dev-python/watchdog/watchdog-2.1.4.ebuild
deleted file mode 100644
index 7b9fe168c229..000000000000
--- a/dev-python/watchdog/watchdog-2.1.4.ebuild
+++ /dev/null
@@ -1,43 +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 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
index 19dab80e9b44..6ff4d4193bde 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 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index e7ef038e7207..5a607d4e0c77 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,6 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
-DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
 DIST WebTest-3.0.0.tar.gz 75871 BLAKE2B e97d050c1077d74e463e3409580d021424f755933bb9d5ac5e119c70c76890d5632e565f03a02f3497e21fed95158c56b199a877fc4575968f6b4af2655db8b6 SHA512 b97a6311d7e3bf653bec93c2390fb75c991d0dea6148680d8b6ff87861c130518a5d150dd157eab9b032b278566ad12c0ac8f5fc2ddbeba31e35de1e1f06f747
-EBUILD webtest-2.0.35.ebuild 1117 BLAKE2B ceab3f56a2076b41056ed2fb5a86e96bf010a0c5c61cd8ed2e21eb958bf8b4e7eb97d99c018d5a75964f6bb0c0bcfec2037e4487dc72925559316090a743a885 SHA512 d3d245f1ca0324fc8fc22ce8ec9a7602a54685ebac19029982cd30ef1ac37cd6672711d6aca1ccc62c151d15d56a97073c2f05b5c338b36741393e58ccebe448
-EBUILD webtest-3.0.0.ebuild 1019 BLAKE2B 2a4a745ad7cca69a94b884ad26bdc3a204f4fc339e9e19ee0f31ad5ae4bb5a6620951800f2e7e15b60e53e874987d959c4f84a8b8d7f54e9d6f6341a91de69e8 SHA512 60eff4a50e2cc6a3e52dc718f3b09ab61783ae47f4bfcf971af5cdc7cc242fe8e572207488a0677a9aaf8c05e8e007a213f841b1aa9d9cf9c38b90751ef10de7
+EBUILD webtest-3.0.0.ebuild 1011 BLAKE2B 15c3f19962923822eed51b1dfaad42a98e018eec0f530d26836b5c64c9b7873e41279eaa427912fae4833ea813281c36851f5bbe77950725d715cec5077d262b SHA512 91c3a7520f775392ce17bb161f90a8b810d9f8c35e08cdaf1dbd302951c965043cd1fc82ed5623705fe0468fe61059d2b06f65983a30821e68744d8a4e0d99ba
 MISC metadata.xml 335 BLAKE2B 423ef6b809d06fc79897080a0a1d99beb5c8ed05ea68b0bb9d93076d21407b75f332478de3462a7f267b495b7d99d0ca8b05fc04f2420ad05df7151048655b95 SHA512 c4f686825404a8be87906b4492ce190e9dd350eed9a9ddbe765f48e296e771be0db4937c608e49ff2b8a7d82c63e1d62cd84a67cfe57bfc1622e2223f8b8ee70
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
deleted file mode 100644
index 6b1ffd9087b4..000000000000
--- a/dev-python/webtest/webtest-2.0.35.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="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/webtest/webtest-3.0.0.ebuild b/dev-python/webtest/webtest-3.0.0.ebuild
index 209ac9463c78..7d3eadc6cce0 100644
--- a/dev-python/webtest/webtest-3.0.0.ebuild
+++ b/dev-python/webtest/webtest-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 2832618a0c8c..cb340f0fe0db 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,8 +3,10 @@ AUX werkzeug-2.0.1-test-warning.patch 2830 BLAKE2B 292f19ade3dec20def690e56caa51
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
 DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb8f0d05a8cd49f09707c368b6f9649b299f427fa7bc2e54628cf3eb688c399e420ecd54f12d7eab9cb063c7c740b07 SHA512 8c8e36a58fe53ac4ad3152a34145c726a9145782262b9d47be7bfe9a8e127666b0d0c0c50d305277a153298644732efe37e3785ceaa5b11394adfeb70d86e70d
 DIST werkzeug-2.0.1.gh.tar.gz 894795 BLAKE2B cef0c6d704604d8b63d9e9d1ef8f232f97cae6654a4284b66ba7cd97f850df725d644ea11ed898a53f69668247545de86a9c44bc381606c700f4e2611fea7699 SHA512 721a6c3cf8f803c80873f68d94b273da2ddda79b5e83d9283b9af3d3c971bb8c7ac7828c7a60c33b9bded7b05f063810df12fc266ee7d264dc6261100fc97708
+DIST werkzeug-2.0.2.gh.tar.gz 896727 BLAKE2B 15506d57a8545eb45cb0f4efb78bcc4dfc1faa68910f09dfdd14f4bbb2404078247a7f61475c5fff9058a1557f7f6541eec262fb274e7ed82e1a82b9f644cf8b SHA512 789f210546c089e8a437a379e516147fd854806357938bd559a61855182143bdeca967c86a41d004e6adb119d31e4493e3c36e74aff989ee9cd08e48d1428dd9
 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 1169 BLAKE2B 2a32953488b2934bf6e7548a023156689dd1c36ec6d95cf8d1305ce6f5028ed7dcb591b4f9ccd82adbf60929502a39b191011b95c4badbc84fd7d448186bb64a SHA512 f367265ef139ac60bd6cef591cedc53b2eb6ae47be8432f9ee1c191c4b39bccb085d433795ba43cd62ada1007b280c34f4923ce984930b7296714916830199ca
 EBUILD werkzeug-2.0.1.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
+EBUILD werkzeug-2.0.2.ebuild 1091 BLAKE2B f65f22c5ee499fa00459fe80605ab86c8645299997eb76c7a7227cea210fda84bdd8b2425db1bddab18f2e8490d2c9d9ffea229a9afe3786b120da01ed7f64ca SHA512 1809181fe5d57329d13b4a5a4bb1a028b5bf69ceddc93f9e9b7cc05e308e267fb2138fca13d892799df4c955632cc9ad9ce3145a50d45fe366bdf3f9ae77a4ca
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.0.2.ebuild b/dev-python/werkzeug/werkzeug-2.0.2.ebuild
new file mode 100644
index 000000000000..9cd9d744d14c
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.0.2.ebuild
@@ -0,0 +1,43 @@
+# 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="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug/"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing --via-venv
+
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:httpbin tests
+}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index f2bbb09eb4a4..71884df1cc4f 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,6 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
+DIST wrapt-1.13.1.tar.gz 130138 BLAKE2B bc9a0238a4e16f36e83a6fd81e94d5a257e27e0d5864dc98ba4036f16c3cd92b971e9eddf8193afd13b5afe82ac4f83d50e66f8bedfcd0068ce53f162f4f7ac5 SHA512 a5d7d9013e975261608563fc86b92dd9d455b9efe5f5a79800d317438317f86d59b5678cd4c053832aad2e35dfc08d75b16ed456564cfcbb6541a12a1741352f
 EBUILD wrapt-1.12.1.ebuild 765 BLAKE2B 54e2d2d3ce53c7c234f48b305bcfd1c0b1c2a4ea00697816871580dc5347f428af4729ba5f7c280e31420ea88221a640430b8e98472ebf2ab85da2ed882e6253 SHA512 0ec5d5a96394877bc7a29b7feedf13a203d7d0c8282d3f452c70a9026234f6888187756232a98e94bb90c459c2d9c90de9000722bb692fa70e826bea8518d640
+EBUILD wrapt-1.13.1.ebuild 700 BLAKE2B 57f46f61c3f869b7e7cbb83447db0e9903079019f44ebf34144720584703843a43b9c5fb9f244e5b604daad6673ff9d3a405f7814eb51a1b30fbe4f71d394efb SHA512 aaed5b5ba473d52598f08c83744da901f98220058c7312943190b5792690e93e4fba44abc1543fc906df0dc6c7ffd7354364338c6740f2f09b979d00a178fd65
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.13.1.ebuild b/dev-python/wrapt/wrapt-1.13.1.ebuild
new file mode 100644
index 000000000000..01eb043f35e0
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.13.1.ebuild
@@ -0,0 +1,24 @@
+# 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="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index 1b7cfe19bf76..3277f4504632 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,5 +1,3 @@
-DIST wurlitzer-2.1.1.tar.gz 8674 BLAKE2B 08cad7fc0ba0852a5d54b9141b419ed822330b763bc6a906be0be0f7f6e4e0f8d6c83e62fc8a63f5179babbaa6fcd4d8fb1e4a876631e324bd53d21f4f116f68 SHA512 776dfbdbfbe6c87818ce527519730a20dbb43f140751195c67e73eb3fa5a9a9181b8b475336ee43a184dc5b712ddaccbfc74bb0279b47f2d3b3e4d7db4a471ea
 DIST wurlitzer-3.0.2.tar.gz 9846 BLAKE2B fe3223d1305891b60b9b3c361e05047d227f5682c63a47135b0d3e95bc373918266ec4cc141c947ff68795da12a8ea0c3c9c7e7a6ea31de8af22766b3354bbca SHA512 b0398699a15910511726053d32aa883fba249df9e7de393d645e4ac927d6ee9950fb459d27129d2806e39494245250b23ddf41acd349af514056dba1739cb1c8
-EBUILD wurlitzer-2.1.1.ebuild 473 BLAKE2B 2960ea9ccea6fd094203a218bdbb3a44b460b1328a9ec7583f2d73d2aef72bbeb7e47c42f69a8445e4cb1ab2e1279e7dd8e6f90b818c8d7691a69ccaf9589466 SHA512 c43a89401f61bb4cc8e9b1fcfd2adba3d31e63be205199bb5d0367b8351b89e7ba491778bab3c474c20dae13d1111d8f732629b3d04d3755805244d9798e62b2
-EBUILD wurlitzer-3.0.2.ebuild 475 BLAKE2B 8aa6064965e52171223e2248a54081c39b84525b1f0a078be87cfb4932371dfb798e12e028b9b460c6c71a5756b78e0cc8d397e39b3115c974565a0b459d7372 SHA512 4ca1602d0618afb9087992b91b44ed0c4a5b019b8f10c84c71efc881c9df02a161854faa89c99ddfb2aa43b974d638a098a94e35c4037c1e3c55453c2831d1c3
+EBUILD wurlitzer-3.0.2.ebuild 473 BLAKE2B 2960ea9ccea6fd094203a218bdbb3a44b460b1328a9ec7583f2d73d2aef72bbeb7e47c42f69a8445e4cb1ab2e1279e7dd8e6f90b818c8d7691a69ccaf9589466 SHA512 c43a89401f61bb4cc8e9b1fcfd2adba3d31e63be205199bb5d0367b8351b89e7ba491778bab3c474c20dae13d1111d8f732629b3d04d3755805244d9798e62b2
 MISC metadata.xml 410 BLAKE2B f4b2bf2a0b40dd3bc003c4f2b8538fda1da58ec272854b16ba14350f4a19d5e775f6bd7a804e4bac5cc9f6d45120a838992e35e263caefc2c34ed57f773c73db SHA512 3460352689742cd8a132c3d5261c7d3bc47ad311fa51343c47d991eee2ef9fc6107767a05c1d628df24ab68c946abdf1a5181c046b104e741d6597937102b2b2
diff --git a/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
deleted file mode 100644
index 57afebf51516..000000000000
--- a/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Capture C-level stdout/stderr in Python"
-HOMEPAGE="
-	https://github.com/minrk/wurlitzer/
-	https://pypi.org/project/wurlitzer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest test.py
-}
diff --git a/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild b/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
index 7a64cf34ebad..57afebf51516 100644
--- a/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 5af3845436a4..9b6ab4c8e898 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,4 +1,4 @@
 AUX xarray-0.19.0-riscv_tests_datetime.patch 1832 BLAKE2B bd38f8d95e67d8c44a17db4283b0e2c8d7b1a87ea2d4c96dd65e186b99d453d4cf3f5b52d70e2077648612c44b9fa26a0f44740f89fa23000bf7f88ac5dec7cf SHA512 40be0dd9969e21dfb6d6183d1aaa18ead960c6aa4888a10b6636bd3ab05d5995fd95c18fd87b95de535b36d0c0bd90302e9e781229407f25c7c68b25042d197c
 DIST xarray-0.19.0.tar.gz 2882403 BLAKE2B 454595076074c9805f0ff6f8b761a61e4c172445f2fd0bbcbd39a9615f3465704871fbc5f7c1a9c5fbb1c80b6c47cd677e590e1513ca88cd67908ef3502d234e SHA512 8f4ce7f770ea10e757112b722c7e7a56f19be2f885c63620d547cc54d8b625a5a23c5e603ba804c4d94f2a94863aad8351a9f6ef22ccbc1a78d77a549a21356e
-EBUILD xarray-0.19.0.ebuild 1184 BLAKE2B 52021817b18a0d20566ade83bb0b7c3ce4912529f5dd587904bdfefc289433b04c5b655e14bc20abfc5ed1706cf79aa27f50a2f4de0fd928219e8a8582293357 SHA512 8efc2bbbf62d5d3599b86adab334f8274c967db93b8308000a4f45a23b735bbfc5aa91b87f811545f18af99b0a0a089cfbb0f90f7e723d194d50878c020073b6
+EBUILD xarray-0.19.0.ebuild 1183 BLAKE2B f195e4b00a9ce1a261f7fca26bdae0ec4c382ca2f864c8ae0edb8acf6fe21dbaafb22cc6267edeb681b02b0aa125a809fb282c6a0023e88b39d319101ee5b430 SHA512 0e3059e47641e26cd3f4a59ecfcd9b6abd05ecc082919ca0f081a9090d61669aa62df7330b3f561c5d02f408bf8d0ad1cc857393fb1af4379c8bed1213191462
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-0.19.0.ebuild b/dev-python/xarray/xarray-0.19.0.ebuild
index 476ba4d0219a..257015a19644 100644
--- a/dev-python/xarray/xarray-0.19.0.ebuild
+++ b/dev-python/xarray/xarray-0.19.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index d1cc4e638dc3..11055c43d5d4 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,6 +1,8 @@
 AUX xdoctest-0.15.8-pytest-flaky.patch 1126 BLAKE2B a96a688165b8781ce189f8963df89e6ee61b6f53508c78de0b95ab8c519ab5d618a835a78c21abe23d79d34cdd9c7b677430ff3bacb05d26c439afbaf886288d SHA512 20749730d000d50a80c660e536be465463d08162788c470f51721fd793e9cee9eb0138e1c82979dbed67976aec6041adc55c33f8d518ec9cd9eff2652ad8f56c
+DIST xdoctest-0.15.10.gh.tar.gz 191579 BLAKE2B 4836b773c3cf664c825433199b13ab7d3fe2c68538517bf5594797ad3f2f894d0132034fdafbc4502a00ec7393c19473fafe15fcf0257e3565592dc9907e3d71 SHA512 18c1a2774ae9331582610e3459a02f4e4de838218e7250af071570b2318f4c14330084b9fb903d88651fc40a4ba12b686ee6f2ca165edd8155e908ae4992a840
 DIST xdoctest-0.15.8.gh.tar.gz 185463 BLAKE2B a16578e6d50398ac80d950bcc9a05131880816e2ff3a15bd1489474e532f9b495d099dcea204d8375c884c6957aaaba9b276fbcb65b5717b2850314453f787f7 SHA512 ab4f991ba6e312bf6cf675c3bbeeae87c0666b96c911ee7727f64b8e4c13420bb91e0a7a955ebce73b3fb15625b52bbf1b67c6edfe91234655501060b17723d5
 DIST xdoctest-0.15.9.gh.tar.gz 190313 BLAKE2B 9980752ad5742a7c4a73418a3ace408c38a6bef6cd43ee5cd1893d6cb195a7c387c5062735b2c903725898ea670e3e6d8e683d4341dcf2dc9e17a2c723107910 SHA512 6a49fbe7f2535ab86ac7047406fbcc9f7e98c964664a95a115c3d945ba8157e4e70ab8c31edae6faee932cfd5e90201d883d9b4b10e2cea9cdc8ff14b5d52d54
+EBUILD xdoctest-0.15.10.ebuild 765 BLAKE2B 76106ed120b3af56642290aa67371e3390daee4881b9d64f4b376a365a3723c57981327108b8e37bf80a2b875ae2981e2f5c4e531e581c9952c000d141fa7aa6 SHA512 226ade6502c30804020c18ac7707105cf0aeee16a0e08382d4dcafaf8590da738880f7e391edf64ea1ed8da7b6affdd1c6c280fad26c978bee0d4d9d97b65805
 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.10.ebuild b/dev-python/xdoctest/xdoctest-0.15.10.ebuild
new file mode 100644
index 000000000000..de12e44c0541
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.15.10.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="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/v${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/xlrd/Manifest b/dev-python/xlrd/Manifest
index 3cf5b9c588da..9f30454dab19 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
-EBUILD xlrd-2.0.1.ebuild 592 BLAKE2B afaec13f8fb33d5073e71b32c2482de82f7fe79231467fe546c35e12ab589b6dc3480b0738ba8fc019c3dd454b471b779aad64dbea44d2b1d0b18845059a8d65 SHA512 0221032cecabefaae369aded38c31623dcd13d9968db3f42984264344dc574023937516e819cc8ab2ac773c29a65a7d7e98fc54e4b0516ede75ae435f66c1833
+EBUILD xlrd-2.0.1.ebuild 591 BLAKE2B e0798cc6df3e6d2b6aa4b6a080df5aa3f6def7a35caa565543c0e9f336fbaab3a82dfdddc3441fce51153ffc38da439f9e07852290363a74b0380549bb676b64 SHA512 fe3f6e76d7f366cbaf6c49155ad5f2a2545165387be36ec7a1d7cb42c91ff9d30b8e21ce91bba772f1d8193a8144779f5e9aabec5db5051a7cce74e9817deac0
 MISC metadata.xml 576 BLAKE2B 7146486fa8a2bab5361906374c81a7557837ba2408b34178f1c30c48dcb09a696151b9a4a14c98ae80108bab329215d13fd57695cbe710cf4da0d9fc10fb3030 SHA512 db59cf6c70ffb69390c0f9a7b9682c48ea3b786aa53e7fdd92343efee0c2aaf8791529237fa826cc041eeecf290d95fe69b6ff099b304da945cb62b4e3452832
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
index cf1405b9fc30..155ee03f124a 100644
--- a/dev-python/xlrd/xlrd-2.0.1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index d4aa69dc63e9..19798bc1f7a1 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,3 @@
 DIST XlsxWriter-RELEASE_3.0.1.tar.gz 34350396 BLAKE2B 441d9969df932ebe636474ca10eb260cea160b71b8bc46a78964ffcb752acdaeccd69703ca80a2af4c5284c5555f49c62cfefeb5fb8cdb9f0c305be44848815d SHA512 425e86acd8e54e89393931e5c698c244721ad16fe4bcb13aa9038ad7ba279803f8cf5c3b35170b274a0386ada03ba94ac385d039b3b8aa97c86f0abff4a20e58
-EBUILD xlsxwriter-3.0.1.ebuild 590 BLAKE2B 89a4697a347b45c38cbf43f72501fd66bf0a353db68c7aa935f16e84931be6670e329d55c82830448a21b7251f71aeccd56cc7f58e62b00fab5dc0adff90ba8c SHA512 b5c56f5db0a0addf5e616bf2c32a76c2e17424e4d5de3b34683d9af63b7dbf773425edfe088ba308a8bb2eb68c14804d0d60f4139e803ec15b0aece855cad96d
+EBUILD xlsxwriter-3.0.1.ebuild 589 BLAKE2B da0ee6ddb320f36cc918de0c205205df37479036ce9626470d1e9e0eae9f769ec743b7ef32e8726f994385657a653e7d02eb71c0c84d6b7a9e95e8d5a585e040 SHA512 abb84e4b741f4838c6b2e8c5880d765c71efdfab7a3b0a99656925ec42f9678a754a1bd96831db6be2155b8c346579b4b347bb8eb55fc5595823c9fc085403b6
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
index 8945048769f9..d4166f77d24d 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index fb6842687cf9..d274cf279c15 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,7 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
 AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3ed8c7cf0878fab338996d386916db07fd82c4ce2e3eee32889e40a76f63b383b2a3ba4e2de9f7a9fa383cbdf1 SHA512 4f112e61bd3b38aa997b84af581d1926ae0b3078c59ec14979422a182a825a2e6e108c1066a67d7f6cdd4eff9d70b9f46f3e5c66a054b114eef9bd241a214865
 DIST yappi-1.3.2.tar.gz 936566 BLAKE2B 55f114b8ed8689944f8146cb283701b41f34e87f3e5104d7d8df239cd2afc24f1ca1bf86f99bf672735677005df6527c83c5306a7902ea45e335134a925d6e18 SHA512 7a555bf6db8d7b9d8b4e36ceda1a40319a3d0aa478c512fb0fbca678dd3966b1facffa7555dca1ffaf07461ed3ab81284bd643e331eb2e6d1ee9c99eab1acb55
+DIST yappi-1.3.3.gh.tar.gz 936700 BLAKE2B 45e974949dfeaf6487dd76ef13a1b7f4456e805e50d85d089a366c5dc4ac852ccc117224ce5f17affa1f1ba1950a86b6f666cbc8e76edf51bf21cf2f527b877f SHA512 5634b8af997a082031ad1ec12eb83498949f1a56be3a324137d118f55ee51758af8c129da30138fa54f165eafed1572fb2289476e6d0cd838a884ee9118fd8da
 EBUILD yappi-1.3.2.ebuild 907 BLAKE2B a0b6a829db293ff3529a65789eea9060b5c280e71a0f972ba9601b111e442488324cd9aa109f8f2d596c79c07d798833636b320ab4547a32c0d783a9cea7a81c SHA512 de3a6f723cae4803b582be6703f04342eed9513a1dc3be4f175690a52b3454b08980f88ee4a31d2eb4ac11733f20475a11b837e2d880a4a51210bd6270010710
+EBUILD yappi-1.3.3.ebuild 846 BLAKE2B 800c136a45c3dd1fadd317b58e1edf46488e30405d2bb7c2a610cdadcf56f6ab66d95d2c5e33e6b0de184b8b544e9cbceee16952693577509b1f12e3a686ace4 SHA512 1f08991de7653b2403b167a86776de496d53e389275f3edb72e1da6906d3c7947ddee39535d54608b2497e5783923b93b85b962ded51784817bbdbbc717754f1
 MISC metadata.xml 489 BLAKE2B 243541f7de9fca044073eb0f35d32b751738c9172dc1ef15599eed56c0c8b2e9758d703e555aadfbdd4d1f96def39f88798be495d80fcbb763e0f1e0f3590822 SHA512 2eeeb6c6b73f5077584150d05e9c1d8bef00d0fb83283c6f5804ec31151f3e59d2de91ecd86508a2fc2a61aaab7e82455c633487f64a4c6dcbe5ca9229fe20ed
diff --git a/dev-python/yappi/yappi-1.3.3.ebuild b/dev-python/yappi/yappi-1.3.3.ebuild
new file mode 100644
index 000000000000..96b069349546
--- /dev/null
+++ b/dev-python/yappi/yappi-1.3.3.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+# no tags on github, no tests on pypi
+COMMIT_HASH="8bf7a650066f104f59c3cae4a189ec15e7d51c8c"
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
+SRC_URI="
+	https://github.com/sumerc/yappi/archive/${COMMIT_HASH}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}/yappi-1.2.5-warnings.patch"
+	"${FILESDIR}/yappi-1.3.0-tests.patch"
+)
+
+python_prepare_all() {
+	cp tests/utils.py "${S}" || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 2b80a0ed7846..d0921a21baaf 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,4 +1,6 @@
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
+DIST yarl-1.7.0.tar.gz 168325 BLAKE2B 25d708935c8b97142ee729827bb70955458d8ea8212d2a6e59dfe899f2cff41a8cfd93581f8e0f80a3ce194707068ad968f1ae8ee0434e11ac8f7909abda246f SHA512 581b786710c334a8f3d2259678f2bb22c40a0c2b125a786c81a9dc9e4e637e3eb80f11194835f58ada17b346b840ae1a539beba37a52e59b648340cc93f65d5c
 EBUILD yarl-1.6.3.ebuild 927 BLAKE2B 86f90493dc43c951fb824c3e1f9c1ce789c376bd92646ac314e7fb6ebe9e1d88554cc05e3a85fced290251ce12645565c0ad343c2b2a87b4d5046f31512c5881 SHA512 376fceeb9f260ca9444aada5fb4fe080f0a9eb0ab7740b7b05243c0ae1a0bd63144d503e1e893af6403da02243f95afb9aa00ef7e19d640af3fac52a7df556a3
+EBUILD yarl-1.7.0.ebuild 783 BLAKE2B 9c88ad8875d1d24531e960b9fb4e353c8b235ec4aed37d911e857241cc9b89c636eb93032398e5ba903edd8d3eee1745841d1feeec04aa489a95a746d955533b SHA512 7db615ae4ab1184dcc607c77806d79a17f8941474ca46d49c7981720f1f8a95f25be9f2dbf2df30f590c3aa73d8b084a0ea5d9b93b4d12da8b871c3922bacf4e
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.7.0.ebuild b/dev-python/yarl/yarl-1.7.0.ebuild
new file mode 100644
index 000000000000..c30d1180c9bf
--- /dev/null
+++ b/dev-python/yarl/yarl-1.7.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
commit	e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree	4c5f7db60483518201fef36f8cc0712789a08db2 /dev-python
parent	391b5b359a346aff490103da7dddc85047f83830 (diff)