gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-python
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
476 files changed, 5688 insertions, 4032 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
index 24380890aa1d..f045b8742135 100644
--- a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/GitPython-3.1.25.ebuild b/dev-python/GitPython/GitPython-3.1.25.ebuild
new file mode 100644
index 000000000000..12f116358c54
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.25.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 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
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.9
+SMMAP_P=smmap-5.0.0
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream reverted the changes needing py3.10's typing module
+	# but did not update the dep
+	sed -i -e '/typing-extensions/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest
+}
diff --git a/dev-python/GitPython/GitPython-3.1.26.ebuild b/dev-python/GitPython/GitPython-3.1.26.ebuild
new file mode 100644
index 000000000000..12f116358c54
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.26.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 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
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.9
+SMMAP_P=smmap-5.0.0
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream reverted the changes needing py3.10's typing module
+	# but did not update the dep
+	sed -i -e '/typing-extensions/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index f4c7fc286983..d0a2bb2304a3 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,14 @@
 DIST GitPython-3.1.24.gitbundle 9658020 BLAKE2B 4ac2c1a238de1d6e5be9f2d65ec486a1a48b38695946889f8ba1c7f0474216e251d6385737d0576be9ece09d3751a305d756b58a21dc20a279609a35553de0f0 SHA512 9f05b4c92b85fa80e9b774380758c1a6e0d4ada81c170ddd6c542a31fae1a047844a481e8478afc3472e3a226f8eca1a37a3ef7a6b9c06787fd84543cd073b1e
 DIST GitPython-3.1.24.tar.gz 191249 BLAKE2B b60f5186aea33434d77b63997e5e9dc277b49a97934bfe250795af9c0ed92d00c478dd4475a00faa2f5867882f81161dcd21ed46c86883a48b8397266b5318de SHA512 af2aa85574287827e5d2b78f7a19776be57518aa0b8af7a3fb92bef0d97c6a27b3272ed39adf2080b39cd5a9eb114164de7a2a9bbf73cfe1fe2647e0b053b092
+DIST GitPython-3.1.25.gitbundle 9683858 BLAKE2B 64dc43f6602f797830c6bf44d85ee0b5f870ca7f52626cc6f6f3e9e3a01faf3ad1fcb276e4f583eac9ff9add74fb7ea967e8df614f93434e56ef7b57963540c0 SHA512 2f1d6f839e80b2c70e892af48511403ffc229e8d61cf0faa6680d9b011363ceb2f0da750028f831d3099c2cdce16c375ef60ec94cc2f831e93f54e7728a78f12
+DIST GitPython-3.1.25.tar.gz 191824 BLAKE2B 95185d0e45cfefd4c74c98d9319aacbd678f942e87569beaf87052c4090947ab58a508f5248998d23952277ccae93effdaab2dc0647fd07964971fdc7f2ac9d7 SHA512 f5b29f2374c63d122e697fca8bc65d2db03f43eb21c70a903fdb3bb1667ab647cff9ad6b473213a47d124775fb7424b5abff7b8d76bf2748ac848dd4aebdd04a
+DIST GitPython-3.1.26.gitbundle 9711896 BLAKE2B 31c06bc713cabe11f0a1cb5fe0a94dbca628cc047de3ac29d83eb97370ebe112aae813ab93717618d4382f13a63bd9cc79709e493c99f77c7d0a2a505181e869 SHA512 99ea5bf310e5edb36f02b44b07729041c683bd1eea1b7af278d6a89147a0761c04aa6eeafbd488b1c84935d00ebf47e7c6230984a8caaccdeccd8c3878b094e4
+DIST GitPython-3.1.26.tar.gz 191901 BLAKE2B 365defa1947719273319bbf8b035710b6bfcecae19d5a8f452d4667b4227f1a5bce4238ff9377b2ac97eee27de97410b19882072b5b6673ec6a75638bd9c8751 SHA512 dcaa14b5bafb6d41c0d5afd57494146b309bcd9a7c65ed4ce56f71fc6e2399640147fac7319dd91b8ea4ae1ca38d02885d5a4b64eccb043c4b8a4347e27a1ecb
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
+DIST gitdb-4.0.9.gitbundle 1461448 BLAKE2B dad9efdc4e9711361c851f4745df2e3fa3b2360ab58cffea971a854429cf3e11862a267efb5afa3d9ff7668dc6d1bb7f11aa033172238bea61a6252d0488b746 SHA512 eb71e6dd380e67a96a9dcd50a3a3c82aab8c7f85b1ca4258a92202a5e4cb5a1535363599c94ab26884b4cd755ce30694c1b193a95e5cd5199b5d4e2cf8e72818
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
-EBUILD GitPython-3.1.24-r1.ebuild 2163 BLAKE2B cd8eb4b81dc761a1eb7ff72bff395e0a41e152a627c18381b9df146a2c926965c2df24c24d1aa0e03a5bee03e18d22bd4b1e05eb6e701c51a7cf9fe66ef0d0f0 SHA512 c474013015c57fd446010c5f7b48c6138d5ef4822451c22885552e4e6b4b989d94c2d07df000dca4a1516a7649f9a945d7efddb06b04e7e58b5fad2d5dca51ec
+DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
+EBUILD GitPython-3.1.24-r1.ebuild 2162 BLAKE2B 1279f12c0f2ead67e929735fc1b9309c34aa70d494bf885488b740a4de95c8cde571afe150f6b811936e0dc13e84df1a5fb41c8d38e20c75dc9440c2da7e93b5 SHA512 2166128c96a50089c3f4f3634e7561cd6e5c67e2fbc03dbd01587c03a8d1848b219c310b4936416da86b637bc975bbfd6ae67ee444f0cb8547b203ca1e4b5e32
+EBUILD GitPython-3.1.25.ebuild 2170 BLAKE2B 9fa3e1ce424291ff9fd5b0cadf5930fecd204eac21e2867c60da951440e078220bca8373500b06d54ce913c18e7c6edee1da7fee2054686fe2c65b3e4d637dfa SHA512 5642267ae8c2170c240ef435c6d075ce0541b11a76b34c21a89ce16bb6bb9ba027177f6d5178754fa28884b9a3bf3306888dfe9fcdeede50341914d64d915f57
+EBUILD GitPython-3.1.26.ebuild 2170 BLAKE2B 9fa3e1ce424291ff9fd5b0cadf5930fecd204eac21e2867c60da951440e078220bca8373500b06d54ce913c18e7c6edee1da7fee2054686fe2c65b3e4d637dfa SHA512 5642267ae8c2170c240ef435c6d075ce0541b11a76b34c21a89ce16bb6bb9ba027177f6d5178754fa28884b9a3bf3306888dfe9fcdeede50341914d64d915f57
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5d423a39db06..49692fb19e77 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index ac2cb3042d8f..1c2b0e2109a6 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,3 +1,5 @@
+DIST PySDL2-0.9.10.tar.gz 5228778 BLAKE2B 1aac6ac3a33dd5cb56aad7e9fdcfe5ec62f7b406b9779aa04f92ec4f051cbe5f03596de06aa2d5688724c811c86959edefe40dab1e39980a8410c6b09c10c5ab SHA512 86517734d356ba7685914ce6e4583c8131bc2e84bf2318f985119407d39794878aeb8fdb84464e1e35c3b4cc1569777239dedb16f4669169f9f0302dacd8689e
 DIST PySDL2-0.9.9.tar.gz 743302 BLAKE2B 1e9e0eeea48b838227d3fe6ea93311d445b1d3a15588f4b83d075d18306b419ba3512826e44c5e4ecc2aec59ad44da73372ec740ebf6106271fd0b77175b88d7 SHA512 52b469735b1229392ea2f73b2dfcf1e75cedf7582a488461be9b06bc072f82a5c8c559d345a0c3668829c0f8bb2996005d538465ed7d2a45fb8480001fd0ccce
+EBUILD PySDL2-0.9.10.ebuild 1470 BLAKE2B b9d80423fb0b5a5284501f9d5c813405527f5d1b912c857e7eaf4a6a92753a1c1578ce4a34e6eb3050a2aaebd378d8860d0373c802d7b53b76c4fc3fe5bc5bcd SHA512 6553c686e21ae9e903b908f561532dd4f01b3fd3d49bff54f52089fbd7cd3db82b6f3eea2faaa702dcee7cd948ca03487877beeb6d4d5b4196b4e59227011370
 EBUILD PySDL2-0.9.9.ebuild 1470 BLAKE2B 7fc6e28e999dad910cc51c4ba37c016e983ffcd1f5c226b402f824bccde5aecdbee8fe9d446b9d145b2c0a6bd9415536a531f248fd6b7cb91f346aea41e10373 SHA512 d05ed9743dc77ca0c39cba979322c02090b9f5b4e8eb36ea1a7f954a97fe752426862f9f65ae70f6543d4a333bc31616b11e58d24068463932024c7da8c118de
 MISC metadata.xml 452 BLAKE2B af30151f34ac5bc3eb54885a9bc3d27f2a2aa382b4645304f75e7cae5fecba1861d792b351ebbd3728ab4de19be4dfb5783e70354fe055e0e86611c0a0a7ae16 SHA512 4a64c9e36268fdf570a1b5eb8362f1d3e6c6c9159bf4a7200b37491d6c37ea6da988f569440f53ed62d69efe4ec23d44ba6da0d341abe7457a8b259f089bc5c7
diff --git a/dev-python/PySDL2/PySDL2-0.9.10.ebuild b/dev-python/PySDL2/PySDL2-0.9.10.ebuild
new file mode 100644
index 000000000000..08911e560403
--- /dev/null
+++ b/dev-python/PySDL2/PySDL2-0.9.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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 (ctypes) bindings for SDL2 libraries"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Optional deps:
+# - dev-python/numpy,
+# - dev-python/pillow,
+# - media-libs/sdl2-* (loaded dynamically via ctypes).
+#
+# If a reverse dependency needs the specific module, it should
+# explicitly depend on the optional module in question. You also
+# probably need to explicitly require some media-libs/libsdl2 flags.
+RDEPEND="media-libs/libsdl2"
+
+# Require all of SDL2 libraries and at least the most common subsystems
+# for better test coverage.
+DEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-gfx
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		|| (
+			media-libs/sdl2-mixer[flac]
+			media-libs/sdl2-mixer[midi]
+			media-libs/sdl2-mixer[mod]
+			media-libs/sdl2-mixer[mp3]
+			media-libs/sdl2-mixer[opus]
+		)
+		media-libs/sdl2-ttf
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# from .travis.yml
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=dummy
+	local -x SDL_RENDER_DRIVER=software
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index aafb0cd3e1cf..884ba820c0c4 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -61,5 +61,5 @@ DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e70
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD adblock-0.5.1.ebuild 2234 BLAKE2B 7ea403e43372dd2a600ec290ebaf1f0c0482235d50c85adfef7e14f5c72f622a478b3b8a429ac21a2e855f001c136ae03c1ddc9d0b574ad1df621af0dc24ca76 SHA512 b2764fbb9236ab38fb687aede1aa0927be4b51f00819f9f14de7f23cf557c22d434838043c682b024a3217f45248919c88790e28b574223b23413f1ba32dbc5c
+EBUILD adblock-0.5.1.ebuild 2252 BLAKE2B d1958d260f4cf92fa24ee149d1f22c4fb68f0f940a0a60e06aec235406df747d958055a92235332b9ad1b92623ed7a8936b7054a26694a7de5ff60be86a90227 SHA512 0d8f8e560cc0f866e43283faba384cb0e0b8ce24a96916acf244beecaa1470e3b7ab31244d75e9dccac9dce20de0b283d7d8d0acfe1e731581e0ca16aac0cc9d
 MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
diff --git a/dev-python/adblock/adblock-0.5.1.ebuild b/dev-python/adblock/adblock-0.5.1.ebuild
index ed820b8a8806..bbe06f214840 100644
--- a/dev-python/adblock/adblock-0.5.1.ebuild
+++ b/dev-python/adblock/adblock-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -95,7 +95,7 @@ BDEPEND="
 QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
 
 src_compile() {
-	maturin build $(usev !debug --release) --no-sdist || die
+	maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
 
 	mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
 }
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index 8d56e5aef4e1..8f6cdeb984fd 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,3 +1,5 @@
 DIST aioresponses-0.7.2.tar.gz 28135 BLAKE2B 300d06ed43ad81d61fe9cab4002b9e9bb062a48aabed8aed21e3a8e26d8e153546ed079e6dda6ef26c6df2e843663ed9e02b2855ac71e011b873da926923a72d SHA512 847c687990c38733c714cfd7b4f268406392aeea6764f084dae25f43246b7b5731f149067fb921864b1b22c9e7b2ca66254ff311d726333d0b23a5566ab18029
+DIST aioresponses-0.7.3.tar.gz 28895 BLAKE2B e948e25daef231b7984609ca475cde9ce026880953b395ebf1d5619fc951338614d1f56332c54467706f66275bc8aa1be9f04d3503295388f9dd4a213316d7c8 SHA512 9e2bdbf4fe5089928de9a7ddd54931d70ea137fbaba2bd22b32d248c9282f70d551a3aa2de270342bdf0c1acd0973b377f503d1194156aa545109ef3458278b5
 EBUILD aioresponses-0.7.2.ebuild 915 BLAKE2B 2e258f726f6ec36b16d4cdad04c9b0c87ea975b5b0da20916bf4004144fb7d64e9dba7af43b6a1232e4e877042df3205cb4ac3b6eac594471ac381268910ada5 SHA512 9cb963b8c5b37f4a08dd164713a4021ace76d48d4c1079c814889bd64e60af88f63badfb95b7efa82adc90ae58ae1c3d7b2209dc58a0852d21dc07feee78c003
+EBUILD aioresponses-0.7.3.ebuild 917 BLAKE2B ce0565b1c1be03c219d221f69ba03b019d83c9a91f981a7b7d3aec18e8ef4340088018d542b129a3e52acee32c5da90fa30c4686da3973c4a53a9bf5e76a2d72 SHA512 b2eff3be2072eee73e0cbc66f9097a7a277063214b5f75a20974a95b25dd7cc2e63b9494c79785c76690d08fa2255039166129d77d1be61439df68831c0cdd9e
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.3.ebuild b/dev-python/aioresponses/aioresponses-0.7.3.ebuild
new file mode 100644
index 000000000000..4dc31d4d5b5d
--- /dev/null
+++ b/dev-python/aioresponses/aioresponses-0.7.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helper to mock/fake web requests in Python's aiohttp package"
+HOMEPAGE="https://github.com/pnuckowski/aioresponses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# These tests require Internet access
+		tests/test_aioresponses.py::AIOResponsesTestCase::test_address_as_instance_of_url_combined_with_pass_through
+		tests/test_aioresponses.py::AIOResponsesTestCase::test_pass_through_with_origin_params
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 5518bfc81141..48d76220c2c7 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1,5 @@
 DIST ansible-compat-0.5.0.tar.gz 32913 BLAKE2B 468dbcf20865225c76896dd8aad6f4b9a749b7a45d661484f89e2eaab4416b29f2e0ea0477b86ea52193165cd23180a79ebd5adac571e0b7d659096e84c27bcb SHA512 3ea219ceda313daf923d11ff45c31a760ddbae7ac782b1f89316eb29960a8028fab4e7e242fa0247c6ef5824d71ff9f22ae8956af73dda261a69713110e3db8e
+DIST ansible-compat-1.0.0.tar.gz 34729 BLAKE2B 56eb32314e310777e454a5f5e020cc4dfc485e6d5720d45e99734ce8cf238377f1ff443f9f78f5b9de947944564a7001294907c0e186fe94cd4561d4d348723e SHA512 dd02b47acf38b378016acbe6f2e6494df1cbf68d88a0cb685a5f594ee24b23af1c4d14878090ba7ea69f76185afb57eeb546cc40a6038171eebc991401c6e241
 EBUILD ansible-compat-0.5.0.ebuild 1833 BLAKE2B 68adb5e57ae000f40f04d0951abd8553d210cb224d192b0943c23c9b7610d9adf635ab6bca04c62fb820edfad20e26398905e814ff979cc84f447c245905aa32 SHA512 cba48e8ae2b0b49d2cb03a67deb7d7ff5ad06422ab4aa1917f20810c2266292d790261697846a4833b3c2abb6764d13c262e0d6b497da874046073cdc04b97fc
+EBUILD ansible-compat-1.0.0.ebuild 1734 BLAKE2B 193fd3618adf36a087d3c60515063b45c15e3d67b40d28d371aa6b1615139542b617f9ea3795e8f89b24d93a917b66731ec58c851d577cb5fb52be278df51465 SHA512 2b3d1e1a224bafb5dfd7a75e5ff8817949db7f54ab0a9a82b7cde2185aecbd483c36bc278807c12863faf3da4fb49aee20c527ea312372f56a0740af7a173d86
 MISC metadata.xml 419 BLAKE2B 5862d98909b54bbf69b84b10742ae5c4e8e5919f84a986161f8fb948f472c9f4f8b567fd4fa81d259395187c8b58ce64c2675349b076d9087021c2ef246d03d9 SHA512 9c22801a3c01f6d1be465823f3b78ee43016dd037ce80f99f78ec0d906fef887260b830ff20d523fae085204914cecece77893e3c3a7c5a6247f301395d8e3f0
diff --git a/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild b/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild
new file mode 100644
index 000000000000..e963e3ab20d9
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 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="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible-community/ansible-compat/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="$(python_gen_cond_dep '
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-markdown[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+')"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+# Requires currently unpackaged Sphinx extension myst_parser
+#distutils_enable_sphinx docs 'dev-python/sphinx_ansible_theme'
+
+distutils_enable_tests pytest
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index b9d2c42d7def..3b87c538be2a 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,6 +1,8 @@
 AUX anyio-3.2.1-missing-trio.patch 4024 BLAKE2B 7f53d13f07dc1a8fea86c5b9c44a07cd2f2da61159eacbe4043246ada988ab7a57e894b9dbf58185a20f39ada7794268a65ae6868a5f8501bcb363fdf95f776c SHA512 a53ee1bc475f34eb6be535bcde0ed67ed626e6e0576fcfd51ef700370bca3be8bb9c5f89fd69a9de36ce717b05246564f0204e27038f0d48f2ab6039643aeb1c
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 DIST anyio-3.4.0.tar.gz 135737 BLAKE2B 6023d051a10a067b8c86576dd80571a64c72a807c56235ecd7bad364b79b10c5b845c6b584c5310db01b3bfdd92deeaf64b855716b9fa817fe2fc590de33ec4c SHA512 276fb5fc243e2c7f80a069f604ef68eeaca923c0df6f533878f9bf2185e846e537a1b9a8f19260a3c9ad3aad70898884316e6783057044a936762f7eb1f1cb9a
+DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
 EBUILD anyio-3.2.1.ebuild 1114 BLAKE2B 7abdbaf9ed430fa5925cbe76a4c5e7f3907d13cf009ac5a7eab70547a0e8f6f4ac9512b1ad875b2cf540afd4665c2882c65dee0c07e0df33a359ebd59fee4bf1 SHA512 c3f5682aad78694879395c85e02c3dfe99270c31e01f4c185e00b7f72aa5cadadd3deca2e01a09e23621976cf72984b6a29c4f7e55d4cb18de5d3ae1333875cf
 EBUILD anyio-3.4.0.ebuild 1099 BLAKE2B 9c65c3154235572743675700d637f937f783827c6b82431cc9e9cfc7126eb04654c0301fb78922fe2138b97715fc1561229127d656b8e5f0f5d355a8230eb392 SHA512 7ed6955d779e89eb5c3b01c4476264326bd8c16f0d5d4dee7fbe35343171e474e43848610f44fd97abaa21e219b60e80c08f934bdd6fcee6a27581fbec2dc34e
+EBUILD anyio-3.5.0.ebuild 1100 BLAKE2B cb98454a3a1f156cec5f8fc1ee021b4bc4f4fbe4e8dced60114454203b0e646cf6c691b63169bee4fca44161d9c1b652caa2af03ab109f1a937ee58f426d1a10 SHA512 de765300dacb7ec40aaf40b9c9655afea154d0088c317b91fb4f61a1f619f69880d4a9b3628078e7413d8310fe80bced04ae648ded294c11008a4068396402e5
 MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
diff --git a/dev-python/anyio/anyio-3.5.0.ebuild b/dev-python/anyio/anyio-3.5.0.ebuild
new file mode 100644
index 000000000000..a57dd40c611b
--- /dev/null
+++ b/dev-python/anyio/anyio-3.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	distutils_install_for_testing --via-venv
+	epytest -m 'not network'
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6b4840da7bc7..0d56110bb5bb 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,5 @@
 DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd SHA512 b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
+DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
 EBUILD argcomplete-1.12.3-r1.ebuild 903 BLAKE2B cbd90ceeb0a29aa70e4cfda9156183624066e543d0dfd5ea5228c9346e6b4b4717eb1010b9a961b22f71f75f0786e738596654f6b56e3c7d7473dedfd2b4a020 SHA512 24218f36ecee2c95fa460775aae935f6ff618ba314c1b32d1062b5adfcf42fb0259592ad5e43557155f8fee6ef573f12653c5609d0475e355bdceeb8f0774729
+EBUILD argcomplete-2.0.0.ebuild 910 BLAKE2B 05f7df1fa93a823e0dce76543964d01c97d411a2e434178a95ff1d3c7b27e0bcf84cb5d11aeca40103b06ff1144ed8d9468daa78e0c836a074b655da1cfec55d SHA512 78b63a7776a7f0ae1ac102c5d49659fcae8dccaa2104130c791e260d5f51f215e928c81e0598e541d05acdbe059841c9b8e9cdfee7d0bd9f96837d420e46c254
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-2.0.0.ebuild b/dev-python/argcomplete/argcomplete-2.0.0.ebuild
new file mode 100644
index 000000000000..c4bf6f18595f
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 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="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+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}" test/test.py -v || die
+}
diff --git a/dev-python/argon2-cffi-bindings/Manifest b/dev-python/argon2-cffi-bindings/Manifest
index 9d729d9826ae..29946a1f4f2c 100644
--- a/dev-python/argon2-cffi-bindings/Manifest
+++ b/dev-python/argon2-cffi-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-bindings-21.2.0.tar.gz 1779911 BLAKE2B 3e2e2252e37678661502ca15425196b91a7952d0bb5c7ae4ed35132e9085fbbe5d817c9c1bdec7d94eb583ab6baf9d1e1e454a24415bde1408287c5606745fb9 SHA512 71d023ae96073ed78599e4f4e42f8efcc985cc329adeea00b14b54eaac1e6a545e6ad9b7f4cfdc60a4e9c396f95053c0ccb6f6f67d92f70265f91315fff4a390
-EBUILD argon2-cffi-bindings-21.2.0.ebuild 882 BLAKE2B 3332084dbd7178ce50f202027f2048272b9caf8c0608e77f1eba2ae7c55d11eb50e65f8dead90fc3a6cdb102362d3a6feff292c805537d82d07747de37d24497 SHA512 959008cdb511197549355f75222f1e512e4a5fddcef48dac61e19099a2cb4c7affc5fc799fa2d0e11fea5fb163a70cddfcc4e8985dce8e56fa722c01f0bdabb9
+EBUILD argon2-cffi-bindings-21.2.0.ebuild 876 BLAKE2B f06596eec4420d11024f99120ad12c107152dfa50101a609115bb4f4fb593dd4dc3104000b9c6955d98aefef2859803be430dbf848a07be7cf1991cfd23b0cff SHA512 26726cb58a5ffb46f13f6023bf252fe2bcd1a3090328966eee48cda084b42e51b8a0939dfef938e32c8b6272a8b1df9cddaff383bb3a46a22ddb6943409dbc0d
 MISC metadata.xml 684 BLAKE2B 80c3275f178c9972fe804e6965b62bda1caa24a3b4b66e985b372e6d587a6715821acedd63a06de10ac23b560bafe3b3c78a4fa78fcffabe55056b7429d74640 SHA512 e299e8d3f84c3d2c52508f182ba56ee350bd3b6d700c1fbe1fc87a13bf36a1b24b61b3f77e6f93c64e16312b306899460eb2cfcab0f972211ad6cc1791cecc39
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
index 101e4d4c7d5f..b76698164cc0 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="app-crypt/argon2:="
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index aaca75ae59a0..73b348658f5d 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,8 +1,3 @@
-DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a59f453c3c0d0e5f2c437e7a62132abf86ab6baa8bdd656ad28d00a151296a66211d365c0afe228821c8c1ff1a0a66c46 SHA512 bbfebd2c075f360a6c1c187c0789be2aae7480b9398f36db7bdfe74f288d9e00b44a788918c54f4cc8bb1947136ab0493f61975de408c482a5131e2bf1a8f4d0
-DIST argon2-cffi-21.2.0.tar.gz 42399 BLAKE2B d2f1a7e7caf776239f343f5e5f2cd1fcd78f0dbdfc28814e3299df18e5c97a81cafa37bf10733614fe32ddc8d19fa5c5721285e8b96b9172eaf2322a5bb9e529 SHA512 40cdd18106d959bf58f20a35ea84ac3c3859d28ed6cfa28ee81655c12038b4e0f28bfe2d8ee9b96cd6009dfcebe0ef6aa4eb7fa9cd81cad0b32911ca723a8bdd
 DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e
-EBUILD argon2-cffi-21.1.0-r1.ebuild 763 BLAKE2B 25fa5be24583bc6cba16ff5b60c305b7b358d23fd849ed8b006e704dd9d5f09098bd51d22516b32d0527e6fa5a388e24450599a71b6238b6a59f670b8537157d SHA512 db9f3fb5464f2f5eb0d86dce73c70c45683a589469eff9297da0e9c01634a61d0c7effb1d2e13965da1a40c5824432a2a3acc4dedd6b3a52e4ec1b8ab0932a53
-EBUILD argon2-cffi-21.2.0.ebuild 1492 BLAKE2B 1731f7ed7acbfeb77ba8ac116d6a245e7359cd2c2873d27538343f6d67d70a88945d646a771a44671c9bcf3581a6a9e1498354b7228377256ef3cc05cd31fcad SHA512 7971e8f6e8f3d1561becf0bd1a5088b39fe0b2194499022211f2b4bfc067f2c73999dbfd128107331653fd63d930ee8e40cfcd8d519bef6109642c2b9fa0eae9
-EBUILD argon2-cffi-21.3.0-r1.ebuild 1182 BLAKE2B c29f7f24849ff91682f993ae1a1fd98d086ac7ac5a9079a0b74a73c50d5fe47c47e132519e33f21370983e2d8e459ec9f2926245cc50f16ee2bafc5b51795936 SHA512 e4830868cbcfbf05dc63f12e48ba8651dee880ea12ffa9df4286ab55f7624e0afe0efe8b49cb5439b491586c0c81961ed6618eb6e0e02b126718b9a8fe64e858
-EBUILD argon2-cffi-21.3.0.ebuild 1479 BLAKE2B 07c5b6643dcf64f9d0aa9d5c3f327fe6bb8898e882c8e40aa9a5cb3689a49c86c3a84713d10d1ccec0ae1900c43a262310f60f0d98795d2a530aae6b3391b6cd SHA512 d67b48c4c7f38291eb264ec2acce7d8e3b0f64f42d078920cab3a6bd6592c5adba9d487c079f24e7781100b5e186739fa322e733e831222f350a5ad995504216
+EBUILD argon2-cffi-21.3.0-r1.ebuild 1176 BLAKE2B 97b09203c17fa17030d4eeb4780d0f2b957cbb1417c91d4adba76058d53c260f926e8f4c5a4e78b6eecdd6cb55601c8e2b59567e7127b46a32036b207d4fa91e SHA512 c38e34fa4c8c9973da3039a1be22381a773288cca548b9ca4a24ce20c92968d255160c62c607e093a659978f642b7dc41a485dd48124dd1422e1b6f5a4dac563
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild
deleted file mode 100644
index 3239b9e0e4a6..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.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="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 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-DEPEND="
-	app-crypt/argon2:=
-	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 \
-	dev-python/furo
-distutils_enable_tests pytest
-
-export ARGON2_CFFI_USE_SYSTEM=1
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
deleted file mode 100644
index 4b92a9605e4c..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	<dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.md FAQ.rst README.rst )
-
-src_prepare() {
-	# Patch the tool.flit.module.name entry in pyproject.toml to include
-	# the "src" subfolder. This allows pyproject2setuppy to retrieve the
-	# dynamic version and description correctly.
-	sed -i -e 's:^name = "argon2":name = "src/argon2":' \
-		"pyproject.toml" || die "Unable to patch package name"
-	# Sphinx's conf.py uses importlib.metadata to determine the package
-	# version. However, argon2-cffi is not installed when we try to build
-	# the docs. Therefore, we patch the release version in conf.py.
-	sed -i -e "/^release/s:= .*:= \"${PV}\":" \
-		"docs/conf.py" || die "Unable to patch version in docs"
-	distutils-r1_src_prepare
-}
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-notfound-page
-distutils_enable_tests pytest
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
index 8317e93d5c4a..b3f986e7389c 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
deleted file mode 100644
index 00502332253a..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	<dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst FAQ.rst README.rst )
-
-src_prepare() {
-	# Patch the tool.flit.module.name entry in pyproject.toml to include
-	# the "src" subfolder. This allows pyproject2setuppy to retrieve the
-	# dynamic version and description correctly.
-	sed -i -e 's:^name = "argon2":name = "src/argon2":' \
-		"pyproject.toml" || die "Unable to patch package name"
-	# Sphinx's conf.py uses importlib.metadata to determine the package
-	# version. However, argon2-cffi is not installed when we try to build
-	# the docs. Therefore, we patch the release version in conf.py.
-	sed -i -e "/^release/s:= .*:= \"${PV}\":" \
-		"docs/conf.py" || die "Unable to patch version in docs"
-	distutils-r1_src_prepare
-}
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-notfound-page
-distutils_enable_tests pytest
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 9b30245a558f..f72cb625c36b 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,6 +1,8 @@
 AUX argparse-manpage-1.5-remove-six-dep.patch 439 BLAKE2B 24ea98d0519e1ec1079ad3b6bcaa5e361cd2b57a55b72a378c0658f680e7d2878cdd0e6ba57b87450bb60ede705d22e01439384d0d84c54d0e9a5ecb48e79597 SHA512 cac28b8a3a4bc39c3eb5d421cef46c474d25dde1b6bf1ff8af2833e1c9d0f1422118717a8673cd1c1c554ad29967ccbe9b3ae316ac6d645c9ce08176b5dae86a
 DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
+DIST argparse-manpage-2.1.tar.gz 39889 BLAKE2B 9c534b775e59064062d91587e275acf0af343cef864009e290c9a5224e481cd2f7cde87e85b2b0135483d6119e711cd6668d8455315eeb2a28d335c8ef37e3ae SHA512 aed2908bec8f6bee0f8619c6d5cff742fdac0f44ab7f65b8d0c1aa3409ec0335ce763cd2177b2606111b9ba5fe43698b04ace43f9017034cf99a7142eccd9ea0
 DIST argparse-manpage-2.tar.gz 38279 BLAKE2B 24edcb71aed7731178d24e99a36baf8be2270f6d4da0d884610da294d44313d913f8aa2db381eae77409ec504b18346688d5f7f27257285b7aa92d453b1a58f1 SHA512 24854cd5209635e8938716f97cb4eb283152a2a109c554385a78a5145c6e0f38c76a9172d607fb3ffdf610e8d3f7270ed94f6b4612ce731ea9dafe0a1bebebe6
 EBUILD argparse-manpage-1.5-r1.ebuild 563 BLAKE2B 8f67b333c2ed21261fc4d5a3eff0de293b1039ca8a79da15a8481e34dbebbccc7a506c98bf51a3c946efd728f57b04a4ffe6c18fe8fe5642d235a8c016e1c8d1 SHA512 fab1ac0f4a279a51d88399b1cc05353ba87359834a588eb29fd5902384b9f30c9105ac168cb33fe22f148f26bc881f106eed660bbdcd0db46bd30416b1f9e14e
+EBUILD argparse-manpage-2.1.ebuild 617 BLAKE2B d38003c7f4560e5b5260d0cda83d86cbc0af8d42034f0a08949a293c98d2c1728429a3e1d085823249a21398600153474ec5e0ba443dc18fa04f9e4d8dacce6a SHA512 731994bfd62a8a958fc6d6b3a27657d5f3cc2bde12e712bb48e430d756f47d228b3470f6ff30368ef1b87fc2a4c7dc02c322be6fef1133b3f45a4f610117573e
 EBUILD argparse-manpage-2.ebuild 617 BLAKE2B caadc2e82e3a4e4b80630236585a5957a50c32f9e422938af96edbded3b6d5c60337160555fc802ca0c71a627bb7989e07fd4c453c00b2099884a60d1d9eddc2 SHA512 48623465845212f666f5725c55fbd70fe483bb8c623f7e67074c20f51cb15c09da30599c960156cd794e074400f5f5d53f675b595bd84e9749a4e4c0cb49bdbd
 MISC metadata.xml 418 BLAKE2B 532dd384efcc880d73bd757b09aa98af767f74ca3f8a573d0897d2dbc86122db0de0b526834b87a5d76bf958f593a5f89bdad5bdf388e54d4fae227922b86485 SHA512 daabf95331a36e1d40065f7d544b3df75a68aad6a4bbe3bb3890db97898c47c9c0498cd77d62bd86684ee470b35aa68397097324ea83ffb4bdfd606bd786f3cc
diff --git a/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
new file mode 100644
index 000000000000..5e779edcda9c
--- /dev/null
+++ b/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Automatically build man-pages for your Python project"
+HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
+SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 01e83a25866c..6a1a17b94ac6 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,3 @@
 DIST arrow-1.2.1.tar.gz 118941 BLAKE2B 4e1cb13180d72fa42e8bbbb6ae810aa3101ee4f7be53f8235b901b662293ba67a5379abc1af0f19c1e64ae68c772d0bef8125717b3ce3ee24d587ff89e7c96e6 SHA512 96ac71c103554a9a609227af870c051031e66fcc8abb343f6d8f38c7e35ad632633b68afb2818443e38ff59ea4790101fbca4449f14168fc41260d15fcd6cce4
-EBUILD arrow-1.2.1-r1.ebuild 756 BLAKE2B 99f28172e0ff3c7f33682f9c74e1cfc707d416bab48ac02d6efc0787690edfbee114f1249f4a04160139ce916a72cefc3a80a833e53f31a15d6697350067c841 SHA512 aef621c470b1be61b7b08e2c4836b533862e21252864bcfdb32163d2d1cd446497a3715b26f5204ee7028482f23efbaedbc8b891e4418a5e46cdbb1c0839e280
+EBUILD arrow-1.2.1-r1.ebuild 762 BLAKE2B 9afbcf6a956e801f0234e497f276fe89198776b8b70bcee17e2beb904146330e68544bff45543561fafcf7e3104d79dbaff1d14aa533830a06b14f596ff6d31f SHA512 0aad63dc3d749f0f579b5a7bd015f0842c65b97c6bbd7081a5ac28099f053f361fb57e8b8fc51476a856303cd294677b0aa7a153fe3d11e1d967151a4376ee50
 MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
diff --git a/dev-python/arrow/arrow-1.2.1-r1.ebuild b/dev-python/arrow/arrow-1.2.1-r1.ebuild
index f01fee5b6035..d4831843471e 100644
--- a/dev-python/arrow/arrow-1.2.1-r1.ebuild
+++ b/dev-python/arrow/arrow-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index f12794e77254..25dbf7d6f359 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,3 +1,5 @@
 DIST asteval-0.9.25.tar.gz 39473 BLAKE2B c726cc4499b71534e981eb344f424af897fb397a9b60be9a1635598a354805b77429b14939f653a7c37a1ad16f26673b718e9caf796a8f06b535cc468496c385 SHA512 16601ebd84a1f6fb48c51279c9d3ae513d0b98c0407d0301bddda941b04951eeca041ccf6f6801bad194b9d3f719044efef446cd91444ea07ebab4d8b763c81f
+DIST asteval-0.9.26.tar.gz 40113 BLAKE2B 9d63b78c500e521ea2740a3068087c42fdb00913c1e110d71fba3dbc9187bd02169a095d08db16c6b2b10d7e066a0e0578ff81d220d0cadcf994bb75790ff450 SHA512 8d568edb018416ff40d09d9dd123ccf595426d84e1f1554a22a19dae045703494fabacf1e15a2778c3ed042b1ad2f3b318fd37a20a15c50301e651d657902e57
 EBUILD asteval-0.9.25.ebuild 446 BLAKE2B 299b6dd67b19a0463627680bc54f4da21eb84a1066ee5cd60636f28017073536a45cceafce1abe51b973d5e7338e90ae8cf334a5fc8a8f2b19058a8408f4f011 SHA512 e8197b5398de74e102c9a8ec03430d6eda909e8b0d4afd52e92e8b1b576d42d34314de40c70bec618b930d049b4a7a57b5443247edf0dccd460f1607f54f817f
+EBUILD asteval-0.9.26.ebuild 439 BLAKE2B 8aac3be0bc4e701f19fc601498b469c3417de0633b030a86e505473083c947ead492a2073faa95a4285658c8414adc31491dd781d9bb679f884bb7fff267829f SHA512 0f9e3880b26ec51f71da825f0c32173a9f8357a76ad9b5014034711218ce6738cf88dd1ff5d781ffd1d3f7ab14f00ff9ca70d48c58748c38ef931552b6e88a2e
 MISC metadata.xml 388 BLAKE2B 8167e3615c8fbf4fdbee5ac6aa354ed365c255ece5a3793a5a9b9db68206781230437f824360c5ff7223ee70c33da9f2c2be1d9b7c9d7f4413b9da82b1a96c2f SHA512 a4185b786faa55a63dedb33b0a2ec1900f2e9fca3887d1531963047be795271c4300c51238afeaab98f39778b1cdace3193b1fa4b3e400d83f7201392b09f221
diff --git a/dev-python/asteval/asteval-0.9.26.ebuild b/dev-python/asteval/asteval-0.9.26.ebuild
new file mode 100644
index 000000000000..ce77acf316e6
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.26.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 9834b50b506f..74751b76efbf 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,11 +1,7 @@
-DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
-DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
 DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
-DIST astroid-2.9.1.tar.gz 408617 BLAKE2B 921178fc6be9f3905c0e93c755fbf0ff70da4bf6242cb10a6881e78b66f9636fa39d7aef1ba9435ec69ae314968d33126a64d2d11a8da2aa2ee0dc9010d58ce3 SHA512 b6c69a316bd9f21be34b5e15505e38719721991c0b9a9162233c2c8c7b0fcef792027f6564fa58f083448d00bbae910f8dad1a2957aad5d3bf23c1bfb6727e31
 DIST astroid-2.9.2.tar.gz 408664 BLAKE2B 918fcf1e90667a9f3c69689557026f282e5fbbb40a8e3c184569f53d9a005d9822538cd15401e984256f928731d44a04d1a618ca818eb1eeae57b32e94d06425 SHA512 e9523f5874dec8cc3f252efc2b2f6707999772cc9809cf982d92693182052e575eac31c7d759c9aea22068e90a9bb25d89a20bc8d89dfe2ba44ebcc04f78471e
-EBUILD astroid-2.7.3-r1.ebuild 1244 BLAKE2B 67ee476429bfe190bae26848a03d506782e7fbdcc57563101253321537fb8123a5d45c81f9710f236d8fe471f7b58f66f15c2725d0bf36cca6205123aa1b4bea SHA512 15b5ff612fd7d0b10eb60e3c45a7e5f45f1980e3aa8d38e0cfdf3f349313da5e7cc0df59ac655570c47d00d14586b5151179d14dd74d30240637317a1e4d0d8f
-EBUILD astroid-2.8.6.ebuild 1299 BLAKE2B c093e88206d0f820547b7afaf95b13c97c8c0635fa096fc98923cd711dd7fc7c05478beba6c42aa099c5645813d37cbecca4157c2369d9eb013880c32f6e2124 SHA512 e853ca621bd253db6498b0d16c941cb13ebe8f2c4bdece39094592b7567f6504a72db8444151915982484748e10898efdbb41aa7b47f872fb0b5488534036340
+DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
 EBUILD astroid-2.9.0.ebuild 1305 BLAKE2B 5563d28361824789351a923225d6b25fc1f4329dc1260326b80113c2fbd24df8387d645c9bc9ebfe9560d994707dc59918b26847e6c2e61b5a3be18303e440a1 SHA512 134a3d5ce85471c35c3fd363211b127cc9f83feb5cfe839478df7dbb1191924d3e508a6c41e391c08da96096c396d6749ea5c42210401fb95e525bd8c054aa92
-EBUILD astroid-2.9.1.ebuild 1313 BLAKE2B a31e17f61abf894bedbea61d9d53b09363d5ec7dc8c36d09e03c08b3d5b84b62ed5fdf6f0092a33be7d90a04c0c9cf82159b28a1f2ff0181c896819a72194490 SHA512 ac9165d1ef3484d4ec21033ad961f140b8762b88672fecb68adea38d5008ac992ce4a5a6c976c1c560441bee0afba1ca27e4516d46085a196ae851487dfc8714
 EBUILD astroid-2.9.2.ebuild 1313 BLAKE2B a31e17f61abf894bedbea61d9d53b09363d5ec7dc8c36d09e03c08b3d5b84b62ed5fdf6f0092a33be7d90a04c0c9cf82159b28a1f2ff0181c896819a72194490 SHA512 ac9165d1ef3484d4ec21033ad961f140b8762b88672fecb68adea38d5008ac992ce4a5a6c976c1c560441bee0afba1ca27e4516d46085a196ae851487dfc8714
+EBUILD astroid-2.9.3.ebuild 1313 BLAKE2B a31e17f61abf894bedbea61d9d53b09363d5ec7dc8c36d09e03c08b3d5b84b62ed5fdf6f0092a33be7d90a04c0c9cf82159b28a1f2ff0181c896819a72194490 SHA512 ac9165d1ef3484d4ec21033ad961f140b8762b88672fecb68adea38d5008ac992ce4a5a6c976c1c560441bee0afba1ca27e4516d46085a196ae851487dfc8714
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.7.3-r1.ebuild b/dev-python/astroid/astroid-2.7.3-r1.ebuild
deleted file mode 100644
index 0f33e85134f5..000000000000
--- a/dev-python/astroid/astroid-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.13[${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/astroid/astroid-2.8.6.ebuild b/dev-python/astroid/astroid-2.8.6.ebuild
deleted file mode 100644
index 81b03aca25a3..000000000000
--- a/dev-python/astroid/astroid-2.8.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 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.14[${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/astroid/astroid-2.9.1.ebuild b/dev-python/astroid/astroid-2.9.3.ebuild
index 7d421ea6fce4..7d421ea6fce4 100644
--- a/dev-python/astroid/astroid-2.9.1.ebuild
+++ b/dev-python/astroid/astroid-2.9.3.ebuild
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index 66acd8f26fb0..729168e47d7c 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,3 @@
 DIST asttokens-2.0.5.gh.tar.gz 46876 BLAKE2B 8a8da138888de0a4096b10eccc483c9540710acde0da188ed3fb3845f96b862fe2eec393c69ca62e7b313bfa0e2f0d673d828e9d1ff6dbbf5b641fe8122a548d SHA512 3e710ca9703e67643bb9c0a4db4e5c1656e6d5c904a1262a9ddb962beff06e4e8bd9815bcd2509b48974a97a565d8479a4369583c166a65b6d16c19fd926e93f
-EBUILD asttokens-2.0.5.ebuild 950 BLAKE2B 823eab9da787046f22eb5acd44a8f3a55981858aea1f4fb8096dff1b5f12e27865b1a8763c081edc0e8575bc0acdf1a365306d1dbb0a7b16a6813d5f1baa3070 SHA512 41f176acba00467ae219891d91df722b80b0588fed4cf53415205ca120bc0aad1b992a2e3b9b83c3d98eb773a1dde8ef66e331a2e41f60f16a19aad99a895f8b
+EBUILD asttokens-2.0.5.ebuild 963 BLAKE2B 71abf4993c076d2d3d7d34e38d86fbc8905b23a6ec26f90dbb4921afc42bd39b2b105092ed33941ea8db48169d2cb290f8639449932a7f5baee8f505d6447981 SHA512 5897c01ed8fca2a143d4b705298dd152d0867f9ceb222b81e157391d4a626fa88bf345cf7a633cc4c1f8ebfe37b2a63a895e2ffa0acae6e27dfa54d30434ffd3
 MISC metadata.xml 350 BLAKE2B c05dcff93454660cb741def5cb0ca82e56f0cba84bddb9604153b6d70625e4dfc9e15743c3448a0cb68d9b5ccf0778f8126390872bd8689df0e0ab2bed7e6582 SHA512 521762b1e8a542c5f3156014884c3d845b6fe882e819c924aa8023f8dff32a94490e64a1d1f700f5127bd867c60c4f0f7c4aed5c39f78e52bd8ebabd113403cf
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index 393339cec50b..620f7a901849 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 60c160ca50af..8ab572bbdacd 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -3,5 +3,5 @@ DIST attrs-21.3.0.tar.gz 204413 BLAKE2B 1aac1198196aa3438eb1ec9dac0a4971362caea6
 DIST attrs-21.4.0.tar.gz 201839 BLAKE2B f8e9ca1385efe6f5b9bf468f622f0bf5390830c5f3c3526821446113146a61460b17e8750ea763f6da50221a8aa65f5f1ff98a6ddf69b1a87344508ca6495560 SHA512 5a52776eb505c8a354912fa037a9710e49830fa6ad37272cb6d8c3298f4179a5b237e36cd7db3b1c9af19fbf0194ad6b83c3db9a473f9349769180073273ba65
 EBUILD attrs-21.2.0.ebuild 834 BLAKE2B 8f0f084f77ecc36fa86224d54fed167f261f2d2849f93ed574e8515ab71ce90bff54378355a37a7d876e702d5108d41b2f443e10dd8dce89ece2e30449cc6076 SHA512 8d79750bd49caf82bdeb3bdb9c1b4fce1afab4edbb23de615838727ad7de97789241c9338a8db256c931b7821d6c46f43a8ad561f8f10bc76835648a04a92913
 EBUILD attrs-21.3.0.ebuild 1048 BLAKE2B 9e3f3c11a743404d979dd6ad872281cbcc8fc23f552c4fdf41b577daf9d96b77bb422d76a0b4318ae440b051c19eefd9fe5472b65fe6a859ad0f3f9b39c6559b SHA512 d0439deb44d9db9fb2a583b0d487f84ede35b614423e834616f17aac2a8ef9d79435f8b615d636cc2e23ebd588b6cf6a229db097fc35170809518580dea440e3
-EBUILD attrs-21.4.0.ebuild 845 BLAKE2B 0baf5eca97840f2e20cbac13711f897b9327cc6334803c3054da6efe2621a531cb02d4676dc24bc7d354b8e335f5d0ea7f5bd9b2c844c14a2acae52cc91073f7 SHA512 84c589dde0739a7a038e3acf6fff84034bff40381d5b2167a84411649e4df76e2c9ec684eb2736cf77d387ec520ef1b587910b23c81f86217b0a5ab707ecec85
+EBUILD attrs-21.4.0.ebuild 851 BLAKE2B 8a7ac516fbf7341120b045517c175517722c6524c9db1fee5f676b6e850a5af5fbe1fa6fcbcaf814969b62fdd8a73ec031242ca78f852d04d6e8d8e9a9653ffa SHA512 9384d4bdffca9c50c4c946d42ab03f4d7c4a1dbd4782d045b05ff2c402f47e707a4b52e10c7e2ae0df112f7e8596aaf72e88261ff4a0c80ea79c90da0a6c3315
 MISC metadata.xml 521 BLAKE2B 566735fbcb7141b4e2bf3130847bdde2850c803d5fe981540f728273231484984e5ebf3fed549cf9485763a8d9b8d102ccf984660a34541286621341e8aea64d SHA512 1b4999c797e93fd228652d1b6bd52dfc1a5e7b0828d2e70cdcf8dc859641c2c15f5353e1b9cf1b1f19dee8af75c521b26e651a7f4709e7729425d7dcc45137f1
diff --git a/dev-python/attrs/attrs-21.4.0.ebuild b/dev-python/attrs/attrs-21.4.0.ebuild
index fc8c81c3faf6..d66fcee59ce0 100644
--- a/dev-python/attrs/attrs-21.4.0.ebuild
+++ b/dev-python/attrs/attrs-21.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index 7e5736f68c6f..3840c5a84200 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 1744 BLAKE2B 6e10d0d028adbdb3c880978bc5d1e5dd682ad080b45d1246abd29f21662cdd5e7dd75fbcd10541821cf4128a75182e1782319a19612260b92f4e57f1a80a1f7a SHA512 f694ffff2091523bc993e7ebaf924a24c6f40e7337906c77c5ff992f446ccbadec237b631952b80097be221c7996339a33a8426a27be77a2e981268d04dffc41
+EBUILD berkeleydb-18.1.4.ebuild 1755 BLAKE2B cb7214bfc8c8d1099e060809277f8497bb1e8179ff8f9063717d4d95954b3d2674df215cd686caf7ee973c1e776ed09c2b95b02c9618f926ff20cb81baa4bbef SHA512 311e4275b07e4313a3bccb3c9ee4063090aa297aace4ec6343c46c337f12eb1bc3e48996cfa87478a0c222792b8998d5471c33edd6a590193e80f9e76a32ba3c
 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 da72d00697d0..9c8e6b6acd04 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 2fe2b936aa9b..5e57a18a2ab8 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,5 +1,3 @@
-DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 DIST blockdiag-3.0.0.tar.gz 2694464 BLAKE2B 18887a48e0aa8293703e45746ee68c7c11accfaddf11d0d02af446c769404ce1666c2587b3e212cc48f4fb09bfa6169931c42a024adb739ce9223ccec862905a SHA512 e0e588941c5212a924068cc0b3953b670089e33c385ea8ce52fc54f5ca79414fb12217eba1052c5384c9f2fd81e79304639c9604cdc4a6464f7c221bb67ef267
-EBUILD blockdiag-2.0.1.ebuild 1642 BLAKE2B 9f3cd62f5fda1ce0e0fecf1367d8dea29883050fbbf6e60209e7a8b51629524cd1f62c53a42b05556bf8ceeaebf6e5675d5972128763e20e73956a9e058e0aa6 SHA512 db989b8e63819c67c7f4654f9f33d4e829eaded3694cc014b47c7267fdd104c403de5d719a89463e8bb72a89738b7d445f6dd57afbd29c3151c5b69acd56f996
-EBUILD blockdiag-3.0.0.ebuild 1651 BLAKE2B 856cbc21c9fd7f78fdc03350f88e772cd6c75fcdb103bd4a464ebda3d906e5db5e953a742256b8194df29da6e827bb8b764231f1af31af17dcc9ab5194c67a2d SHA512 b068d8a98d259e68629fb5a105d9f601ea132ea7ea7b7be9ed10aac48a11b277d1e8f256cf2d3fc1fd2b0d7c51adf33ccc1ad155fe4c99d9948b6c0cb6d7e4e3
+EBUILD blockdiag-3.0.0.ebuild 1644 BLAKE2B 56cd88a4412994843c7b21accee9f91f98044efab5347cef8a184c1e262652ab51aec3ca62492c249612a925e957c4a5d7b54afeed58e2961f68a41c496bbc5a SHA512 c0efc6918260523602f485921bfc1be75bb198d24a31d398c183c5a1e733136fb9343ab7e74729b2030a9ca7fcdeff65754884a127349698ad547897304d31ab
 MISC metadata.xml 774 BLAKE2B cd87c48d2fe14c0a3ba550d2ff3a949cc43122607c0f6573c202a057cbf7d75d9dfff36b8915f3070aae5fd45a43a47a9846fc5e35a8f705d8c40985245903e2 SHA512 85c46541c543bc679e6d90bca22d9bfc12d90e43325255839060491df8ed9e11a04a3f8c7448a1650a37aff1832fe81df1dbc436728662f53314a5a5a19fa0ce
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
deleted file mode 100644
index d0799b0b795c..000000000000
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ /dev/null
@@ -1,57 +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 optfeature
-
-DESCRIPTION="Generate block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		media-fonts/ja-ipafonts
-	)
-"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	# unnecessary dep
-	sed -i -e '/pep8/d' setup.py || die
-	# disable tests requiring Internet access
-	sed -i -e 's:test_app_cleans_up_images:_&:' \
-		src/blockdiag/tests/test_command.py || die
-	sed -i -e 's:ghostscript_not_found_test:_&:' \
-		src/blockdiag/tests/test_generate_diagram.py || die
-	rm src/blockdiag/tests/diagrams/node_icon.diag || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	# TODO: Better descriptions!
-	optfeature "PDF format" dev-python/reportlab
-	optfeature "misc extra support" media-gfx/imagemagick
-	optfeature "Ctypes-based simple MagickWand API binding for Python" dev-python/wand
-}
diff --git a/dev-python/blockdiag/blockdiag-3.0.0.ebuild b/dev-python/blockdiag/blockdiag-3.0.0.ebuild
index a71507b524a3..fbe42c7c45a2 100644
--- a/dev-python/blockdiag/blockdiag-3.0.0.ebuild
+++ b/dev-python/blockdiag/blockdiag-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/funcparserlib-1.0.0_alpha0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 58e04d3a7ce8..96ec2cd05454 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,13 +4,25 @@ DIST boto3-1.20.24.tar.gz 456338 BLAKE2B 4192f20a7a5c247a72b381506697034d744fd62
 DIST boto3-1.20.25.tar.gz 457371 BLAKE2B f1e6ab3add86f0ba25b22d92f58580e4ab86affdfb5c3b6f9a53938a2a647d0fc8cd23975cd60b909e5db339d442820e557497e232bda836ac9f2028b376afcf SHA512 2693134800ad3313785922c654296ca04a5b561e135fc60a45784e8190cdeb1dd525e6a81f314fda9f14f9dfddd5ffd8bde9af2d2be50b61921b9ec1248fee07
 DIST boto3-1.20.26.tar.gz 458382 BLAKE2B a2123120c07bc8e53004f6c76f6631f3363d5d8e58057a08d2edf914d3a7ea1d2d6a771529abf7031604ac1c366a5b8ee4934e6d34d27eb3dd0716bc16cd6d22 SHA512 5ad18954f8347f240031c2dfab2664bf760b334b12ae90f1d2613f53194843f500164e645445d17fd4e7e7061beb3e2fe34a5a2651a92fdef5efecb18324cd36
 DIST boto3-1.20.29.tar.gz 457663 BLAKE2B 8bb10de51a0250c3bf18b339ca6d9aa54985ebb0ff860862ced57ca1f0455f4c95834a689530e3bad043711735c22fee41e2e860602d7024bb8128ecaee7aa85 SHA512 c19e24a70d68919a2953a1f8060b519782a422183385276e0a439da2150fb20bf24e89153ecd9a134ee0fd631921569739aebf226815ca9c63244c8f2bc3c59a
+DIST boto3-1.20.31.tar.gz 458553 BLAKE2B 396acd8bbc47f76a0ba65da4b83f141f253690370f6cd36fcfad8b4ba1017889bb2c4c63bbcc8e3f817307cca666593072becde30b5739f38386f764a9f2c876 SHA512 0772959c735a6002431f171b6476398a1e1096301c20b5429504ed9a9bd6e3a2b6e95392504b3ea49ef942ab6c5210a0d26a0cdde6be52bb88d642ce776576b9
+DIST boto3-1.20.32.tar.gz 459036 BLAKE2B 21aaba2f5f5db65edc3570e44082cf394429407c0431bdfc19866e530b48358909ab730ecb5b871dcbb5f4c087af43f53474a7dca6ce9ca84e78ba480f5cc819 SHA512 a50f0724f4c6ab8b0fc0b329909ff35126bbdc9c73da5927dd1259565b2e43e87c718bbf8b2dd5433e75b4d35b8094d3fc122163febbbe66b6175ecfeb81fad9
+DIST boto3-1.20.33.tar.gz 459654 BLAKE2B bf2090e6af9cad5f4e9e5178d30e109c63c403137f9656c22358bb672da7e0ca2e9f36585b5721f2a7bbb2d3d3027fb3942e055d3db78ede0b03f5b6a2e6ad78 SHA512 877c8e59686cd7ac940aa7fb1f2adc75a89e4ce5c74e7a999bebe80e80819c6f909ee8f9acca1c85a6a11f3b7a8ba39a41221ec54a8b99c412da9208a791f4b3
+DIST boto3-1.20.34.tar.gz 460169 BLAKE2B d687bb3a90da0e8cd48e551dad68754edc97689350f43879c90e8c96470dc79d389b5332d06d079dd4d26f303d9260f1a83bfc2edfa2507e3a33020e4475e8f1 SHA512 ae13db5ed516a9166c14e72e078f45c911a9c16edc2e2d95dc296de09345fb311ecad92ec7615137b01edaae254d075b74e68c1c909a79b2eb1ac2416ab5bbad
+DIST boto3-1.20.35.tar.gz 460636 BLAKE2B 4ec04ae5caac912beb4933727ef0f8f1266b9ab27788a98d7ae10fc8b19a79e3deeed0ce6c1156f12ad12062df24828909fff070813fae4efc705b5e7babc2b1 SHA512 59fcaf477d5d67d68dcc007d93391b71ad8d04d46fc3c098c3f0fb7c82806a1a37999bdb292a240862dbaf83a6c2890d947315d1d9a4faeae68fb9e896cae73b
+DIST boto3-1.20.37.tar.gz 461197 BLAKE2B 4ae94815809401378bbd6c6b7774776c62436c3ae379be44b045105d00ffdebc6cfba1112ed6d4693662c6a00b5de53b4fcd1ea605a93cccb1406f3f983d8c9a SHA512 368abbe51e814b5a8080323f436d8e0b5ea660b31abd77a49299afd6363c3d10e51883a3237f06799be53472c3e24c76f5ba3ece8cc9721b87fe3fb40ad8911f
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 EBUILD boto3-1.20.14.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
-EBUILD boto3-1.20.23.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
+EBUILD boto3-1.20.23.ebuild 1416 BLAKE2B 8298312daea6c7cf1ef5fbef47dd89671e74497cccbb26b388af53cbcad43250c041f4b5bf302be91d1002fa684b496bac27a59dcf6279084a53b0f5bbd5e6d4 SHA512 8d95d86348c6331574312f6622ea5c0a27169ea13cc30d3dca01b724df13e07791e55f39d127528d576e85872041921b7aef8d1baf53740474a4db9a71a23e28
 EBUILD boto3-1.20.24.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.25.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.26.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.29.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.31.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.32.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.33.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.34.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.35.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
+EBUILD boto3-1.20.37.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
 EBUILD boto3-1.20.5.ebuild 1409 BLAKE2B 09669b67946f26bccb5f8886bc2ef412c4575263c129de5ebf5a1b9799077f44e2939a6c64e213f49ba54959d75ac2265e21eed71ce67e432a7f5d81d1ec4e7d SHA512 cc3047469af35dbc9e7e7963bec4b29c5af79680fd7aeb98aad094e751d13ae8dcf7b1f9f2e79e44531a086423a26a02a5b980314f2ded366b2a99fda8abd9bb
 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.20.23.ebuild b/dev-python/boto3/boto3-1.20.23.ebuild
index 9e72dd682a4c..17ec30c411f8 100644
--- a/dev-python/boto3/boto3-1.20.23.ebuild
+++ b/dev-python/boto3/boto3-1.20.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.20.31.ebuild b/dev-python/boto3/boto3-1.20.31.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.31.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.20.32.ebuild b/dev-python/boto3/boto3-1.20.32.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.32.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.20.33.ebuild b/dev-python/boto3/boto3-1.20.33.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.33.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.20.34.ebuild b/dev-python/boto3/boto3-1.20.34.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.20.35.ebuild b/dev-python/boto3/boto3-1.20.35.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.35.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.20.37.ebuild b/dev-python/boto3/boto3-1.20.37.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.37.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 656840c17b07..d033282746d0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,13 +5,25 @@ DIST botocore-1.23.24.tar.gz 8677151 BLAKE2B c12382994208f673cfcfa71e17fed028abf
 DIST botocore-1.23.25.tar.gz 8685879 BLAKE2B 6eff15d35c66ded69a07ee0a276efe1e42dac9a3924a1d9735cf55ad89307a6a695e2ab6ee092e6454d1b6d682d329afdcf40644a8a6b89099dab1d53543adda SHA512 f09cb0564e0208816b05ec827d534bf866d4de827466ce53d91bcf21b08060934c937e38f756d02735412bc965bb831283f0c44a4c957af4271ba754215a6545
 DIST botocore-1.23.26.tar.gz 8688841 BLAKE2B eec8481bef3096d7173281138e072364fb2eebf0d22e7ef7edcd1fc7878b3c9888279f8bc063d57deb0e8410bd77da43a243c0fe57f3b34d3ddeabe1134a8d9a SHA512 050e0e63506b1d3161811c570c81e5d574f8f96ea000729453650fd3c5df9422d8a23959256f0867a17cfe4db426fb79b2f47e5875eb0c3574e6c6fa8d061e6c
 DIST botocore-1.23.29.tar.gz 8705067 BLAKE2B b5c2358a263f93b4808a2527b7ce8a1bbc36dcd44ebf5d987bdc39713d494cdca8dc7499081f54a03467c5b7e998897d651672b586c2430da99ac67e92c8c3c4 SHA512 e5d282c69a4180f3d8e0a496a703df36ccc79cf23a63549167267b59ee44dcd06b5e6a7aa0234728467b0787517687f5b5e75db3b9a1e9c35776902b772f409d
+DIST botocore-1.23.31.tar.gz 8706949 BLAKE2B 2e31bc09173a93806fe045e5217defcf17b624d6e9ff543add0eb9183c99faac40c14a8b7d71a2ec71b5983df572cadd2d098155c8c9f5abeceef80c17c4c35b SHA512 7440740c05b8f009955b6627b82f8f955d907d529923457b19f1a251b701fc7cba2dd19a77eee1fce220745d93f19f4c42f146772ecd46f3ea0c93f63047086e
+DIST botocore-1.23.32.tar.gz 8710235 BLAKE2B 278189ae1ee9887e62092344543b6431425640c90c243161cc34448f5b4ed9cce624042bd21d445150f09e695608361633554d535aaaf1850b5987111a43657d SHA512 f33c9818d3985a0334d5c2cf2f9ec9aa34834a73dfc73f8e9298e59432141f6792acecf0380cb8d607cdd12156f182ee130952390d8f0e808cca12659317b2e3
+DIST botocore-1.23.33.tar.gz 8712535 BLAKE2B 97064bfe24db14e49ff37b515549a2294ed2fbba82f36cf4d5281db27add007c8524058cb208bcf168add9e739bb2d51e7980295938ac6ff6ff603ffd0cfccee SHA512 7373a9cac5efb12898ac1665b74a5eb3693d5e5defd55bc2972bc70cbfcdf69672a8cb4b8d0a6b2bfbc59e789fedea09014ac47ba9ef6af8cc038471330850f0
+DIST botocore-1.23.34.tar.gz 8718420 BLAKE2B 67325949a37c3a3ff61e66279626c30b8f225d74137512d9a45414e1af11a18dd5fba5f0f4e64dd71c3d0bbbabf210d6e8a63901bc6deba8f16e3cfc163ebb81 SHA512 8afdf0a186f4850e8905ef1cd6660ab8ea58546cc119a47085976adc51195c0b9d524c077a3dcef6687cc5977988532932a424023dfea83eb7efd1e19b19eb95
+DIST botocore-1.23.35.tar.gz 8719275 BLAKE2B 2bda51eef1ac3d420952751d610722fbb57e004e8503e17dddd0a31e7ab360ba719c97f97d4b9e5aa6440965bafea9966b11d246e85fe753633c88141881cbfa SHA512 84a8692d840d9c8930ad8f80756f4d6ce6350e6a655966ff33ffd7f2bf5f5997989d6cc9067b52dd5631f49c35b5120eaa3d533274f322581281810ab47b988a
+DIST botocore-1.23.37.tar.gz 8728451 BLAKE2B 039352d4c727433cc5aef435cd7527fa3bc6027c3db8b2a27219d4cab8f602f74995b09e5407c1df1c7a51e37830db7e8f351484485f6b822499933c35607472 SHA512 79004d38fbfc744d2fd91364a1cc99d8be1f2d03f25f2ba77df0da4b4d429a156ac5d52ca523ee4992ff99ac83b7a14e7f49e3b12b9b6f91e164fb720c41e10d
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 EBUILD botocore-1.23.14.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
-EBUILD botocore-1.23.23.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
+EBUILD botocore-1.23.23.ebuild 1534 BLAKE2B e9b46b29966098939f52d5891cf6ee83da16da1f21274c04a5dd3458b115efef10cadd5db1259f3bc22b65fda759b7ada39f2e34aa79f94a5cbf1a599c63402d SHA512 5c38de2d75850e52359ff974466bc13e395db43521a5bdaf10bd200378a7ab803f819c595885d969fa579a1215898932606329260f6775ec8dd316a344883b85
 EBUILD botocore-1.23.24.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.25.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.26.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.29.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.31.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.32.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.33.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.34.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.35.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
+EBUILD botocore-1.23.37.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
 EBUILD botocore-1.23.5.ebuild 1485 BLAKE2B 9b21d94811fb8d5254dba77700f691180d481a90767817b99f88d581d758f04bc4f9adbb6aeca10874feb1244a185f6857e893244e42eefd3eabb85acfd99489 SHA512 2911847bde3fc7a321362a0adbcf67fa548a012d3625efb9d2512b04b279c19780925cd508aff6af5a96705e904c560f4c2a2a23d7aa7dae6421814a9545328b
 EBUILD botocore-9999.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.23.23.ebuild b/dev-python/botocore/botocore-1.23.23.ebuild
index 5babe7de7679..ddf3c2151f07 100644
--- a/dev-python/botocore/botocore-1.23.23.ebuild
+++ b/dev-python/botocore/botocore-1.23.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.23.31.ebuild b/dev-python/botocore/botocore-1.23.31.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.31.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.32.ebuild b/dev-python/botocore/botocore-1.23.32.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.32.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.33.ebuild b/dev-python/botocore/botocore-1.23.33.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.33.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.34.ebuild b/dev-python/botocore/botocore-1.23.34.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.34.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.35.ebuild b/dev-python/botocore/botocore-1.23.35.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.35.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.37.ebuild b/dev-python/botocore/botocore-1.23.37.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.37.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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 ~riscv ~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
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
new file mode 100644
index 000000000000..c18c1cc918ca
--- /dev/null
+++ b/dev-python/build/Manifest
@@ -0,0 +1,3 @@
+DIST build-0.7.0.gh.tar.gz 37127 BLAKE2B b06ba16c154087046bd5efddb5fd6f60dad9ee79a204a0c1124fb4885d3692bcf4bd88b75c9665ade3f8457e12742d32e3cef40a0ffb5a894b049a6e942c09e3 SHA512 fd8410dc91333ba94c5141dd78f8052b66f947839752a5d0f401630f6bceed5be2e1f45eceaa2a98908c0e3ddb88a00e3ccca341a3890fa99202bc560ab6ff42
+EBUILD build-0.7.0.ebuild 1728 BLAKE2B dfe3878c5711764de0b55d9d7dabea4ffd57b0bfea096dfffb9dde5ee98061626c79d5935a6ebd9cb3b6dccd8069fe4e4d017239ef4f7a38a93308fa362e5522 SHA512 8f40b1e23d6f7cf3bdf7230c916ab9e6667faf0f1fa92c2f3b74704a5544a2c096c694d286bdb83e4bf84d3c202cdcf6cdc0ddde4ded5bd6a3cfcd4cda7dcfdf
+MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-0.7.0.ebuild b/dev-python/build/build-0.7.0.ebuild
new file mode 100644
index 000000000000..2ed498c3c848
--- /dev/null
+++ b/dev-python/build/build-0.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A simple, correct PEP517 package builder"
+HOMEPAGE="
+	https://pypi.org/project/build/
+	https://github.com/pypa/build/"
+SRC_URI="
+	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
+	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/filelock-3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
+		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by the presence of flit_core
+		tests/test_util.py::test_wheel_metadata_isolation
+		# broken by the presence of virtualenv (it changes the error
+		# messages, sic!)
+		tests/test_env.py::test_isolated_env_log
+		tests/test_main.py::test_output_env_subprocess_error
+		'tests/test_main.py::test_output[via-sdist-isolation]'
+		'tests/test_main.py::test_output[wheel-direct-isolation]'
+		# Internet
+		tests/test_main.py::test_build_package
+		tests/test_main.py::test_build_package_via_sdist
+		'tests/test_util.py::test_wheel_metadata[True]'
+		tests/test_util.py::test_with_get_requires
+	)
+
+	epytest -p no:flaky \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/build/metadata.xml b/dev-python/build/metadata.xml
new file mode 100644
index 000000000000..dfa7f7dccb22
--- /dev/null
+++ b/dev-python/build/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">build</remote-id>
+		<remote-id type="github">pypa/build</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index c6e14719c66c..4deacb267931 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -1,4 +1,4 @@
 AUX cerberus-1.3.2_no-pytest-runner.patch 259 BLAKE2B 6cf56852d33703a9b2ccf8605849a0d23f3397156ab7704b25d98af6037824fcab48718a5f4dd00258765d37d210182d9cd3440685a964f5c15596196c837cc3 SHA512 eb28000c54bf2fb8f88f5df2fab3edb035d96f6360d3984d201eb7188f218c52c59f9008ac0f8df19ad47f909de8717c67841cc7b5c463f805406f567bd0028a
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
-EBUILD cerberus-1.3.2.ebuild 549 BLAKE2B f557c694fa539fea27e62e7e26a5732fb3a6bdf25e1b5ba262a33e6b3e24790776a8204a62514799e33600cd5d4334b0262505dcd6d599125a8c70138bfecd94 SHA512 c8a9c5a74e1cf346dd1d3c40aad8cc221767218cb479135181a03eff495611ae61d62c7f4075057396cebe6e010db60c15c9b04437e6476e6ff5c7e210edf62f
+EBUILD cerberus-1.3.2.ebuild 548 BLAKE2B 2d21ca7b0dc077a7e761492731aabcb373012df0e9bc1a79f2958ff2f87b2c5c13cf97b637681cee96213d97bcfc4e38834b40779e35c42e1e1fe53ed3671988 SHA512 16624a3d874cd0e88f9aff1a3284075bb4e62c660d7de54c8ec9fa37b9bef7b0dbba677762bc82310b5ec438708810eadb5ae3f97e9875530c0b0c337e5a6330
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.2.ebuild b/dev-python/cerberus/cerberus-1.3.2.ebuild
index bb8115a7763d..4e51f4427dae 100644
--- a/dev-python/cerberus/cerberus-1.3.2.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pyeve/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 13b2663c4b34..55949cf8b361 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,5 @@
 DIST cfn-lint-0.56.3.tar.gz 8278034 BLAKE2B 894d30add7a193d256dc2195c0cd1d4b75f10f60abe9e37c5b0bdd84178d9559759326ad3e55d2321b99588094b436dc2dc8dff1cc561ae56dd4cee98d6b43bd SHA512 8aeaf44a626f9bfc05ebeefc8aec9211fcac1a65de681d5d700f3621631bff15e74ed644b9d0dc8af4d9b0b14802c2259dbc4ccf38594705040f5fd3af1cf482
+DIST cfn-lint-0.56.4.tar.gz 8550039 BLAKE2B 99efd99b423e068717f3050e4da444436463c16b0a55dfc36ca7ca45b1136d08bbce84441c8c4170eff7c82cbd4ecf87b6f78504b1d09d850d803a7e957903c9 SHA512 b7c94d85d58f9e44ff8d5575bb33c8c7fafcb908afe144d585765f02d645436d6583ecc802f0fa376597b75c72ada9a23862141cf1170c1ac1f64f2467d346fb
 EBUILD cfn-lint-0.56.3.ebuild 1702 BLAKE2B 8a8ef3027750e526b208d261e6dd31638e5922fb3502955c78d5d8b507bd257b75efeda5fc6f2a024bc3b07efe5e962b995f409bb9331ce959b99df61ebd01c4 SHA512 d907a4ecd603c0d2b0b75b7a702b7c7173894154ec2bdab364107a7b998d0a5bab210cb8f9161e0a167d5e24e95b673792efcaab6b7f794b9b5757afb740888f
+EBUILD cfn-lint-0.56.4.ebuild 1704 BLAKE2B 42928e071ccafc4418380bb7e4b419d86924d2462913c14473f4e795bf573f50e4a44305db121a7bf96de87b16b80ef038b79551debb13f1c052509942060ded SHA512 0662be6689df0fcfd7fce92053cf8f2199a8b07f27b3969612ce1af9a23ce8d993baff5e2ace11a2cea2686bddaca587cabeb79ab07450db8c89881df0a75fb3
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild
new file mode 100644
index 000000000000..3a28103e724a
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/chart-studio/Manifest b/dev-python/chart-studio/Manifest
index c74e146451b4..02ca73665d1c 100644
--- a/dev-python/chart-studio/Manifest
+++ b/dev-python/chart-studio/Manifest
@@ -1,3 +1,3 @@
 DIST chart-studio-1.1.0.tar.gz 51680 BLAKE2B 02aeb188dae3c1ff73faea891b0a9bef775ecac58e79ec4a43f2c0e0ca1ad71f5ba0cd93bd35779e7358b9495549915e23acb2817cb7ecd3becd4afccec71077 SHA512 1ee049b79df9e5f781cf279f03df718597ef4c0cc0dc02975a16b5a8f34f9330636453868f54e12e9ec8484a23c3481dc6a367995b359e1a4c2363860a962256
-EBUILD chart-studio-1.1.0.ebuild 521 BLAKE2B 8141a69fcd48682c4bb94db16b027183df0b6d98005b5b0e9de489f96210c654d41593994a4a0586bbe55ba4cd671e2fee5659895b09c1e95970e0530afc3fba SHA512 9d159e88790eb4ffd52aa170ea65b0e5f7d4a3415bec44638da362fff0577cfc0d6ad93307fe2112447310ffb3ee9ee2eea30a2e437ffda570972d63f617dd21
+EBUILD chart-studio-1.1.0.ebuild 522 BLAKE2B 7deb8447a97ad99d94622b694f6351184e56f7c763bc31a0e761ae4cff1532b0e871de7b750b66465fb015fa48d7ca894fa72737fd3668901cc02b903b679e9a SHA512 309489baef05b939e34419fefcfd00477634f16fc297bb839e0d71346583b81b375140d90ca54ffbca4a13ce3f6462013f4a835c4c4075b440fe70309de25f6a
 MISC metadata.xml 608 BLAKE2B b735f54ea7fa4dc06e9f522304a2f7b297380d6504ba8520e80d6abc31dc231154b244d3bc788dcfc8b413924c3792fdb1258739bbeb20fdcba7aeba16451c78 SHA512 909661d7e9dec9661674301c2685f1b38caf7e889c103ef89ffd84c17d4f3fad60971a904152ce01f5bc48dba7d38bbd9320a96b6340e0b71a2a3495e6020151
diff --git a/dev-python/chart-studio/chart-studio-1.1.0.ebuild b/dev-python/chart-studio/chart-studio-1.1.0.ebuild
index 2e464a6cf1b6..faed2dd0e4fc 100644
--- a/dev-python/chart-studio/chart-studio-1.1.0.ebuild
+++ b/dev-python/chart-studio/chart-studio-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 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
 
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index d9296fb739c5..68478a62be54 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
+DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.1.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-13.0.1_rc1.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-13.0.1_rc2.ebuild 904 BLAKE2B db4ffbceb084bc96bbbd0ddefcc42ddad15e85e98288923412a55023ab8c4a2251966515322597d28b43550183913033606c736ab76d6ec230bcbaf3580794a6 SHA512 a7c2a331ea88793f80e9536b859deee9f86f315a711c64faf86421d294d5de9255d8eb75fd44e1f07b214f687b8caae95442eb3cd0cbfb1ef3208ac79387d084
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-13.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-13.0.1_rc2.ebuild
new file mode 100644
index 000000000000..65aab706b6c8
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.1_rc2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index e83c06d37154..208693510c21 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,3 +1,3 @@
 DIST cloudpickle-2.0.0.tar.gz 60038 BLAKE2B 21f3c170c21c5b5c44fbe5317d788e7b09cc4d15789d91227cfcf736807ee11cbbc003ea66dae4fb90de99ea5fd1c6096827efe4d438b92b8b73ec981e12e784 SHA512 4f2c0019a9b6b7ca4c8749b0c2b600ac502450f6fec9c23fe5b9ddece34c77105c86666274e24c6672d405c3e0e800b0a7da055a95ada8fcc060a63214aa9666
-EBUILD cloudpickle-2.0.0.ebuild 811 BLAKE2B ab91ed14622216807c87c4c7f88c1e88df047feb9a9b0296793b27264e3f944120b102bbea4b846baf40b39ae7b8899acea9b240920f78659067642b827321ac SHA512 50119563952015e5e013216a3912710b394ec3a3b6ed1228c30e45b62097bca28fbae342c5ef9a32ebdd849f78098d1509add7010d4b3808acf07755cc0fcf84
+EBUILD cloudpickle-2.0.0.ebuild 817 BLAKE2B 5a6b03b8b0230f44d76a9f8e7bcf85d31110f8b86cff405cb8aa489434015164c9ae1e99fc51bf113547bc7ef75f1f26a4c8fa0252eb315176140a18afec3f18 SHA512 1b5da18bcc55b4fb5d11470804e7a33415db355794d614551ab218d84d7bfef6b6e361287b95621bde43bf4edc9972a8f975267ec5644cb8f74886b5cbf5df15
 MISC metadata.xml 400 BLAKE2B 6b8036e6fee459cd45ff48884ade7ba9471d948ff06e46062584e5953fdaea8197525ec02e2dc44d4daa6326c7a1859680340e616f27d72ea1d98fe5c011a5cd SHA512 70c88c748d18923d3205c9f2ebc683e6b73240d4f8215f1bf3c3c91bb5eaac259066dc735f10806c43375432df581545831c616ab3aa7218981193956e6c0450
diff --git a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
index 97042f870071..fa0fc87d23bb 100644
--- a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 46269e62e132..7ffd67ae07b7 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,7 +1,3 @@
-AUX colorclass-2.2.0-fix-py3.10.patch 1141 BLAKE2B 3ee06d510c39af677977203af1e1ac8f7de50ec93afc9540de45ae62e6ac480b5d0a58407845b92edb193ef014f42fa8132a141a8698bf5499fce4e71e9dca67 SHA512 70d7e9cfdc6647c77ca0e36407cea51f7ead276edf9e41201ca307a282ac36acf0d5bb622e2e76f76e58ec52d2e91c201b1b2490565e3698aff42852a9520acc
-AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
-DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.0-r1.ebuild 594 BLAKE2B 84541c2864698d0df1a5fba5cbbd810c9f0d7fbbc52cf57d87ba9d2983839a8a34df6d590351cc2d954f4be1c415c6948f971bf86a368ff72b1a2a00c6c293d7 SHA512 591c3ee088ffb41f135bb1962af3435b8da17d0ed8606a6e2a6c3c0440fb4f3d33c8216f4399aec330cfc81ce44ffdcb865d592b53f1cf7ee0ea1b1e68791766
-EBUILD colorclass-2.2.2.ebuild 862 BLAKE2B f128d8c96aba7ef51705664b6639b6e9be0a975a50d2bd380dd21c9775b96dd3b64fa5d3b238e3f706a46862f8d66c6574b95a98a482e5de9aa7cafbd84d8b87 SHA512 bde99f9f06db103e81c28e1c92d0bdafacf5f6a18bc3dd89392d3edbb991b5a7240e4e36464e8cb79ca58bbe533861a4b2d318fcdb56bd5bf449f6ed0f095f47
+EBUILD colorclass-2.2.2.ebuild 860 BLAKE2B 605f71727ab689a7b0782dcf67029be4e462042202b3e785fcfcb7bfdc1d32445c3c3a738a596d95995cf0bf0af3a98cf299e51ef3db5f38a1f7aa313bca3982 SHA512 78e0f449b5f3bf344b71132b8537ffb98994dce6187c28f5cf1a002271bb1477741a4a79582a555993a4ff35f4b41ce41a85a645860fac551000ba42f431ecae
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
deleted file mode 100644
index fde6c8c536af..000000000000
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-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="Colorful worry-free console applications for multiple platforms"
-HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
-SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/colorclass/colorclass-2.2.2.ebuild b/dev-python/colorclass/colorclass-2.2.2.ebuild
index 31cca6e7e360..b771b682bbc2 100644
--- a/dev-python/colorclass/colorclass-2.2.2.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
deleted file mode 100644
index ee67d6d40bb3..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001
-From: Ralph Broenink <ralph@ralphbroenink.net>
-Date: Mon, 24 Aug 2020 14:49:24 +0200
-Subject: [PATCH] Make code forwards-compatible with Python 3.9
-
-Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
----
- colorclass/codes.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/colorclass/codes.py b/colorclass/codes.py
-index b0ecb03..8b6085d 100644
---- a/colorclass/codes.py
-+++ b/colorclass/codes.py
-@@ -1,7 +1,12 @@
- """Handles mapping between color names and ANSI codes and determining auto color codes."""
- 
- import sys
--from collections import Mapping
-+try:
-+    # Using or importing the ABCs from 'collections' instead of from 'collections.abc' is 
-+    # deprecated since Python 3.3, and in 3.9 it will stop working
-+    from collections.abc import Mapping
-+except ImportError:
-+    from collections import Mapping
- 
- BASE_CODES = {
-     '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch b/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
deleted file mode 100644
index f25dd0440aa7..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_example.py b/tests/test_example.py
-index 7ee8c05..3516460 100644
---- a/tests/test_example.py
-+++ b/tests/test_example.py
-@@ -10,6 +10,7 @@ from tests.conftest import PROJECT_ROOT
- from tests.screenshot import RunNewConsole, screenshot_until_match
- 
- 
-+@pytest.mark.skip(reason="test fails on all platforms")
- @pytest.mark.parametrize('colors', [True, False, None])
- @pytest.mark.parametrize('light_bg', [True, False, None])
- def test_piped(colors, light_bg):
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 3b228e8f0265..6695298aba11 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,5 @@
 DIST croniter-1.1.0.tar.gz 39641 BLAKE2B 0c01d801b55b0fd6189d5b35f7493580aa25ea18e8be061152c6642fd05a9075c1211578124cd945bb754fda4704f637069a98c5080e41ce369cc3c959b35edf SHA512 ccc56e912d5ff684ec930f87ab096b0a739191014a2d0a76febddf0fe4155a6c319cf28011bea7b8f8034218a35813db65c3d4911ff575878a12f8fe1f75720e
+DIST croniter-1.2.0.tar.gz 39813 BLAKE2B eed3db9d96571de188f5bda3c3000ce4607e72fd97d2f70b34355495349744129c29ace03320d987f43d1692720dbfbb965e824091825b2e11222306a10d081c SHA512 0d7d59d617be16f7f1b6401a3c1260c3b644855c046fa6c2948cf2f2caaf7ee0183c659e0165c8d36068467893bb68bdd4024a246a85c76448ab0a62233c9ca1
 EBUILD croniter-1.1.0.ebuild 617 BLAKE2B db6f2fbbf39283fa6a2627b34c7627a2add30a4067aff112398902a59f316135d06c2516f02027e8319cf5df7cd390f260cc39baa48a18c53b061e76c9b4e8b4 SHA512 b92fc3493d31a69ef73e63b8f54c2581b2046662041e8e7493c9c27729a80457292612f0cc9b1b6ecdda0603ad5116b6d0a869da1dc9ff48adc881585a8c7746
+EBUILD croniter-1.2.0.ebuild 619 BLAKE2B 0fbaccfa5df3bbdb9b0611a55b552fed6d3516b5f27ccea55138593e776a33672fcae0181dbe48e01cb1a6ec677f5ce62570fbe71c01c01cff4f9ab59df947ad SHA512 35fd1c3f4d8ca94037b429ca6266d5ca136ad35bd11725497f5b9e782ef9da7176b209fa1952d560cff3bc343892e05c39333436829a7ec8a8c6b545748f3481
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.2.0.ebuild b/dev-python/croniter/croniter-1.2.0.ebuild
new file mode 100644
index 000000000000..ed9b81bdbbb9
--- /dev/null
+++ b/dev-python/croniter/croniter-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 93df32d2896d..6a12100f347a 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,6 +1,3 @@
-AUX css-parser-1.0.6-fix-py3.10-test.patch 5335 BLAKE2B c99d96c6fde03b0676521f1586ad60ad8c32f82b27c7fb99054edcff7f61b5450f12600d383c2d5d808643853ba8cfaf9a10eb54677de682d93273f6970eb557 SHA512 6d33f69edd1ef2c8b694e9b8bc34b1dc61be242eb32bbb15006529c6ec7ee9ee8e15566f002ef405d872174df65256dd609d2dbb63f7fbf7d9651fc32c559e11
-DIST css-parser-1.0.6.tar.gz 336932 BLAKE2B 00cfc4597137c0aa6af3cc8a72fa3e59a1d7b83210668c8421c0703a4a38d05d73f691ff00ffac14025f021a10f85c1d3697778794d23f75db381f5e63e24b7d SHA512 4c623541e1145c91458e7e2028f6a0de652ae2189dc99672fc72f098799d6349edb051bafc0901258481fa3422346303d2ef634392889ee83a29814609cdbd43
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
-EBUILD css-parser-1.0.6.ebuild 595 BLAKE2B 9e6986a702a2c7cfce7c75ade323666975d5ab1cdd37ab989cd5055958957d621e48269b2e7d7ff1836767a02d5c5cc0b68d1ce3f065e065736e12aa823d379b SHA512 989c44df0e09396c35b40cc78e45b75fb581aa5e4199babbf1d36b152adcfb907ce7836c4cac31e59b592f6f116b97a87966311e2fcef7bde370cbefe54c5916
-EBUILD css-parser-1.0.7.ebuild 541 BLAKE2B dfc296b6999bb9e635a60e903dc51fdd5bc187d1748e8ce46036d36835dc64c302926be4d105c343a94198beb7561bfc8adb9d57c06b8c2dd360c258617758c1 SHA512 be739f32dcc123b05a14aa7567b9da8f939b538e759abb76aee918196d269f928741409331471d3bddcf47287366fe6b9e5e27acc37695995ec4ff103b4b1d4b
+EBUILD css-parser-1.0.7.ebuild 539 BLAKE2B 1ff6c1dc4c6a78b8c83b85f17e0be129118c1fd3f774f14fb382d4101f04538e5fbbe4a942c5a7d51d669d7358449d22f14c8544694f186d5a8531a5332f3c7f SHA512 5e081b6795adb3374b2fcb54534f1c2af52abc8b7f74e63867ea3b17e1ee46627481750fc67b679095e71d52dd2cd52c6354c2cf8cd3d001be8a4843ae6db416
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.6.ebuild b/dev-python/css-parser/css-parser-1.0.6.ebuild
deleted file mode 100644
index c069413d87d8..000000000000
--- a/dev-python/css-parser/css-parser-1.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="https://pypi.org/project/css-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-test.patch"
-)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/css-parser/css-parser-1.0.7.ebuild b/dev-python/css-parser/css-parser-1.0.7.ebuild
index 5ecdea286917..142831e80e03 100644
--- a/dev-python/css-parser/css-parser-1.0.7.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch b/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
deleted file mode 100644
index 9107adefed56..000000000000
--- a/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/css_parser_tests/basetest.py b/css_parser_tests/basetest.py
-index 2b26906..115053f 100644
---- a/css_parser_tests/basetest.py
-+++ b/css_parser_tests/basetest.py
-@@ -149,21 +149,7 @@ class BaseTestCase(unittest.TestCase):
-         else:
-             self.fail("%s did not raise %s" % (callsig, exception))
- 
--    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
--        """
--        Just like unittest.TestCase.assertRaises,
--        but checks that the message is right too.
--
--        Usage::
--
--            self.assertRaisesMsg(
--                MyException, "Exception message",
--                my_function, (arg1, arg2)
--                )
--
--        from
--        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
--        """
-+    def _assertRaisesMsgSubstring(self, excClass, msg, substring_match, callableObj, *args, **kwargs):
-         try:
-             callableObj(*args, **kwargs)
-         except excClass as exc:
-@@ -171,7 +157,7 @@ class BaseTestCase(unittest.TestCase):
-             if not msg:
-                 # No message provided: any message is fine.
-                 return
--            elif excMsg == msg:
-+            elif (msg in excMsg if substring_match else msg == excMsg):
-                 # Message provided, and we got the right message: passes.
-                 return
-             else:
-@@ -189,6 +175,29 @@ class BaseTestCase(unittest.TestCase):
-                 excName
-             )
- 
-+    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
-+        """
-+        Just like unittest.TestCase.assertRaises,
-+        but checks that the message is right too.
-+
-+        Usage::
-+
-+            self.assertRaisesMsg(
-+                MyException, "Exception message",
-+                my_function, arg1, arg2,
-+                kwarg1=val, kwarg2=val)
-+
-+        from
-+        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
-+        """
-+        return self._assertRaisesMsgSubstring(excClass, msg, False, callableObj, *args, **kwargs)
-+
-+    def assertRaisesMsgSubstring(self, excClass, msg, callableObj, *args, **kwargs):
-+        """
-+        Just like assertRaisesMsg, but looks for substring in the message.
-+        """
-+        return self._assertRaisesMsgSubstring(excClass, msg, True, callableObj, *args, **kwargs)
-+
-     def do_equal_p(self, tests, att='cssText', debug=False, raising=True):
-         """
-         if raising self.p is used for parsing, else self.pf
-diff --git a/css_parser_tests/test_property.py b/css_parser_tests/test_property.py
-index ae6ab2a..561a5eb 100644
---- a/css_parser_tests/test_property.py
-+++ b/css_parser_tests/test_property.py
-@@ -162,8 +162,8 @@ class PropertyTestCase(basetest.BaseTestCase):
-         "Property.literalname"
-         p = css_parser.css.property.Property(r'c\olor', 'red')
-         self.assertEqual(r'c\olor', p.literalname)
--        self.assertRaisesMsg(AttributeError, "can't set attribute", p.__setattr__,
--                             'literalname', 'color')
-+        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", p.__setattr__,
-+                                      'literalname', 'color')
- 
-     def test_validate(self):
-         "Property.valid"
-diff --git a/css_parser_tests/test_selector.py b/css_parser_tests/test_selector.py
-index c0c769e..f2746d8 100644
---- a/css_parser_tests/test_selector.py
-+++ b/css_parser_tests/test_selector.py
-@@ -412,7 +412,7 @@ class SelectorTestCase(basetest.BaseTestCase):
- 
-         # readonly
-         def _set(): selector.specificity = 1
--        self.assertRaisesMsg(AttributeError, "can't set attribute", _set)
-+        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", _set)
- 
-         tests = {
-             '*': (0, 0, 0, 0),
-diff --git a/css_parser_tests/test_selectorlist.py b/css_parser_tests/test_selectorlist.py
-index 7028fe7..54c945a 100644
---- a/css_parser_tests/test_selectorlist.py
-+++ b/css_parser_tests/test_selectorlist.py
-@@ -11,6 +11,7 @@ from css_parser.css.selectorlist import SelectorList
- class SelectorListTestCase(basetest.BaseTestCase):
- 
-     def setUp(self):
-+        basetest.BaseTestCase.setUp(self)
-         self.r = SelectorList()
- 
-     def test_init(self):
-diff --git a/run_tests.py b/run_tests.py
-index 554c752..6507434 100755
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -1,10 +1,12 @@
- #!/usr/bin/env python
- # vim:fileencoding=utf-8
--# License: Apache 2.0 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
-+# License: LGPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
- 
--from __future__ import absolute_import, division, print_function, unicode_literals
-+from __future__ import (absolute_import, division, print_function,
-+                        unicode_literals)
- 
- import importlib
-+import logging
- import os
- import sys
- import unittest
-@@ -72,6 +74,7 @@ def find_tests():
- 
- def run_tests(test_names=()):
-     sys.path = [base, os.path.join(base, 'src')] + sys.path
-+    import css_parser
-     tests = find_tests()
-     suites = []
-     for name in test_names:
-@@ -85,6 +88,7 @@ def run_tests(test_names=()):
-     tests = unittest.TestSuite(suites) if suites else tests
- 
-     r = unittest.TextTestRunner
-+    css_parser.log.setLevel(logging.CRITICAL)
-     result = r().run(tests)
- 
-     if not result.wasSuccessful():
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 9c7b741a5a31..7d26c05822c7 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,6 +1,4 @@
 AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f77b6693f92b8e236d71663a297f6d6d8629ab9c247b35dc80b3b455d643a25a4aec97c586a6c4580947e8edaa529721aed8 SHA512 accef4bdb6b7a986998cf13b356faa4825e19542e38623570c7f6fb1cdc60f6aca41ee03e84dd543a352bfd77eba227be29cacee60117aad54cd802b4309d169
-DIST cx_Freeze-6.8.2.gh.tar.gz 1271879 BLAKE2B 5c0feb7fdb51edd9e1c3a508d3d2401d1930986ee8caf957ad84a853baed56b0a6d9bd09628331adac67b4b8c79059c5a6669f8a52f22596cd1d42c87ae8d7f4 SHA512 7c7de3290597ab986326ee67b9cb8fc3dd554cef2940e3df11df5be23a6a5b4eebb33784149aff59ebec97663c8a2e70b0811cb7c244cabe43659c59882ecd40
 DIST cx_Freeze-6.9.gh.tar.gz 1273371 BLAKE2B d005fdf0e2ac49cb4f347256d3b643124694a0628e4abf6806c122c144bb973e14a2d9101b2d446394d50c6c0d9af7edca1e62b50bb4d76f63c96fabfda6cc7c SHA512 219f052cae05a757c2cd57c45e47c0b3e85662ace895a8b768e1571044e132b7db367af2a6293d175e022f79f87b02007dfdd8807eb39be04a89602b51cc0246
-EBUILD cx_Freeze-6.8.2.ebuild 1079 BLAKE2B 9709a5b6fa508d8158ad193faef03682451d3f68d9e6613d7112901d3c120c5a06bf1901c5e2b01a78987674b44793d1be0d86ffc0a07b4b5857c51f916d823a SHA512 518e38dd073342d03da4a739408f8bb10ad70b1321c4db7847f932f18ccc76c048395c7218a1dd41fad44287f39b5e4fab115a842bf791927f9ca66257a11db7
-EBUILD cx_Freeze-6.9.ebuild 1081 BLAKE2B 9e0bb0451bcd989a220a973f2739def01fc9c1495fa6e8ac7d46478e3d4c729028d7b557f35e7091736475496a1e5b43b20cf7d846e4c0a4e17fcade3e321acf SHA512 488f34592e0af7b211350e0beabc52539727a99d4bf8fe58d69596705a3167b30c4c5609dc24cbb6c1ffc1f760089de43b8aebdfba7eba145b71109ae0e040a8
+EBUILD cx_Freeze-6.9.ebuild 1079 BLAKE2B c417889b9f271c28696e4a06374609dff880a3c2612fe9320280765a00080c29ecebacffdcf39486373fd77d373c629c0aae413fd066903dfdc7577bb56e9439 SHA512 cdd37584c6920cc0e0c39cf1f11305f8177dd082f24896fde04fe4b3875735fab36cdb2973a5bee128a09b0afbd2493a8e4f11b38e7cfe1f77f449ae737a1a9f
 MISC metadata.xml 384 BLAKE2B 3e1553ab02bce58de9d197935ff0fc6c709473af6b4a0d48c0ef8cd8eacf4b2134b8e725b633842f44a13705af6ab53893755b66e85e400c3e128e85625b6bcb SHA512 e93f9015b6c5097db33107455b92c2fe70f4bb8089ea29c5cf5b16788cd6096743203a4abc971bf97571eaed73a1428915988db72a8756eacdf26ef597a69abd
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild
deleted file mode 100644
index 92900097dbf6..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild
+++ /dev/null
@@ -1,46 +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="Create standalone executables from Python scripts"
-HOMEPAGE="https://cx-freeze.readthedocs.io/"
-SRC_URI="
-	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-util/patchelf
-	virtual/libcrypt:=
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8)
-"
-BDEPEND="
-	test? (
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild
index 7dea19185598..a13575400fd3 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index cfcc9f74fea7..e972193e55b6 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,19 +1,8 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
-AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
-AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
 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
 DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
 DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
-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 1932 BLAKE2B a2ecc222a291fc50a5e8f6f6149a7702b7430cf413a34ec748a62520098c755af92e6f945bf47df0a3be80faca57a21baefd7da6c6479a8abdc6462ba9a8b7a2 SHA512 6d1b1c269003c998d6fb2b326e58efd0bd434d494d9dccda5fbc0512b9e75c3f2be0a677a9b42755141a642dcc06f5eada7b7c7f16c5557be1d797be45a80115
-EBUILD cython-0.29.25.ebuild 1825 BLAKE2B 93ddf306ea56ae40708fb45e7e597dd7048784becc0de6211b1d731f3b2e231f849db143b620a9652b541a54d10c07b640a8b5c01637100b3f2eb8def41191a3 SHA512 ac0701ccaaa308283ae1f244ca2eeba8f0d6024f9511f162b00ba7809b00253c6a377f66dd1a2dfe7e85a66992d279d7b997d96c4de6ec032ff98fab4d18d945
+EBUILD cython-0.29.25.ebuild 1824 BLAKE2B 2c84e4bf9cfc26bed3d8f88ceab4f760565688ce44a8d2082e3058a6dadc4f71ad89c6e85d192739b6d176e382d08d0ad1f532bd1d8f0285de5bd8bbce970ec2 SHA512 c80bd93c6c289b3c6a150dca28f4b891f9489bdb70643a0e26443e77e3b1510cc97a899655a173409147283c49db31f9315873a6be1658a11696c7d2f6eb9966
 EBUILD cython-0.29.26.ebuild 1832 BLAKE2B 8c16b823cd4559572787a1b135050bd7cda1301e902b393b537363b4657764aa8386810b9d57fd25b66231fc47d9502be265b1bd4822170ee3020af709e95d1a SHA512 68bcd199642518860b62784d718138510cb3e0036803e856642dbbd53ef50126c2d9df17fefb16d82929f8547973cbf20a4fd73897e6adb17fe6fa90d95d3b2f
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
deleted file mode 100644
index bb017b7e2557..000000000000
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-	"${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
deleted file mode 100644
index bce6983a00f2..000000000000
--- a/dev-python/cython/cython-0.29.23.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.14-sphinx-update.patch"
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-	"${FILESDIR}/${PN}-0.29.23-tracing-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild
deleted file mode 100644
index f613ee176918..000000000000
--- a/dev-python/cython/cython-0.29.24-r1.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_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-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
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.25.ebuild b/dev-python/cython/cython-0.29.25.ebuild
index 9a05a3bf7890..13ce9563c542 100644
--- a/dev-python/cython/cython-0.29.25.ebuild
+++ b/dev-python/cython/cython-0.29.25.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 )"
 
diff --git a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch b/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
deleted file mode 100644
index 3f426754f6f1..000000000000
--- a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 10662e28c..a84e0b928 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -41,7 +41,7 @@ highlight_language = 'cython'
- extensions = [
-     'ipython_console_highlighting',
-     'cython_highlighting',
--    'sphinx.ext.pngmath',
-+    'sphinx.ext.imgmath',
-     'sphinx.ext.todo',
-     'sphinx.ext.intersphinx',
-     'sphinx.ext.autodoc'
diff --git a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
deleted file mode 100644
index 0aa7212b9a34..000000000000
--- a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Needed to prevent a loop while calling cythonize on macOS - or any platform
-defaulting to the 'spawn' method, as Python 3.8 does on Darwin.
-
-https://github.com/cython/cython/pull/3263
-From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001
-From: Marcel Bargull <marcel.bargull@udo.edu>
-Date: Fri, 6 Dec 2019 18:21:19 +0100
-Subject: [PATCH] Disable parallel cythonization for "spawn" start method.
-
----
- Cython/Build/Dependencies.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
-index 593e00a6ef..f9b9c15bc5 100644
---- a/Cython/Build/Dependencies.py
-+++ b/Cython/Build/Dependencies.py
-@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()):
- 
-     if N <= 1:
-         nthreads = 0
-+    if nthreads:
-+        import multiprocessing
-+        if multiprocessing.get_start_method() == 'spawn':
-+            print('Disabling parallel cythonization for "spawn" process start method.')
-+            nthreads = 0
-     if nthreads:
-         import multiprocessing
-         pool = multiprocessing.Pool(
diff --git a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch b/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
deleted file mode 100644
index ff0e45a646dc..000000000000
--- a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Fri, 14 May 2021 19:39:58 +0200
-Subject: [PATCH] Adapt tracing code to Py3.10 beta 1.
-
----
- Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++---------------
- 1 file changed, 49 insertions(+), 30 deletions(-)
-
-diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c
-index 15ceb41cc2..2cd9af9da7 100644
---- a/Cython/Utility/Profile.c
-+++ b/Cython/Utility/Profile.c
-@@ -47,13 +47,32 @@
-     #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame)
-   #endif
- 
--  #define __Pyx_TraceDeclarations                                     \
--  static PyCodeObject *$frame_code_cname = NULL;                      \
--  CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
--  int __Pyx_use_tracing = 0;
-+  #define __Pyx_TraceDeclarations                                         \
-+      static PyCodeObject *$frame_code_cname = NULL;                      \
-+      CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
-+      int __Pyx_use_tracing = 0;
- 
--  #define __Pyx_TraceFrameInit(codeobj)                               \
--  if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
-+  #define __Pyx_TraceFrameInit(codeobj)                                   \
-+      if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
-+
-+#if PY_VERSION_HEX >= 0x030a00b1
-+  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
-+     (unlikely(tstate->cframe->use_tracing) && \
-+         (!(check_tracing) || !tstate->tracing) && \
-+         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
-+
-+  #define __Pyx_SetTracing(tstate, enable) \
-+      (tstate)->cframe->use_tracing = (enable)
-+
-+#else
-+  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
-+     (unlikely(tstate->use_tracing) && \
-+         (!(check_tracing) || !tstate->tracing) && \
-+         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
-+
-+  #define __Pyx_SetTracing(tstate, enable) \
-+      (tstate)->use_tracing = (enable)
-+#endif
- 
-   #ifdef WITH_THREAD
-   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
-@@ -62,8 +81,7 @@
-           PyThreadState *tstate;                                                         \
-           PyGILState_STATE state = PyGILState_Ensure();                                  \
-           tstate = __Pyx_PyThreadState_Current;                                          \
--          if (unlikely(tstate->use_tracing) && !tstate->tracing &&                       \
--                  (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {    \
-+          if (__Pyx_IsTracing(tstate, 1, 1)) {                                           \
-               __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           }                                                                              \
-           PyGILState_Release(state);                                                     \
-@@ -71,8 +89,7 @@
-       }                                                                                  \
-   } else {                                                                               \
-       PyThreadState* tstate = PyThreadState_GET();                                       \
--      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
-+      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
-           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
-       }                                                                                  \
-@@ -80,8 +97,7 @@
-   #else
-   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
-   {   PyThreadState* tstate = PyThreadState_GET();                                       \
--      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
-+      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
-           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
-           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
-       }                                                                                  \
-@@ -91,10 +107,9 @@
-   #define __Pyx_TraceException()                                                           \
-   if (likely(!__Pyx_use_tracing)); else {                                                  \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
--      if (tstate->use_tracing &&                                                           \
--              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {          \
-+      if (__Pyx_IsTracing(tstate, 0, 1)) {                                                 \
-           tstate->tracing++;                                                               \
--          tstate->use_tracing = 0;                                                         \
-+          __Pyx_SetTracing(tstate, 0);                                                     \
-           PyObject *exc_info = __Pyx_GetExceptionTuple(tstate);                            \
-           if (exc_info) {                                                                  \
-               if (CYTHON_TRACE && tstate->c_tracefunc)                                     \
-@@ -104,7 +119,7 @@
-                   tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info);        \
-               Py_DECREF(exc_info);                                                         \
-           }                                                                                \
--          tstate->use_tracing = 1;                                                         \
-+          __Pyx_SetTracing(tstate, 1);                                                     \
-           tstate->tracing--;                                                               \
-       }                                                                                    \
-   }
-@@ -113,13 +128,13 @@
-       PyObject *type, *value, *traceback;
-       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-       tstate->tracing++;
--      tstate->use_tracing = 0;
-+      __Pyx_SetTracing(tstate, 0);
-       if (CYTHON_TRACE && tstate->c_tracefunc)
-           tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result);
-       if (tstate->c_profilefunc)
-           tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result);
-       CYTHON_FRAME_DEL(frame);
--      tstate->use_tracing = 1;
-+      __Pyx_SetTracing(tstate, 1);
-       tstate->tracing--;
-       __Pyx_ErrRestoreInState(tstate, type, value, traceback);
-   }
-@@ -132,14 +147,14 @@
-               PyThreadState *tstate;                                                      \
-               PyGILState_STATE state = PyGILState_Ensure();                               \
-               tstate = __Pyx_PyThreadState_Current;                                       \
--              if (tstate->use_tracing) {                                                  \
-+              if (__Pyx_IsTracing(tstate, 0, 0)) {                                        \
-                   __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);  \
-               }                                                                           \
-               PyGILState_Release(state);                                                  \
-           }                                                                               \
-       } else {                                                                            \
-           PyThreadState* tstate = __Pyx_PyThreadState_Current;                            \
--          if (tstate->use_tracing) {                                                      \
-+          if (__Pyx_IsTracing(tstate, 0, 0)) {                                            \
-               __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);      \
-           }                                                                               \
-       }                                                                                   \
-@@ -148,7 +163,7 @@
-   #define __Pyx_TraceReturn(result, nogil)                                                \
-   if (likely(!__Pyx_use_tracing)); else {                                                 \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                \
--      if (tstate->use_tracing) {                                                          \
-+      if (__Pyx_IsTracing(tstate, 0, 0)) {                                                \
-           __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);          \
-       }                                                                                   \
-   }
-@@ -176,9 +191,11 @@
-       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-       __Pyx_PyFrame_SetLineNumber(frame, lineno);
-       tstate->tracing++;
--      tstate->use_tracing = 0;
-+      __Pyx_SetTracing(tstate, 0);
-+
-       ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL);
--      tstate->use_tracing = 1;
-+
-+      __Pyx_SetTracing(tstate, 1);
-       tstate->tracing--;
-       if (likely(!ret)) {
-           __Pyx_ErrRestoreInState(tstate, type, value, traceback);
-@@ -199,7 +216,7 @@
-               PyThreadState *tstate;                                                       \
-               PyGILState_STATE state = __Pyx_PyGILState_Ensure();                          \
-               tstate = __Pyx_PyThreadState_Current;                                        \
--              if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+              if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-                   ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
-               }                                                                            \
-               __Pyx_PyGILState_Release(state);                                             \
-@@ -207,7 +224,7 @@
-           }                                                                                \
-       } else {                                                                             \
-           PyThreadState* tstate = __Pyx_PyThreadState_Current;                             \
--          if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+          if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-               int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
-               if (unlikely(ret)) goto_error;                                               \
-           }                                                                                \
-@@ -217,7 +234,7 @@
-   #define __Pyx_TraceLine(lineno, nogil, goto_error)                                       \
-   if (likely(!__Pyx_use_tracing)); else {                                                  \
-       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
--      if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
-+      if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
-           int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);              \
-           if (unlikely(ret)) goto_error;                                                   \
-       }                                                                                    \
-@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code,
-         (*frame)->f_tstate = tstate;
- #endif
-     }
--      __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
-+    __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
-+
-     retval = 1;
-     tstate->tracing++;
--    tstate->use_tracing = 0;
-+    __Pyx_SetTracing(tstate, 0);
-     __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
-+
-     #if CYTHON_TRACE
-     if (tstate->c_tracefunc)
-         retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0;
-     if (retval && tstate->c_profilefunc)
-     #endif
-         retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0;
--    tstate->use_tracing = (tstate->c_profilefunc ||
--                           (CYTHON_TRACE && tstate->c_tracefunc));
-+
-+    __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)));
-     tstate->tracing--;
-     if (retval) {
-         __Pyx_ErrRestoreInState(tstate, type, value, traceback);
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
deleted file mode 100644
index 64202a93ecad..000000000000
--- a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/cython/files/cython-0.29.24-unaligned-format.patch b/dev-python/cython/files/cython-0.29.24-unaligned-format.patch
deleted file mode 100644
index 955c32debb49..000000000000
--- a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2c08fd50d62e4255602ee3c0d41157df7608e773 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Wed, 1 Sep 2021 00:09:02 +0200
-Subject: [PATCH] Avoid copying unaligned 16-bit values since some platforms
- require them to be aligned. Use memcpy() instead to let the C compiler decide
- how to do it.
-
-Closes https://github.com/cython/cython/issues/4343
----
- Cython/Utility/TypeConversion.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c
-index 751d12b62a..3669bc9ec1 100644
---- a/Cython/Utility/TypeConversion.c
-+++ b/Cython/Utility/TypeConversion.c
-@@ -829,14 +829,14 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value, Py_ssize_t wid
-             digit_pos = abs((int)(remaining % (8*8)));
-             remaining = ({{TYPE}}) (remaining / (8*8));
-             dpos -= 2;
--            *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_8)[digit_pos]; /* copy 2 digits at a time */
-+            memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */
-             last_one_off = (digit_pos < 8);
-             break;
-         case 'd':
-             digit_pos = abs((int)(remaining % (10*10)));
-             remaining = ({{TYPE}}) (remaining / (10*10));
-             dpos -= 2;
--            *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_10)[digit_pos]; /* copy 2 digits at a time */
-+            memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */
-             last_one_off = (digit_pos < 10);
-             break;
-         case 'x':
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 26a624ad73eb..e21989b72609 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,6 +1,8 @@
 AUX dask-2021.10.0-warning.patch 1606 BLAKE2B 69d75601493a8702ad61e1e9411c1219a83a2251349e4112346215fa7d8f78e10ed1f4bd1f6f5ed1db14627e1b7ba24c8ebf180b9210589c27bdecdf3d94d207 SHA512 f0479c156cfc40c6501bbc4c1832abb2d36a322edce2b5827c05e7d6cea075e12c57c5f0460eeebe250ca049ad6df74eba7509a4517d654775c915391a6b6af4
 DIST dask-2021.11.0.tar.gz 3971871 BLAKE2B be2c28782e3e870b62e70041bd7572783ff9eef61c27d2fa092f00b74ae23877163e3c00f59f67c5c39b6fefd723cb2c25cdc58b5f5c76c08ef1d686f256cb25 SHA512 cebdef68b2c40348c84627505f4e1f17f998aed603d590be5acc7b78233362330352be395396be00f72215b738e9393ef08eeae8ed0fb933466c1c2d6158e5ea
 DIST dask-2021.12.0.gh.tar.gz 3987797 BLAKE2B f6c1954ff41048861fcedbc56bd658989dece828613344e876e097d03f93338c194d66e62dd9fa1605b5dfd0362374a1dd2e00a383eec4476db16ac04de29266 SHA512 e9ce4613bf1ccfda7ce85bd90ff8f24d59335f02a941c12335214a2636f46ae1e1e8c2b1777ca9b9dd83f190071a2893b02bee129a68e9b7468c30f2a45df68e
+DIST dask-2022.01.0.gh.tar.gz 4903414 BLAKE2B 495531085d126d51c03b1f6dda490cd2d859276821a6d1ab6c2b90fcf6a4cec925b9fcafdf3b3da46344391e77a9bd09cf023f25b0f84bbe6ca8fa36b0bed73f SHA512 3fc25f6ccfca8354e3c6e2425f4d2c8b85807944b02cd1e872931f5b34d82c9afc6f5ffb17b5f835c531ebac4b6759ddaa81897a6f3d2aeee2c09935f221f62d
 EBUILD dask-2021.11.0.ebuild 1316 BLAKE2B 1da54c68cb9326c52fc931e636e973241b51e38c3f4772af018ceb04557010185c5a02de6b2f879b5cf41a34048182b8b034dba2fcb12350a03d9fb122d3949c SHA512 7a37317e26196ebe7f9bc223f814fd3dfccfb3630a5189f8ec38221bb3aee663323ae95c67cdcdff2789c3ec80f07847b9e7388634762bac486415e3e341f298
 EBUILD dask-2021.12.0.ebuild 1350 BLAKE2B a795c9aa32809957e0c5af07e71a14273d933fd5c897cd6c04a921536b3ea9594544ab1a8e6ef78f6a3515cd302b01a4e0209184f7bf3b7265960fdda16dc449 SHA512 5285dd3366fb72cc7aa0db596e6f678c65a459920e8c0b7646a0aa7253f202530816bc758aa0030283cd4527423a3e4af845fad192ba387eace426f22400cf6f
+EBUILD dask-2022.01.0.ebuild 1433 BLAKE2B e6a22d9ecea05a5f4cc5b74c27c3252278f3829fec906cb7d8e2a4541fadcc48cc506d8b87911c2d7d98a3d22abf4d77a68d42ab74d2045f4e72be38de33645f SHA512 456e2a23753acd5fec9589c9136cd2cb738f3d04b4f42632cf8315f955ebae2fb89b97d0f2e2e264b2d4df11ca578217ae3aa8ca0078bd5cbb81234f1b4f3dbe
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.01.0.ebuild b/dev-python/dask/dask-2022.01.0.ebuild
new file mode 100644
index 000000000000..a8c79554a055
--- /dev/null
+++ b/dev-python/dask/dask-2022.01.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/dask-2021.10.0-warning.patch
+)
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index ddd7cf25d6de..985ac5f295f1 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -2,8 +2,10 @@ DIST DBUtils-2.0.2.tar.gz 92119 BLAKE2B d53dc81000b426e2cfb8dace616d589ec622c7cd
 DIST DBUtils-2.0.3.tar.gz 92184 BLAKE2B 75b07f9c12ef2dc4debf7fb59d81f9765ad67c643126d3123544bf218d7932777dd458e9dd18fc9c4c2a2a08d4ff6e811b5d31924870f161c1c529582e7e42d6 SHA512 755491930713f082c0b550fd8870b22f807b909fec3e0667ecf9ddf04a282bebe6a879cc08a052e4872571bd9ab8e66aeb0668bd6b6e9edff4260c470e4bb00d
 DIST DBUtils-3.0.0.tar.gz 91960 BLAKE2B b155371571e21b300862dc47946681a1391e852f9445a8578e504a8485f56c777b0e569bd02af8efd1fe94f664f728c0f294673c61470107df5e50285249c1d0 SHA512 1dd128d39a087d9b4205d473e3be776ef74145ca635e52b05ba4250d82c90584e1ec7ad3c196adcb04356979868f72694a0b942d9224fcef8bfd6f5aa512c3fa
 DIST DBUtils-3.0.1.tar.gz 92286 BLAKE2B 7c0fe402f2ead551fc34dc42fd8d1866ebec52892dc01645677668a27275a916a87597ac19590830756acf2aee9ee6380180eca5e6876e10deb8c52545d27623 SHA512 ff201da374e68a03ffe4a93a0aee7e0138146da646a8ea81e1d6746e8c77e6a96b6a7230b56d3412a81ca21cf0ffd9321d0f9599d115d294d5439ac5e0033f9f
+DIST DBUtils-3.0.2.tar.gz 92566 BLAKE2B ee63b252eedeba18ab1db68c10ebe7b2204bef4d2f7d07fc09a095d632dca97304280ed7f14994644e42835fd61717b88de6902feb97df04533979b2b82625ed SHA512 3e4631b8c30466e0f8be438b980fe98071535ea63e06c69161ffda89ed2716fd84c406ace1b3b78e7811bebbc7d0383f080a43b58ed073c37280a7282cb9ccb6
 EBUILD dbutils-2.0.2.ebuild 697 BLAKE2B a232322d0332a411a540067066069574c29a00f43f771c071ee50d9f17d36891d24840aaa08977310319961849738df387f68c3bcbd5cfdcb10316bb6c4e0ad6 SHA512 acc3f68613bbd6f010900523fcf66226de80623d7cef0bf62ff4a1a1ba3a973768fed8b78ea2189693973fc390ccf13b0ac4f8697aa2e5f96f0c1ecee6403c3f
 EBUILD dbutils-2.0.3.ebuild 697 BLAKE2B a232322d0332a411a540067066069574c29a00f43f771c071ee50d9f17d36891d24840aaa08977310319961849738df387f68c3bcbd5cfdcb10316bb6c4e0ad6 SHA512 acc3f68613bbd6f010900523fcf66226de80623d7cef0bf62ff4a1a1ba3a973768fed8b78ea2189693973fc390ccf13b0ac4f8697aa2e5f96f0c1ecee6403c3f
 EBUILD dbutils-3.0.0.ebuild 697 BLAKE2B a232322d0332a411a540067066069574c29a00f43f771c071ee50d9f17d36891d24840aaa08977310319961849738df387f68c3bcbd5cfdcb10316bb6c4e0ad6 SHA512 acc3f68613bbd6f010900523fcf66226de80623d7cef0bf62ff4a1a1ba3a973768fed8b78ea2189693973fc390ccf13b0ac4f8697aa2e5f96f0c1ecee6403c3f
 EBUILD dbutils-3.0.1.ebuild 697 BLAKE2B a232322d0332a411a540067066069574c29a00f43f771c071ee50d9f17d36891d24840aaa08977310319961849738df387f68c3bcbd5cfdcb10316bb6c4e0ad6 SHA512 acc3f68613bbd6f010900523fcf66226de80623d7cef0bf62ff4a1a1ba3a973768fed8b78ea2189693973fc390ccf13b0ac4f8697aa2e5f96f0c1ecee6403c3f
+EBUILD dbutils-3.0.2.ebuild 697 BLAKE2B 190cc65633df7da952e0ee68eccd4680743b5c8ade195636246fa6db566800c6831ee3cd919e3e7b1b09047d814a1f02b643dae85288c921052b3d289f544f8a SHA512 1387103bb61d0a2941d73c0b9a4b123c0198331622221e5e8998a791d67b3ef2e58c43f35ae1f9a78540b3bed88700b4152b5a1b5defa61f1d4887239623ede7
 MISC metadata.xml 1005 BLAKE2B e6d13ea0ffdc7d972db2bd8f5f0e2212937e36c1646e900f2eb76cf270ae840db7211d218e6900208bafab3fef0c5226128cebabeb52a51e8204b1981809683c SHA512 ba6884914df60365c4b085b56abcc3e927e780f4f8baa6e2cca745cdc53a1fb18917f1b1532d9e957e515a7d5b8e190d87e556547b98a094062f672b3a1b14cf
diff --git a/dev-python/dbutils/dbutils-3.0.2.ebuild b/dev-python/dbutils/dbutils-3.0.2.ebuild
new file mode 100644
index 000000000000..1a02688b6c9e
--- /dev/null
+++ b/dev-python/dbutils/dbutils-3.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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="DBUtils"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Database connections for multi-threaded environments"
+HOMEPAGE="
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
+	https://pypi.org/project/DBUtils/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	dodoc docs/*.rst
+	rm docs/*.rst || die
+	local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 3822e23aa96f..c96f7e587445 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.4.tar.gz 18527 BLAKE2B d83df38dc54197063418eacad242269bbc130a8dbac61a9b0dcf473ca1e9fe0f4101f8f96839d81acd1e16d9386870c108dc4aa2c3e206670360fee6066e9e59 SHA512 a7cb4565254d47aeaccaa98cc1bf5a605d5dc323b7f15130d16f6322af3d084e5fae34da5e793be1d197b1ca6213306ab1a907277982766ba38bdfd20f53ea59
-EBUILD ddt-1.4.4.ebuild 638 BLAKE2B 8388f5257f11334290a4428484a08ca4d07155d1b4bb40a725dd412721d0db3f27628a15c7dc875afe291b81c848e00abd4d9987072b313e3ad4cea362faac72 SHA512 f79b1229544af846fb4744e06f5c9c56c2ad3299a26f61d1e9bd4e7cdf5e497f6316277fbeb928c6713c9e28bf7ca0e7692ce3dd775ccb8fce9d132bc1a7012b
+EBUILD ddt-1.4.4.ebuild 637 BLAKE2B dd8531676b92f0802db001d2b9fafba96b6cebb1d9e89a2a6991aa144de0940a891a28396950d1914f490ce04e2ac20e53cd6024da8cc6d56b530075270db1c7 SHA512 b038667f44054b3537e6f1b9a55bd4fcde5bb148e83008ac7e0df4115dc2e386990d3e67df5be8624a13dde7549d4a336e763ed486b728b0e9773b4353634d4f
 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
index 88b208f9e859..b02e22877ba2 100644
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ b/dev-python/ddt/ddt-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index cc38bdb9542a..1d90844affe4 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,7 +1,4 @@
-AUX distlib-0.3.2-py310.patch 1131 BLAKE2B d5f7dde9f3a23756d926ce39061ab1d168e3dcf1161b63eadcc2f639f58cb58d9e3dc4bf4738cd32a148fc649abd236230ea57353d851c1fd536c5fd2964c56e SHA512 d96f9ed3e023084103025650d34448cbddd301f7d43d65f565427e00976809d813730f5208dcae53969cfbe8f5eff054cd538141ff1e988dcb4396f8c94cd5ae
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
 DIST distlib-0.3.4.tar.bz2 1169083 BLAKE2B f1b5e5ca7d0155d204db177d9844cdff4d593be3d927bd5f9e8ad07065b52383527d3990b66c5868bb8377703d031958c5c88a9daf4f0b238903ddbea3ef6cf0 SHA512 24f8d6f5012c881ffa6bbdae7887ee5a7608ac36a83e2a96cb8a337d1ab6c896a4078028d0383165ff44be6b735aa31f7d199845d89899813be74ed00e1680e8
-EBUILD distlib-0.3.2.ebuild 1539 BLAKE2B 7b2b33f76a6c609150f5c5db91193682cac586ab03fcb62f067bdb786978671b0c7996f70d0c1385dd4b36043c8507911641f00b5693c61be9aec290b8c97ab3 SHA512 45076c88450a8dd40f02badc60b7d10084485fbadfc6a5596a165e930ec1c64c6afde009fe6bc31704057038dfdc713ad68abb72fbca6006501286e224f880b9
-EBUILD distlib-0.3.4.ebuild 1455 BLAKE2B c727ca8734f8313b37befb963cc2f2a976cd3577b63f62da5393d85946eb8f8a2f9e31a2b63e9f8d15f23effe793e8541c65d821922689a363ac6d302c7d634e SHA512 b56c7d8e6dc29064afeb1dcd3ecae94bcf46dace4ecf775ec5ee9742626e68d8c88149fdf759c77bbbf0ff1309ee908d41f85873327c14cf662bafb7a15256b5
+EBUILD distlib-0.3.4.ebuild 1452 BLAKE2B 5437e026d18baa362a36ec268f632dc411fc4db3939a63ed33d2e521c11635091df13de403f5681bae8f3f60064e5730c249ba67ed92df75e2f84a45b4e39ee0 SHA512 27ff6601978d34be31ee7f3777af5ec11743cead0dc0617ac9bc3ac4d966c9b6f65fe9e5d37b01c7e5f5fa658e6029ca45d79aa1906bf3c2fe975bd9a11197ae
 MISC metadata.xml 289 BLAKE2B 013504330142232b0a1343e0a85d0b29ded52c98dede7dbdd59c7f76dc20f0d0790c34c9cd0f0fca6ac1375bb2895908a9b9be001e1f067f5270241c72d85cc7 SHA512 482e8a6d8f38c56dca30257c1565667370eea4e5dc24ceea2c627566d620d9491ac4ffa4fbf8493d759c9d51064962f77bd74ed904cf58a1d4d3fee30825f9cc
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
deleted file mode 100644
index fa54b57e602c..000000000000
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 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} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-# This package's tests are extremely fragile and tend to break or hang
-# when it doesn't like metadata of packages installed on the system.
-RESTRICT="test"
-
-# pypiserver is called as external executable
-# openpyxl installs invalid metadata that breaks distlib
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# make sure they're not used
-	rm -r tests/unittest2 || die
-	rm tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-	# fix tests for py310
-	eapply "${FILESDIR}"/${P}-py310.patch
-
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.4.ebuild b/dev-python/distlib/distlib-0.3.4.ebuild
index bade1188726e..6e18b4fcd97b 100644
--- a/dev-python/distlib/distlib-0.3.4.ebuild
+++ b/dev-python/distlib/distlib-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/distlib/files/distlib-0.3.2-py310.patch b/dev-python/distlib/files/distlib-0.3.2-py310.patch
deleted file mode 100644
index 23c3dbbe0274..000000000000
--- a/dev-python/distlib/files/distlib-0.3.2-py310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5a9540cf58fc020b0c6a1d5c23b9b93d1abd2eb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 29 May 2021 22:08:57 +0200
-Subject: [PATCH] Fix test_is_compatible to fix Python 3.10 support
-
-On Python 3.10, PYVER is py310 which wrongly matches the original
-'py27' <= PYVER < 'py32' condition.  Replace it with explicit match
-against known Python versions in this range.  This is probably
-the simplest and the most future-proof solution to the problem at hand.
----
- tests/test_wheel.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_wheel.py b/tests/test_wheel.py
-index 849e7c1..7c8f5ee 100644
---- a/tests/test_wheel.py
-+++ b/tests/test_wheel.py
-@@ -206,7 +206,7 @@ class WheelTestCase(DistlibTestCase):
- 
-     def test_is_compatible(self):
-         fn = os.path.join(HERE, 'dummy-0.1-py27-none-any.whl')
--        if 'py27' <= PYVER < 'py32':
-+        if PYVER in ('py27', 'py30', 'py31'):
-             self.assertTrue(is_compatible(fn))
-             self.assertTrue(Wheel(fn).is_compatible())
-         # use actual wheel names from PyPI.
--- 
-2.31.1
-
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 9d6da9f8fcfc..f5d0837383f5 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,5 @@
 DIST django-timezone-field-4.2.1.gh.tar.gz 23457 BLAKE2B 72452a21e6e086363da2ef40389d12b79860f66706e54fb9050ffe48f7fa6ad2908c75d4c7e17a79df339eac76492599dd4533ddca69a5b8757b46a36ed4b0fc SHA512 4c2da420c3aaffa23d8cdb66dbbe4b2ea8638de5a45d9e381bf9af980e52eba77fc03a2b8fee8497662199cdc9436d56543c0f6316e74ae5da68187a305c34a2
+DIST django-timezone-field-4.2.3.gh.tar.gz 23605 BLAKE2B d183fb57254a6a1c86ca57558b88d5429d1d4d368c2cbf2f7a7f4d5414432fd80c5ae1df30793da185d5347afe8535dd821e7e605fb0693f26619b319894a6a3 SHA512 1a72ee557b5b527d2aeae9033c765272ebdd017d9e05708734e9bcdf6355e2747e1ce920a542dbead2d8fc6043024ece24adb3b27ccd6d0f2c8e5b3eb907e012
 EBUILD django-timezone-field-4.2.1.ebuild 807 BLAKE2B 6b9fe27cf74bf9a38679c8c78cfc92bc8d3b60839a6118546b003d2d33b120010f084fdd785f4fdf0f9932de53e6cdf077476f0fb092461afbb2a5e79ede1d0e SHA512 1f175570d95e3a7fcc0fe3cd0a30f3908bd2bced12c0bda740a5e90347887cd7689ac60bd984c07964822d0ff242d8845b8a567cca2941cc375ce3ef802c4b7c
+EBUILD django-timezone-field-4.2.3.ebuild 807 BLAKE2B 318c8fd30d009fe3301b0f3e4432077b30ac6dd16331210dc27de262a0bc5a8be1d0913c7b8fa695ac57d67d84a321541af1e2d3fb8cce58b8522d8dd8f313eb SHA512 7e28684261aad0378f757b1c9914bf91aed40ec3a6705886474c7e0f4ca1d48906365f9b39d8c80a4508e7c916126516864f34299f3169d6a997eb869e2e3b67
 MISC metadata.xml 325 BLAKE2B 481e3472db098df8d49a956b8771b6f32a7bfff8d0ab5a5d556a76c1dfbf4d393e566aed3bec7b8da37b72641f01ef34f1eeb4f5862bd7930facf517dff95875 SHA512 878eac6d1101f54284c6a33bc6458e6a9fa272dd3bc3c824f45e3c0b7b51835de2c9b80c312860e5d1dea0ca6fa1ad44b5e32d61cade7b818ffb4aa9427fed20
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
new file mode 100644
index 000000000000..1f18eee3c76a
--- /dev/null
+++ b/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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 Django app providing database and form fields for pytz timezone objects"
+HOMEPAGE="https://github.com/mfogel/django-timezone-field"
+SRC_URI="
+	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DB_ENGINE=sqlite
+	epytest
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 65449e0006f3..f8b75bdc092b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,9 +2,7 @@ AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-DIST docutils-0.18.tar.gz 2036219 BLAKE2B cb18016eaf674df18880cfac07484a68cfc158b68adc8c6ff5944b39407460a7feab192fb1c4bbef0293dacf58463e95c04bba53de578cf4e7c9ab8de14f6ed7 SHA512 c61bbe26b5f771dbfa4df94249bf19575088160f82a4a5cdf427a78d2675de915e9d979fffd515e353259ac57a08e7096c970f06ae20d7ca6f48d223072f0096
 EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
 EBUILD docutils-0.17.1.ebuild 1748 BLAKE2B 150d82c9667c782fcd015ec933a647fddf41022dac98253c7c4a187575d4526ad768cf6967f37dcbc89cd1030613b8a76466e6626021c23bf76020be24578cc0 SHA512 08d1c248a3db7098d50f8283b0d7a8b8e1cab5ffd7a8ff4ab8c779b216d3c74ec097f7185514c25ce1154b21f2ed3c03f09ef5b0d8d7ec69abd3f03d2cdb14df
-EBUILD docutils-0.18.1.ebuild 1756 BLAKE2B 42e23242c4edfbbb7bec80d33c1cd89689c6aa70be9fe610d9db6f9c3a2281f0c9782110bd981df915f3ea1629736e8f4c8a6ea4201e30daaa7bf5215a672f29 SHA512 9c8f201f3621614e6d62db780cde5c3cf95402b41d4ba14f846bbd456b25ce1d4e421a82ceb27ea054b1e83e9cc0aec8cb3cb6fcbf44d3bde333c2ef9e25c348
-EBUILD docutils-0.18.ebuild 1748 BLAKE2B ca7185e8f02cd7ac679725e55119543be4e9a19853fb23aca2abfcca4fbd9042405ac5bd3520c3b0ffdface39c245b31b6ce329650ac98a2f65b9b3a8ffa934e SHA512 c52fe86b64915a31e3bed105592afe798db79d32b5ae3c634a89bd9d488763c2d5b6faf5a41cc74ee4bf28ce21bd0f3eab225f4ce14d8b590745f347c89233f7
+EBUILD docutils-0.18.1.ebuild 1748 BLAKE2B 0ef8c8f4d5b8a7e5486b22da44ab1e2590896a926808805aeb014f9e166010240090a32df9ab733c600c0d9ccecf1fad7b29104c36dee2dcede65cf5ac80e123 SHA512 7ed7da4f0cbdad4bed26a29cfc17a1691203b1a050bbf0992cf08cdb04b0364d33aa44f8c4e412532e78f73931a8a1542960f7b5e251261319f87a55ed3aa248
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1.ebuild
index 59a8486954f7..4ae40190793a 100644
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ b/dev-python/docutils/docutils-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.18.ebuild b/dev-python/docutils/docutils-0.18.ebuild
deleted file mode 100644
index e826ac2f7fba..000000000000
--- a/dev-python/docutils/docutils-0.18.ebuild
+++ /dev/null
@@ -1,67 +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="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index e986e05bf4c3..550eb115fb8d 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,5 @@
 DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
+DIST doit-0.34.1.tar.gz 1447636 BLAKE2B 5b798ee2f291aa869bf03c492d0f6f9025e78ef5df95fadeafffdb953c159778dab30f75b0f9be24386748d362f6f380e34735891ed45f3511e819986b5788ca SHA512 ab5f9a56ee96d8b49f23f7d411eb4ee012639618b9604d65f61a2ce1ea1d1b42884277c08fe5ecd4b5097725d20b004457149e51f50a506d3daa9cade7ab858b
 EBUILD doit-0.33.1.ebuild 1250 BLAKE2B 535080da1e2ebbd0e05188dfd398b004a3f475be4e7050f69402fdd09f22d62a910faa79089490d4adc7354a4a915978753ca858ef0908e2bc0567e28331dc39 SHA512 6896807b062d8b39abfec6955f38931439438bce5c53263b21f884771430163abc60061087294fb01f6da21424312067fd4cb935ed8875ba3b43046f81cdf893
+EBUILD doit-0.34.1.ebuild 1252 BLAKE2B 7fb7ea9885e74616706d750eafac2a756728a48bdc9306e063abe2f22696084f1b5eec77956f6c856f07188c8ffa2561c51e580460004c91dd97b92d9e9a8704 SHA512 857d9fce36e4d4f6ca04dd89127ae746619727c0c77bae4925bf492819f151b9be681e53886f901001cceb5c275b11db7e9e1000a97ee48bca935da9a55820b5
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.34.1.ebuild b/dev-python/doit/doit-0.34.1.ebuild
new file mode 100644
index 000000000000..70559ea71051
--- /dev/null
+++ b/dev-python/doit/doit-0.34.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+	)"
+PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+src_prepare() {
+	default
+	# Replace custom theme with builtin for documentation
+	sed -i -e "s:'press':'sphinx_rtd_theme':" doc/conf.py || die
+	# Disable test failing due to impact on PATH run in a sandbox
+	sed -i -e "s:test_target:_&:" tests/test_cmd_strace.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp bash_completion_doit ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 41fd3a63c9e5..3b637357554c 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,7 +1,9 @@
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 DIST dulwich-0.20.27.tar.gz 416618 BLAKE2B 73ed04d9fc871a82126e212bdac0eaf235e44aa76f3e54c98bd50f71379fdd3082b2a3af12a22f3276a45909ef17e38a116deb6adfd650cdbfa19afa41803dd1 SHA512 dc82250c5b3cbccc1ccbb55ca2d871f4d17ddb3616cd92146468fc5f0d805d3fe349b2cedfb4e814e027c07f9352e87c72ca7e97ed6218aa621fa9311dc075c5
 DIST dulwich-0.20.28.tar.gz 416723 BLAKE2B ddbb36c65e1372e1c2fbab5d85ef26a77f40e4763eee8dc5d2ba249a6b4e37bd6e38197eaebbcb46f16df577c0ff4730ec69fff39a549adf2e5d147e7a3eabfc SHA512 5eb90dd888909f787ef5e9f0a79d7db9a31c5897e334a862c1d0593c4f115ff30047f108c7b315e0145e267f581ba0f4fd0fafb7b1b2316d3def4f70697f2e20
+DIST dulwich-0.20.30.tar.gz 417219 BLAKE2B 6b5b10a37f2901424b632dad081b9972da5af7475e11389c73f8a64a57ebf421700c6591bfddc5418b9c02d61916894aeeb2371a3ceb514532fd1b9e63dffb2c SHA512 1dd18c047e8bfe9f23a10c0c55b57be7b4d89d93af4a682265dac3bf495d1594057ed755e7caad926100d35e3603006377163dc6ae71bc51a500c744064f8bbc
 EBUILD dulwich-0.20.23.ebuild 1588 BLAKE2B 8f042ad848f62019a8522e80d50698015fcf0a0a88eade0368a04c1daa3e6ba129d41e70fb967b3bc5b3fc49b0b034bb6c6e315e29fd010a761e0f1fc2c138ed SHA512 3304d877079090d89300bba68e08b6b9bebe98fc10d30c184d7b97c42bc3b48e040fda9ed7cea6568a585eaa37eb67189e069cc529e8b87e53e6f549e3a297a6
 EBUILD dulwich-0.20.27.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
 EBUILD dulwich-0.20.28.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
+EBUILD dulwich-0.20.30.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
 MISC metadata.xml 558 BLAKE2B 72c574d6eb1a3d94686fe9aeeb53fa8d96532f4477ee94bfcd6c0dd3e0d6fc9e313dba9642b68a57ba0b38830fbe1f8d953c3ae79bcafcb6bbf6eba0e35f61a1 SHA512 de70aed32ec0b362668a6fd33d8be5251d57048bd6396e09608f040fe71fe8e3262f1c96fbc8058ea776e09a59ac465652f4f7d778fb4e3933c7fea4bf64d7f4
diff --git a/dev-python/dulwich/dulwich-0.20.30.ebuild b/dev-python/dulwich/dulwich-0.20.30.ebuild
new file mode 100644
index 000000000000..e282dc27d571
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.30.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 25fabbea7e80..3cd13a103c06 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1,7 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
+DIST easyprocess-1.0.tar.gz 13757 BLAKE2B 40af585cc27a5b238d2688be6a55b39433fb8d3f62835ad64f93c5bd0fd98de8928796fbf262f6c390a08dc0e3b103bfb10adbf387a521c20e68e5615e4fee53 SHA512 d20c4b855403b5bc637ae4572563bd21d3bec7dcc083b06066020e1ad9ceb4645a2bde3575cbdc3e13607ad048c86d75fc7e7ef9c5367d99bb9556a1630f9cdd
+DIST easyprocess-1.1.tar.gz 13755 BLAKE2B 1d1c0d66e34fbb3ea58736cf4750b5fa48dc6e97d07a568086129fc58ca910d26a383e032dd0030da78235695269da6b7886871e6ef0f0ce7a482275ff2aa0e6 SHA512 fd5d0453cab79bb93806ac0dcef97ba207171c087bc5232f30d6fa210fa479e0dff83bdd7bb5c59d71f65582dcb3dfbf5f25ea2e2ee162d8d5feb8ca8d223a68
 EBUILD easyprocess-0.3-r1.ebuild 648 BLAKE2B d6e18e6127d2fe7c27968eef4b62146377ba896f502d8c92069442a2d3bb18f82e2572693b54b11f7e46943a21e9d37418e1dc969c83d4fd7b43661e94e2b2fb SHA512 161180cb17433e16ad7c7c81cba58d3a6cb59fe72af0a6f0bc2ea59131e95486f779cd6ce6f3551cb04275f94c9da6578023c949e5cbd334a5fbd95b2c757c6e
+EBUILD easyprocess-1.0.ebuild 847 BLAKE2B 2507ab9a0663dd56c438e73f18b2ad7caf0cc76809640be9afa5e98ef6bac5a89aa1fba8d371971adf4a9991e21d93c3f8ebb59476a20ed4c3c2416bc6411d0d SHA512 c68ecc24a27846db22780cd10dd48374a34d0045ec81fb96929344958443b861798195c49b77b7d657645e677135c61d72b0a7ad349baa8f519ae916f85a81a3
+EBUILD easyprocess-1.1.ebuild 847 BLAKE2B 2507ab9a0663dd56c438e73f18b2ad7caf0cc76809640be9afa5e98ef6bac5a89aa1fba8d371971adf4a9991e21d93c3f8ebb59476a20ed4c3c2416bc6411d0d SHA512 c68ecc24a27846db22780cd10dd48374a34d0045ec81fb96929344958443b861798195c49b77b7d657645e677135c61d72b0a7ad349baa8f519ae916f85a81a3
 MISC metadata.xml 414 BLAKE2B cc96af9a5eac716c510f429ee1f47437e23f9a7622975309ef8f6eed0160d12325166919e73af6f15f6af830bfc62b2dbc8a4580c14e001b1a3d305c6b0fedfa SHA512 aa063a7ec44450d83dbc43c6f804f06a04262d6bfe270d61e124c14dbe964c8b2bc926906f826997dcfff054f1d889d6fe8a63e3d653bb37a8287739cbafdbaf
diff --git a/dev-python/easyprocess/easyprocess-1.0.ebuild b/dev-python/easyprocess/easyprocess-1.0.ebuild
new file mode 100644
index 000000000000..f17744f48ed2
--- /dev/null
+++ b/dev-python/easyprocess/easyprocess-1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use Python subprocess interface"
+HOMEPAGE="https://github.com/ponty/EasyProcess"
+SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/EasyProcess-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# looks like a problem within imagemagick itself
+	tests/test_fast/test_deadlock.py::test_has_imagemagick
+	# TODO
+	tests/test_fast/test_deadlock.py::test_deadlock_pipe
+)
diff --git a/dev-python/easyprocess/easyprocess-1.1.ebuild b/dev-python/easyprocess/easyprocess-1.1.ebuild
new file mode 100644
index 000000000000..f17744f48ed2
--- /dev/null
+++ b/dev-python/easyprocess/easyprocess-1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use Python subprocess interface"
+HOMEPAGE="https://github.com/ponty/EasyProcess"
+SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/EasyProcess-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# looks like a problem within imagemagick itself
+	tests/test_fast/test_deadlock.py::test_has_imagemagick
+	# TODO
+	tests/test_fast/test_deadlock.py::test_deadlock_pipe
+)
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index d351e7d11ec9..707852a70096 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,3 +1,5 @@
 DIST emoji-1.6.1.tar.gz 211816 BLAKE2B 5e258d5e7199a1a294cd117605a989939edf01c41a2d2de533baa389adb4cf9cb324550e19df50f9f76af4c402076f24e9db8f17ebb1d5f6f6ff6bfcf31471db SHA512 bd896d8b539224e371835622dd577f2b8b6b3f8cb443f487a2826a0d61e91bdae19570b4d73bf73a8544157dbbbac20dd3212019b0e70cb680e22951333176a6
+DIST emoji-1.6.3.gh.tar.gz 216366 BLAKE2B bdfc5a336629e97132d4e1d8ae148d9690982c71f03eb4538a79b41c8110dabab6d031832b355e332d37c8c065accf6e32ba79e77f026120aad6da81b77fd3a5 SHA512 d04cb0c58423f036e7739e8d69b361891129e1c3fb6c14ee57b2b5d58e6e8dba91abf3875933a4dbb209d9d9d06384e813100b0968018265b37e0f8c55bc50bd
 EBUILD emoji-1.6.1.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
+EBUILD emoji-1.6.3.ebuild 422 BLAKE2B 0ab5acfeee7a1a6d6ad834dcd61eb482b733cf3a5ecd8ab594ec190bd916526be2db717b090a04715c0a0177c6e9aea8fcd834da76897eff5f0922f91b0bbbfd SHA512 3502a9ea536c20a37569e828ad51bb02f64f9538029c2f5798c7e6f9cbccbde037f479cf2ad8a8837e4a77847687ea7c7b9dea20afa179ea3e725cc6a1838794
 MISC metadata.xml 396 BLAKE2B 65f441554017bf19380e2309b4fa34926968ae4734961ec9c0f551d64e801c2ff05ccf89a35125870df499b63dfb4d04d092f2f236bc91f01eecadc7d0a90f72 SHA512 0c4f1b15a3f1aa4394f7f5d6ee12e48fa10344fe9b97b6253437556e95bb9b938bcf3158e07193fd66d722d38c927cc2013eed4da0a7ea2d50076edbf439bb38
diff --git a/dev-python/emoji/emoji-1.6.3.ebuild b/dev-python/emoji/emoji-1.6.3.ebuild
new file mode 100644
index 000000000000..8a6767f47b45
--- /dev/null
+++ b/dev-python/emoji/emoji-1.6.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 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}.gh.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 2333043a3b24..958bc55318ca 100644
--- a/dev-python/enrich/Manifest
+++ b/dev-python/enrich/Manifest
@@ -1,3 +1,5 @@
 DIST enrich-1.2.6.tar.gz 15581 BLAKE2B 06f104a11b2dc85c1d80a2b14c548aaac40c78795e86b1c6ae733f884fbd7af0776af53d8cdd15c15d6abb91ca89dd7f815823b419fc2b3de322b50e55844dd0 SHA512 07c280d3526538af9d718c6d423be50d67e8285007a6702b7f3d842725a63cb282192c29481cbea6cbe7da886b630e5694776092dc0ffcaac522ccf1e895b5a9
+DIST enrich-1.2.7.tar.gz 16918 BLAKE2B f8fdcc9322a60d8885faf44efbbeaea2a423dea956941679f96560ed9c6b2db5ec3f143c241fa60d579034e0fdbf8b0e490f8c5dd38cd519a55964135623f804 SHA512 4e3d8598e82d7d013ff74dd325be02245086159fef819431a1ba7505e2e1557992ccbefc0b5a37d0e81487b4e378bef02179c6b74fd50528d6710ff297f0832a
 EBUILD enrich-1.2.6.ebuild 582 BLAKE2B c9a7d2a50b39a66d52381305559fd2b1bbdcfe3fad2481bde21e775743ab4d169350367a184a4a24fa4920921ef43d40700ad778df466d8f5bc47cce256c82de SHA512 a51c6c98f9b099136ec5bf9ce011dcb70961a75c092c17a422589ac61626c4fe833e27b23554370866abbfa60db904c95a09c4f186a04776bea68468fb4cfbfc
+EBUILD enrich-1.2.7.ebuild 587 BLAKE2B 1a5ace7c57f75f0f406201429332b9ae74ef7f9a0d6189c028324b5a69c69dd80d19b6f34792679129da88ed523cb88b35cb889214af9dd6fe1f31f03a74ec42 SHA512 9d15767367c5b8f6c7d96f35c9d1bc04192b8ec27f309d0140cf4acf0ee62a5d0abbee3ebb73ab781f46fd4732cc0e04f940eaf7188ed7f5da13fbb1a5186fbd
 MISC metadata.xml 391 BLAKE2B c8e2ab1ee58575e9cf34a6873a1507d4eba04a61de74156aee7d2c5e16897c11da16b9b2deecfaa3740c501f869bf1b54e4dc597e57d8ae49464acc987154226 SHA512 bd76efefd66c46d17e9b31f674a4cc934e00f4322b1d90c6040a06c637b44985420226eea3202b6fa734983911ac3d1eb2436949bb99edc412e0f633a55d8358
diff --git a/dev-python/enrich/enrich-1.2.7.ebuild b/dev-python/enrich/enrich-1.2.7.ebuild
new file mode 100644
index 000000000000..73f0bf42970e
--- /dev/null
+++ b/dev-python/enrich/enrich-1.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021-2022 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="Extend rich functionality"
+HOMEPAGE="https://github.com/pycontribs/enrich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index d446c372f059..9215cd2e6a9f 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,3 +1,3 @@
 DIST executing-0.8.2.gh.tar.gz 494836 BLAKE2B d6ade5658c8df656e80bb596f6c19493475d74ea10ddfc60b25eadb4a2f68d8afd2f437a6f82807932bba0469617fdac7a4dd90569623d1c8d7f96220e02ec9a SHA512 9a7fe4d3bae77d49725f35bae9d239bfb2a6e89d893d871d76f26fe4beffe0a07c6cbf50ea7b35b9ced66148d015c48106bc5774b26f201f9b40577f3380f5b3
-EBUILD executing-0.8.2.ebuild 927 BLAKE2B eaccb4d24b7df50e1eb43ccceb657de45618d6f0fe204fe3429c4003baaac0c1617668686ed85fffa5d3670e588a002673caee3362911cd81b2658433698baf7 SHA512 2533cd48a63dc137087447f54329de94ce4a0fa39b2e45f847cc20d640952b059cbbf86fc15b4ce030a7d71a900cde36f3ce191ac4549f42d4d6f9f81762fd5e
+EBUILD executing-0.8.2.ebuild 940 BLAKE2B d3d7b868cbc32652e828aaa31bf0cb26e5a96084483ae4da6be71a6dee356a15836af375056f6b88f6b0fdd287ad8b0a0b56b22c5101b7d8fd1af40fd14f89cf SHA512 7e86fbb3d8d9a69ec2525dce08daaf674785fca6e9927f1ed61321c7bce163547ae365f5c291aaf8558c17f9afedbd84d632401956c9e79d701de087c5e3d39f
 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
index a5e893cb9f44..1872a5d6ae6d 100644
--- a/dev-python/executing/executing-0.8.2.ebuild
+++ b/dev-python/executing/executing-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 0cd80907e12c..47d3ca17822c 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,5 @@
 DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
+DIST python-fastjsonschema-2.15.3.tar.gz 389350 BLAKE2B f9ab32666fce1ba44a11cb981f4f301d7d55260767ec71aefa54ad6bcdd5b8c3d246656908dcd50e909257b35bb9ee24eb34d5ce7fe0f91501127cad412a7e1d SHA512 59dfc513de46e9df790edaa1abc994decdf98d65bec8eb8a6ac7211d2277f4e15d521a308e45c6532a232321d8a4655f87b7a01f2d57b9de20246a4d6deeeb9b
 EBUILD fastjsonschema-2.15.1.ebuild 627 BLAKE2B 637e4552d6e574e5403dbb0204581dedcd99a813ab5094df7ed6df8db5b43cb21643fd9b13986f47d59cdad9c8f6edeee1a70efdc14b8e0b1297349ccceee5b4 SHA512 ef83c082f17931fc00925374659391f94f8f0fc2089cc25f26cfc02a7886e0745dbcc488a3def083947bd3b136e6b1a18129fb4c675e164c87c1bf57391691c7
+EBUILD fastjsonschema-2.15.3.ebuild 635 BLAKE2B 2c3bfc1ac90243db661b54adda29ef0a8335bde453295645e7649ad1637bbec67704535dbd05d0cabf8296674212b24b5d7707e33f63f439058252926c9049a2 SHA512 be801242c1d244f02c24ff02d3b212997a85142b3598c3f32cc1cdbe0fe8cff22f13ccc1801d47cb6a350ba2374681eece489966c18b2b7989a159feb207e856
 MISC metadata.xml 320 BLAKE2B 6a243ee36316e1c8db01ec6da04593ee4edb8cf479e829291e74c5672b5dd419cf9a3528c13dbd540342377186130a49be652e3f8c1cf78feafd310dbbd3bc88 SHA512 0c0dff7e564b1c1176e05a49c0c028ce181497bd734a1c19e24d8af7169c16d8b5dccc73cc31379c28ce0e58d1eb142d131969719b1c8fe6df3b76c59b4f3a3e
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild
new file mode 100644
index 000000000000..5a3028e4da43
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
+SRC_URI="
+	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r tests/benchmarks || die
+}
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 7453a176e9f1..a58b5caa8580 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,3 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
-EBUILD fido2-0.9.3.ebuild 1338 BLAKE2B c24ed847ada26e20b26913a0af124d47e91fad0651e4044f976d0821c240da7e05eff48d08ffa2d61bd598be2b7a008be39cc36af10719a2f34a6f8069b4e672 SHA512 f37f9e4e1ee30ef80ef241d8871a978d5d0944fc9c2e3edc4cf36b51cb1161eb864294b46fac09ee028b0a8b3f9329f3053d425de1e09225d8ce90ed424fdb01
+EBUILD fido2-0.9.3.ebuild 1345 BLAKE2B 4c477249eede6dd1fd6cd1856af5766e95aac6d007e2de65c72688422ae1905e09afb5fb646a1ed78a5409990c127859f96aada6210212c53c723316f39ac133 SHA512 83975e9bb7f1d97b4142974fdb01e3d83fdd8fab874cf1b1a226e296f0976bcd35d7dc96bcf1c1d049e4ed478d037a3a4027f1c9ca0613b398e134ee94e83b82
 MISC metadata.xml 820 BLAKE2B 092fc3aa0dc3e3a8998e7cef0a3229d5b8791983dc07df84c74ff6b7221afc879aa5a39a6ad58ff0bfe2836fa48b57d3445f20a0c78e2affc3bc47b73b81544b SHA512 f588e6637d75b668dabf80fc2c8e1133119a770d4f7fa5077025e0a478f8eb9c7f18eac1ce15395549485625bc4c82bdeebf07440087cd074e95d42a685eef53
diff --git a/dev-python/fido2/fido2-0.9.3.ebuild b/dev-python/fido2/fido2-0.9.3.ebuild
index ae881fb19eca..2e80af42e647 100644
--- a/dev-python/fido2/fido2-0.9.3.ebuild
+++ b/dev-python/fido2/fido2-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 RESTRICT="test" # Tests require <dev-python/mock-4
 
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index 8031c6934327..9b7b2239bb8f 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.2.tar.gz 7591 BLAKE2B 59c55e054b04098ad2e1c95d3464f3582fdfe2a83da75c8cebf556e2e7e32abeccf1bf69ec2d0b5c9790179d1c905da21b27e60e1c9810b62502c455193851fe SHA512 767a599aacbe87328b3e36bd85e0841870760ed9bd95dd3a4a9084edc6f0ae89f8203d565c2b075f16f1db21b647c17b2aa59b08e4702109d7e5f79f36d9f3fa
-EBUILD flake8-polyfill-1.0.2.ebuild 904 BLAKE2B e3b4f141c00155080465a6355b2f01225d0ab124fa32987e0f94ab0839dfe9cbbe6a27d407392d2df6178f0685fc749e13498f2dbc8142636a09c5f8a1c36194 SHA512 f28107c9d8cdab611d2e2df3bd6bcc28e21862f91eac63aa2617f78168ad80812622dc1b512ddbf74a9bdbc38928f09b5a912709d59c25456767f0caf0dce7e7
+EBUILD flake8-polyfill-1.0.2.ebuild 751 BLAKE2B a5d151de87c3f698ee456b9d260c112caa14d3d43662f622ea8b1675fd7b1c1fe07ef8745c98370f069f3f5e8f384695c9718fd01ac9bbbe13ae2d5f1387de0c SHA512 cbdf3b2490a6460f637ce014896aa53f258b0f43ced1c63c99c2922c3f51eb17b69715fe47d8346d84c6c5996c2f6771f9cba0f7cade55c7acbcb16465a8d630
 MISC metadata.xml 321 BLAKE2B ab71ce26e6578053020b11b3a3cfc43ec2e5169c16895c9a0e74463169dc590422dd784c46098a197610b86defe55b6343efc4267d64c6f96760a48b793caca8 SHA512 0599d1542a14f64b54e369713d0cbd293ff9d044ac98b6c6ee3a48748750b11550279142630d7b6f814558b576d5b5e4134f13c1a91bd0638bdf3113820d5ef1
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
index da199eabc872..e9866fde8326 100644
--- a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
@@ -1,35 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Polyfill package for Flake8 plugins"
 HOMEPAGE="https://gitlab.com/pycqa/flake8-polyfill"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-EGIT_REPO_URI="https://gitlab.com/pycqa/flake8-polyfill.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
+EPYTEST_IGNORE=(
 	# Get rid of the test that seems to test only the migration from
 	# pep8 to pycodestyle (bug 598918).
-	rm "tests/test_stdin.py" || die
+	tests/test_stdin.py
+)
+
+src_prepare() {
 	sed -e 's|\[pytest\]|\[tool:pytest\]|' -i setup.cfg || die
-	distutils-r1_python_prepare_all
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/flask-assets/Manifest b/dev-python/flask-assets/Manifest
index 9b1e6b1f29d0..6ceb1d441519 100644
--- a/dev-python/flask-assets/Manifest
+++ b/dev-python/flask-assets/Manifest
@@ -1,3 +1,3 @@
 DIST flask-assets-0.12.tar.gz 23017 BLAKE2B df7eb45a9abdd0be3f23655f49d30b53c90ea204fa0c91c286657d6b12750c7cdb11e78c2c8e140dc8677c90f52fa44c7d776c446c8fd4f92a060a570bdacb2c SHA512 28a5b275ba002c32e53200038673e507556d0acc12ccc9d2678ea3c179aa93eff275dd8fca9686186d20b65faa1600902e892a6aa4043df449c399008a37179d
-EBUILD flask-assets-0.12.ebuild 478 BLAKE2B 10f093f55445953b03125172121f7925bb379b62e6f29916822e80af1891f1f039583e8a861f7fd01047775b25379abd545db85a5d2825a7fab2dc377ac5c895 SHA512 5b9184a909bcb2e83e79d1fe9e5819913cda3877c50caa1997975319ebcf13c38486326c50aa244db3ccb3f19dc2445bef4b9823d6df160fb78ce58ad33df5ef
+EBUILD flask-assets-0.12.ebuild 483 BLAKE2B a186a315ccf7e286c9ee81d02ddd3680a6f17705652ff0702d3976730e85cc870da0dba8e52fa7c4c3d5a4766a061bb30e2ff7f29cb31264dda450e0f67a1f06 SHA512 caf5384979f98385021d0cbac5c9e3a3c4dbfed5bd06b282deab86d7493878c6b4c1141683cef679f9357faea771dc57da1d9a519b8f8f54fb54406521ee2bac
 MISC metadata.xml 410 BLAKE2B 8511207736a655a7ff56cb6047315cb3ed834007e007c1abb2f96606ff47edc8a47705217d7866c3f31ead0a9f80d03973288d23a6945527bda5946c941e5cd1 SHA512 22fdf365db2d96670a4c42f9621c0d23ee5c8e4e11f2917b65aaa0548998a1e9bf73bdd3d5c975e0d06330689be6a59f691c3a8d24b1c94790998fa102434bee
diff --git a/dev-python/flask-assets/flask-assets-0.12.ebuild b/dev-python/flask-assets/flask-assets-0.12.ebuild
index fed6fba31d6a..851c9b12a082 100644
--- a/dev-python/flask-assets/flask-assets-0.12.ebuild
+++ b/dev-python/flask-assets/flask-assets-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index b9ead84655bd..9c778ec9258d 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,5 +1,7 @@
 DIST flask-paginate-2021.10.26.tar.gz 120721 BLAKE2B dd37fa131baf20540620c350bca4a17f791df57c82fabd99e644891707259d330d4225fc666d3e5c31410bc17e10531bf735ab8a01e7129641fa81a9d8fbfe82 SHA512 86a782797a9401eecbbfc25c90834ed93d7c376c3eb6bc05f19edf7ad6f174aca01de9dc3b183c0c268e2995d81984fa1568e08aae8964e429c60f01b7b23736
 DIST flask-paginate-2021.12.28.tar.gz 120846 BLAKE2B 63c14a94db4c968ef22a84b28aee2ca3e223fa0a7a32e22644b02b718ae32ea9ece9177b85c66942165e01926b26bb599dd3ae47522ba9bbf9a1c68b7a5ce567 SHA512 3ff805ad2d30aadfd1affabde0b0caccf2c3c2efb54b0997f809e13a76c6db64082d0f003ba4485a824e48d5d2792d99bab5173059ebe5a4077a1aac99b3c4ca
+DIST flask-paginate-2022.1.8.tar.gz 120847 BLAKE2B 110d6f7bb6c244378a41ab26c914898b54fb05cc00cfc6c7c3e15ed96e2163f92cc89c4ce93199091d8ed2f52301e997ebc16a71a3d802b8107249f9f832ca25 SHA512 9f2e0e50d73ac15ec2a413671a52e9dbbbb7eac8576494483441ea1287a12e2076cf649ee9df0bf3b3d2c7e13eebe4a835031ab57a2e8b2015f383d53318a0b9
 EBUILD flask-paginate-2021.10.26.ebuild 521 BLAKE2B 140807d77a64c79dce577a6f47cbcfffe7f99f8bf90a35064d9937ad366b8bd79b43e964cf57885889db4407726871542f934aa138146b7faca013d136dbbd7c SHA512 8049baacf47d517bb4066793f31a7a6bcb84328677ccaeaa157404fd985a563a164fcad954425c79cf5eb6de274b00014bd77536091c280f87d5ecd240ab6609
 EBUILD flask-paginate-2021.12.28.ebuild 521 BLAKE2B 140807d77a64c79dce577a6f47cbcfffe7f99f8bf90a35064d9937ad366b8bd79b43e964cf57885889db4407726871542f934aa138146b7faca013d136dbbd7c SHA512 8049baacf47d517bb4066793f31a7a6bcb84328677ccaeaa157404fd985a563a164fcad954425c79cf5eb6de274b00014bd77536091c280f87d5ecd240ab6609
+EBUILD flask-paginate-2022.1.8.ebuild 521 BLAKE2B 51061fa761855b1ac3830e3308853f5ddd3e902b2fc846fdbe4d08ccbe5d78345498badf23309f5822903e577df1009236c3befd317d0080384e16695170eb18 SHA512 1eb26aed1af510ea0b5b775b9e1127fff7a018cdbab1843de63bb466b6bee3bc1a620820a402a610f847b1ae6986c767f2d5d88ddc0a3349ba3c160d1e232cdd
 MISC metadata.xml 659 BLAKE2B aa9bb930f20057e07df9b82804e8638b99f63e0773c11408617bc1c3c09f0cf8ce1d3383bbf577c42baa0149c271ddc8da113d5a31056e8ad41d4ac8ec4b64eb SHA512 660aba4453bb417b9a54dcf0b190ae16599c00203a19b4c53615b972595e223fb2f6ce8da6f097b34a5408c4cfe09b2a02a2ad19928352acbc8a4ee53b822a41
diff --git a/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild b/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild
new file mode 100644
index 000000000000..186458c0798f
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 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="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/tests.py
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index b582b4625bed..e51fbfc4f147 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,10 +1,7 @@
 AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
-DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe267163f8af64967e43c3bed94893849e9752d36d3965e70c798dd3fb3b454131cee2d34697cc389f11aaea69 SHA512 18f1d1cb86508e76b4e37e6c1ca2c414400c86e9163bcc52fd3358220e5b4362da4001da7ce427926c62ad67ee86799ea8d08e858e5e17230941c529b9995ce5
-DIST flit-3.5.0.tar.gz 122519 BLAKE2B 3c3eee652f090afd1c07e8a5cd1b154e7390ed621ab202ded3b4664d59ccfa2fd827928451f6d8928573d012cb9f6b44544c48540e03b2918d32ae3ba9169838 SHA512 e2239c209f735f11aeec8672aa14449fe4b6e1d2ed6523d661edb730f0b9f93b2794c6676bf878c09bd27966a9f8b9c19e6a7f14063c6efed4d8bc043b4cd2db
 DIST flit-3.5.1.tar.gz 122689 BLAKE2B 49be251df549783114c6758fa688d00fe18ed88d215f91783ce78eda722ee3d8578d83781a1a5c9ee61dd001c82df010c879dc742a1829c2ba8bcf5edb930556 SHA512 00e884774c7f59dfb54d6db09f65ac0ed47f1dd23872d6913f3a41de7242fb3829b2edacd03d08e080635c0a515521333aa74e6d26a2faa5fc02e56454b2b37a
 DIST flit-3.6.0.tar.gz 133365 BLAKE2B c4170eeded3c15a93c8e89b9483459247228136bc5ff32c6edb8cd9a4b5c3171fe381d0a1b4e325ed863457c2bce476efe3276455d5b9e4279a702dd35ed4512 SHA512 6506ecc73f9e0373e84b5b90a3d567f1edad6d95561886ff1f08f37addfc39006e75ab199c376a7d18452f6b8e2cbdd9e8f59a1fc96037702c3c682dc0b5a757
-EBUILD flit-3.4.0.ebuild 1062 BLAKE2B 681ffd2a329ca0a9de0b3304cdb932c65110e0a0f9c782529522b8083111cb68bd1d543dd97d90b64172e9c77032b1900a6d4780bd81cea362d5523102463313 SHA512 53d0857b74f962c56db386ccb9013bf090b5ea2f39ef9196ad845318952696f64935871990ea594553721cb51522cd83d7601362043eb96dbe11d67daf5e7195
-EBUILD flit-3.5.0.ebuild 1062 BLAKE2B 681ffd2a329ca0a9de0b3304cdb932c65110e0a0f9c782529522b8083111cb68bd1d543dd97d90b64172e9c77032b1900a6d4780bd81cea362d5523102463313 SHA512 53d0857b74f962c56db386ccb9013bf090b5ea2f39ef9196ad845318952696f64935871990ea594553721cb51522cd83d7601362043eb96dbe11d67daf5e7195
-EBUILD flit-3.5.1.ebuild 1097 BLAKE2B 0af46d0abee286c9a500f011de2584fc035cc9aa65ad6a07cab71072a628d4d15a9124375ca6bff884726225eb021940db3ec8355fcbcc14e15eb7217c65524e SHA512 2803b1180f4b39dcc931e129ae5b4b490dde87983a02cfbcd1df19a839dc62e69797877d68e9a268e866570143da88f77732d3fa05ae41f8aa918a5fa5f9ea79
-EBUILD flit-3.6.0.ebuild 1197 BLAKE2B ae16f5e045d0b9b79f0b3d7038a709e23705c81bf3def9a364bcdd70bad5dcb3046b13eeac91b18c007b6fefa27bac3aca7d2519a16438c04246a987b2e23655 SHA512 78440671617715a630f885c23f1a9505d523862326d3aeffe237df9e7d5fe38f322d583400d1c11816125fc9ba7163b63d2173b0d9da6b99834f1afe78ad5f63
+EBUILD flit-3.5.1-r1.ebuild 1055 BLAKE2B 8be0966056d9983fc015d177f895ce0c6cc94e45af9df00e62cd383a347457d78ca20222e5eae6ded4b536bf1c8b0511be204a5e36bf927d615ae9c3b47e18ed SHA512 75630293036e8aa353710cdb59149e340f2243dfaa826eb770a8265729683d35144bf7c413ed994bfab05b183eac57844ff5237def6e71a65520232bdc846f53
+EBUILD flit-3.6.0-r1.ebuild 1155 BLAKE2B 18e1ce1a05c8e381399908dca09131e186aaac053135e37c0405c6873da45ca680829f366c7cadeb01b72fe96efe52443f752562666619f10c26835359c9152a SHA512 a6086ea34a24e8e77d0619426885e79ac3c41229cc78658125b44969a85181d42975e4bb0dcacb51bbd7bdb135233b83d38122fdc53e7f9371fcff08c22b6426
+EBUILD flit-3.6.0-r2.ebuild 1141 BLAKE2B 7afa987584e5814ff464a380fc0711ea9faa30fd3ef1ae132cb9706665fadf505fc7bf3b4a36d639e69c88a8a3a33d6a4e38915abfc7df9bc063b692ee048b9c SHA512 72b0649edcc37ee4ac5b900eb2119cbc7a37aeb56041ccdce939369329b990ff02214e4312d20268af7c6663d88fe72d1d3e6739ca1dff4559571c1ebb8a4c03
 MISC metadata.xml 467 BLAKE2B 534a82783fa3ff1642fc8400689549e75223fa01b175f4ac164d4a636a4c9eaef5bdd9fdd339ffc30239436449788b4d01ebc5e3609034d440c01a5c699176ea SHA512 ad8f3f98a35aa88255bafa81ea9cb109e14b8a544b053cff3f1325dfda3c4c6343a5060353c43a08e030e80a60186eb7dae248d7f6739ea95a7e72e747b1b194
diff --git a/dev-python/flit/flit-3.4.0.ebuild b/dev-python/flit/flit-3.4.0.ebuild
deleted file mode 100644
index e0ffe8a26ea2..000000000000
--- a/dev-python/flit/flit-3.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2022 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.5.1.ebuild b/dev-python/flit/flit-3.5.1-r1.ebuild
index 0b4c68459970..13d3a2cf3055 100644
--- a/dev-python/flit/flit-3.5.1.ebuild
+++ b/dev-python/flit/flit-3.5.1-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.6.0.ebuild b/dev-python/flit/flit-3.6.0-r1.ebuild
index d5541742237d..d40edb3cf264 100644
--- a/dev-python/flit/flit-3.6.0.ebuild
+++ b/dev-python/flit/flit-3.6.0-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.5.0.ebuild b/dev-python/flit/flit-3.6.0-r2.ebuild
index e0ffe8a26ea2..60a9fbf7f27a 100644
--- a/dev-python/flit/flit-3.5.0.ebuild
+++ b/dev-python/flit/flit-3.6.0-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+HOMEPAGE="https://github.com/pypa/flit https://flit.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
@@ -27,6 +26,7 @@ RDEPEND="
 BDEPEND="${RDEPEND}
 	sys-apps/grep
 	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
@@ -40,3 +40,9 @@ distutils_enable_tests pytest
 distutils_enable_sphinx doc \
 	dev-python/sphinxcontrib-github-alt \
 	dev-python/pygments-github-lexers \
+
+src_prepare() {
+	# make sure system install is used
+	rm -r flit_core || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 913bb6bc69ae..4fb9e29bacf1 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,5 +1,6 @@
 DIST flit_core-3.5.1.tar.gz 27497 BLAKE2B 0e47576a05afa306a17e0fe64bd48e4a141fa51df225365495692aeae1c693635f1ea13ba23fdd93543c9b152dcfc2424bd8101a544ad25be2c4561964a8a8bb SHA512 c83b5bd54ffdf2d7dbea340939cb5f0210ffd36aa0f61b02519837843ebbab206a2456a007f76cbae45c2133ef3d21949d1834083c8dddb505ed5bb127a5fdba
 DIST flit_core-3.6.0.tar.gz 37534 BLAKE2B 7450dcddc0719e17b79b82a07fbfee3116ea9eface5cba8f7d6fa27011f6b20822f8f5c02633ac75456b30327328ef60e05e15ca78a26935dfac5a66e2538a1e SHA512 6a217a6e7d8c4f81491314987ff1510f1cede233213982d9f7b2705ab5b1a7fb4b337ad9daa5ff824ed00034ba1d53215d56def86909240d49265e628ffb83b2
-EBUILD flit_core-3.5.1.ebuild 695 BLAKE2B c267b9959f27e9229f3222e24f6a121b65c42e66086a3a1fef104753325717624649a5fe12129c1a682e59efe8cf630bcafefb0dc559657127c6adf3115814bd SHA512 04f013691ffb5f0f5fdef0cb4b9de786331182dcbdfb20d700838d7f9714a4ee9de25d9095ff416bae6236addff151c8f7dea1ec3993b83f240d8b56cfb44e2a
-EBUILD flit_core-3.6.0.ebuild 865 BLAKE2B a7f3b7737dfc0b858ff0b9f74aabc5b1388e315b8cddb4f2e0c7314fcfceee68298325c9e00b6263dc674620841734d52b26b44615f4326fe4fb000daa88e8de SHA512 3fbbe711756eccad554efbc37246ca481ef91912cdbaa19547cf6fe8a403ddc3309b28d280bab7bde4c3b988cacabd35bfea3bf92a7c67c641b653b9928ec6fc
+EBUILD flit_core-3.5.1-r1.ebuild 653 BLAKE2B 3f425a7783057efb26eeade36b3fcd0c945465f6b431527c52a18b1b9020210501f83425dc23d1cb8edc078506718635b342d7d7ed8f4c09d8e9c72474f62fe0 SHA512 0a805ccbfb68285507e0f0b072961545cf61f309177b64bd7224865a38b7a2c5b39183e18b36bb4bb55567a43390c3449decf317ccd390c8d33889e999498e31
+EBUILD flit_core-3.6.0-r1.ebuild 823 BLAKE2B 264f191f4717bc4073a28679010f08598663f99c84ee78df9ceb22712863e276cc982275721fdc406c9949196012d3529518b37b2c7653d609985b90cb938e57 SHA512 078fc81e0fa8764f44f9185d6ecde0e6d2310846b077be9478e351a3ff64e7542820241e3c042f60d6724f39c072a1df946c55d268d241c93490c7650052a09d
+EBUILD flit_core-3.6.0-r2.ebuild 780 BLAKE2B 5fd4b0084f6e802175d57586f50e9b6e36a4389261805728bcea3e8d2ded58452be7dadf91d7a4fcabecfba955fb305c6313a103a9472acd1de00b2778157181 SHA512 0836bdc94669bea01e39b25a4a1431146a5f1627da4dca685581b369718f49b7810f8732938d8fa3d6cf8e6266609de4b5356b8e111933ebd4308acae60ead1d
 MISC metadata.xml 515 BLAKE2B c6ba982d0b2d09457d65675322db9fb3aad7e6cb4c4a86c615bd4e49ba1c879132b776a8021169c78d4562f835da5e9b250da2fbc07b5f85978b3bd94c466b53 SHA512 8a97932ae53ecb31363b0a1aa0309bb164f3091214508f0b044246133d11821b2e78491ad0a78d8324aaf470f9acfc80bf8d6871bff67b1051e13815ad233c0a
diff --git a/dev-python/flit_core/flit_core-3.5.1.ebuild b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
index a27ed429b4ae..8a614e2b6daf 100644
--- a/dev-python/flit_core/flit_core-3.5.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/flit_core/flit_core-3.6.0.ebuild b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
index 22ec64d9e025..dbf83cbd0820 100644
--- a/dev-python/flit_core/flit_core-3.6.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/flit_core/flit_core-3.6.0-r2.ebuild b/dev-python/flit_core/flit_core-3.6.0-r2.ebuild
new file mode 100644
index 000000000000..7856b4e0aae0
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.6.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="
+	https://pypi.org/project/flit-core/
+	https://github.com/pypa/flit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r flit_core/vendor || die
+	sed -i -e 's:from \.vendor ::' flit_core/*.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index bf1ddb2ff913..b3a111a15a7d 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST flufl.i18n-3.2.tar.gz 24209 BLAKE2B dc827eb4099670c6e5c39ebc8702fcda146b20a3978fa56108ab98a05d2c8911e705b71dacd6b9fc7fae9923d009487f6f047baa0dcd06a5de2e4f4d5fafc465 SHA512 07f329d026f24db623045f3c9857bcaacc1f0982066d4409fc060c4f712716044f96321a4e4909cbc85932f36fc76f71b9d118662ba837fd85b22754ce2d25c7
+DIST flufl.i18n-4.0.tar.gz 21119 BLAKE2B 6bd4a311c3df56b03a0d46164f7f1ee1eeeb257478a82515261894f4cdf3017b150f1e13ce95a08f50ed5e01cf736884c7ba05a96e3f6b90917418ed18462753 SHA512 03e953af7e406d24a64d334647008e222cf74e5e055865638a52d8ec7e25edae44046aa4dfa8766b5a1458b335e9e29bd8b3e89703d8c8b28ab777375da19712
 EBUILD flufl-i18n-3.2.ebuild 752 BLAKE2B b8399997db0a800c1b3faeb8e0524dcf8c49602e15ebc8ac43aab316f9fbb493bb4c78b9685e4f621bc1066a3d80954c20945fcab7e6a0aa35269be95d2a729c SHA512 e566ae7d3eb337d9230f1cca9612d47c1d71cd3f79caa03e6d04389973db0da9710d444e7bf698c1ba0d46fbfee2ea83431b0ed46f46caac2d1115cc5d5495ee
+EBUILD flufl-i18n-4.0.ebuild 676 BLAKE2B 03833f4f95ed8041a22eb604cd07652ac14a5df31e86716ee52f08809133649f91d9521747b5faa31f15c5f7c9ef0fb4fdf67f2eb430f6eda94d6dc3f2cc84dc SHA512 5aaf8135a8b3627c170dced9a381abee29d3c06c4794bdc401b884e71ea49e6458c7a05a8beb40cf3d68cbc1a252d98f9848113513714af8b2e70855a3181dc2
 MISC metadata.xml 488 BLAKE2B e1dfe22c80f0ca5a7de3f70dfd3bea7c4d90968f572d34433629032cf0a62a6a5906bd977fcb20b26ca8378960ad74fe207e3c294ee9e4e34c22746321531783 SHA512 047efe6af9b2fbff70f85700a2e35d02be1447c530f6f05aea98abb419103533e5b10f47135b52033921a08d534c454a482ce8541c00b40507b1dccc40417bb8
diff --git a/dev-python/flufl-i18n/flufl-i18n-4.0.ebuild b/dev-python/flufl-i18n/flufl-i18n-4.0.ebuild
new file mode 100644
index 000000000000..f343ff90edc2
--- /dev/null
+++ b/dev-python/flufl-i18n/flufl-i18n-4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+
+DESCRIPTION="A high level API for Python internationalization"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index bed316cfee14..814116665f07 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,5 @@
 DIST flufl.lock-6.0.tar.gz 30762 BLAKE2B 98e259f04aac565271e7918223c1bc8abd528f91fd04490a519b482c0d12bbf954f0c678f89d990bc036df5000fb5587e1689d6fc0cd499ed7fe806a1e3125f5 SHA512 cbd41f1dedb91fc120c3f3e20c15f25a39b0ce5b27a2c4fcedad301e91156d5291b35ff961c38a5a7d43c40fdfa2a879a2ba427f1b17994678fbba797e7a234b
+DIST flufl.lock-7.0.tar.gz 33169 BLAKE2B 72c763e50e0a28f02fe6d9a8d88b1c64626a60310b203f9bbcc82e950f8ac494640748dece4c63542d4b89512a1f98bb1d92bda145028ebd18a8f254c2e2c1eb SHA512 b1c5151d30aa3e9afc12fe0dbd9be05ad1f9133b32f5e3bacf98532fefb08fbf354bf4b9a4b9fc90e448861941eba358e8f67218daf9797eb031b487cc717181
 EBUILD flufl-lock-6.0.ebuild 839 BLAKE2B ca8214c65942f8a86f48d95d6f80616183a538b3549702b9a09374c4a64ca23457f68d831ff3d792bc47dbc6a4c43b3c36a916fe213f36ee7b41b8ddbe64f268 SHA512 9a9e625c086c5ee9bec28a1a68a4a4fe86b74069ef4146feb910988f739d9e1950ff984a5fe77e6c962b3dd60acac2281c40dac53bc71e2cba45fe8fbcaef443
+EBUILD flufl-lock-7.0.ebuild 719 BLAKE2B 7f9a6cc7fb0a530832bbf8e548c4ddb8e8a8ef1d2d5cc7352b1dab7830ead4551b7d3a788d3c7d56c2ae86861fed98421242a42996a329777f662300edfcdb5d SHA512 3628ae508f4596f26f69052ddc4a54f6d1c2fdd0af47247b1980770d8f8abae40a1b36b7d6892cf114247e2d43b14985c8b1367123886d076984d56a64915b48
 MISC metadata.xml 407 BLAKE2B 351ee456a6b36c54e42f4be026d3fad2aa49e4f2be746b43934e4402f594a2fd4eed5a29eb4a1bd22192a141e220523dad77218ac1b1e8a2db10190df97b83a0 SHA512 aa8fa297cc7b996c495542c23628ece8139117ec1da6b2cd0cf7c72bb90258618f8e2368aa1e5e48689540b11a7df7e16fab4da502f5058c1b6cf6e058c309a8
diff --git a/dev-python/flufl-lock/flufl-lock-7.0.ebuild b/dev-python/flufl-lock/flufl-lock-7.0.ebuild
new file mode 100644
index 000000000000..c6d4bdf9501d
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 5d0fe75ee308..958c156e945b 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-r1.ebuild 535 BLAKE2B 1dd21d0238e68617b5db23e1995a4632924299431b2764b755955ac9c241a04cd4984bdee25d8125c76df3c34d322e66d9dd91d77f45d89688755544fba63df2 SHA512 f502ec0765c72d16c2861936db1e15b8e9eadcdf6454efa25ccb6eb44d62276e61fe37496d079422e909d214518f58a8483d576bb193e348572dcc0759a6de7b
+EBUILD fqdn-1.5.1-r1.ebuild 541 BLAKE2B 3349ecd9137d1176c425df52c9babf56ba7504534cfebef8c4b9102361084765217d88b9a637c5382adec67a900026940b58ba2232a200b79139b86d980555a5 SHA512 b4a72f44fda44cefe9d7a06de65ef5b0475628793f8e24961db0427718e6d888748718dacd157cf3ea8fac63dcb4c340283d9fb5a98f4353ed20a719725105b1
 MISC metadata.xml 652 BLAKE2B 59a8160abd347e18ea95c04143def0b8c0aed88e48fec0383ff973048a3913f43d51b854348ab279a3ce321fcbc0844bff9506e213b8e3936085a49d5ba7943c SHA512 de3fa18cb8d162fdbbbdcab61f9395c2da6c83c004925621b0ead1067ba8ccca25cd72997b00505221c0e5a1c3fc20e0a1c04fc488321bf25b3cd77c91f822e8
diff --git a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
index 4c31abcdbb2e..4be089dbd91b 100644
--- a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 999612161800..d6a3b6da869a 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
 DIST filesystem_spec-2021.11.1.tar.gz 325020 BLAKE2B a5d1a483bb446a6241e34d4d6f505b46657d837209ff259c6638843205b606a4f6823b9b2510c88fea2e4adec01aabd36df1ceb188444b8786b4acb4e34e33f1 SHA512 a7985e46d7ac989908a8d5bfdb47baa49d84e220fe16774db029d25408cf9f3d956ab468bb351fc956ca388b8e7d0054151fa33e380d50f0e1d8303bbed15890
+DIST filesystem_spec-2022.01.0.tar.gz 325470 BLAKE2B 1a6dccad133a449ba9b78516f968586a0f300e97150a6aa887f2f65fafe6e2bae708620ef185789024a7248877405d736839292011f3db2221c119fb80bbb5ac SHA512 50e36c9aded9ee9824694bad563b8e92ee564c6fb6fc30d3a51b8b2e8b4a1e5f605fdbaff00eefb354b0201cce4bced0ed95b48817c5ef15ad1f09965d311ac0
 EBUILD fsspec-2021.11.1.ebuild 1165 BLAKE2B 02c725f58308a36927b434f3b8bb66e3c583fcf331408e1406ac3ed9a4328f01d7c6d5840e58bd5917c4a615798870b21a38b571e37c1bbef78b70bcb9a2eb9d SHA512 2bca4f847ab6ee8bba7fd35c89b89e11805dc7cbfd7bfe09dfcfb1335a24e3d81b394bac2523ef473fbff610a7e011585d827f1909c9db4cc522dc6105080362
+EBUILD fsspec-2022.01.0.ebuild 1167 BLAKE2B c471f9cdec94a918982528a502f6626227e9a9c44028e110151edee96f9ac82d39184015f0d08a97b78cd3b379898fbb25fb3b96143ee0d71f18d31939206638 SHA512 aef05ef70316866430b0a7afc2478096be184aba3e2faa68b021e92ce8ae2d57fb9a662403fbf18b76366ee0714837b72e1d69078faf588b952a7375add3c8fc
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.01.0.ebuild b/dev-python/fsspec/fsspec-2022.01.0.ebuild
new file mode 100644
index 000000000000..86ba2bbab851
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2022.01.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2022 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/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 03f360fe62e8..9717977cbf53 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,5 +1,3 @@
-DIST funcparserlib-0.3.6_p20210809.gh.tar.gz 68069 BLAKE2B 937079952a42f2171af8f6421097eb920d01eae02f870c27a790ae374a1c8c3ac27019eae78d655b80458bf319fd2db7d411404902357ac66eea5daa4472ecf9 SHA512 7d2b6d27e1981d97097c2aafc0730e5b6c6bf98707e997f87f7a9944667ea361db41305099803a43ec04b46ab53e4ab09d0863413d00a39a6fb27c30cceac361
 DIST funcparserlib-1.0.0_alpha0.gh.tar.gz 68260 BLAKE2B e1a9a9a516142d683424df881a7c390a3999438905136fbd394f23856022f14390d22f1dd3914e680d2c188c819cce9cc4f7ff2e485478614dd4632701db4614 SHA512 02cac31d76bb888118a99367811a8cfac28a999ba113ce43f4bd6211cef815ce1793fc1767637dd019728f15d5c408e859d5bc8365a2c53804092f1d6f03e54e
-EBUILD funcparserlib-0.3.6_p20210809.ebuild 793 BLAKE2B 5b46e037ce0e760ecbec5622800ac2dfc3a6e601bf3656a08cf8e39a7cdc59bc8c47354f97b2567cf229c371c9b0e7a852555e8c0510ac3379e88aad1a3ce7d8 SHA512 5e004bf98d1617ea535fc2535d49ee058853ed5128fdcd5ca78de7011745799eea78179eecd2741c3e17f89669e71c34430957841c95b0f7d0b08e19f79992a2
-EBUILD funcparserlib-1.0.0_alpha0.ebuild 771 BLAKE2B a25ceabca1a66ff1e77bcd93e5ae6e2dbdbdf2c6dd4aa571fea7dbc279bc4077033ddd695d1b6a4ca4b915a2b8e347dc1a238744789997d5a6dec9b18bca203c SHA512 e7a44941c68bd47eff8635911bddc4bb5a5eda08b6af01778f0ca01632482bb4e7001cc7ab7ed1cfe0ab397a83fce6cc1627bfd47117daaf5206d9235dc95d01
+EBUILD funcparserlib-1.0.0_alpha0.ebuild 764 BLAKE2B 9a959187eb5f4f4fff0221bd915bf8fc575787a3d68ef20b05c8181d16d9cb95149d98c5e1bc250f1cdb9b86471b71c605b34f77168df4fad4731e4240d4d6fe SHA512 7aeff5e31bac8844e2fea9ad2eaa1573253bf984c0c63dc3819f6c85f6e99935f980493c2fd7f94706e42e6000e57881c7c4e9d3ed1b8b9bf19b0b385626dc97
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
deleted file mode 100644
index da2ed65d5555..000000000000
--- a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-COMMIT="d4ba3955ffc10544dbae6aaed68bcab21d0c294b"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
index af090eda2a07..11745efb63f9 100644
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 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"
 
 BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index 85e4574ee22e..f82e7572c6e0 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,3 +1,3 @@
 DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
-EBUILD furo-2021.10.9.ebuild 683 BLAKE2B b4961e8aeeae7a40d02385bd640158dec0e7c83fc3bdfff0f51f4beac2e8f5543dc9bee3aeaca1ea920ccc17d93eb6a52cf738834b152ac723e38364d9d4d8da SHA512 2c06be6a50c2a2358885b59bb1af1a52ae5f3932cee9942a00547ea79237bb92e1e551f4f354e85817060090d0586c707277689f15784f0150f4165909a39284
+EBUILD furo-2021.10.9.ebuild 686 BLAKE2B 70f30e3b365e80cb1da5476dcad2b49cdbd7405314f86ca5bacab5c282cad0e42824772fc9035ae8c6e4ce030df4777f04c24cb8f8a8b1960042e41775182a83 SHA512 c5547a5df53d57797114348b5cd5bbc853a166dc98b46a89367011b4dda505d041a6d992f2c6a2223cd482712e7ff464533aa443034222f709ce39437447d706
 MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2021.10.9.ebuild b/dev-python/furo/furo-2021.10.9.ebuild
index 992e79aa37f7..b782d71bb3ef 100644
--- a/dev-python/furo/furo-2021.10.9.ebuild
+++ b/dev-python/furo/furo-2021.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 141e8c55d435..49b18c73dddf 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
-EBUILD gitdb-4.0.8.ebuild 1210 BLAKE2B 2cfb09cb610f1a5cb04830d1cff5732089579704213d9768960e223984e41abfa6b456a8c632b48d7144ef5c340da6bfc418dab727e29cce9274b8ba9718128e SHA512 7fc5047271f575640e157f8449ae1771365c74eb12b3f7f51932f17965975344f8619cdd2cf2c2c11fec0493e82b741b2b7214488829c799ee18bfb394d0419d
+EBUILD gitdb-4.0.8.ebuild 1209 BLAKE2B 7e119209dcfae9a1103c0a53496ce5b36972e76a786340869707dd41a041a2acb672058fe55e0fb3ec627fb0dcafe2675fe2948ba4f44e09de41184df4184295 SHA512 1ee0583c19e3091f97f6e20779e1b14f7b4fd8e14be1ab32a25ea3915c170debd8359c224c51b38e89f66994289ce1e2c61ff9dfc5e3f0c99f17fcb92d02cb55
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
index ee2d0fc2620e..8c146410de5a 100644
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 3222afcd874d..64b455e53c16 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,12 +1,6 @@
-AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c8766e4829d35ef91c9c829c2d2b433ac5811d45995bdf089b3dc2dc6b58d9b3a10f0283b22d52551b06da4f7709d4f78c8366240 SHA512 a4478447e966292db24e208b763ac11463e7684372e7df5d2115e5908ca6fd88718005c3f8169dc0171e22160d10d3dac034106f50680bc7e1d86d96cc3bde11
-AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
-DIST gmpy2-2.1.0.tar.gz 258571 BLAKE2B 942786c9a2e1220ecad15e97c26cbea0b93c7719e5081f6defe7b71d43be0c4ce259355eb34fa013a0b90679022535a271f26425c615e65103d3a2705b27ec8e SHA512 0d62354a1446708548b8dfdc6d7f8000151eb5901251f87f935144f615fd586726617c7a2bd05b91dc3e2a0cfc8797cd81d60afb8c705da153b537345eaddb34
-DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
 DIST gmpy2-2.1.1.tar.gz 258607 BLAKE2B 3c070d101066fb0ba5da61b8c1eacf6bbd334aed987161091f31bccc1e836430cb844e0fdcb5017718341761f54c0fc3290e37ace28a5c4fc07930a194e77256 SHA512 37a08b546476f1b49cdfdb04b3a6d4da266615f789eb03896d5e2dd326c91f0fb9523504414b0de30e7265840e2ef77362a5ff011906952100c8b1da4d88d709
 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
-EBUILD gmpy-2.1.0.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f
-EBUILD gmpy-2.1.0_beta5.ebuild 1288 BLAKE2B b340097a38ecfdf08bd687c28087c1dc1f4673c70f2f1684c546b27cfece75b748a47496e123c3cb34ee9e358a6438f48125b1cf1c2e25912e053452033af806 SHA512 f77c84add0eedee24a6318587bb5fc78b4fe67765dac5cd51827807c1292267fca48abeb7189643698eee7b88342776567a941a965009f8ea82086d4b85f8e30
-EBUILD gmpy-2.1.1.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f
+EBUILD gmpy-2.1.1.ebuild 919 BLAKE2B 33220f0459520d2e9baafbd8870cbdbaac5fc83f7d4f338db115fcc2c095b3e01bb51fb801ca64d83c73fe84f3b574a330d68f64d3f6e97e00a9f3d0ba1f1f35 SHA512 cfa2102fe119a528b8f5f8f8aecb5900ee41b6ba9d1c6e8fbf5aebfc56d7e893298946d07ce0b99956ee1bf8b7f6938125afa6cb4eb799c908d884a1b5a003e8
 EBUILD gmpy-2.1.2.ebuild 927 BLAKE2B 2fb9638e1fd8141e095508bbad8399bf0d13f8e38280df0c7fe252efe4f9a064cf2fbcf3c98b0add631e45eedc52d6a8441c92a2016a6a50f7a18d914832267f SHA512 c139a66f332f18aa0a6cc54e5adf2955f2b7354b64202ed80fa3dd8c77210896d9d473ee371fb5aad30e67b2cd947cf175c6a688e59389bc07d577c2017da514
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch
deleted file mode 100644
index 38a98579409a..000000000000
--- a/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/src/gmpy2_mpz.c b/src/gmpy2_mpz.c
-index e5087fa..66a297a 100644
---- a/src/gmpy2_mpz.c
-+++ b/src/gmpy2_mpz.c
-@@ -69,7 +69,7 @@ static PyNumberMethods GMPy_MPZ_number_methods =
-     (binaryfunc) GMPy_MPZ_ISub_Slot,       /* nb_inplace_subtract     */
-     (binaryfunc) GMPy_MPZ_IMul_Slot,       /* nb_inplace_multiply     */
-     (binaryfunc) GMPy_MPZ_IRem_Slot,       /* nb_inplace_remainder    */
--    (ternaryfunc) GMPy_MPZ_IPow_Slot,      /* nb_inplace_power        */
-+    0,      /* nb_inplace_power        */
-     (binaryfunc) GMPy_MPZ_ILshift_Slot,    /* nb_inplace_lshift       */
-     (binaryfunc) GMPy_MPZ_IRshift_Slot,    /* nb_inplace_rshift       */
-         0,                                 /* nb_inplace_and          */
-@@ -113,7 +113,7 @@ static PyNumberMethods GMPy_MPZ_number_methods =
-     (binaryfunc) GMPy_MPZ_IMul_Slot,       /* nb_inplace_multiply     */
-         0,                                 /* nb_inplace_divide       */
-     (binaryfunc) GMPy_MPZ_IRem_Slot,       /* nb_inplace_remainder    */
--    (ternaryfunc) GMPy_MPZ_IPow_Slot,      /* nb_inplace_power        */
-+    0,      /* nb_inplace_power        */
-     (binaryfunc) GMPy_MPZ_ILshift_Slot,    /* nb_inplace_lshift       */
-     (binaryfunc) GMPy_MPZ_IRshift_Slot,    /* nb_inplace_rshift       */
-         0,                                 /* nb_inplace_and          */
-@@ -229,4 +229,3 @@ static PyTypeObject MPZ_Type =
-     GMPy_MPZ_NewInit,                       /* tp_new           */
-         0,                                  /* tp_free          */
- };
--
-diff --git a/src/gmpy2_pow.c b/src/gmpy2_pow.c
-index ddcb43a..cf96470 100644
---- a/src/gmpy2_pow.c
-+++ b/src/gmpy2_pow.c
-@@ -98,8 +98,11 @@ GMPy_Integer_Pow(PyObject *b, PyObject *e, PyObject *m, CTXT_Object *context)
-         unsigned long el;
- 
-         if (mpz_sgn(tempe->z) < 0) {
--            VALUE_ERROR("pow() exponent cannot be negative");
--            goto err;
-+            Py_DECREF((PyObject*)result);
-+            Py_DECREF((PyObject*)tempb);
-+            Py_DECREF((PyObject*)tempe);
-+
-+            return GMPy_Real_Pow(b, e, m, context);
-         }
- 
-         /* Catch -1, 0, 1 getting raised to large exponents. */
-diff --git a/src/gmpy2_xmpz_inplace.c b/src/gmpy2_xmpz_inplace.c
-index bbcd977..e5bbf09 100644
---- a/src/gmpy2_xmpz_inplace.c
-+++ b/src/gmpy2_xmpz_inplace.c
-@@ -271,14 +271,14 @@ GMPy_XMPZ_IPow_Slot(PyObject *self, PyObject *other, PyObject *mod)
-     mp_bitcnt_t exp;
- 
-     exp = mp_bitcnt_t_From_Integer(other);
--    if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred()) {
--        PyErr_Clear();
--        Py_RETURN_NOTIMPLEMENTED;
--    }
-+    if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred())
-+        return NULL;
- 
-     mpz_pow_ui(MPZ(self), MPZ(self), exp);
-     Py_INCREF((PyObject*)self);
-     return (PyObject*)self;
-+
-+    Py_RETURN_NOTIMPLEMENTED;
- }
- 
- /* Inplace xmpz and.
-@@ -346,4 +346,3 @@ GMPy_XMPZ_IIor_Slot(PyObject *self, PyObject *other)
- 
-     Py_RETURN_NOTIMPLEMENTED;
- }
--
-diff --git a/test/test_gmpy2_mpz_inplace.txt b/test/test_gmpy2_mpz_inplace.txt
-index e7a8b96..147118c 100644
---- a/test/test_gmpy2_mpz_inplace.txt
-+++ b/test/test_gmpy2_mpz_inplace.txt
-@@ -147,18 +147,16 @@ Test ipow operator
- mpz(25)
- >>> x **= xmpz(2); x
- mpz(625)
-->>> x **= -2
--Traceback (most recent call last):
--  File "<stdin>", line 1, in <module>
--TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'int'
-+>>> x **= -2; x
-+mpfr('2.5600000000000001e-06')
-+>>> x = mpz(625)
- >>> x **= 2; x
- mpz(390625)
-->>> x **= mpfr(2)
--Traceback (most recent call last):
--  File "<stdin>", line 1, in <module>
--TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'mpfr'
-->>> 1
--1
-+>>> x **= mpfr(2); x
-+mpfr('152587890625.0')
-+>>> x = mpz(390625)
-+>>> x **= mpfr(-2); x
-+mpfr('6.5535999999999999e-12')
- 
- Test iand operator
- ------------------
-diff --git a/test/test_gmpy2_pow.txt b/test/test_gmpy2_pow.txt
-index 89bd876..d5b1f45 100644
---- a/test/test_gmpy2_pow.txt
-+++ b/test/test_gmpy2_pow.txt
-@@ -15,9 +15,7 @@ mpz(25)
- >>> ctx.pow(z1, z2)
- mpz(25)
- >>> z1 ** -z2
--Traceback (most recent call last):
--  File "<stdin>", line 1, in <module>
--ValueError: pow() exponent cannot be negative
-+mpfr('0.040000000000000001')
- >>> z1 ** 0
- mpz(1)
- >>> mpz(0) ** 32
-diff --git a/test/test_gmpy2_xmpz_inplace.txt b/test/test_gmpy2_xmpz_inplace.txt
-index 94f86b7..c02f966 100644
---- a/test/test_gmpy2_xmpz_inplace.txt
-+++ b/test/test_gmpy2_xmpz_inplace.txt
-@@ -135,7 +135,7 @@ xmpz(625)
- >>> x **= -2
- Traceback (most recent call last):
-   File "<stdin>", line 1, in <module>
--TypeError: unsupported operand type(s) for ** or pow(): 'xmpz' and 'int'
-+ValueError: a non-negative value is required
- >>> x **= 2; x
- xmpz(390625)
- >>> x **= mpfr(2)
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch
deleted file mode 100644
index 9f59a6096fcd..000000000000
--- a/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/gmpy2_hash.c b/src/gmpy2_hash.c
-index f276a42..1d2bfd1 100644
---- a/src/gmpy2_hash.c
-+++ b/src/gmpy2_hash.c
-@@ -147,7 +147,12 @@ _mpfr_hash(mpfr_t f)
-             }
-         }
-         else {
-+#if PY_VERSION_HEX >= 0x030A00A0
-+            // Python 3.10
-+            return _Py_HashPointer(f);
-+#else
-             return _PyHASH_NAN;
-+#endif
-         }
-     }
- 
diff --git a/dev-python/gmpy/gmpy-2.1.0.ebuild b/dev-python/gmpy/gmpy-2.1.0.ebuild
deleted file mode 100644
index ff00de624895..000000000000
--- a/dev-python/gmpy/gmpy-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +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
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# The tests program asks for input when running, disable that
-	"${FILESDIR}"/gmpy-2.1.0_beta5-test-input.patch
-)
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
deleted file mode 100644
index 4768bf50c719..000000000000
--- a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# In python 3.10 _PyHASH_NAN was removed and its usage replaced with _Py_HashPointer
-	# see https://github.com/python/cpython/blob/3.10/Python/pyhash.c
-	# https://github.com/aleaxit/gmpy/pull/297
-	"${FILESDIR}"/${P}-pyhash-nan.patch
-	# The tests program asks for input when running, disable that
-	"${FILESDIR}"/${P}-test-input.patch
-	# Based on this commit:
-	# https://github.com/aleaxit/gmpy/commit/db7ce2ef46fab84e7b9c32b05725e9b02e8cf206
-	"${FILESDIR}"/${P}-failed-tests.patch
-)
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.1.ebuild b/dev-python/gmpy/gmpy-2.1.1.ebuild
index ff00de624895..0e73fa850314 100644
--- a/dev-python/gmpy/gmpy-2.1.1.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-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"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 00c4759ea95f..7fce563cb06b 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,3 @@
-DIST google-api-core-2.2.2.tar.gz 140701 BLAKE2B 4e90db4311fc88d3fc8e29d6d8f11ae1424000c0e293f219d679984ec4a2c1bbbaf72d734b937d6916302f3a9a8b1cb369dd719972f4eb2d3f7264bf16ffbc7f SHA512 9b307c8ebd224b7614bd1d9f48d752852929b726c04df24f81e0b1b601f9a14d10654e9ef53b6a5ab677e8e57256f87b8683fa4dde0585f9c2e6d313d29d53fe
-DIST google-api-core-2.3.0.tar.gz 155449 BLAKE2B 4aba324a18c8b6f9b9afd223688771fc6a57ee71f550736cfb5c9fac861a6a84369eb4e6ebec0664241590624c52cd0bcc8762afeb230debc16f0849fde049bf SHA512 f85c9279822ab818aa9d183bc930e61be9cfb2e65ab6a46fcd8aaab2531b4258c6247b02fb8f4f29841d9ab13ca33e129198589cbc37b3c77677a72e72635285
 DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
-EBUILD google-api-core-2.2.2.ebuild 1505 BLAKE2B 0d4d6b99d01c7759d419b61ce5abb74fe338d4972e191ee655bcd47667463a4a736382f1e3a6204618703afd56013441b45bae319b1937993c7a2a02c0e7edd5 SHA512 e75bb724fb988b313a80b6fa34f3e5afc452dc1b1212020ba992603d7206cc19b04657a6654ea494b5e575185dd7c143cfa12bb882614091a18f7deb5c0199b4
-EBUILD google-api-core-2.3.0.ebuild 1507 BLAKE2B acbb86b23d9904ce223d3576848d88659d92b5baeee57cf3cc67b7b9c33ee16d7a8e7428c35a8812de5d88fe55c36bcee0bd66a3c8015a0779b552da7b86ad60 SHA512 f576d7da20f9a87b9239284d2900a653430c7e15e441fc04fbd51851e485a1fddc24db6f555666cb6141f0a744ba7ae289040b1c319fc31a987c13fa8d89870c
-EBUILD google-api-core-2.3.1.ebuild 1507 BLAKE2B acbb86b23d9904ce223d3576848d88659d92b5baeee57cf3cc67b7b9c33ee16d7a8e7428c35a8812de5d88fe55c36bcee0bd66a3c8015a0779b552da7b86ad60 SHA512 f576d7da20f9a87b9239284d2900a653430c7e15e441fc04fbd51851e485a1fddc24db6f555666cb6141f0a744ba7ae289040b1c319fc31a987c13fa8d89870c
+EBUILD google-api-core-2.3.1.ebuild 1505 BLAKE2B 54190c7b2b0a94ca00b70ffa7536190e7c50da696ea7e1f49e343b801ed54814c6094b637659ee61d8c3eac623a378801d25cb8311339545ffb26cc6399b38d1 SHA512 54b01fcab9ac9a0f291ce85a8a44b11dc79fe54a4556f10e2b07a4bf978492b57f0c60afdc96481081a60df50fb70a8c3c1ba2b88eb185292ed7b0a3fc094276
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.2.2.ebuild b/dev-python/google-api-core/google-api-core-2.2.2.ebuild
deleted file mode 100644
index 5c79fe508a2c..000000000000
--- a/dev-python/google-api-core/google-api-core-2.2.2.ebuild
+++ /dev/null
@@ -1,50 +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/index.html"
-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}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		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.3.0.ebuild b/dev-python/google-api-core/google-api-core-2.3.0.ebuild
deleted file mode 100644
index f67642816e93..000000000000
--- a/dev-python/google-api-core/google-api-core-2.3.0.ebuild
+++ /dev/null
@@ -1,50 +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/index.html"
-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}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		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.3.1.ebuild b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
index f67642816e93..0c6e40af4dcf 100644
--- a/dev-python/google-api-core/google-api-core-2.3.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index d8e5098b0c35..401f2ad8fbef 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,5 @@
-DIST google-api-python-client-2.33.0.tar.gz 28292803 BLAKE2B b7e285a78d06aa9c0cb5609521443aa048220bb4b83e900b5915603c3cc1bd2eb6ff009c43503a8178f4ca2281fed0488bae9fbe0c29bf7a9df9ac2d4cf294e4 SHA512 47c8352440a2ffd3beca049a200c4a0cb1a2299b5fbce70b64a913f6121e731325831b229102d9940b386e082592efd49fdfc9409055b32f172551862740bd63
 DIST google-api-python-client-2.34.0.tar.gz 28469433 BLAKE2B aa2c8849b629fe489cf39cddd410a40a0af0bddfa5f370a4a41c1446aeadf69cd4592eeb1d76e6c63da9737906801aea9c8a4d706328b63a7bf5b34a43b83e00 SHA512 321dfdd3ba821beabc6c3a96575afd06c75a0c8e3db61b1ff5fa9db472e62de81b037c435a1051d6294c2a37e471bcaa068cd27ad7434a3416231d31931dd74e
-EBUILD google-api-python-client-2.33.0.ebuild 1377 BLAKE2B be3e2d39923cc9be436e5b0f60e55f58789b1b1f1b64095ecce75037fa823b288016e74e2c3f6eef4370fdd5037e6d7f7aed9ccea86119b4e2497843a83283c3 SHA512 d3dc2686aa60ffef541f4dfb2cb1707403cc180e845d6d7ea3d27de4c1cefc19baa9a64eb6ca21741d69e9626bd8295df395d21ffca5216221534a7ef16404c8
-EBUILD google-api-python-client-2.34.0.ebuild 1379 BLAKE2B 642429bd1cae61fd100116b60e2e44acae4bd61f2b905deeaf397539b267974778d533e56a8b65a14bf8e4ade6778508591e4928ec711861c20ac59e75bba9ec SHA512 a7b60dc3f434c0c42322279ac14d691f40697c47828758ffd2860a1ad6b50cc57969a75ad5f605b08adf7fd4f34f335e779bad38d06f77aa05d347a4050a91af
+DIST google-api-python-client-2.35.0.tar.gz 28553015 BLAKE2B 8ff92145f280e090b8f43c10e425dd4a8fe65b4cf565c5b5a0df2813cdb8ba1bcea50e37556efb9dd0b270a21fe11b7d6d1b445c8fdaa83326c7dc6230ee1fdb SHA512 4d0325b79250a26ae252568759e8345d31d692aa1d8f1d7aae623bb9a1a950efae654cd689d39f30450789c6d4fa9ca264111f8a9e798820cf6d0c3acba904f6
+EBUILD google-api-python-client-2.34.0.ebuild 1377 BLAKE2B be3e2d39923cc9be436e5b0f60e55f58789b1b1f1b64095ecce75037fa823b288016e74e2c3f6eef4370fdd5037e6d7f7aed9ccea86119b4e2497843a83283c3 SHA512 d3dc2686aa60ffef541f4dfb2cb1707403cc180e845d6d7ea3d27de4c1cefc19baa9a64eb6ca21741d69e9626bd8295df395d21ffca5216221534a7ef16404c8
+EBUILD google-api-python-client-2.35.0.ebuild 1379 BLAKE2B 642429bd1cae61fd100116b60e2e44acae4bd61f2b905deeaf397539b267974778d533e56a8b65a14bf8e4ade6778508591e4928ec711861c20ac59e75bba9ec SHA512 a7b60dc3f434c0c42322279ac14d691f40697c47828758ffd2860a1ad6b50cc57969a75ad5f605b08adf7fd4f34f335e779bad38d06f77aa05d347a4050a91af
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild
index b7db8f42faf4..ee4279a8e2a4 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.33.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.35.0.ebuild
index ee4279a8e2a4..b7db8f42faf4 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.33.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.35.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4327fb51ce34..8b17a3d6a422 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,3 @@
 DIST google-auth-2.3.3.tar.gz 186600 BLAKE2B 52b1269b88d27fafafcb053219c93c7f180cac11cdf32b140531553dda547d02087b0418d44edc6497eb37793859d86d4beaad1a7a128c86839202785584c9ab SHA512 3ab6d97e71988ef5e338e0a643545f8fa504f5ea04f4176afd9417ecf0e9a3fa45333f0c2c7ea5bf32423df32c48ec59ac9d16ef8bfc35a1aa4c0fcc114fef63
-EBUILD google-auth-2.3.3.ebuild 1543 BLAKE2B eb469a57434c04e1ebd13901b01f2f9059b08b5c239f2aedacba745e0331ae4aba0f5f62265cf625112259d10a95cb11784ab04c9a7f58ff2bc281406d3a8b84 SHA512 49028bae5b830d04b22451cfa942e9c5147b1d25ef6c0ecde8b0be30d0a540c5592686e4c07e176b8f2469989e0798d107e949f277add585673610b41957b8ac
+EBUILD google-auth-2.3.3-r1.ebuild 1542 BLAKE2B f84f33bd8824386e08f3f7011c76dd22cedfca975fe1f20e255ca0b170bc598dbe5efcb431fea6391360062f37fa12bcc21fa6aeb064f519a1d4e04b978a3e7a SHA512 d35e59ab467cf463b9d3f5c5cfc00123b87c361221e13759c183ad700aa66d0e2671a9b4c4152fd386664f84d582e2efa529689aeee267bbaaaad0385f56b80e
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.3.3.ebuild b/dev-python/google-auth/google-auth-2.3.3-r1.ebuild
index 616a33ae31c4..03004f5afbc6 100644
--- a/dev-python/google-auth/google-auth-2.3.3.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/cachetools-5.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}]
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 58fdd0e199c0..fc5c2dee4a1a 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,5 +1,3 @@
-DIST googleapis-common-protos-1.53.0.tar.gz 106651 BLAKE2B a38ae93d0fe639bad571d74c9f2d011504cd82175e19aad27deda467676936c7df804ded50ee51544615609ce4fb6a6ec629fa175fbda7b2119c73747b6c58a7 SHA512 2ae8230b712ab6fc8328d3e3ba55ace28b9ba5fe3a300899b4a1f13d5d8b3bfd19eef9d1829747b57c56169351e4aa14380551d009fe6bd46e27aa22e7d3b9a5
 DIST googleapis-common-protos-1.54.0.tar.gz 112874 BLAKE2B 95d2429d8bf27299ff406d0a06f31b2b499f66533cf884a8ec77ed6defa10bdabd6460232265efc9606e5f890ab14c571a0240e842fbdf7117ff3d7bff5ef28d SHA512 535cf6e4e5331a99232cb3eec1bc56676fcf87c522bd5b06f3452c7b22abd51479f3e4c69c8654bba4d789e8267360e11573d357ac90bb63854281e227eb8bc6
-EBUILD googleapis-common-protos-1.53.0.ebuild 696 BLAKE2B 51c4a5982b7aeba474af81b5a9d6409ec1d108d741340811c9bdf010ce9f3a83be06103e1b3b278ae8a6e0b6d3119ecfb15eff58b36b39e67a6c269ea0f5d787 SHA512 7e0fc052e377c78e8e9ace6364d7cd2b64f3223a3cbcfcf8ba3ef4f6adfb2e6f76d929dd068104495d8eb4903154f9615732d94075d0394a77b0546cefdf666a
-EBUILD googleapis-common-protos-1.54.0.ebuild 698 BLAKE2B d551a29b03321e3282246941202b4f2c4e33016e8ec33bb308845cf70fe717e09653cac7d104d3e3d914dac5502867161c54c6231ccb5858d0a0e58e689a0d7b SHA512 2522d84c8c2e620dc0ee12b36b76bc2dbd448a8d828dc5fff10fae463b45469cd1571a3cba8f5f1a99e19bb023f9d6b1ac9a1e1f16165d538c3f7fee76678209
+EBUILD googleapis-common-protos-1.54.0.ebuild 696 BLAKE2B e6eb8b2afed603f1478358b2d5e08dd77f3688c8b6bf2f816f906f9c32a8c412cb51ba55a63efe2cb15fe38a362aeeeca944f2e5a187fc306a65408e115fc28f SHA512 2438af0469bb0fc4b590284258f2b3dc762f8bc62193c3c7646ca3de046996b66a449aa28da17b7a8c4d22cfd28b857297de4d12bbbc2d0a3b790d8f2972e538
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
deleted file mode 100644
index 490e9d2f7527..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.53.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
index e33bff07b4b9..0a47dd50e56c 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 6f26f0c27664..18650c906043 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,5 +1,3 @@
-DIST graphviz-0.18.2.zip 205555 BLAKE2B d245dcd33a7779f00bb9e740968175d4fbe12d3182682b548f447e2c4ce4423683c3fd2727aa693a5e9c264cfdeed603af9a7bc9839f8d91f5fc091045473146 SHA512 f18defc99411b0b12a8326589da603197d345f458d4b0d602e63205f8542fdf4bec636750ac0fc5551126dff4cd76ce04fc089c0985831a1efec3271a7f22230
 DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
-EBUILD graphviz-0.18.2.ebuild 738 BLAKE2B 3b922e8adb465d19bf41c30ee65f3adaea7ae2e2ff8e4ccdf3b5a3f36de4eb19b3ace88dac3d6d661551d916e21ded6055cf96a629d23aa46be663459f577d61 SHA512 2dddd822b6602ba1b5251aa9305245d7a1ed2793c1f64ca2a6bd1f6b180d34a8b420483a145698b5b814e0ff9d90770d2e471a03482f5ce484d96d8f3ec529e9
-EBUILD graphviz-0.19.1.ebuild 862 BLAKE2B ed05ecaf39596ea4c8563a6a7ab25e8b280c75480e18a1326d303530fb74ab6d63e1a31c8af57baf6155d3da873275e32f33f97521dec654a9fa31027d86716e SHA512 01e19fdcf5b6ee8edc8c040f1a6eb9528f35dd048f7dedbb9248ed83bee025f8cc6dc81647603e5d99a78d32afa29c727ff29393f7ff74a0a42c0598d5f20672
+EBUILD graphviz-0.19.1.ebuild 860 BLAKE2B 405c4ec93ccf9ecaf7e95370593cb289b792e51a4fd8f5144dd4847fcd3941088bd16eb842a2dda9cb33928bffb39e78d16234da6d94f67f4f86515671ade103 SHA512 c947ecae0691f1b93b4fda210ebfe1f1f1008a71572de9719276a3fb020e956edfed8a2ce0360f662ccfd7a62927867ad814955715a04101de7a34db58ef8d77
 MISC metadata.xml 553 BLAKE2B d974f24c488a83d7c1510825d5e157644a4df70113af1283224a847d1cce2535ff4cb0633833a8671f6508fdd38c9079bc21239fdc1d1e9ac85f2ad08ea3a297 SHA512 72d2ce4887aa23136d689bf51b94f17ea3c8803464f623b0f4380381b9639a15a34858f26f129d5db2025d2ccda82dc80f22f5984ef58cffdf4dfcd7b8c51127
diff --git a/dev-python/graphviz/graphviz-0.18.2.ebuild b/dev-python/graphviz/graphviz-0.18.2.ebuild
deleted file mode 100644
index de96bc061ec5..000000000000
--- a/dev-python/graphviz/graphviz-0.18.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		media-gfx/graphviz[gts,pdf]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/graphviz/graphviz-0.19.1.ebuild b/dev-python/graphviz/graphviz-0.19.1.ebuild
index 9df7603a752c..4600484d191c 100644
--- a/dev-python/graphviz/graphviz-0.19.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
deleted file mode 100644
index 4fc16b8d5845..000000000000
--- a/dev-python/hacking/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hacking-4.1.0.tar.gz 61910 BLAKE2B 95ced5b2fbafbb890478b5ef598a836520b4d1a3f1f2a0e708aa3f3135f394aab9e1ca8eaafa9d2f9f8dfcd1043d925b0232228234021ac89d2882ad6c7918a5 SHA512 44741548b5031777b0a508255129893da63a076615dc4245fdcb2368711be0ff6e16702c12c75a7f2c6b13257e2257c58e6e95dfad6da6640ff077fbf2b507db
-EBUILD hacking-4.1.0.ebuild 1654 BLAKE2B e73d791dc4360decdd129754b15cb21461571a71f7156f6a68b9d9db0692c12dd7fce0187f2b19a7b372851562c0904dc81f8fd2cf0b3899e14dabacdd018764 SHA512 226384eedbb2ff45118806d8ffe556deb07be8870a709f27bc189b83c925e430a0c705efeb43e276c5b2b09f765a22438bd9a1ea49ac6f1742ff8f7e340b0b9c
-MISC metadata.xml 746 BLAKE2B 8c335eb21433a8c9f7acd8462d8121d9b830b3e724fd8d32f61ae0b098c7160d78c80ef705c06bcef32b3b3d9bc11bcd4d60035dd1271daf7c68e33cb295308c SHA512 f637a3ead1e9ca79d78d68d4d14e90803c8b51060b81309939347728909ec83c37fcabc294f0fcd5eb8f0c4fbd8af6178c62d5380f2d977ddb654a60260897d8
diff --git a/dev-python/hacking/hacking-4.1.0.ebuild b/dev-python/hacking/hacking-4.1.0.ebuild
deleted file mode 100644
index 300c203adc98..000000000000
--- a/dev-python/hacking/hacking-4.1.0.ebuild
+++ /dev/null
@@ -1,57 +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 client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/hacking/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	<dev-python/flake8-3.9.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.20.2[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-2.2.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
-	)"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	stestr init || die "stestr init died"
-	stestr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/metadata.xml b/dev-python/hacking/metadata.xml
deleted file mode 100644
index 26582f8ffd63..000000000000
--- a/dev-python/hacking/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<longdescription lang="en">
-		hacking is a set of flake8 plugins that test and enforce
-		the OpenStack Style Commandments, HACKING.rst
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">hacking</remote-id>
-		<remote-id type="github">openstack/hacking</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 79b2ed4a697c..44a58b43d325 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,13 +1,13 @@
-DIST hypothesis-python-6.30.1.tar.gz 9180975 BLAKE2B 3b0e8e29d74f579a9ace6fc341451992386de3358defcf42936d2d535c31bae07d7ab49fa6d4a8d1a2bd0e8231086dd9795d78125555e668425fba2bc539b224 SHA512 8abf31debf94124744d17d5ddac6698a21981feca7b776e97d92d5f6d1404ec17794bdf11b256dc7b0a335a041af6d3f1f20ae6fd6a62abc1ad78c2b39354fa9
 DIST hypothesis-python-6.31.4.tar.gz 9183157 BLAKE2B a8c82cd2e798b7dc0b149a09d52cdde77677473d91f3192783a8903fa7513ce410a89e67df32a812a12b59ca113b065c52e84fae0632f8a2dd852f4a39e90cbd SHA512 b1783d7463b575afa40418e4d67aff04c025bd9d733b1c6b2ac671d8d1c9a5d58ee7d10ce5e27aaa14156285abb6b182f7ee5f3ebe8eb335421680d20dbb4405
 DIST hypothesis-python-6.32.1.tar.gz 9176925 BLAKE2B 0b57c8b46b766055a19c8831620b6ad780bd1a3b3e4835496cbd01f4fb861c64679171c685797458ec56ff07fe9524840cffce1e1930390de71225b707163880 SHA512 f64b0ca16a47d9f4dbce4986aa2c4414e86e596b6e167bd8be373fda05f8bbb626de7a615861a71313faebde50b1fe55e54c8b20247c71fa4ecb2223de171502
 DIST hypothesis-python-6.33.0.tar.gz 9177426 BLAKE2B ad1b1a358345f9b92bf41cee196c7bba5374054c84b7ca96500cf41b095e7ae6df12499dcb3b656907df30b360d167630d3d4c640c9d5d903125158af6db3089 SHA512 0165b7c431980d7758be50e834dbe04356478590d5fc54656ea9d31508bbae81f9fbb53b38178862b2d4959e17fa3564bc6971d466ba95555c8e80a6fb208639
 DIST hypothesis-python-6.34.1.tar.gz 9178792 BLAKE2B 72cbb1b372fb23da8ecf4eb8355cb054216c78b6464b5ddbc7ee5534652d69e4f3cc094241c0434bc0d80cc555c87699504f87bcf4659724f77d70deaa19b871 SHA512 234b8a814994b0e93cae24233cc30ab8eba853a081d4cce4309b4af5e13234a3de8d704f3255cce11195603645c2641fa1985529d64631df90a61cfd1c4a7f06
 DIST hypothesis-python-6.34.2.tar.gz 9178843 BLAKE2B 24bbc19ea5c207880d577a3c451f6e90c4b124a934aa1cd103c11ec77cbb5076d75e3860abd2b9bd2fc75640ba562b81d3fa038cc7752109625990e0ac0e1039 SHA512 a03233a2b84b1e009ad246663b0c7f6b56f2c04d08d69297ff50b02b8af292fdee37f877ca2f709e6ef64192d31e3d9bf18f78a6f5c92b8f03bf04ba398d063c
-EBUILD hypothesis-6.30.1.ebuild 1754 BLAKE2B afe7c86d0907a4c0500ff94249349431c435567753fba197261ce9bceedb03da6ecab286780b66ac4c83361528fe93ff4422c8615bbc6ef20faf289efaa3dcf6 SHA512 b3199308c4981d523366fb48c5d6bee4e1d0eeaa3e9854627cdd23b5d81d22ba4bde02b2669368a5d8bbcccdfb3941aa692c78b18524e907d70c24470e284385
-EBUILD hypothesis-6.31.4.ebuild 1762 BLAKE2B 160ab670a5db81e8ff41937a560cbb11efc1e9ae4bf41fc85176e9ab7c640e81da405ba4d477261def8f04c3a6b479ced41b7bb1c9b109e82a024bfaae62819f SHA512 2158da223e25cd54f10fd64167d3d25032e1d3647b5dca501f6c2ca8f977ee829550f7526d538b31dc192a9fdacdd9b4fea2f61204db4d0dc94571358af2b2dc
+DIST hypothesis-python-6.35.0.tar.gz 9178905 BLAKE2B 7cb55da84b979d8a075361674bbfa00cfeb5276e0ae25c153794fd876d1f65c7a88c5cc16e8b0c085560be937be14a113ba4854b734808b592f3d7c0be30215f SHA512 b390272ac471b23d8de1414cb7e2fd9d814318bc1063e4ad2bb2d61ba3b3af0c92701fa7a737117dc894a71e8d0473f52c11caf70fbb35d0837a4927537daaf5
+EBUILD hypothesis-6.31.4.ebuild 1754 BLAKE2B f37892379513cb972bc5f1a402c1dbb167a06f8e3f67124f55ccf06a303ae6f357c2664af068e3ce19dec13d62c656a1a16c8cca8959fff079e94fafbc2415a9 SHA512 c6e20336f4f846c4ad3b80133e374e69e85fd604898044bee22412b2b9f8cf292d3b7e21c5178e34fd9a92929042921ca9ad92e9b239dba6d44a22085034d451
 EBUILD hypothesis-6.32.1.ebuild 1762 BLAKE2B 160ab670a5db81e8ff41937a560cbb11efc1e9ae4bf41fc85176e9ab7c640e81da405ba4d477261def8f04c3a6b479ced41b7bb1c9b109e82a024bfaae62819f SHA512 2158da223e25cd54f10fd64167d3d25032e1d3647b5dca501f6c2ca8f977ee829550f7526d538b31dc192a9fdacdd9b4fea2f61204db4d0dc94571358af2b2dc
 EBUILD hypothesis-6.33.0.ebuild 1919 BLAKE2B 0c970e7d2910f7d6c270ef62d2de074f8095a0a03efc71bd166e84d4a1abe635d6410e46018f6803ebb2c26378df5bb50c54ab4545fe281e5a1e125e6355f5b0 SHA512 adb7968c328f2985ae3533a7925859d6804a15b5c14d0a34a5e49d7362aba1e9918634e5f09e2c53a3f615d191ad91373f52a593745089a9fac239dcc50234df
 EBUILD hypothesis-6.34.1.ebuild 1919 BLAKE2B 0c970e7d2910f7d6c270ef62d2de074f8095a0a03efc71bd166e84d4a1abe635d6410e46018f6803ebb2c26378df5bb50c54ab4545fe281e5a1e125e6355f5b0 SHA512 adb7968c328f2985ae3533a7925859d6804a15b5c14d0a34a5e49d7362aba1e9918634e5f09e2c53a3f615d191ad91373f52a593745089a9fac239dcc50234df
 EBUILD hypothesis-6.34.2.ebuild 1919 BLAKE2B 6b445f0902299913e613578ca46b6cd8cfb22a7de4a07d8fcb18b3ddcd8fc145e9ab24053dc0afc0ebdb64b32fbbbbc37c85db140d9d90699fa75f1d9d8ebdc5 SHA512 3e6b41f3ac713598f82ff5bc36138b7d36904f4f7a6040f0022da4e5300be83b2f3c79adb5da4fa90909fc852ce306621badeddc0ce6498dcace25f991bda1a9
+EBUILD hypothesis-6.35.0.ebuild 1919 BLAKE2B 6b445f0902299913e613578ca46b6cd8cfb22a7de4a07d8fcb18b3ddcd8fc145e9ab24053dc0afc0ebdb64b32fbbbbc37c85db140d9d90699fa75f1d9d8ebdc5 SHA512 3e6b41f3ac713598f82ff5bc36138b7d36904f4f7a6040f0022da4e5300be83b2f3c79adb5da4fa90909fc852ce306621badeddc0ce6498dcace25f991bda1a9
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.31.4.ebuild b/dev-python/hypothesis/hypothesis-6.31.4.ebuild
index ea716a889cd2..9e5d3e0a6576 100644
--- a/dev-python/hypothesis/hypothesis-6.31.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.31.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.30.1.ebuild b/dev-python/hypothesis/hypothesis-6.35.0.ebuild
index a708f1a69a39..0d2f0a38a35b 100644
--- a/dev-python/hypothesis/hypothesis-6.30.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
@@ -25,7 +25,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/black[${PYTHON_USEDEP}]
 			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
+		' python3_{8..9})
 	)
 "
 BDEPEND="
@@ -40,15 +40,19 @@ BDEPEND="
 distutils_enable_tests --install pytest
 
 python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
 }
 
 python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
 	distutils_install_for_testing
 	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
+		-x \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
 
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 31955be19170..f032654b23c9 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,7 +1,11 @@
 DIST identify-2.4.0.tar.gz 101312 BLAKE2B 1ba4fcf235518427fba8a59eb30ceb0c20ed23f5a3c4f56d6039ab530aaaba6b83ee395626a7d086f193f57f00a8d34a659883d897a21dc0fae5018cb0a4e87a SHA512 f0806d3785ef5db9cb1b5354c146fc0d33b4a4f04b3ff899945e9e93273a0bf8e4c8ff07ace22b5d71721c953148c007630dc400b82849321e8399ecdfffbc85
 DIST identify-2.4.1.tar.gz 101282 BLAKE2B e7c04480159062ec25063d956dda6d904031bbcc30fdab6011ad24a8c3816490d0dfe08cec19fdfe660509a246da820ccfe41d4dcd909daa9c59b622bf506148 SHA512 69253bd364ed96ae64d83ee25da0d9aae97731e602f193008471dd99f47db2b87aa33dda1f87fb9edf939992e0452ca45f07f1d7d5e628352b50d4c2e68b7d0e
 DIST identify-2.4.2.tar.gz 101279 BLAKE2B f70bc1d493fb1fd94f95ea7cedfba6c522fb79ad9d94e1bc3c8937ff728e82fd450ea7b64f5769811dea4788eeac0e0b5fcbddd0c817443bf6005d59de1d9b83 SHA512 73b139effb62ec047aa3285a5e0e9b196b459e9e8efd5dfb82090dbdd8f020055680fbc381778a1c7a298e72ed6c1778fc74213812b2f30abe9b18b401e053e3
+DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee54692cce52e1269057451733fab9c02647a51deed98cfa569b7758f37b4cc07353eb418314901b1eed2333eabdc SHA512 2c82cc90d98a149dc211680c96d8c3bfcdbf955fd61eb207ae4a62d9bdb8f159707a7578838582bd16f45c300d9a8e7c5e7009a9daecb6b334b27fd160cc0d40
+DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
 EBUILD identify-2.4.0.ebuild 516 BLAKE2B 9e67c4cbb998fad7f8fee2583b0553822dc9dc7d589a092b1127938f48999afc05e1aaef3ba5d3eb1f85d9ae399268c82869eb4bf3ae4274bdbd65b41f14ede8 SHA512 47c7d88fda8e395b105ea8ecbcff161729a21d89717292d393b31e538bcd8c5cf6fe46b0f7249ce20ebe9b10eb7105bbb99a383358bb8843b0754d95d2fc2e3e
 EBUILD identify-2.4.1.ebuild 518 BLAKE2B 4327428e4d169fceba95c9d444157fd626ec810e3e1036514f1e241497cbd1f72c7fa014f7011d8b65e94b0fb750ff442ced7d5047ef9c04ce79a7e26f947148 SHA512 9d8f344351ebbf673680e90335a49802ad3534da08ec2d1fe81df6fd5e8f5489974f17c264a6d34ebe26e99fe27331fbae9f808f498b554e8d3aed0e163f31f0
 EBUILD identify-2.4.2.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
+EBUILD identify-2.4.3.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
+EBUILD identify-2.4.4.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.4.3.ebuild b/dev-python/identify/identify-2.4.3.ebuild
new file mode 100644
index 000000000000..eb1a8e60e930
--- /dev/null
+++ b/dev-python/identify/identify-2.4.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.4.4.ebuild b/dev-python/identify/identify-2.4.4.ebuild
new file mode 100644
index 000000000000..eb1a8e60e930
--- /dev/null
+++ b/dev-python/identify/identify-2.4.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index ddd98ebaf605..f33f8334dbc4 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,3 +1,5 @@
 DIST iminuit-2.8.4.tar.gz 391667 BLAKE2B 15d82db308ac361f45399debb342ba350c6ec83e111fca16baed99dc029010284b946292f4236e26ae5cdd60f7a130902bca53669b31e335d706ead77f6603db SHA512 564506921027d6addffb9df6f2ad2aec69981af49e2552f4d093d03fbf79f12a72e6dec58f159810d621a58ddd56dbf1258359d01d56d33a7c30b08eb5b333ed
+DIST iminuit-2.9.0.tar.gz 408294 BLAKE2B d924d5ca5bef0e5b2dbc1fcfc12daab196c6937feff1badd73f9f8f20601989b21673165e758df7dabe072cb4a14cbda12823cfaf30fa5687de4184238465c50 SHA512 55d1d855b23862a4205b6c12ff53ddc088739945523670f3959edfe859abdbd3600da78cc219af6ed792156e2da7d8ae844e76e49ac759af433af875eab26714
 EBUILD iminuit-2.8.4.ebuild 791 BLAKE2B 8f62074517fdf3c8a6db059d43351763b15cee8ef6dc17ea934f8c20540d2dbaa5eeae27d3288a0a4a1e908447b6bfaf0db7fd0b92d80f850681f3953b1b3a8a SHA512 d20369173c72bfe9b2f4038355819ee610e0a70b8918dd17a712b5759e3630230fd11d15c00fec6ff5ea53a7ba149bdc6edf9d67795eeecd579e2792ad7b867c
+EBUILD iminuit-2.9.0.ebuild 791 BLAKE2B 4ad5fa85546390f0ba4d56492ae8e5862fe0c980374bbf5c03342ef5e715be1e30e5640c85d2fa1085a03c7db906aaa823a6ad6c3a2b369f7d04f0ab02731fb2 SHA512 471a3c46bc369b9b6bc9e88aa713e6feb6f3a0d84806448b8802cac7e3a7b34633fae8e95d45d49e03cdf62f990787b161299fb8b5305ef841488a5e7e2e5845
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.9.0.ebuild b/dev-python/iminuit/iminuit-2.9.0.ebuild
new file mode 100644
index 000000000000..438c3d273a88
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest -p no:pytest-describe
+}
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
new file mode 100644
index 000000000000..e8aeb57acc52
--- /dev/null
+++ b/dev-python/installer/Manifest
@@ -0,0 +1,7 @@
+DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
+DIST installer-0.4.0.gh.tar.gz 466643 BLAKE2B 635854b3461995cda3b7afa507ca3fe35cae8210e79de0bbd46938c8f103d7840ceca8bb388c2c9533efc78150691f980c478485ee33bafe0bae6c08a6aef8c4 SHA512 13537c479bc8ead8f8b45c8e5c5182e8b1b32c2889df8015be7f517f390a9efbea6fa167e0886dfade6621a8a2d822bfd662ee0238d3d86689619ca4d5483b26
+DIST installer-0.4.0_p20220115-cli.patch 14552 BLAKE2B 6632c1472ae0a578f6c7ed0acf1bb0d89ece924626b68c0daa28d9a7d93826837adaf6b0d40f048c4f5c2986b4328ca565340137e7b7fa7f407f62ebddc70275 SHA512 f8c6369955e0bde2bff0b935c39748d02659bc6ca0341af405e2c1026cf145479ba0b908bd769cdc05f3cc920f881b894b6a5eb7ace643951e05250ec0486b80
+DIST installer-0.4.0_p20220115.gh.tar.gz 466532 BLAKE2B 6dea3f4bacb52c4983e111d420495ee157076342a823b7062c6e5b3e4d3b70e6b2e9cb024d0c7baba6f88ed70f4303ab071d1882bc9d8dd0726f82a3e406056f SHA512 fbb0d4c8642fa2cbe2fd3be2eef7044a0353f04c67ecce20aafed33a0d7877ff55872ca5ad51390ae7e02cdb7af5dbd57b662085b60d425be95da6643b061eaa
+EBUILD installer-0.4.0.ebuild 1070 BLAKE2B 90aea78130610f2b3dc25a20245c90beb999edd0b958d28bf36b4778e7b02f9bad403e8900782095b8cbd43ba70628e036f0462a2e41db8dce19c6f271cf0355 SHA512 c17af01f99bee4546af02630615eb1859f06b17ebe9583c01d9368f1f5aef14f004197dd7bd56b67d423bfecc39c0fa072f3f9c74655183fdba46085acc8e3cc
+EBUILD installer-0.4.0_p20220115.ebuild 1317 BLAKE2B 5a957f71288538ed60bf86b2e282cdcc72a89ce955d93fc6cef4ad47d354940e0cfd335df89c1cd2de5f5e8adc39431786bd3edcba3cc7d2b34000d4433269cb SHA512 3baf8fed904c2b4f3fc5481c69ab9b7e4eab310aa168e68f08147992b2ad35cc8d4220fe865c1cd250083d3032f924cce69e39bcc4c2c5a043088ea86ec389f3
+MISC metadata.xml 396 BLAKE2B fafd8a4b677ddf2aac2df9ed3142829bd39eefd12fbdfdd1608a5ed2a299c86b18993440aa9941d609af9b4d34e9166a0464c2b9a06bde9ea08a4b91537b18bc SHA512 d9a031da54c07c60a8edca8df2c9fd1d2d7767e71038b70a0ff46da99005cda63af56cd54247e7eac716cf66cfc3a768edaa62a68c87983c7b5354ee6d8303f9
diff --git a/dev-python/installer/installer-0.4.0.ebuild b/dev-python/installer/installer-0.4.0.ebuild
new file mode 100644
index 000000000000..7cc2d248db09
--- /dev/null
+++ b/dev-python/installer/installer-0.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 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="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pradyunsg/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/pradyunsg/installer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P}-py2.py3-none-any.whl
+		-> ${P}-py2.py3-none-any.whl.zip
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# NB: newer git doesn't use mock anymore
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_test() {
+	local -x PYTHONPATH=src
+	epytest
+}
+
+python_install() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/installer/installer-0.4.0_p20220115.ebuild b/dev-python/installer/installer-0.4.0_p20220115.ebuild
new file mode 100644
index 000000000000..c6fad5e821fa
--- /dev/null
+++ b/dev-python/installer/installer-0.4.0_p20220115.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022 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
+
+EGIT_COMMIT="bf68f7b045ffc08784af03cf2433548c9ee9e8ca"
+DESCRIPTION="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pradyunsg/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/pradyunsg/installer/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P%_p*}-py2.py3-none-any.whl
+		-> ${P%_p*}-py2.py3-none-any.whl.zip
+	https://patch-diff.githubusercontent.com/raw/pradyunsg/installer/pull/94.diff
+		-> ${P}-cli.patch
+"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# NB: newer git doesn't use mock anymore
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}"/${P}-cli.patch
+)
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_test() {
+	local -x PYTHONPATH=src
+	epytest
+}
+
+python_install() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/installer/metadata.xml b/dev-python/installer/metadata.xml
new file mode 100644
index 000000000000..090fe7139f47
--- /dev/null
+++ b/dev-python/installer/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>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">installer</remote-id>
+		<remote-id type="github">pradyunsg/installer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index b02b3d3d9b73..ae46ebb4bfa0 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,10 +1,6 @@
 AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a94414debec73ae849ceab34f69fe3dfe6ae225c31503f33f09d3c0460b5ed98677a2eba71285948e9b8f75b1704d7328b9a4eb0d9 SHA512 df15b568d93709ffa2a8ad2e28c8f3c6ad7aac8108c0306a1922041ccda82c5871149aa5eb4e507bfad0cf948bccdfac7e49d63f4cb6b9302c71673d6c0fa038
-DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
-DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
 DIST ipykernel-6.6.0.tar.gz 123747 BLAKE2B b1e836ac08e24baf3311e34e1323362bec94f8a59ba4cd824703f03370031226f9af41f864930c6fb59216d185e3c7e8798d6b91e88aa6ca0c214df33c6d7d37 SHA512 bf55e26a4bca0d02f4bbb87ce53a224d22a4765596f0f5d7a6d576bfa100436f676df59fa934e1d6ec66f8d802a1c7f787a9a31b906ecaa1ffd8a77fa3d96127
 DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
-EBUILD ipykernel-6.4.2-r1.ebuild 1643 BLAKE2B 518a656392d3ab77593bb3c27114d5938016ece504c32144685ae1b7d4826ced4dbb394e9b689041943f1e84e9cde651e781e016bdf1f0e6d60c8322163dfb48 SHA512 dbba4abf3d6efb658e692086a78f6e4877df3fe61a84263008ec21f85c7de5a445f1d2943bb32715de89dc091dcd0e7c5b082543a1bd37e4b7c355e564304ad2
-EBUILD ipykernel-6.5.0-r1.ebuild 1832 BLAKE2B ea220d7c228ff8ec86671cc4fbc75cd4814f11655cd211ee6343f47367d715bca5bbfb56232f69504c19d6f917a5d753967c4ae5384e1673d65e4ab785bb7733 SHA512 017a8d52cfda02f49e51fb3a000844898fa42362220c611024910eaba805669ad66ac257ee7a425820654cd9cc4a979fec5dd82a12dd9d16dc41a17c8ba70832
-EBUILD ipykernel-6.6.0.ebuild 1789 BLAKE2B 52353c8ba04ff29bd3f94a7fedbe9f8af3c966f0ba6254ab13dca3314a31765ccd5da49e42e081b6ef7819f360cecc04ea692d9783aa6d3cc68c2e26a7c3dd3d SHA512 1cc3552b0b6967501c5ac31bef55dbb674f6821b32e96dd92ca8aa7101fe4f4860f4c4add6753673ceba7a21c2613a01aee0c869e04524d7643f95aa36464ba8
+EBUILD ipykernel-6.6.0.ebuild 1781 BLAKE2B 04655fce64fa0b5591a9f593cb02401856b83100efe54aa8e83bd1122ced241450f019d2783783fe29778d6cbd7ce35970b65d91d8771a7178615cca7947265e SHA512 279bc6db123d38e1e378a49ba7edde597c3dce595eb7667ae825db97a93e4c686988d4b308621e1a9ea6214af6f0d694e2cdebfb99fe3188a09dec10af654b69
 EBUILD ipykernel-6.6.1.ebuild 1832 BLAKE2B 80d935a7994fa00923c4bc12a48bf3f6d10a452ce1794405e64e113fc6612b127a4d2b0ec0d6b7910aa3fbfae516dfdf664fbbe61bf0931f7b2098b4d594cc19 SHA512 57ff481b5779d75c9ffef6688fa23398f0e566b7b19576302a5a756e40ebac9139412e4219ab8f63edecad738f7bb2d8c8340ca14361ab8911d1e6ecc8114707
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
deleted file mode 100644
index 2e632c2d5273..000000000000
--- a/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
+++ /dev/null
@@ -1,55 +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
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=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}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
deleted file mode 100644
index 524e5e76b01c..000000000000
--- a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/argcomplete-1.12.3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=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}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.6.0.ebuild b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
index a2aa44976ede..b0138081d9a2 100644
--- a/dev-python/ipykernel/ipykernel-6.6.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index cbf33c79e74b..dc6d6ea3d274 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,7 +2,9 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-7.29.0.tar.gz 5151803 BLAKE2B 685bb7df39513fe262c07dbb10de4d795860bf2958c626d030bfa3e18052a98d7c9d5f0f96c0c9a5d4b9fdcfab09c492457d409f05ce522f607456ff3a4b35fd SHA512 b8e9cc07a0f77bbfaa88183546ed9d7e4a4c37e7c1704b1a3716d605a04339f986c7767f3c0920a94039eda99e75afb62a7bb43fa0cde6699a902f3b8f83a398
 DIST ipython-7.30.1.tar.gz 5154336 BLAKE2B 0753433eea2ee6a5a6451db6aa537c9c9469c749b970ecdd040123787064e7be78363060a785c7ea4175b8e0f4f2bfefa15485f6f5412ec34690fe505a1cfb97 SHA512 839f709e019dd5efe32730f2e4c457e6dae0db5490844805d30f12a1fd17bfb2f991f1374a84542b2392d3ce332096d3922471c6b14149331075be8719b14734
 DIST ipython-7.31.0.tar.gz 5154974 BLAKE2B 5debac9a1011cc6541a2ce97df5d8793465ce4c289d1293c33c29eacc23cbd2271f0a8d7362c3445a88d080edefd85046aebc8782cd930c3dd8b6837ec682bf6 SHA512 705122ca63df17812ab360da06d58431b51d3a1f3bba47df7131e882de64de54c6986e7ba3d55f4b77c4b1049981b0100ba64825e952b25712c843ef7e975e2f
+DIST ipython-8.0.0.tar.gz 5395839 BLAKE2B 8844372c423c4b33a2a77b376c033aa00a4d44d1735cad42c4c85b05950370fcafea109025f4f02d124643656673ebf45ef27f78a93d31083b94e13d9364b32c SHA512 cb372080fac212f0d3872747820d06829f6b008ba142650c1af6fbc2ff287a0a82e9ec27777fe1c94f86d7dd9b57a9ebab467eeabd100344d053becd8ec1f70b
 EBUILD ipython-7.29.0.ebuild 4469 BLAKE2B 953d54ebb8837bdc34c55a1cf15e0f7bca2b367608e6082523e7a7dafa9df86025ccf127de6b9dcdad767108f992f14cdc662416ad8d5beddfb1ec9216a24921 SHA512 952c6093b489d5b7e95f842630fe4dbbf05ecc5acc2750953a9cddd9184032468f72b6c44f86621b13227b41896f021625f1bbe55cd608b03851458817ad9dd6
 EBUILD ipython-7.30.1.ebuild 4469 BLAKE2B a4fe701945791cc17bc043316eea80a3c350f56c8f621e1eda6d05182c6d1a656c2ac874826777690ede2f36483b98c3632c88c64501bc76fd0ecf63b109e9d7 SHA512 2b157b63f61fbaed1a2dd5dc6c76f3d27a8303a738cac99ed7b27b9829dfaf1929e7690b41e8b84c24cf0af268aebf80e45709f3a1f15d69ad82ac1999501fb9
 EBUILD ipython-7.31.0.ebuild 4477 BLAKE2B 6c74574a989cc388ca07628230ad56d8a75cf0cd304a1d11f9313df5b7316ee9a37a7c6050c696a6499a4484f80df14eabea78e241d989c604ba0bfb66021989 SHA512 145c220398ff972009aedb123db8d8c276d44adb4bf984cdb6183baafcb854b1cd68a39a0710775af62ca72238323c458a2c80e0ee67cfd9920122b6a95aa9ac
+EBUILD ipython-8.0.0-r1.ebuild 4352 BLAKE2B 6972f647ad4ee2a6fcee147d892fa0db63b3e35a447d994f0eca4c7b5acb7a028ad791d59914374c21b6bf03554fe32d9e7e6cf14a167f673b0edebb98888a8a SHA512 3d1194d7687dcca7925032ba4a1ed61acdbbdd94b885a92e2664c2e3da7050b675b68d20adb3fcd86fdeddd237f7fadb2a5624db62c4e3988b7363e5001256fd
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.0.0-r1.ebuild b/dev-python/ipython/ipython-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..28e1e1885dc1
--- /dev/null
+++ b/dev-python/ipython/ipython-8.0.0-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~riscv"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/black[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# Internet
+		IPython/core/display.py::IPython.core.display.Image.__init__
+		# TODO
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
+		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
+	)
+	virtx epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index e84bb21f3f94..0d1f3baae0b3 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,6 +1,3 @@
-AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
-DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 DIST isodate-0.6.1.tar.gz 28443 BLAKE2B 2b451e4dd9a9979feb930090cf045b21c984e962222edc59eff6f08a448258833ac5c368701ed2a703d48c1238122cbe7f628d136124920730bbd96fa04519dc SHA512 437e420ec7ee68dedded825f30d3289eeb0da526208443e5a8e50fe70f12309515e1285b21132d26e6d4c1683f90dfa1d401582042b5e4381fe7ab0e34af26b6
-EBUILD isodate-0.6.0-r2.ebuild 635 BLAKE2B ee9637a41170335b79bc5c62ea9f720bc55a0bcdbf3ed8582222eaefe9b535dcc5c4e43111bf83c171270c061ca5a02a84d43886ab101f9bfadf035fab229936 SHA512 87c920abf4aa581db54331e80c45f39cdbf6189e1117d2afa3b7300f90cac860507d2f9a505faebc0f8bfc6dc3f7193dee1f9a905d163ce9e20a9b70c7c620a6
-EBUILD isodate-0.6.1.ebuild 598 BLAKE2B adbb483ff491354fa7d2d955c2fff865118d3ef44376be65f02c80066e4230e6423a81db3648ebdaeb1069836c253c8c1cd56147a881ab2b744abae1ffcc78d2 SHA512 ef8b8eb40216aeb326ea1e2bd5289ae9a2517b8f24377ede17806e213a797c0e7c60bf2e6772f367ed10982b994c184974502abf744e1368999a54f40ed3df01
+EBUILD isodate-0.6.1.ebuild 590 BLAKE2B c01830456406d1fab85e68cbb790fd4c42f7f8cf7808616086d8c59cd55095a1ba6aef6bfefa3164c1ad7cebb5120a1b5388852ccfbf90b8f7ac602a96af2527 SHA512 4d8cf104fc165e3ecef0cefc7508e17589aff8a125976dc5920936eac962d20cb7bc8fc09f48783e9bd58a516dcc3d931baed1b8311b1e15f9976876e65dce23
 MISC metadata.xml 1176 BLAKE2B 559d17eb8968603df379f3ae23b313b69bd64d246c912f33f2911a65d53f3914da6893635c023d4f72095807e26334dc2e3750d31986c2175006ed436587bb86 SHA512 b7697a229b5b31cfbd6991c3e07f1a44f2d20c0c65badee9b0a1b6e9bcbe6f7bb7ba3fa6a48ccab5a4e2a385f83453f371275fe1770bed6cd14e101c1c470be2
diff --git a/dev-python/isodate/files/isodate-0.6.0-py310.patch b/dev-python/isodate/files/isodate-0.6.0-py310.patch
deleted file mode 100644
index 81b38b48a2a9..000000000000
--- a/dev-python/isodate/files/isodate-0.6.0-py310.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 40358ac82b948ea8377d5ca32b576def31b39a84 Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:21:56 +0100
-Subject: [PATCH 1/8] Avoid unclosed file warning
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e39446f..9634625 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,8 @@
- 
- 
- def read(*rnames):
--    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-+    with open(os.path.join(os.path.dirname(__file__), *rnames)) as read_file:
-+        return read_file.read()
- 
- 
- setup(name='isodate',
-
-From 91bf24dd1610d5f6ac5d4867457f0703046017d2 Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:22:22 +0100
-Subject: [PATCH 2/8] Raise warnings produced by isodate as errors during tests
-
----
- src/isodate/tests/__init__.py | 3 +++
- tox.ini                       | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py
-index b1d46bd..7208cbd 100644
---- a/src/isodate/tests/__init__.py
-+++ b/src/isodate/tests/__init__.py
-@@ -29,6 +29,7 @@
- '''
- 
- import unittest
-+import warnings
- from isodate.tests import (test_date, test_time, test_datetime, test_duration,
-                            test_strf, test_pickle)
- 
-@@ -37,6 +38,8 @@ def test_suite():
-     '''
-     Return a new TestSuite instance consisting of all available TestSuites.
-     '''
-+    warnings.filterwarnings("error", module=r"isodate(\..)*")
-+
-     return unittest.TestSuite([
-         test_date.test_suite(),
-         test_time.test_suite(),
-
-From fc0fb3278da5f463ca5b2f0a3acafbbf2869bd7a Mon Sep 17 00:00:00 2001
-From: Jose Eduardo <jose.eduardo.gd@gmail.com>
-Date: Fri, 19 Jul 2019 16:29:43 +0100
-Subject: [PATCH 4/8] Fix Python 3.8 DeprecationWarning
-
-Ref: https://docs.python.org/3.8/whatsnew/3.8.html
-
-> Many builtin and extension functions that take integer arguments will
-> now emit a deprecation warning for Decimals, Fractions and any other
-> objects that can be converted to integers only with a loss (e.g. that
-> have the `__int__()` method but do not have the `__index__()` method).
-> In future version they will be errors. (Contributed by Serhiy
-> Storchaka in bpo-36048.)
----
- src/isodate/duration.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/isodate/duration.py b/src/isodate/duration.py
-index 6d1848c..d923cee 100644
---- a/src/isodate/duration.py
-+++ b/src/isodate/duration.py
-@@ -180,7 +180,7 @@ def __add__(self, other):
-                 newday = maxdays
-             else:
-                 newday = other.day
--            newdt = other.replace(year=newyear, month=newmonth, day=newday)
-+            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
-             # does a timedelta + date/datetime
-             return self.tdelta + newdt
-         except AttributeError:
-@@ -264,7 +264,7 @@ def __rsub__(self, other):
-                 newday = maxdays
-             else:
-                 newday = other.day
--            newdt = other.replace(year=newyear, month=newmonth, day=newday)
-+            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
-             return newdt - self.tdelta
-         except AttributeError:
-             # other probably was not compatible with data/datetime
diff --git a/dev-python/isodate/isodate-0.6.0-r2.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
deleted file mode 100644
index a7b6227bc1e5..000000000000
--- a/dev-python/isodate/isodate-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/lib"
-}
diff --git a/dev-python/isodate/isodate-0.6.1.ebuild b/dev-python/isodate/isodate-0.6.1.ebuild
index e6be6118fb17..1d51b68f610e 100644
--- a/dev-python/isodate/isodate-0.6.1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/isoduration/Manifest b/dev-python/isoduration/Manifest
index 996ecee6ebde..0f578f7353c6 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 740 BLAKE2B 8685823342f87ef89f21766ab0e2696b9e9235e3df8f389eb516d9a5c357dcf08d664ab0d2e85ef047d8fd63133ff747052be4d79b182982415ac92a9e1fc102 SHA512 e401a96792ba407d4bfe0ae9961673bb183e25ce02bcb60a620604616420a06b504b112841a22be538d3ec4427c1a2d6b91f0cda2a6b67b2b9d0a58c136ca13c
+EBUILD isoduration-20.11.0.ebuild 751 BLAKE2B c597a927ebe6863819ee0bbc3e72644d8010bafda43af71dad6430f86ecc769cf70a82cdfa2a71d31af6320291b59d2e504a7dc94aadfd3923d6ad408b32b491 SHA512 9899c80683fd43760a3eb07220838304435084480e66f0c01480a613573c7f8b3333d7cc13257eb7837ab766c4a2b2a73e5e147e90503e9e6a26c011a5cf1012
 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 5b3c87c6afb1..54bb5d2d4db3 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 5e7f4bb14666..559804a81514 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,3 @@
-DIST isort-5.10.0.gh.tar.gz 728239 BLAKE2B 6a206cdd4ebceb29f8c76f1c08b3217da1d76b56bbfbf177175d08f502884ae1f0700dc1443c92c28d68d257cb6468e2210d35a2003680303aa2ae9eaefe3ce3 SHA512 e8de97d6714ad626974e601a676b35a324b306a9f6033fd5cdd4cf5a5caf29cbc3238dca8cbf38e749866776f01aa58026159f53a4181f6637daf93181726ad2
 DIST isort-5.10.1.gh.tar.gz 728462 BLAKE2B 5b892b9849293e8730e6d89592bace62009a8589d185b4d3a5bafded605ccd46fd0f2986fbad5cf1d72321d030e3193a111ab7e6114c6b4a7a67696f546b3a14 SHA512 545c1844bacc1d2d9e87e60b03b30a846ee1ebbfe2a229c3e018a2e1cc6e9a04a3691f1b2e7ec8575806f2341bc1af15eb64904b4eabd786d6b9b289cea5ce2a
-EBUILD isort-5.10.0.ebuild 1351 BLAKE2B f5ea04c9dc2cbbd58fd8aa7d8208b3abce12c2296b4094c0215fd282ec006bbea0298a56cd8cd9f573ddfdf9ea277e188411d18093426c4fb20157b274204226 SHA512 439eba539f6c1020f8a1d8d8b4d62f81cc5e1619e8a5145606101e684df82f2d9070101dcd002fbca74b3532e9dc778ce95126911a84a5c97f28523bc8be3549
-EBUILD isort-5.10.1.ebuild 1365 BLAKE2B c2b0c6f5544affe049ca21e70a7c5718e737a02ded15fceb6081d036fc163ee7b7e8eb8d5350f90cf7839b98bd88d385faa43f72c4fa06509bd04483c24b1985 SHA512 8ed565fa990f1ccc15fde1da844ab5baf219201ddcb3616e019138ab958e7194ae3afb5ca8c5de446529662730cc9f3497c4ea5b65150fe650a32ca56ea8a1d2
+EBUILD isort-5.10.1.ebuild 1357 BLAKE2B 6b99e47a02c625033e571c941fbb0d303a531952677b5445539c8fcee7eb46e893c18b07838262b000cf6cb02410c66b529aa6ce7bfbdeabdcf92a2dcfc93256 SHA512 cc1e0888f3305de59d750e1219823fbf4ea386608019c8406cdbef9b88de8ad76f8e650bea6d3ec0c278cc18a4d8d6e2ab8e252828b8548c22600a1b6cab695c
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.10.0.ebuild b/dev-python/isort/isort-5.10.0.ebuild
deleted file mode 100644
index 70b2084a9486..000000000000
--- a/dev-python/isort/isort-5.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${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"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.10.1.ebuild b/dev-python/isort/isort-5.10.1.ebuild
index f823a07ca519..c45f67ae3d41 100644
--- a/dev-python/isort/isort-5.10.1.ebuild
+++ b/dev-python/isort/isort-5.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 71b789ef2384..0ded119571ef 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -3,9 +3,11 @@ DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4f
 DIST jc-1.17.4.tar.gz 3818285 BLAKE2B 0761e923916c61125967451f3b4806e3080184106c84e2c85f5de8b37d03106bde98d1b4d99f4d00308b7d935898e81cd5c7d112ed611dd4707074019becc968 SHA512 b5fc437be425d60c5e859ed9107be8a3190bc5e1eb157b01cd3b4cdcf27ccab51b6d0299f0c462b1e595d741bf905c11b25d49568159f04aa4443f51889027b6
 DIST jc-1.17.5.tar.gz 3851890 BLAKE2B 86b6c1b9786bbe30138cb7ba5171fd14682b420c3ff11716ab5d1bd4e4cc3d95067ca836c6217040799607933037b3cd6dc49e6395831140c10906e8be530685 SHA512 6e7207af158be41cf55ac7f9400c1a676075e85de0fecd63d9ddcffeed5d903a9619ac52b955d10e0db354f97e73fb9766b96e51c5648104907426000ecd1594
 DIST jc-1.17.6.tar.gz 3876556 BLAKE2B 97f84a6d1351102bc016e104c4f6d5aa8a7a47fa5ecbdad66df75253adee323259961d555d728b11090df9a05d74dfae0720655f8ea21864479b7e59f95dffa7 SHA512 a70dd9dc79a99c147aca8e647722820ba69f7668415eeea24be336e2c14728808938fa2d9e19122849ad0c1d89684f08d1ff0dc6361137eb9fbacba6546857ca
+DIST jc-1.17.7.tar.gz 3922848 BLAKE2B e075e5e2c7bd06d7c4310a2cb94b1ddd55014d9d8a920c100fcba01735188a7a9ed221224cc73e62efab02a9feb8d1f208a30964e41111063f1147299f098ce6 SHA512 be565377f3f776b387e4a8ff6bc07ac39c93bcf1a21e71cf96dd3474f459e07f050fd30b0b9281331a39c361155463b63c5a61f4271885126406029b5f9546a0
 EBUILD jc-1.16.0.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.3.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.4.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.5.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.6.ebuild 595 BLAKE2B 1bb002fc60911bb430e13ff166e84fffd0d0a22bfa2e08750a305f11a6ca8d57df1cbd009e91b23cbaeb068564ac57001ff613c0a63f643b5cb7fdfe934c3092 SHA512 76036c213cdee21957dc20dfc8a90b3cdee04b2458a5849ca05eac747949e90eb54a42a65a33081a2e467ad34e5c9c389f1a7be36fda28cd760267039baa82b3
+EBUILD jc-1.17.7.ebuild 595 BLAKE2B 1bb002fc60911bb430e13ff166e84fffd0d0a22bfa2e08750a305f11a6ca8d57df1cbd009e91b23cbaeb068564ac57001ff613c0a63f643b5cb7fdfe934c3092 SHA512 76036c213cdee21957dc20dfc8a90b3cdee04b2458a5849ca05eac747949e90eb54a42a65a33081a2e467ad34e5c9c389f1a7be36fda28cd760267039baa82b3
 MISC metadata.xml 391 BLAKE2B 7ae27439328a8823bbc95bbd4877e91d858db314b7ad708b10abec19d8bfa818a0dfa6821aee0825497353e071771bac4ddbeddb78749ca841d882c6a5f5493c SHA512 7d4760729571e0b5e055248a89dec389682cc4da6dfbd117d5a42ec016d4ea3c1f8fbd99118c3b62fd32195c6cae6aedab956678da48d61d6a0cee801a2ccf04
diff --git a/dev-python/jc/jc-1.17.7.ebuild b/dev-python/jc/jc-1.17.7.ebuild
new file mode 100644
index 000000000000..5d846f299830
--- /dev/null
+++ b/dev-python/jc/jc-1.17.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="https://github.com/kellyjonbrazil/jc"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index b594ab82d52b..5acc576fb9df 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,5 @@
 DIST jellyfish-0.8.9.tar.gz 137296 BLAKE2B 7f71f6e683021f3062c0ca529f3cd0488ab52cb9aea0d87766aa6b08d19d6b480f482a7385758ceba1a203247431d0362814f388f6a242f1ea928c32a385325f SHA512 d7d30573ebe552370a191eb755b4d27417e31eb66e7f57c2abb414e3d4075854a51f231c1d76001b7c0ff8b112a82dbe5e72be224425bd7a569a6b12455113d8
+DIST jellyfish-0.9.0.tar.gz 132588 BLAKE2B e7490da91d1a53b775ef145151c6dba5b16c938f59773e205b5cf01e1a262d36bb07a49d8c5d823fa722e2d244fc8af1bf9a603911411461a97b155cfdd0ce83 SHA512 1faa3ea03ec8b26085b5db34339f0aea061d3e4897f29235eca56995bea36ae8c152ae0ab0c67279dab4844d92d89293e2de2126c1d449407652b77da258e9f0
 EBUILD jellyfish-0.8.9.ebuild 691 BLAKE2B e7e83bcde2d00f7e2dcda70fc8bdc46e717a282a88b0596bebf325ae4f3670318c9bf982cf6e83bbc29b13e4cc46b7ddad78441c50fc1f8850763ef0ea229186 SHA512 46224db9ec41b1ced1ccd185fc029d0ea62690b5ebe3a1fe3400816e2b3b6c94982e1756f25be141bbb3cf8f333d7953b22439134282ef257245b78f66d6f17e
+EBUILD jellyfish-0.9.0.ebuild 693 BLAKE2B 8e64e35ee29b4f03d808b84212fc3fcdffbb11158fea0f1c46004071afa155bcf2d38cd1977c84e81aec3651385aed819cea48b1cddb927696053b90feeebb15 SHA512 330f1b62b0ce565cdefd53d5bd166a0999079d90dc1c4a0cce0aa75429668bbc03959aaca6ce2f30844d61d2a09d19a4114eaae0ac76ab1c062beb1811377cac
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-0.9.0.ebuild b/dev-python/jellyfish/jellyfish-0.9.0.ebuild
new file mode 100644
index 000000000000..f2dee7bcff82
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	cp -r testdata "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest lib/jellyfish/test.py
+}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index d923a3676680..84ba950c8794 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,5 @@
 DIST josepy-1.11.0.tar.gz 59198 BLAKE2B 862030d501f1c2316ef30800fda7dbf7dd36b9e49434605b3dc7c329d4ff2d405fc8483ae8a8a1346af60a1e80c018af4f0c17a3d5d00881da03c3eff561c81b SHA512 06aed9534434a94f7b922270221aaa85feb4ba9d836460303ecb7fea1c5679d557a6dad6d32bbd1a05ccc4855318fb56752ebea91498bb8c36884cf7b3d01859
+DIST josepy-1.12.0.tar.gz 59205 BLAKE2B 3ead71c2eb60a9bcc45615f85435f616bf6fe16c75d7e34ae5bd0f418b5b71b6ea03388198a371765e497aa29419efd9fbb2615d4546a5a8a9704acf7c9a70dd SHA512 7a5257d4a75feed65ff3abfd472e8f1c9cc81b62e27365d776d0f25e1efd94ae46374060ea463b9f04fe5e9577672bf2ab8dc8d6371cb8d01a4765921930e01b
 EBUILD josepy-1.11.0.ebuild 732 BLAKE2B 8c0b9745aa3f2b9b79d28fa378ddc857eeda13bd56167e6b63c712ecedd3cdcd60429a000dbf53236a7bd454ecfc33ebeddd07010e79077cf4e088c42cc625e2 SHA512 66ec04fedb64dbce8a1c6d1d184f017b25b63e7473c82baa0db92e49defde12266adc65f1b4cc3a004c3328a25f2d3fc74d0beed648b7c4e45f83c344f65bf16
+EBUILD josepy-1.12.0.ebuild 734 BLAKE2B 151efa0b064aebcaaf227a918774e091a48baca256ead20553f2bb74d3aaa3e54ff008a63b358c056455dc6f2edd05d2b18597557ba368d678f111366b8f531a SHA512 8ff57071ba62b0650b81febd545e0e84aff4d4c3275a8c45ce93f99d7e453b20f27b8e5eff5f225ac378888e866e930c37dd636eed0e2ac394b5bf529da325c8
 MISC metadata.xml 720 BLAKE2B bfe4668c6be6fcd57f41af649d31ebe5e4d96db8a0d851ca9c8365f42f1752e820f7dcd04da9ab974f8e9c99ab443bc7b516005ca510f4dac9390616b9135269 SHA512 be0b55bee1d51c91cda3893a2751ac9e8440b61c106daa9223ac6ecb3cd20e06b41dbad892e0e647e899a7a1eef1e985f29ea9a355a8c0d50524f599aec3cc88
diff --git a/dev-python/josepy/josepy-1.12.0.ebuild b/dev-python/josepy/josepy-1.12.0.ebuild
new file mode 100644
index 000000000000..b006df302d60
--- /dev/null
+++ b/dev-python/josepy/josepy-1.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index ff2052654151..b83b13c1dc9d 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,3 @@
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
-EBUILD js2py-0.71.ebuild 1121 BLAKE2B da75187fa5e359779515c34c5cb9838f5d7297fc171079e61bf442c9f3c2e57b0d1727856ef2a7555335f7e4ac22beae43bf18ff17e5a407472ef3ea32bc6061 SHA512 95aeada16c29663c2b5cd870bf6c8e9b458ae1a2a68d7abc5415fa88e5c0ed545923b9b83531f43158838c2ba37c2bf0c7c0bae57b35fd0c3b4a9c5fabc14c85
+EBUILD js2py-0.71.ebuild 1151 BLAKE2B a71cf420f012979dd545514a8ed8dccb966a47fe041346785cf37e702726c065ca748afcc65fcae2bd6c48607e65f6edc0e954c3878de34bcaab2864619e6bdb SHA512 c220f90a45a00d0691125c8c8071d9249094e9857f77ba3c45e6664caa34721aac6467bdb78a79c15d18373dfb3700fd8a79f744de913183672fcb6fa1352bad
 MISC metadata.xml 385 BLAKE2B 145afe58273b407d1ba1f3859de0d79a3bdd4307575d043a8b574a8bac26c2d577efec841c6c3a9424ca7970dac33517df48c0f287c18bf4e1cc5faa5125ba6e SHA512 7e48c836578bcbb4abf0d99f0f2b870ab15158f05d5c402e2d84c9f9de7d2c994127eba26897e406b6c7d77c962867d39a37bf7ce78ca09d39b78d64f9d8d68d
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
index 1d1df80c8ff2..11b0a6ea81c3 100644
--- a/dev-python/js2py/js2py-0.71.ebuild
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index a183fe3b8d59..ed224c37efcc 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
+DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
 EBUILD jsonpickle-2.0.0.ebuild 1811 BLAKE2B b1024f88b341f774815edb8b20359790300485925a33f219f3ef5bbea858d0dc14e1f2e562139b7ee3bbff86784c6b2e9fed16de9e4ab9db156ccc7e37e74e4c SHA512 72fa39810bf632bcad04bae31dffc2aa57d59c0d96623bafeba084b757442cc62eb840088312113268d65847e0cae997779ebc768040396d32162b97590ea8d3
+EBUILD jsonpickle-2.1.0.ebuild 1543 BLAKE2B 2e3b0041c15a1a7ab54e50365906cc044f4b2ca8f5fc5f6b172d39f4a1ad1dc8d66046367e488a94a80935d3843e629550315739cebeabcd7e4f5af7216d2fda SHA512 7eee78ba13c3c5622be8134af08bf766bd6517fc99da26350b2bd41915ea69e74bd08368dd8bcf53cb448d26922e7105bf7aadb8984a7d494fdc334557d6dc83
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
new file mode 100644
index 000000000000..49cc08ae65f5
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		dev-python/feedparser[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# unpackaged bson dependency
+		tests/bson_test.py
+		# broken when gmpy is installed
+		# https://github.com/jsonpickle/jsonpickle/issues/328
+		# https://github.com/jsonpickle/jsonpickle/issues/316
+		tests/ecdsa_test.py
+	)
+	epytest
+}
+
+pkg_postinst() {
+	# Unpackaged optional backends: yajl, demjson
+	optfeature "encoding numpy-based data" dev-python/numpy
+	optfeature "encoding pandas objects" dev-python/pandas
+	optfeature "fast JSON backend" dev-python/simplejson
+}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 76641e75aa15..978cf93ebe33 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -5,10 +5,12 @@ DIST jsonschema-4.3.0.tar.gz 311317 BLAKE2B 6ec3d2cf05923657e9875b5f51b9356a730a
 DIST jsonschema-4.3.1.tar.gz 311425 BLAKE2B e524675d64fece5f7687d62ed043ffb35e7627c6d1f213fde3e9c2f35b929fc56b998d39e84148fe24c507361114e047540fcf23606f4d77b2bdfc0454c6d529 SHA512 621093b8964ea94dadd23aab7c0bbbf5eb23ae615b569278886a4213ef7adc779fddcd75cfff87e243087f788fca180f4472cd3bafe8f2f8157e30c04b5f33e7
 DIST jsonschema-4.3.2.tar.gz 311576 BLAKE2B df6e656244b3ad963714e3a5e457971ad29455529b1e032e4ead2aa60a76ef332d31c871d6e9cc98b1a76d52e53b6586e6ef0b601d4b1b6fef8b39e2ea29acfa SHA512 a849282e6661ac28d3116754e87235a1970993bedeb4590d67605409ef875c5c26efe12a35bce7eeb624778a6d7770feda0356b4a0c05f6bc0364da9aefcaed6
 DIST jsonschema-4.3.3.tar.gz 311720 BLAKE2B 685e7712bdf87f0b6cfdc0ca6b094c90efd78acec72a6233661caddbba52e55ab78af83a24b14b9580a9eed6179302208b35ca836dce36459db65f0017805142 SHA512 f2a9e4d89a12d5d1c53666a9c95bc29adf2559438f0ab11f34abaf3f2525f525cd742ae54f2d3a732d98db92c4f45fc7611ffbc61f2ac1121377066a86db3bf9
+DIST jsonschema-4.4.0.tar.gz 313519 BLAKE2B 6339c4ac9e99b55e41c133861baacb6644e04d15e915d3199955512530c946973ca6d5348746688660ea7392d53102754dba3f3380fc8aa3a4ab284a9dcde684 SHA512 8e5c138f4debf7540e2cd131f3f208d1778927ac9036f5fa67bcf5db8c62fe1bb454c7818ee61acef64e856ea4b498ef6ab08be314a3c6b1e461e0bb44db41c7
 EBUILD jsonschema-3.2.0-r1.ebuild 1197 BLAKE2B 81734c4600491524c84424a641ce9294e00045416bb1357be63ef8a9bdc55f04a1935b942a5b75f760d4c16e7d4fd6c055a6e75776ccec1cf23b13f6e34112c5 SHA512 9d37f5d64ecb8edd50854dfd22b649da5370620f01278584531a4dd4441c32cda3d743eecfc0f4a51596de60ff63016d3b0440607d272bd84508ea7209033b08
 EBUILD jsonschema-4.2.1-r1.ebuild 1374 BLAKE2B 79a46ed09ef19f712631c752fcc2e6f95953effb60864ce89e17ecad03249c99f04af68b74cbb1be1990465d1cbefc25dca7fd221dbb820bd42ff6166347f2e4 SHA512 11fb8102ca5f3d5735a2b637c1138618ead1de35009b56a45ffa22a734ac1a684cba7014fc583f410b3deddb61d98fb040be74cf8695f975e21908e7682191c5
 EBUILD jsonschema-4.3.0.ebuild 1382 BLAKE2B 6f7cc3d74925d8a9df02d9c6e7cc99441b7076923352b6ebf7ddb0d26bae78d12c0066ef8f4560b057d7f09111430b39beb6f6e15ea9dee96f37645c027f70de SHA512 15da718d62469c50a295da62354dbe4fe92b72a50c78560d80ef90babdbc3ce510700262f8b169ad38b2ea3da3aa28ec0aa1dc84e0d69f960ed34ffdd347dedf
 EBUILD jsonschema-4.3.1.ebuild 1382 BLAKE2B 6f7cc3d74925d8a9df02d9c6e7cc99441b7076923352b6ebf7ddb0d26bae78d12c0066ef8f4560b057d7f09111430b39beb6f6e15ea9dee96f37645c027f70de SHA512 15da718d62469c50a295da62354dbe4fe92b72a50c78560d80ef90babdbc3ce510700262f8b169ad38b2ea3da3aa28ec0aa1dc84e0d69f960ed34ffdd347dedf
 EBUILD jsonschema-4.3.2.ebuild 1389 BLAKE2B 4602638b4fba8514be1a98e1a4f7d8a41803305313aa59d18e9f579be4e6910584db0cf9c1718e9903759a30264daf5244a99887d02ef74afe6f0b63c0f872bd SHA512 14dba51f7110ad65f1f0e1b4054b8163733bc6243d13c5a1d8710d9123461cfaab4d1a2bc0ab8cb82701f4b890a05a0ca362d5fe2517282d4fc70ac037d4cc5c
-EBUILD jsonschema-4.3.3.ebuild 1468 BLAKE2B 2ae73a98eb322bd0dd470c32647b58b6df9b30f68d8db87354008c9be022b00475e7ce469c3c81095e4592d55853c50ca1a0a288879e98919bf2f0b225688f30 SHA512 960152a82172667496875da58ffc0aae971e8485d5a961f3add3b91e5bca1f746e251b34ffb71067e9fa370726789535671b80b5c268a18d8bab50e4f35cde48
+EBUILD jsonschema-4.3.3.ebuild 1474 BLAKE2B e0bd00de88d146c4c23fd3167f5f1365b0c047d3d7eab7f63e2e502e856aa76007bc6effaa0f8edc6d877719ccd8c1067fe75bf2f0032a7d4cbfbda51babb629 SHA512 c555a7ce1fad0d717175f616d5a1efca78860d3b0986f48d87d9a2c7858646c5e51b9b3ed9e0ae3ace215fec120306213199622c25d99c417582a14fdbe4de1b
+EBUILD jsonschema-4.4.0.ebuild 1474 BLAKE2B e0bd00de88d146c4c23fd3167f5f1365b0c047d3d7eab7f63e2e502e856aa76007bc6effaa0f8edc6d877719ccd8c1067fe75bf2f0032a7d4cbfbda51babb629 SHA512 c555a7ce1fad0d717175f616d5a1efca78860d3b0986f48d87d9a2c7858646c5e51b9b3ed9e0ae3ace215fec120306213199622c25d99c417582a14fdbe4de1b
 MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
diff --git a/dev-python/jsonschema/jsonschema-4.3.3.ebuild b/dev-python/jsonschema/jsonschema-4.3.3.ebuild
index 319fe19b4d5e..03d1e2c86ba7 100644
--- a/dev-python/jsonschema/jsonschema-4.3.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.4.0.ebuild b/dev-python/jsonschema/jsonschema-4.4.0.ebuild
new file mode 100644
index 000000000000..03d1e2c86ba7
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 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="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+# formatter deps
+RDEPEND+="
+		dev-python/fqdn[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/isoduration[${PYTHON_USEDEP}]
+		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3987[${PYTHON_USEDEP}]
+		dev-python/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+)
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 5775906815af..0814c46e07c1 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -2,8 +2,12 @@ DIST jupyter_server-1.11.1.tar.gz 420035 BLAKE2B 0676b0e126752ebeaa45e2325c34fe7
 DIST jupyter_server-1.12.0.tar.gz 422318 BLAKE2B 9aa4843d02bfd918b0df13d94fc0058e6a6dee74f634dac359f7f6b4ca85e6cd4f91e8ddafb873647cd672284fb3eff087e05c3fcb6eff1621c7beb4b99030ee SHA512 28de049051852ae5d2bc10f2a0643a1441c2df3c229348e8d45e7031cc1c85a118124bc0b3bf7f101fd912ee25cd9cbf3e9b1b633fee20d70f43152e1e03e12c
 DIST jupyter_server-1.12.1.tar.gz 422410 BLAKE2B 611f17fe9804b0279c60ecc4fc1c23e6548643e4f7aa8e120580e167dc58a1f2d98ed7f07b90927bf07a71a89829d5701bd296a8f5ad3e954e4e8ee20c95bd5f SHA512 b199be8b0590c4bd14e995e6c9933f6da4d33e1796203cc157fd42b111db5ec6e860ef321d8311c30995d8aba6f1803dd0fec9148ae9a1cf427b7e38924f5357
 DIST jupyter_server-1.13.1.tar.gz 423717 BLAKE2B 9524e6648365e9c4158a8af4a4b277b4673ca320fc8e2c101ef2797ad89ebe8f93d25b1e74193ed88b06d151621a2ab9d9622cd06d67d5bea3a9ba96a95eb8e0 SHA512 e42a93930d16adb3952a0f98e3ae399a50881c32ef78205922511ea702dc24ffbeae30058fb1445897c4cf52873af0c03be16276398581a3eff52b58739ed2ba
+DIST jupyter_server-1.13.2.tar.gz 422777 BLAKE2B b263831ea27b5628c01f6c0897b213b8e97d60d234e6843817750eb41cf23cc27160841d3e65ccf210648571b8a0532c921bc9cd01ec56d78b4d1cad70cec91d SHA512 93a78a7b47c570e4bee80ef51fb0e35027caf414bfbd3c1bdf1f65d166d9756fade984070605f617912144b043c099c63812f7ba6b2be64c6524f5b8c6f24d7f
+DIST jupyter_server-1.13.3.tar.gz 423083 BLAKE2B 74bc31f0a853559a5368fc48ce9c9991147c76a13f4598cd0973ce27a4417a0320b157f83ce6f6c2450005f0d5668140175ee4d37d77160bb721ed27e9030372 SHA512 01c7a353b4890b4b9f33e4fec4d8ea141d60145d106cf21f9ba2372ee14e45433a0d83d78efa0ae7160f2fc22f7be0b4822992e9d135b3dfdc9bfb01a538f491
 EBUILD jupyter_server-1.11.1.ebuild 1878 BLAKE2B a9986b28f9888fb7a2f14c26985f1aab1765a3dbd6a77045a912256033ce7f407d3abd04241673a398459c4da41a5a6463680a76732009f50ab2ce7a41b55909 SHA512 62e47a7fddaa89fe5238fb24f7bd7145307fdbe7f7faecd76b78bf8368e936d99f51ffff2bc25a59d060e85257edb2a5e446d7310319a5a1f4fa5631423e4d10
 EBUILD jupyter_server-1.12.0.ebuild 1828 BLAKE2B d2da42c7b2241828d37c1a662f78607850a993e4ead018092ac01947bddb82488d1fcf3b39056452a4b1918fd35744cc4f27bd9779eb6c55d6eeee3b9a833522 SHA512 958c9993ec2b18424d573ee77aa8b104c9f3a9276f8609a8c31c1a93f9171c1d17e8a29a14ce25d8a3841c04b3283588176b0083bd6699bf32489fdd642303ff
 EBUILD jupyter_server-1.12.1.ebuild 1828 BLAKE2B d2da42c7b2241828d37c1a662f78607850a993e4ead018092ac01947bddb82488d1fcf3b39056452a4b1918fd35744cc4f27bd9779eb6c55d6eeee3b9a833522 SHA512 958c9993ec2b18424d573ee77aa8b104c9f3a9276f8609a8c31c1a93f9171c1d17e8a29a14ce25d8a3841c04b3283588176b0083bd6699bf32489fdd642303ff
 EBUILD jupyter_server-1.13.1.ebuild 1875 BLAKE2B e21c3d86493d15f8b7a0a49a802dcc0ea8197e2d173fd6e9a40e49beadafb8942eed006d56356ee58a74d3eb21ee3ff29102e0cd3c66fce41c9709d24168273d SHA512 782b0c5993fca4ccfb072e5438bf9ff950f7a1ee5c5b2d6c26393798c2b9bfdd821c7063bf3a01f01efd979a2c06578968c6b196a79381d0665c5f81e35a256e
+EBUILD jupyter_server-1.13.2.ebuild 1915 BLAKE2B 97ed422b50b34e8c21dd900eac74f0e20ba256a04f0dee836b20e24181bd8683d20545f13a8126e4f57307bbda36583cfecf63fdd3a964a5563a2266800c6a52 SHA512 9b353205be2ff8b0ff2d28177e329c4b6765930c5a165d3913a0306a7dc0bdcb959e46137a499aeff77b952dbd83ed167361b4d8836cb1ee15720911ca4520b0
+EBUILD jupyter_server-1.13.3.ebuild 1911 BLAKE2B ed17bdc61a52877f4709eebeeacf370b393d0d789ec76087b043ab8d75161fcce3872fe9c4d01eabc63e0fee2d176fbc461f5fe168adac32464ed53213b5b32b SHA512 7d0b8c06907315ad37862cac070f69b5a2ecb0f8a850f82cac137a86f022ebcc34e7ccdbfe8bb87332dadf077df2c7d4e16086b88b0f1e2006872612e794cdf1
 MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.2.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.2.ebuild
new file mode 100644
index 000000000000..9bc3c8cd77f9
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.13.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 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/packaging[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${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/jupyter_server/jupyter_server-1.13.3.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
new file mode 100644
index 000000000000..579da1dbc3ab
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 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-5[${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/packaging[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${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/kombu/Manifest b/dev-python/kombu/Manifest
index 305bf714ffb5..92cce5b7ad26 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,5 @@
 DIST kombu-5.2.1.tar.gz 420402 BLAKE2B 00ddc4418f31c2ddc9d154aed2d4c0cb8555cdf143d08c969f8e79aa7aa44f60c0bfe40d92a4dfa2f6c2a60b9e4f0590468e2016bd0a84e255cb57c570597904 SHA512 12fc3480651475ce8476424665ccf692a5bf1cbf4cd31c35eaa24419c316dc380357cfab0ca5d58ea275e870fa703d3ac258cb84f04886f9342e730aaaba6bf5
 DIST kombu-5.2.3.tar.gz 421943 BLAKE2B f5b8f27e2b1e79d7dc7c92716f90f260454508769e52c0d78ebe94dd0da150cdd6121cc2db30c80cb290c15fc7d94de37973ac180635498b53f171ac8d884c1d SHA512 0e882063e89a25d324ccdf8745f11e1ea51443cc9a80b215e7f31c85053411cf1d5f26b5ffcd52165a15827ee036300a69a8a192af60d975a495a5a0b5ce3954
 EBUILD kombu-5.2.1.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
-EBUILD kombu-5.2.3.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
+EBUILD kombu-5.2.3-r1.ebuild 2329 BLAKE2B c0a3f21efcfc1f50722b1d1261f09d238db2a7cd75dce84b4de736dcac040da41fb4478e2406beae5e76c2626bf7029300a33247fb46dcdd01916e6163b60039 SHA512 9f733d7ed97293bea40450ee0a4ac526d4795a7877c8065bd3e627a683bb8b85e9352be05e1db99fde84a678545d01a77d10e7b3992932c38126c79f0d901c0b
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.2.3.ebuild b/dev-python/kombu/kombu-5.2.3-r1.ebuild
index 22dee35e6bf5..73c428029253 100644
--- a/dev-python/kombu/kombu-5.2.3.ebuild
+++ b/dev-python/kombu/kombu-5.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/py-amqp-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-5.0.9[${PYTHON_USEDEP}]
 	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
 	dev-python/vine[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index eb2156ca973c..093f22c55529 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,3 +1,3 @@
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
-EBUILD lark-parser-0.11.3.ebuild 685 BLAKE2B 5414fa93c5dd088798b798dfa43ec583880d601e183fb0824770ba869ac12970dd0b1a06edd70b0dd82b6d686456569885b1692ebc14854bce10ff79e0197fc1 SHA512 9b31b026e8881c665aeddec2cd8f99050e2effbf0760796b68de3885ad2ef859907515fbde29b358ffcc99eb4f76ae1435886d3aee4b6ebd5946da02370328b2
+EBUILD lark-parser-0.11.3.ebuild 715 BLAKE2B 1cfeda37a2070dfc75039d656ec55c4972eaeee21fa9cd0e7ff43d3d54e2ad36ad526c676e83c2162691eddf0a79fc9e74f61f59564d76b89b851a786772e6c7 SHA512 eb39026d674bd0b63f08486c606d6cc2447a6893d781e0e856854c44263068d8c123c241d0273cc1a7c51bd84f7f0a8c9cc51c141f705c634fa4db087ab9932e
 MISC metadata.xml 635 BLAKE2B aa735f4a11cbb8154dad090bf52fae833c6233de80a95bf073e9097c1cebb83a004423da1a2a824b6cc07a32ac0dc016339229d3e0f3691094baf88c76eb3283 SHA512 e2a0faa9024d00d51ac7ea60cc57e75c0b59e45747777b6cd2182195f35eac0a9324b58a76d6ce3e776686f1f8b7a163cbb154551ebe0c55046372659e083a07
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
index 10e8711d33bb..76af5178daad 100644
--- a/dev-python/lark-parser/lark-parser-0.11.3.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index e80f8a215dbd..be520e10b6c9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
+DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.1.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-13.0.1_rc1.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.1_rc2.ebuild 837 BLAKE2B 4357710083de3fc49e554d240d40dfe0784e51c523e6c3df8426164fa014094c04a54f08e5b2848c591edea16a56dcb9de2acf361b15aacb1f1424c39b29456f SHA512 4900e1b2e4ab0817e0a5b0f6e077da2fbdb8ca4e71a422b5ba88266854217a26139e55a3463efbe87f206f2086821bb4d0bd395d88a7acfdd3ab3e27be24ba0c
 EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-13.0.1_rc2.ebuild b/dev-python/lit/lit-13.0.1_rc2.ebuild
new file mode 100644
index 000000000000..49771827209c
--- /dev/null
+++ b/dev-python/lit/lit-13.0.1_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/littleutils/Manifest b/dev-python/littleutils/Manifest
new file mode 100644
index 000000000000..f53fbec37ee7
--- /dev/null
+++ b/dev-python/littleutils/Manifest
@@ -0,0 +1,3 @@
+DIST littleutils-0.2.2.tar.gz 6579 BLAKE2B 80aec2c133e39eb0e18c948b15d475e60842689fd0e758c43511a8b014648d7c9e843182e2a87c0b3f9933f748340f2059653f0885cf416edbc5a60457c70629 SHA512 ce0b3af4ef5db634ce0dbb916deb767260f66418abbdca2b289386ecd4c2e44602cb95d568c70588ef9a40e3d700f33cbc5bcdbf859f5030795f79f11871a6ff
+EBUILD littleutils-0.2.2.ebuild 506 BLAKE2B 5deff15a6e3cf289ea293e9b43bf11b0fdc6af6ad824321d0821003aaee28d6358ec075ca63de0aefbd37597ec03d1d530207b8cb35af88958d37730f4e71388 SHA512 856db17ea459d5bd4639804db346e709b66a45a1bdcdf6105cd08f78f0ce1d822cf7978c45317bced5761b65431312f1a79e7d24c6bc8692e5bcc9ef7b36fd13
+MISC metadata.xml 377 BLAKE2B 938ada5473ba95941149e039ca17670238b722cb2ce2301ae55866a8163b82739b25820c9efae9fd1eb3ec8aa6efd51157b8d154438913fa33acc36ca1104483 SHA512 479327bb6b306521010cd65854f2d5cd7627b7887f51d7dbebcfffec5205a0a8d88ccf6c67cc2f9327bf6cf10b5053d218816bd48681bc8888cf0f53889cc703
diff --git a/dev-python/littleutils/littleutils-0.2.2.ebuild b/dev-python/littleutils/littleutils-0.2.2.ebuild
new file mode 100644
index 000000000000..5560c6e9839e
--- /dev/null
+++ b/dev-python/littleutils/littleutils-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small personal collection of Python utility functions"
+HOMEPAGE="https://github.com/alexmojaki/littleutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~riscv"
+
+python_test() {
+	"${EPYTHON}" -m doctest -v ${PN}/__init__.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/littleutils/metadata.xml b/dev-python/littleutils/metadata.xml
new file mode 100644
index 000000000000..87c130b98a60
--- /dev/null
+++ b/dev-python/littleutils/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">littleutils</remote-id>
+		<remote-id type="github">alexmojaki/littleutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 9a1030430707..2b38db514c69 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,6 +1,4 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
-DIST lxml-4.6.5.tar.gz 954972 BLAKE2B 79ddbc1556a70724f8def9621ecaf9fef45cf3437ce4ca721d54aeeecb28a88a283e14c5a6390fbda1cee023f2040a007dc6b8de769aabf36cba88a8cfc16cb2 SHA512 6354c1ef0c2e371142107b4bc9085dbde27378d819f2773656e4a6c017c34d6ce1501df42b1ccd524d10ed75032f8a3c8233e38e6908f521dcef5ace091480fc
 DIST lxml-4.7.1.tar.gz 958025 BLAKE2B d48a7aec9537235207fa387af7c49fe055ffa8e03bcea3e59807dfe35c72f1b1e01586aded550b53d5b7fac733baa1d47fbeea8fba937844de6dab10e02a3832 SHA512 33c88ff07152437a09268f3348ada97549686b5a59e2135631991ecc79ad02f35c20aae5d8363d2795bf058b05ef70fa6fbb56b081308cd89b073e176f4872d9
-EBUILD lxml-4.6.5.ebuild 2643 BLAKE2B 24e1a7f28900af55bdd714d3286e1d0c61e3e49a2ebcefce0cb7c0e654e0a063f19f38311441998b5570e4ddb72510dbd514e7057c437577752d85b2c4dedf41 SHA512 33328f6954ce149e7daed862dafe774915e5388e8c7e833fb7695b7512ce12167ca256ab876bce687e5387330c3b3b3e7918451db5aa678419321b8f44a8f2f3
-EBUILD lxml-4.7.1.ebuild 2651 BLAKE2B 9dc358eeb59595fc850c267abb6edeab9d85b68224ae56e82f58ea17a5665fb8bf57e9243bbf2e0914149b5b03b51d2ccaeb8ec1f1c27c95e03855a8a5c4d3ab SHA512 e409480ff66bb1173bd96b1148c3b4d50c3c88db689e3eac098e7159ac922e6d01c018e4dc437a7d73c9eafe9d8b96ad7660187905a8b60d8441ac428a93dfcc
+EBUILD lxml-4.7.1.ebuild 2643 BLAKE2B 0eba2e12108dc7b1debf04912682524684a35fde4458e196cccc06cd42c914a1904d802c25468f91425d1fb566ee8a62b5afb7153e122b7ec59aedaa1e697699 SHA512 72d3f6ff99ec404f2396b60083c3ea883fa00b4c01380488fb8ee7aa21714728b2c9e5b83db58f625ace4bc10d39cd261730e962b95ab7071612d61098757e8d
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.6.5.ebuild b/dev-python/lxml/lxml-4.6.5.ebuild
deleted file mode 100644
index 47c2e6f13d96..000000000000
--- a/dev-python/lxml/lxml-4.6.5.ebuild
+++ /dev/null
@@ -1,97 +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 toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.7.1.ebuild b/dev-python/lxml/lxml-4.7.1.ebuild
index 5669cfb3cd0a..8ddbda82c77d 100644
--- a/dev-python/lxml/lxml-4.7.1.ebuild
+++ b/dev-python/lxml/lxml-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 80fe2ed6c6ed..c9a355c4e227 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,7 +1,5 @@
-DIST memory_profiler-0.58.0.gh.tar.gz 140692 BLAKE2B 2f3917d833dfcc722b61871c7e704e869527a389b10a81b473989b8455630f5defa5f5b21a172708070b89468c7dd66682cd3b9c0bf435e9be49651b69b50137 SHA512 5c02933acffc05f42d2ae98a069d36563e1d26515d439d94ad3903960dd06cd378faae3000b26c022770e71e83db6f770ceaf63cabb92f4159bda0ff9cc4e849
 DIST memory_profiler-0.59.gh.tar.gz 142586 BLAKE2B b9c8cffbd03f980937d30626facf431e6effd9a86a21fbe629f4238a2f78f2d65242637105ad3a07b4158a6335a541701bba657941bb23c9da0f49a1113402ee SHA512 f70ad8f871bd5068e2817049231abee7e535cb352f0444dcb0d9d072b9f4dda944e85ec7854855307a9748257da80f53dd50fe17fefbd73045dce1306f51f88d
 DIST memory_profiler-0.60.gh.tar.gz 142585 BLAKE2B aa7fd9e547eecadc184d4da5830c582a9a9ab9565f3dc9c763caaa7e75698ed6b499d2555e4a93b39d2f80f85fad025b84043e0812cb25dd1511f4ebf8da5a85 SHA512 407e44a410cdb4c7c8cc5ff40198c28012f8b0c6bba88d2d1612681eb621a1b802ef137be62fc64ca9e3c362ca3814433bc12169d7c3827bf97293c5bbb8bfbc
-EBUILD memory_profiler-0.58.0.ebuild 1751 BLAKE2B edb594384f4f40a11e7feb47545639ab76f9381c8bcc16275e9b5f37c944d6d62cf294e50dda49846e7cebb4971f2696b62b541f3e5e86f0c3e1a52b19c8d8f9 SHA512 13db72b90c2e48c8e9282d47b9535a8d9fdd1257b131514c161a81568396229af68f3b55881e7a20b562ae085b942b87c8605e0de96adce93cb0c54d99d2a11f
-EBUILD memory_profiler-0.59.ebuild 1790 BLAKE2B 7a518d001564b1f62e035fa6b1a4821d0b33afb13eac9e58b58f76d40d8f1195de7a9a4e8afee3c486cbe8f2896d2782dada32d097ed70b59865e1e56ef0b832 SHA512 6970839762eb5d606f826cd185a88f5ed318833df375c06dcfc0948ed127ce01ab9242b93c5365b62e6960661668c6de70a871608ac453740e2b46b20b9deb08
+EBUILD memory_profiler-0.59.ebuild 1788 BLAKE2B c880040bb2fd76f91e449527770a8b9c669e6383fde69b481e9613046d27070aae7e1b6c7079d5f0c77a077c090516a87e2c1878834832a818f9a07c3bc5323b SHA512 43f02d01b7a2aaf22620d1bb1f17cf2c3c562b1166b111365d9b81c7d4b82f0e67b674bc5eed26663a09a3584a485d17740d245a63fcc95b0d063383ce280c36
 EBUILD memory_profiler-0.60.ebuild 1790 BLAKE2B 7a518d001564b1f62e035fa6b1a4821d0b33afb13eac9e58b58f76d40d8f1195de7a9a4e8afee3c486cbe8f2896d2782dada32d097ed70b59865e1e56ef0b832 SHA512 6970839762eb5d606f826cd185a88f5ed318833df375c06dcfc0948ed127ce01ab9242b93c5365b62e6960661668c6de70a871608ac453740e2b46b20b9deb08
 MISC metadata.xml 548 BLAKE2B 744d692e6a44ddb587b1ae69c5f6ff48fa0f02b8acadcaee34242f810d1404fc6b3c4493a257a70b3af21850e08a17a8ee3758ae9e8af1937b645a2968b5d4c0 SHA512 b7872bfa470fb34a4d60bb9ee976d5a62122b0b701635e305988660952e695f52d9d4f0227518dc9fb337b4a3f6a95dc11b5298f1787ddd100b3f46c34f812fe
diff --git a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
deleted file mode 100644
index fb5f53ccb4a9..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.58.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/pythonprofilers/memory_profiler"
-SRC_URI="
-	https://github.com/pythonprofilers/memory_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.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.59.ebuild b/dev-python/memory_profiler/memory_profiler-0.59.ebuild
index afc8e46ebfb4..e95aa5f7afbe 100644
--- a/dev-python/memory_profiler/memory_profiler-0.59.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/mistune/Manifest b/dev-python/mistune/Manifest
index 05cfc2faf71a..9a66c81afbfb 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,7 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
 DIST mistune-2.0.1.tar.gz 75657 BLAKE2B 399ad8902aeb88e8e3645f5200bbfea5011157d3251af33188d2a0298c46dfb5f8e70cd951b216762942a84d29df1bc12e0750bc928f2e0c8e96034246438f53 SHA512 f6a0e08fecfeaad7d4eb0cae155bdd5ab67c66ae15a3a067c9f6cbf47a229cb9b540d49ecdb5c2fa98c8344863e1249ef86f84bc4d966fe473ade18a266c1ec6
+DIST mistune-2.0.2.tar.gz 75778 BLAKE2B 6ed690a70c54a0a06f154d42151d7d857f0e70cfe32529d7176726bd1e2f7a4fb9bf66be476af139c338c9f8b0d0de6541727e18718f6537d3a07771f34441f8 SHA512 8250243bf6cd2496ca1309e1fb062507f37c197817a4c5ec1a8e3c5865b6cc58866b88158b3a2e2967ad53b1f1a668a2e4282c30179ce126242c528000215992
 EBUILD mistune-0.8.4-r1.ebuild 537 BLAKE2B 8215da3fb65ba6b4fb9e8068b87f5298e998895ccc9e2af1355fed21f4f9af6da11883dfca2fdc4925563fee272b26489c582074394f41ffb6a3ed6731e5ef34 SHA512 ba25b829d4b24647d6a7890d425a77abc6fe35fc2c8d5124de769444260fec78bba7dd6839b48bee989071f2194b1374997f8bc704611cb293bbfbeff2fc7431
 EBUILD mistune-2.0.1.ebuild 578 BLAKE2B 4301d37b66a5b118cc7be39a0520c01e72307a27edbe6e8873cfe013ea15856f5b8de776a6636b82bb5bdf92c11ae0548ed8d1d1c078d7c86cfb834bbf3ec45b SHA512 6810a93b3a8646d2ae2456149d329b7655c559d216a67f36d4ca6529e60f563345cebee05edde9402fb2a46d8a5d0e123639270b8f6f04387a98d89ae17e0fdf
+EBUILD mistune-2.0.2.ebuild 586 BLAKE2B 283901d39b067e187c753ace1bace8750b3cd7baceb374853a59b1bbfb37adbf1dff908c3cb9ed87ea901118fb00da940c2084999bea34cda6f66e743027879c SHA512 1bb86ab3f86c6937c69dbf2dbd08c21e979d99d286ec886dce51c5c4747a1306b23e70d3e1ccd0a33e828680e635f7f8ce04454fdd1027031e8eba2bb04b8e83
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-2.0.2.ebuild b/dev-python/mistune/mistune-2.0.2.ebuild
new file mode 100644
index 000000000000..12109ffa7221
--- /dev/null
+++ b/dev-python/mistune/mistune-2.0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 344a02a6127c..dc1e89460438 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,13 +1,9 @@
-DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5e2082fa7ec9d3f2eb07e2ee3ceb245ae1dbe81d461f59529fe2b821042a254b6d69a0838f01f470387bccca4a9a85179a3 SHA512 052245d69e7d19bdfa4db7e2d1d880cf49bd850ea79371cd222ecaab8964840e5b2b09bf4646f1a30f56b0161be6f3f163bcc81291ccbb0e6f47f7c24e741ab8
-DIST mkdocs-material-7.3.6.tar.gz 7391997 BLAKE2B 9ac47337287b724aa30da5c95b5fb54475fe96ac9c1b089f647430699b5393ea8859786214f47a4b32ed84bd509824d94cb876c1e3e40a3935e6669d24077490 SHA512 c29f30971e1e692dfca09408af3eda3b10211dba44f34aae42a61148008a0a3a020579c86bac8fc413a7938e866a9cf4630eab7a91a6e9a734a9ed52e327bceb
-DIST mkdocs-material-8.0.5.tar.gz 7523273 BLAKE2B 93b1f545e90784635a0f9b4c01a697310b18421540fd9563c5307806268af2e48e37c193979b8d86823bd5d875b1cc16d912aab52d108b12d6a796b08f8e7932 SHA512 6508b740ccc4ff7bd30c207cbe437d62c02140566cec047fdf0d98a23894825199b0928764f3fa1fe1314e9e95beaeff817d900dc5bf3d4b42b9b0e677eb3a47
 DIST mkdocs-material-8.1.0.tar.gz 7526249 BLAKE2B 6938ae4ff23ba450520f84630759ce408f1c11d75200281f6c454aa90d6af659d49c0d8f345a87b969e0169d4851a2510906b9e7243a0a93efbc99025dc9792a SHA512 2493edefbdbca0a3708950b62178c66ceefb5fb1868cafcb087bf727c404e3955abb2d45b14e944b4720b532e3cd049fbcae3e0d9b8f36295dede9dd2bdb3717
 DIST mkdocs-material-8.1.3.tar.gz 7654739 BLAKE2B 9b381e99ee2911d9d54a64b40538fb15bf568ba92171d6d42e1679143cf5729c5fabdb24de4d97509bdbdc05e5e282e310c03dc12c973449c935c77ea277dcc9 SHA512 65527fa1b5cd1f3a31cbc84d3bf52aa49844549dde042534f0d24e7bcf175f72ba1b21bda87d1fb4e25307b51f995d8de492b7c5c909f84d075e2b50fe97fc05
 DIST mkdocs-material-8.1.4.tar.gz 7892710 BLAKE2B 3e986279bc93be4599568b431818313e01fe036420a1654a2883f5d855818a7fde64ef04bdf81a9688873a66ecb1e9692147e18a56292071ffbad93157ff06ac SHA512 9298400feb21d9d0027dc22f363f8bdff160b00623ebf09886add90359f739b69c3ee79c3bfc9a4dc18eb2d4cdb5544897aae6a807b0a379cca0dc9df82d16fc
-EBUILD mkdocs-material-7.3.4.ebuild 870 BLAKE2B ea8bdcda6766c2b1c01524366edf07b4ee11a8bf9d84f2d2aa17f27a703eb42213f836f373982dddf1c69a7240618e890af64c0ddd7597f85b1367fe47b6f6e1 SHA512 adad58d4567e0c89747160cf5f128877970b693a604758f44bf7f97b116ba4f4fbebad5400f5998c317c79c93404cf9aed125be612a285e5bd7c078a086d5834
-EBUILD mkdocs-material-7.3.6.ebuild 871 BLAKE2B 357bed8bca5e5f8cad6f4cf124f5591716698a33c07d866486c1bc4630509f24275faac031142f43a2c4d0f23ea4df66d0bfa725741c1da233d5223e92d7992d SHA512 1da177d06fd1f3f51834ab59d2e7acd5f29076c848d44c773647d9552ed493d3d02460bfaa11755e14d66eaf954adababbfb46cfd8dc488de4518abc906ae81e
-EBUILD mkdocs-material-8.0.5.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
-EBUILD mkdocs-material-8.1.0.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
+DIST mkdocs-material-8.1.7.tar.gz 7939617 BLAKE2B 67727822e492dba780539b27290e41fe78b48b47e1c55b0d9b0a0d820685b096ac636b8d2a9ab54a7785390689087a651d833d2f609fbdb4d2ff3702896a1b90 SHA512 2580d046960e76253d0312b677538914fe62f1e58d894d956a3a6932e0bad185a24447fde011f4982b128744429e65bf4383562a62c0ea2601790f22e84f20d1
+EBUILD mkdocs-material-8.1.0.ebuild 871 BLAKE2B 0d149c6c59b7634e671885d19c74b03eed141d353836db0af9fb57a68fd80e62767f528c4322512195477c079bd8fb4d2972c6a18d4d0f1a3871b6908e722f0f SHA512 574299bbba77139a6e64c253249e81defc3b4b1ea46d2f756f7029d459b678c95dbd8fa255577170b6feb98bd00b92d802f9cbed73aac3788165c591e3a563eb
 EBUILD mkdocs-material-8.1.3.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
 EBUILD mkdocs-material-8.1.4.ebuild 873 BLAKE2B 6a520501d9b0ab0abc39c973e632cc4ede50e3cf640d7a31b46eca02b307cc1f5567785029389589562cac70ae2e4ba99fb62ef4ad1a8f17befc310232571c5b SHA512 8313b130b122ea4961a9d0b7d989300c8d0b279fc0cc4190b7ff394ea0a65733dac221128fe10549b31d72927bae3348451b402a02c8e186b8d1fe933bd01786
+EBUILD mkdocs-material-8.1.7.ebuild 873 BLAKE2B 6a520501d9b0ab0abc39c973e632cc4ede50e3cf640d7a31b46eca02b307cc1f5567785029389589562cac70ae2e4ba99fb62ef4ad1a8f17befc310232571c5b SHA512 8313b130b122ea4961a9d0b7d989300c8d0b279fc0cc4190b7ff394ea0a65733dac221128fe10549b31d72927bae3348451b402a02c8e186b8d1fe933bd01786
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
deleted file mode 100644
index 79aa6019f64d..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild
deleted file mode 100644
index 11ef0592d9bf..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.3.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} )
-
-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 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
index 19ab08b7c4f0..c546fa5f2ece 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.7.ebuild
index 19ab08b7c4f0..c649d1b71d89 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index bc40b9667572..9319e6ff6ea1 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -7,13 +7,17 @@ DIST moto-2.2.17.tar.gz 2013217 BLAKE2B 6fe6dd23e96fe8ba210fc9bbb400ced7c27aa662
 DIST moto-2.2.18.tar.gz 2077837 BLAKE2B acb4c428e6cc00711e186a209d61e00366954dabf9ad750f7d639d822daaf7e35399ab8a317fa32756113d41bff27d236be79b7c99b4f2ddbd8fb415144cd985 SHA512 5d416b59b9a3bd97b98ea5196bcfc25accb2bed83e9782cda48acf8ec52a9e304e9fe5edfdd5dda60376df06b7a9c0709acec08d058a99127cc34ef2905ba5b3
 DIST moto-2.2.19.tar.gz 2083677 BLAKE2B e8471c4acccd213a80b4636a1da2a404f1ea2c10750a80059999212f8ab721ab900c08e29ebb069c271063bf2b67dd837fd311ff25f304956a8551bbc7eb936e SHA512 cd549fad44820900efc28e8d6834c588dac57c44a09214f6f5e51894207e9b1f88300975d60390c14252be29d66696dbe13d484ede87c23c6d16f4c39ba7f2a2
 DIST moto-2.2.20.tar.gz 2077649 BLAKE2B 595d9536b21ba442fcf0b9b40e61cc9d3105e220661f67d842cd5e9660ed4ff561e0ea742083e167ef11312b762b204e82381550845a06d6b5a694793adc0c67 SHA512 ac853989ec4822a72139ed62f7bc8b01a91ef2a424b4e622fd0cc6828b3dd21d3a433ba8d50cda5e5b4c03859653d71f9431b7ce2416255be3cf129b1a02e200
+DIST moto-2.3.1.tar.gz 2088810 BLAKE2B 9e1b50bec4e0a7a0bb7496fe90e8caf0b80900e35120aae931e99e0e251bd4905c7bfed670a78d230abd987d3400f93fbbaf0bcdece9d6b5e35c4b63916e72c3 SHA512 122311e549b034b0a45a1cbfbc4fd96e0c846272d460c72279a7991b967720e1732662e623acf6a5f1cbaf874f5755bcfa9dfbf8a0ac31da780de44d42e6f1be
+DIST moto-2.3.2.tar.gz 2095242 BLAKE2B 17b98e09c410e48cac60ca494d6d0a6264657e8df994c0395be15b072dbc998a59b25d017b2897cd2e05429959baa427358b4f11cc3b7a517f4f4ddb88d2f2c5 SHA512 f58b9cf3f0a88964776fc92e4982408f0826a2d0149cc84cc21752030d8c9d3de3ea1a07cb529ea4d77b0d2a5ac5222a6ec24f6b88e9d7d70cc82257b883bd10
 EBUILD moto-2.0.5-r1.ebuild 2202 BLAKE2B 78dc6466511968204fcca5e6df49b3e696e5e6f143617f4d4544c36281d3b87e04204b7a4074358425b38f0630b0f274eda050064cad953573f2f2318efbbcc5 SHA512 f7d083fe0307870a7da48acf4df2d917db7cb11aceb7a19da62673d1aee3b53530535e74d30b3775fad0807b47beb184eeb83e77474491b936bc99b007384b48
 EBUILD moto-2.2.12.ebuild 3222 BLAKE2B e43390f59fd770df538578a675648ef7c2f38f4c343ab5ce68f9cac9996b44f6b96dc67ca54b92684e13e7e9ce8074bd9f50b01b31c44573ee17b563b6cfa289 SHA512 3544b1b804eff94fb55eb92584ee2dcfa6a3ba4b0976757b55c10ab4c39bec5ec948121668628fb741682ed33e3a85b145c6063c339f649837589d9678280c68
 EBUILD moto-2.2.14.ebuild 3445 BLAKE2B 5dafb708c4b79813feba51c57e4d196aea5e72eb8d2a59e277c97f124b9b9cb841ba9d29c8691405c1c1542bbfe1c39086628f06a63a4074caa170031769775a SHA512 c9583039d6c6acfaa643f2684b0b81cfb7647fe404c3aa2bedf6d9e22572588716560abab2f81065ab553e51318dd45cc31990934a4c89af661bdc0bf3df3b2c
 EBUILD moto-2.2.15.ebuild 3445 BLAKE2B 5dafb708c4b79813feba51c57e4d196aea5e72eb8d2a59e277c97f124b9b9cb841ba9d29c8691405c1c1542bbfe1c39086628f06a63a4074caa170031769775a SHA512 c9583039d6c6acfaa643f2684b0b81cfb7647fe404c3aa2bedf6d9e22572588716560abab2f81065ab553e51318dd45cc31990934a4c89af661bdc0bf3df3b2c
 EBUILD moto-2.2.16.ebuild 3445 BLAKE2B 5dafb708c4b79813feba51c57e4d196aea5e72eb8d2a59e277c97f124b9b9cb841ba9d29c8691405c1c1542bbfe1c39086628f06a63a4074caa170031769775a SHA512 c9583039d6c6acfaa643f2684b0b81cfb7647fe404c3aa2bedf6d9e22572588716560abab2f81065ab553e51318dd45cc31990934a4c89af661bdc0bf3df3b2c
 EBUILD moto-2.2.17.ebuild 3451 BLAKE2B c603ccd2a24b8705ac1fa1a192836d34465293155f8ab872e7010e0edb87b77d74ff587e41c39c7cd4596fe6adaaabd7595692f6ea565965bd42209910457a3e SHA512 4d25af169282261b8001633a25be9bb21c8ea66e3275c89789d25e890aca3d30b6a613eb6ea7cd521ea22b52a5c2aac861650e5f7caa01ea03080583acf68f39
-EBUILD moto-2.2.18.ebuild 3450 BLAKE2B 764f3dda54f86537db870536cbecd3d10aa850de1119b8f8992d2fd9ea7396e335f35387e40de6aea68b8d2a679cfcdb13e3cdc96160586556af210bf064d95a SHA512 5332cc9d7d0b2355df8e294e7d571aceb7cc6e8af03769336ad39f95f376c4a5d4d3261be2646caf2909095da40b8b6afee2a8305432189115c390caed68bccf
+EBUILD moto-2.2.18.ebuild 3449 BLAKE2B d49f99ddad8d51e30f254a760d5069560ee8b69db8aa936d8463e80e60f57e5fad8f39af8917ef97c90b3daae88bcdeba5136ac11497e659dc631db029d2d76b SHA512 12a907550c34f060b5c44716dc410c8bfb3f19ed42e24a9dc67750bc943133815a84826f9c81ba2df5df77c0b0d4d876ec65e2fc4b41ddec00c98e68a3ee58ac
 EBUILD moto-2.2.19.ebuild 3432 BLAKE2B 725ac4d31314e1ce4c4ca8ae3b8e5eedc46e50723ba97dd258386a93852366edd3488a5e5b627f7938d313f558b713a1832691a89c1c8a71ba0bc67d4b92b6a5 SHA512 b1b61412407c38fe3b4bee0797815ed71c16270b6c9b1eaf985ceb8b4a0d132b76cb9e9caeeaa1c5da959ae0f5b9c8a9b1f72ef4467ded6c2c35073a40b5498f
 EBUILD moto-2.2.20.ebuild 3432 BLAKE2B 725ac4d31314e1ce4c4ca8ae3b8e5eedc46e50723ba97dd258386a93852366edd3488a5e5b627f7938d313f558b713a1832691a89c1c8a71ba0bc67d4b92b6a5 SHA512 b1b61412407c38fe3b4bee0797815ed71c16270b6c9b1eaf985ceb8b4a0d132b76cb9e9caeeaa1c5da959ae0f5b9c8a9b1f72ef4467ded6c2c35073a40b5498f
+EBUILD moto-2.3.1.ebuild 3432 BLAKE2B e4217daddfd0cf8933bec33da47eb8d5f87a2e6e231c71f2481c5926e26de9aefeb2e749734f6bfc773cdd2e3440f57d5126f6fd8a38d64cedd3b5521622b4d6 SHA512 4e41c06bd9413d74593a7a2769be318ccf3af96b6d1460e3fb0bbcbba41e64ee7106afa1ebb525cde967b2826760ee96324a69f4e1f84e2c22694bd220a7c3ff
+EBUILD moto-2.3.2.ebuild 3543 BLAKE2B ae6cda764e663f1482cc5b60da1df1e362b752184983656bda8677eff815465915425660ec82b9961b88939318a6436de808ff55007a649d792a4257e1d42a50 SHA512 fc00e88c2151afcdddc1cdbfb4b1194dad26db2f724fe2e12abadcee4e45f259144da3bd3291807ec2581bbea2a07aac977e995f87e3d4d28d4053f7f7f5bcae
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-2.2.18.ebuild b/dev-python/moto/moto-2.2.18.ebuild
index 69c10257be0c..63992b93be1a 100644
--- a/dev-python/moto/moto-2.2.18.ebuild
+++ b/dev-python/moto/moto-2.2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.3.1.ebuild b/dev-python/moto/moto-2.3.1.ebuild
new file mode 100644
index 000000000000..8b35ace42903
--- /dev/null
+++ b/dev-python/moto/moto-2.3.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-2.3.2.ebuild b/dev-python/moto/moto-2.3.2.ebuild
new file mode 100644
index 000000000000..cdc02be77366
--- /dev/null
+++ b/dev-python/moto/moto-2.3.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index e4ddd3d773a9..eacdfe41b652 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,5 +1,7 @@
 AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7ffad5ccb344b0b87f444461132919f26b42b861fd86ed4b785b2de176b726c6ac14d5f69aeb4cdac0b6e182cceacb265b SHA512 1193779d8fc0a26845d9435a55b6fea808785f6d2299c3b0fe6ba16c7c8b846d35041ebabe7f51f67aacbd3d1e4a1d334a36ac2b457941b2467cc0ca8a4b30f3
 AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9
 DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
+DIST mpi4py-3.1.3.tar.gz 2461368 BLAKE2B 3ff7f6519a1ee96249567b1c65401fd1242c433bbb0a55c9d0a9b07f167ec44c71aefc24ac5fb354ceeb591dbfe97a4306f8455bb00559789367e91b78d80c16 SHA512 7a15224692016253120e8e88be1f7201e6f4548c1fb5ed15f04f416000b0d9e259dd8e80c0e237b1a960143e52b4a840d2a541359833387ac12868af1c059cea
 EBUILD mpi4py-3.0.3.ebuild 1571 BLAKE2B 5e3e3424a50fc58c6891776ac221341ba22172a44e58a3e57c5a2ed0eb7eefbbc5c93984aa7a9521703dc5db55b74370cf43f9c4d50ca5246125a2ca9c62570a SHA512 1b4117487d63c2845b88ae301de9ae0ff2bbc5a9bbc7eb636216278cccb8040da13b8509f703d5cbe769c24b0cd720710538da79f29544f8f103fd81c9571e2e
-MISC metadata.xml 1041 BLAKE2B 6f06ebdcd00df3413d6e2c7f1185cdaa18f3d9074e1b1492a5d10bbce2b71eee2a93fb5c65cd6fefd645c950195c63edf830a5182be5d07f8cb297b9e0ee38ce SHA512 377aea52bea6b6d98cd4bf6d10cb837daad2945a882ce6b2bcac9a84765a2cdf1e08f062e869fe0f0bb1c0b8b7d1fc3b9c039b48db99b69cad161d5224386d65
+EBUILD mpi4py-3.1.3.ebuild 1598 BLAKE2B 79d4f3ccff1fbc237b2e01395b1d4e63915917033d537c7a856538157fe4c05f1c718857df2ff39600e9e72de15dc5b8a6c3ef2fbbd2fceef8d8dec304b78125 SHA512 712a6b07d44aa59b15802492322bb34a9bdcfdeb124d935e0ce00e569589ce3fb30a6e196406805a635de8cb671df66cee8b73f62208bd82a03ded8ed3117d9c
+MISC metadata.xml 1229 BLAKE2B 1634ae0e35f9b9362e9b4eaf21443a1fe6c7fc54ec6e4cc5914695533a3563586371cde7b48e34dfcdad6dc5a89f49bec705e434e68353e93e122c272fa163f3 SHA512 d0892adce1d1b5253185a9b539d2dca2a0d4cc96ce7e6e5cfb0507a90fdc88d92d7c74fc6fc93e951872bcfad73d4071b403b7e4269081c55b18789f09b35226
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index c9ea17d57be9..0dd4ceca2177 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>alex.fan.q@gmail.com</email>
+    <name>Alex Fan</name>
+  </maintainer>
+    <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">MPI for Python (mpi4py) provides bindings of the Message Passing
   Interface (MPI) standard for the Python programming language,
   allowing any Python program to exploit multiple processors.
@@ -14,8 +21,7 @@
   arrays, builtin bytes/string/array objects).
   </longdescription>
   <upstream>
-    <remote-id type="google-code">mpi4py</remote-id>
-    <remote-id type="bitbucket">mpi4py</remote-id>
+    <remote-id type="github">mpi4py/mpi4py</remote-id>
     <remote-id type="pypi">mpi4py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/mpi4py/mpi4py-3.1.3.ebuild b/dev-python/mpi4py/mpi4py-3.1.3.ebuild
new file mode 100644
index 000000000000..82dad43fd50f
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-3.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://github.com/mpi4py/mpi4py https://pypi.org/project/mpi4py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/mpi
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/mpi[romio]
+	)
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# not needed on install
+	rm -vr docs/source || die
+	rm test/test_pickle.py || die # disabled by Gentoo-bug #659348
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null || die
+	# spawn is not stable in OpenMPI 4
+	# https://github.com/jsquyres/ompi/pull/4#issuecomment-806897758
+	# oob_tcp_if_include lo is needed to allow test in systemd-nspawn container
+	mpiexec --use-hwthread-cpus --mca btl tcp,self --mca oob_tcp_if_include lo \
+		-n 1 "${PYTHON}" -B ./test/runtests.py -v \
+		--exclude="test_msgspec" --exclude="test_spawn" ||
+		die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local DOCS=( demo )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 199f0669a91e..3b5a2fe83648 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,7 +1,5 @@
-DIST natsort-7.2.0.tar.gz 144338 BLAKE2B cba2a547813b56c3f42a6d9526be59ebda0e12f964ce72e166dec825ceab923b06f7be768e4071f9380e7b8c2a2d24a5b9af0ad0752e48655046bca44fd03ab9 SHA512 9490d4f3f304834a82f91fc7f215a9212e5e4a2c78e2d0943d886cff2f50c581171bd27edc8ceec23981ebaf8d13d3be2bf1954439dd76aef9a2cc9983b1968a
 DIST natsort-8.0.1.tar.gz 144778 BLAKE2B 81aaeebb02b0a0e45d9291c4efd341eadff7be9e8b50a966e21b0a22b92eb05cee99148f6e2b93ce792bda2a223f1a64e43d2569dd1cbc4b421e11f2652722f8 SHA512 a1db383c466b8605006d880cb19f284902ae7384bca839877cc7baa0d60b5ab369126ae7efe0b93e1b5a0c399ad902fdd818beed2c34bb209b56e3c960896d4f
 DIST natsort-8.0.2.tar.gz 144912 BLAKE2B 0e5d83e6991ef1208b84cbf17e287f487a2a059d68274876977ae6f18f89492284bc166499a9518bfc2df19999e5593f386ce88beca94c23d8a050697c0b2a36 SHA512 fad31e1af1e1d4a33061b8b3e31d022f353f662d306136d05e0121a0531f33cf388467a40f91f51036f283ab8fbdefc1193d09f440052960ffdf733186b5fb27
-EBUILD natsort-7.2.0.ebuild 555 BLAKE2B 6c99885c6215cf9a1864b3d9404ffdbd0e6955f83da7989d1fe2713fcb6de94dc81614981e0a2307e94a0f1d8aa9e12526ee6b41aa8994c65f947d6e4e8ddfba SHA512 b4694869be9520a60b1490f16d9f41f54f1ac48f387bc0b44720bd306cf9a0604d710d1cef0ea36dd8808a01d19568b054c904a3b6ac54e707ca9d16b6c609da
-EBUILD natsort-8.0.1.ebuild 673 BLAKE2B dfe329b7ebd87052039accd069db81160251915adb253c70a3c7c8bf942ed19d12dc341e83299f79897018f8499abe17104a9d913785fe582828f6f5ac6f4edb SHA512 25fd0f0d2763df4c3d11800737c2d4eee896bff6886ea3131c8a571b9c6928ab7ad4a68df642aa41954881028ce4d415ac8a0475ac61f98767d3a6a2f25d96f7
+EBUILD natsort-8.0.1.ebuild 665 BLAKE2B 58f3a996b8ed1e5eab43c536e8a755681ef0081a3e21109723c8b6e84b568d5584209266198046dee744b9f46d428545036d6553c9f962dabd8e5728630ad2a2 SHA512 0c9dc467c9bc664ef4b00a75e0f6530b691b13f358add27c141aeafe88b832df6609996fe3b5773705d7d89b745b9ca10157cb1f5d23f53eb11ea96d4b3d0d76
 EBUILD natsort-8.0.2.ebuild 673 BLAKE2B dfe329b7ebd87052039accd069db81160251915adb253c70a3c7c8bf942ed19d12dc341e83299f79897018f8499abe17104a9d913785fe582828f6f5ac6f4edb SHA512 25fd0f0d2763df4c3d11800737c2d4eee896bff6886ea3131c8a571b9c6928ab7ad4a68df642aa41954881028ce4d415ac8a0475ac61f98767d3a6a2f25d96f7
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-7.2.0.ebuild b/dev-python/natsort/natsort-7.2.0.ebuild
deleted file mode 100644
index 0c4fa469d533..000000000000
--- a/dev-python/natsort/natsort-7.2.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/natsort/natsort-8.0.1.ebuild b/dev-python/natsort/natsort-8.0.1.ebuild
index 2e369a39667d..9e2ab71ba51e 100644
--- a/dev-python/natsort/natsort-8.0.1.ebuild
+++ b/dev-python/natsort/natsort-8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 6b5986c404e4..43201d0f7732 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,7 @@
 DIST nbclassic-0.3.3.tar.gz 21924 BLAKE2B 382d41c2eeb6ffc9588b80c0bc84e7e8b581fc36f2628d46577ca0a6956c50086a7b9a3bccb1c318fc60169a0367c8c5e1c6bba56b0a35fa063768f8fa580d52 SHA512 74b765c842351b2a93e92850193db7d3ef1a0b11c0c25a9adb2d1b8f7a6f88ae083cc700cda004d874340443632e738a24d26349d661613a707ad6cc42abd709
 DIST nbclassic-0.3.4.tar.gz 22308 BLAKE2B e5adddbd89f22ea1391149d97484f34c3f4d1a7601e471859834a06f5294868bbb23e96a536e792599f5743b68cb72bb91c88ba1e79d4fb4dc0f1ad6ee78041f SHA512 fe18a3523f7cf6bb411fe2e78f6bd0313e18a8a63a51649c99bdfc11365e2d775b8e6b879da1326c5389ab1a69e52a267cafa905348fead74b24a1d5d65e8646
+DIST nbclassic-0.3.5.tar.gz 22668 BLAKE2B d7e74e1274294e9d0d8888d0ccb2718fd02d73eca22d29b3b944a1886f4b7dfd8c7ee893239856790f0b7e84e3c9102c27fa12cd06be8a4015b0197e3516d41a SHA512 a3b5b0b4f11be93adee4f8669127de0b1a5c9d38fedefbb924b7b446db9f0e7e0987b17f62f7d831d7a2dd87de605a2300973735a4d2b8cefbbcbab8403a3d1c
 EBUILD nbclassic-0.3.3.ebuild 961 BLAKE2B 9a76fe1b6414b64c5b47647d58452475b6efd28a052a7b9fe6c480f0715ed078b59c411ff89e7acfe6172cf239be64b0f0dbc55da1ce6ba58202f1c879bc2436 SHA512 1fdb2a3175fee83e53225e05ded32cb751ded41347322530ae063bc6d6037d78048d220a9cc9decddecb53c69d55ae5ee65fcc1ff3d28c4dd4bfc9d17adbdfa4
 EBUILD nbclassic-0.3.4.ebuild 961 BLAKE2B 9a76fe1b6414b64c5b47647d58452475b6efd28a052a7b9fe6c480f0715ed078b59c411ff89e7acfe6172cf239be64b0f0dbc55da1ce6ba58202f1c879bc2436 SHA512 1fdb2a3175fee83e53225e05ded32cb751ded41347322530ae063bc6d6037d78048d220a9cc9decddecb53c69d55ae5ee65fcc1ff3d28c4dd4bfc9d17adbdfa4
+EBUILD nbclassic-0.3.5.ebuild 961 BLAKE2B 16cf343bd564b66b477c86b5177217dad54c5bd5452b88022160a514aa479ac29d0c30c2d7ffef9bd9d0380c8d205259f4f0e9e0a519d99cd63d8abd348c9dfb SHA512 8a984443fa1840890f5c4955de691fc23cb066968ed53093abdcfda8be525ead9022a0962fa2aaa84cf37370a6c48251179ac8101a7975a29cece7f8e3dacadd
 MISC metadata.xml 410 BLAKE2B 0b5a5047ac30e2bfc7f85fa8d5243dc4d90f21b3ba4cfa88e6dfa08d8a063a49fd962650424521a436963a40cd4d2b54ca15326f29aebd3df158c4985d94cd26 SHA512 3ce674ac4b73cd15fba38ea29f8064ce2a5c5b77ae58cb0b046a1b9b9263a3149674a5e24d96f3517d6a5fc2cfd13d5de15090ac40aec4865ec0626e91b28723
diff --git a/dev-python/nbclassic/nbclassic-0.3.5.ebuild b/dev-python/nbclassic/nbclassic-0.3.5.ebuild
new file mode 100644
index 000000000000..07ca7eea2bc7
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="https://github.com/jupyterlab/nbclassic/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv ${PN}/conftest.py . || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 6a27191315ca..0bdde2613ed0 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,4 +1,6 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.4.6.tar.gz 14342345 BLAKE2B cc9d5968d05d9f75f60f02adfb5ef35f39e4a5de027356af73c6dfb1f3aebc271e5b3bc639eb8605748abd30d43bfaab662d41b3b764c91cc545c2d1848881f4 SHA512 92b10bdc041bc0f3af1b42ad219abda37402e0fa4ea16ddcfd2ffc450cc7f49ce1d770cb477160c3fa58c387f85d22ca3f4e4c6507a5cbf7a92bc5268baf661e
+DIST notebook-6.4.7.tar.gz 14347832 BLAKE2B 3430aed18e2748005a98ba8e369d3aeda1925098ea1cb59fd6c5b4fc559a9f3ad41dc3fa655a7cce05a6be7fb44c6fe1b2a6e676a7e3933a658bc2f86a603efc SHA512 8a546360948bde566f6853ad63b38f6fbbdd5cfe8bb6b74379e3feae9aeb0f71c1bd7f1e90798cd95c0203e696d73e2797bdb73160106ae4b9ec661f65b860a0
 EBUILD notebook-6.4.6.ebuild 3315 BLAKE2B 7c6e11f936bf1d4276fc9bd730b9daa2f4d17ad39ae18373a85610954e3742fb29d75eaade9893d3a5ff7e8326fdac8bd63ce143a4b04f40403a39d13f8b710a SHA512 65780a5cbee2368bf9d5ba796c4bda1272623eba42894e52f886426199e3f2cf16efae4f8bb55efc6592548b764c3305102dd64faf0b374f9d2479a6d66a1c93
+EBUILD notebook-6.4.7.ebuild 3319 BLAKE2B 918f1fabd924a5e0bcce8dd93011a17c5b50fe4c27e50943972914bb8afc03fc21870862510ce7869b3115800b2e82ee81a1bb1a85e0b86694a57e67e6af74ec SHA512 feef03ee92077a6b130f5fce1efa28b7c379dd54060798cd726c6491827792e583e0505e35fc46cf5ae2bdb9de578df9157d7b12644989fde716c73d88d8e919
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.7.ebuild b/dev-python/notebook/notebook-6.4.7.ebuild
new file mode 100644
index 000000000000..c8d50af63708
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 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 ~hppa ~ia64 ~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/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${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/nuitka/Manifest b/dev-python/nuitka/Manifest
index 50da12cf42e6..55bd17ab8b4a 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,19 +1,9 @@
-DIST Nuitka-0.6.17.6.tar.gz 3148827 BLAKE2B 4c898cac6ae5934e45ecfd37222670d7665ad9f512ae4e7f4e94eb25d19cd434448dbdf188b74398c49eea3b26a393f4fabfddb879be4d2bd795fc1ae6a8538d SHA512 1e370b083861cc9953ab9b72c98dc81f9d6bbf97196abc69d8229ed2a87f2151101b825c8d34d3656cf3b1cc0cdcbbc5a4aa97fc1c32ce605b0535cbf2d3142f
-DIST Nuitka-0.6.17.7.tar.gz 3150990 BLAKE2B 130c98e0499380591f3d3a4d6acabd396749624eca7a0ddcaa997e27ce0ae05d22230edb4fc7284b89dd3bfad1ac16092b7db5ae7c7b7e7c7a41c1f5a16ea8f3 SHA512 08f99cafbdedaca2df2967f452038a69827f291ab825c31231b434e80f56da0698b458f129c2639d2820257c7dc86e306b507742d4d695002d5a64ab8747cb3e
-DIST Nuitka-0.6.18.1.tar.gz 3688411 BLAKE2B 4ddc98cfb34ff825c628200a72c8cb671a1053c7085a542bf49c96617155c69424b1de924cf6fb7fdaf5a5a52049781f687c1cda909fe4309410296e79f34435 SHA512 3638e6c8dd25a19f69eec3bafed22d758a1ec6c15d0491f91d9c6e5570014b87f6efd6d8944a3e85ade314f49128af8cee15b745e26660cfc466fc22bba3e717
-DIST Nuitka-0.6.18.2.tar.gz 3690219 BLAKE2B 416e23500ce7739858e6393eef9783a385229509666c8fd814ce9b4110e77d69d2e7167e89d7db262ee98f60b48f43a07ffec76185154dbc50460623ac84e125 SHA512 7fa6cf48843d45b1d7a1cad11934b5cca2288939e07c12e6916b9c4a37e65d785599ada9e0001faa4117c50e4161fb54253fda27f186f5a660f59810b7254658
-DIST Nuitka-0.6.18.3.tar.gz 3690647 BLAKE2B 7ab4fd2b788a63819b3cbd146e8508d781beb14eec3f0fc724fb4eb0e4805fb17917ab685ab2e28ea50d06c4235be1aa05a694b19e1a2cafd8542d8133aa3496 SHA512 b2aa249dff42c17e0f1c6a33e57cb5e40e17f4043c54467af68071e674ccbe01fd446bfce1e4f0488fd0094561c51ed9f1322e73b049ef19c3f2a9d4f0a6fc44
-DIST Nuitka-0.6.18.4.tar.gz 3690751 BLAKE2B 209a7b0d981f9ba777c53b80708e7f5b09e65565246e9d06b7a0ad6155d3cb5b57e2191406e304be585b326a917f8787c4635c326b5e8ad9254d5ade40cf1ec6 SHA512 9cf404e985dcdc11416218e30340c5d52b6a835d1d1a94d9b5cedfcea774abc7ed848a5c4bd5783a9a1898f469e519148ed195945d3d8e7b9043da00ea38c7f0
-DIST Nuitka-0.6.18.5.tar.gz 3692319 BLAKE2B f60d1516cad1f82c75d63164d93072e6841f092e71bdfadfc713ef4d10838d33c786094f8e326c413bd63cdd561ac6af7a265344cafa9ab45eece630e4e0ce24 SHA512 4dcccf492b0858482b62736478aec0566f11fc8c548ca478b6055b12d694ca1736f495e11c6e4240281fbb11685f043393a1db839dae590dee821a98b4712c87
-DIST Nuitka-0.6.18.6.tar.gz 3674413 BLAKE2B 68f163071ff451a91bcdd9b556ea3732c3c3997df61addb190a39d40c3a25ce266596e45f5e618369a8db913ee45746a63b9eff675671afc77df8d5247bc3a18 SHA512 e0324f03cd1a5dcae50a54d3a9ffba11db6b10044d855e18a5678ce3469620014be087f1e93f7654c5e9117dacd39970f28284424f91f7a2d5ffd72fda9f3f92
-DIST Nuitka-0.6.18.tar.gz 3687825 BLAKE2B f2c5655c610083065cc205c0a92ff9c57edfc87a479592f435c3dd194e2d6d71ff0ee9866bc97f222b3936190a4420e7d69cf9413b5b2a5e9439448dda82004f SHA512 df4c81d890ce9c5dc24e648f65137d4bb91dcb92917859976a3400ace6c297f985cee4932b50cb3c2aedb2eaa806be7529a98a75a32fe3f59ec718ed3281003b
-EBUILD nuitka-0.6.17.6.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
-EBUILD nuitka-0.6.17.7.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
-EBUILD nuitka-0.6.18.1.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.2.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.3.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.4.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.5.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.6.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
-EBUILD nuitka-0.6.18.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
+DIST Nuitka-0.6.19.1.tar.gz 3727050 BLAKE2B 70cde9f6c7254cc229dc534736c1445f9fc813a1463705e0116021107c6b6909c9ac1e35bf7b0b452cd6b6d23b2c4e4103e8427c44d6d3c3273f7f70ad5daeee SHA512 83c5a6c2c547f139cd947c804f646b37f0fbaaa44a53b1cc42366170f91de138d63b5eeb2fa2e37ba9a24cb34c1faeb8e86c09cb08e829aa6d3607931c2eebbf
+DIST Nuitka-0.6.19.2.tar.gz 3727729 BLAKE2B f74512ab2b57ab66b62e7a67fed8366971fe23103297ab5361685b19408445dac7335e3086f0ce236c7346bcf4d8dfcf828040412e4868e82f06c03e6ea52fd0 SHA512 a92b24168e16054399692d0984dd417b181d2bb920825eabaa64798933b481e188827b5bbae040d329e67b09002b21ce471ce1352b12ac46ab2b8fec97523aa5
+DIST Nuitka-0.6.19.3.tar.gz 3727905 BLAKE2B 7c49bf77100ef28a306bf746b4ba13db07da403ba428b3e770ca3a2efbe384db1f5b66b8858640e2b4cdc5a8034be3f55a57fdc2e175d47bdd24638c379e7afe SHA512 0e9b4805ad2b27338ec03fd121d2787add54795f777b184379eb722e5bff3ce64a64c4802464cb3c11a4be579b03ff89b32995646954a389f1a75fef0069ae12
+DIST Nuitka-0.6.19.tar.gz 3739123 BLAKE2B c2e9a6417ff65927c3246849d614fdebb8bcf323b6496dae81f7cef3ab86a22ad21d3fe3eb19c74ea7f228310e3b1b985cea56201efe71c1b0d8ff64998973c0 SHA512 2d8f8c0d95f6d85c7969879ddbe2375ae190bfc1466a21c442e9e109ed7759ecf0bdcc2f29ec8fed5462df52e1b1e69a0e10574d8e7f52b1dfef7f7ae9626c75
+EBUILD nuitka-0.6.19.1.ebuild 1122 BLAKE2B 9e5c90b6c6b784e2d773639eb4a3ad64a5772d4125b3aa9b3c149df69291aae75df5ce371ccdbf05db68b6bf20127677d391cdab4c9433f529133e637bfcbf57 SHA512 e8d16d210416f6f66f30422287091b84d329927487fd1837635b9a09830d917fe66491b75304b954f812ad8dbd38264687b179cccb93bf6775d143cfe9ac3075
+EBUILD nuitka-0.6.19.2.ebuild 1122 BLAKE2B 9e5c90b6c6b784e2d773639eb4a3ad64a5772d4125b3aa9b3c149df69291aae75df5ce371ccdbf05db68b6bf20127677d391cdab4c9433f529133e637bfcbf57 SHA512 e8d16d210416f6f66f30422287091b84d329927487fd1837635b9a09830d917fe66491b75304b954f812ad8dbd38264687b179cccb93bf6775d143cfe9ac3075
+EBUILD nuitka-0.6.19.3.ebuild 1122 BLAKE2B 9e5c90b6c6b784e2d773639eb4a3ad64a5772d4125b3aa9b3c149df69291aae75df5ce371ccdbf05db68b6bf20127677d391cdab4c9433f529133e637bfcbf57 SHA512 e8d16d210416f6f66f30422287091b84d329927487fd1837635b9a09830d917fe66491b75304b954f812ad8dbd38264687b179cccb93bf6775d143cfe9ac3075
+EBUILD nuitka-0.6.19.ebuild 1122 BLAKE2B 9e5c90b6c6b784e2d773639eb4a3ad64a5772d4125b3aa9b3c149df69291aae75df5ce371ccdbf05db68b6bf20127677d391cdab4c9433f529133e637bfcbf57 SHA512 e8d16d210416f6f66f30422287091b84d329927487fd1837635b9a09830d917fe66491b75304b954f812ad8dbd38264687b179cccb93bf6775d143cfe9ac3075
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.6.17.6.ebuild b/dev-python/nuitka/nuitka-0.6.17.6.ebuild
deleted file mode 100644
index 758649696b8e..000000000000
--- a/dev-python/nuitka/nuitka-0.6.17.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 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/nuitka/nuitka-0.6.17.7.ebuild b/dev-python/nuitka/nuitka-0.6.17.7.ebuild
deleted file mode 100644
index 758649696b8e..000000000000
--- a/dev-python/nuitka/nuitka-0.6.17.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 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/nuitka/nuitka-0.6.18.5.ebuild b/dev-python/nuitka/nuitka-0.6.18.5.ebuild
deleted file mode 100644
index d42d1b9e532c..000000000000
--- a/dev-python/nuitka/nuitka-0.6.18.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 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/nuitka3.1 doc/nuitka3-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/nuitka/nuitka-0.6.18.6.ebuild b/dev-python/nuitka/nuitka-0.6.18.6.ebuild
deleted file mode 100644
index d42d1b9e532c..000000000000
--- a/dev-python/nuitka/nuitka-0.6.18.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 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/nuitka3.1 doc/nuitka3-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/nuitka/nuitka-0.6.18.ebuild b/dev-python/nuitka/nuitka-0.6.18.ebuild
deleted file mode 100644
index d42d1b9e532c..000000000000
--- a/dev-python/nuitka/nuitka-0.6.18.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 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/nuitka3.1 doc/nuitka3-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/nuitka/nuitka-0.6.18.2.ebuild b/dev-python/nuitka/nuitka-0.6.19.1.ebuild
index d42d1b9e532c..f2d40b4c0565 100644
--- a/dev-python/nuitka/nuitka-0.6.18.2.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/nuitka/nuitka-0.6.18.3.ebuild b/dev-python/nuitka/nuitka-0.6.19.2.ebuild
index d42d1b9e532c..f2d40b4c0565 100644
--- a/dev-python/nuitka/nuitka-0.6.18.3.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/nuitka/nuitka-0.6.18.1.ebuild b/dev-python/nuitka/nuitka-0.6.19.3.ebuild
index d42d1b9e532c..f2d40b4c0565 100644
--- a/dev-python/nuitka/nuitka-0.6.18.1.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/nuitka/nuitka-0.6.18.4.ebuild b/dev-python/nuitka/nuitka-0.6.19.ebuild
index d42d1b9e532c..f2d40b4c0565 100644
--- a/dev-python/nuitka/nuitka-0.6.18.4.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6499ef1a626a..6ecce243563e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,30 +3,35 @@ AUX numpy-1.21.3-unaligned-array.patch 1787 BLAKE2B cbc8e231e04582965d5ce60d285e
 AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0
 AUX numpy-1.21.4-copy-python-3.9.patch 1698 BLAKE2B 7274c22c38820a01b02ed899f45afce95a3e5fda74f0417809caab1bf28c1e56348785c9209233ad46b00138606364548a80b5b4120b2d96f0a8cccda0d5187f SHA512 92635f37f4de7992cce2c96861fc28151fe5b6adb979db4b6a4ec456c8a84d58a8bf3ab612c1b83a5a507d96b4084d250c5d7855d245057f6977bc6a899f5a14
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
+AUX numpy-1.22.1-revert-setuptools-upper-bound.patch 875 BLAKE2B 42df9e28ee83b6af974aea3deffc7f034cf0b789e2d2dbc59dc82740af9d4adcf30af8e09376ccf02b93262441adb5b47f6601e8a85b5a5ffe4f75917ad2c010 SHA512 189359b7844a8376e9032eb73f497fd6e628a5ac48c660bad5d200ad9f119668bf40adcec8f75debc39d6fe4b451941d8495beb163c971985028a53c0a4c902e
 DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-1.21.2.zip 10264801 BLAKE2B 2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6 SHA512 ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184
 DIST numpy-1.21.3.zip 10269351 BLAKE2B 60fc96d91e2c4e0b1c6ee409e02640686fe257f5addbb17229568f591551ea3c415c4aac97b7cdb161b88ce436e42a766b161bd5a82f8cb66fff6771c0097bd3 SHA512 8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792
 DIST numpy-1.21.4.zip 10646392 BLAKE2B 6e2953c6ca8e35c99f5de5faaacfb2b76b351a5c9521ba27449fcdeca5614978ff7d71fc52ce3787d1c7506c4e8eb81b1a92d3bf6825de1cb1d304ea4de83820 SHA512 85575a009bf40a8e5acaaa949d2669545968825df34273e367c42af36fa882ebb0830ff7953b5617d34d3061b3877238524937c42470fac9464479dc33ae60ce
 DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
 DIST numpy-1.22.0.zip 11291139 BLAKE2B 91cd2188aaa59d7be18761b74865295f400e309e34bf79067493221c5f0eb875a5c726dd8e322db84fa9714800347954b6a9896aadf914e87872497f7e65527c SHA512 dcea1a6cd257f6353caccc30b2adb1cf2e9d52191ec9f968839c85b1f776ebf8c5ac8bbf0751c2c6f292ae671e4006d26eb06691ca1504e4d65baf4cec3f9803
+DIST numpy-1.22.1.zip 11443674 BLAKE2B 3f2e5fbd449c078fd97670be14e87fd9bccc8418dc37f87199557642f0f951f5fd21b89eff938c30171eda3174c526db91e470e9e9cdc297b8abd9b4fe364ad5 SHA512 0d8b5ffb6f8377b3d6d6cb62fd7eef083f8a3b787542b7887e0d214c6fa78b63b6f726302bca554c0c11c57e4611926c8d8ff4abf5dd59842b8b58086391434d
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.3.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.4.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
+DIST numpy-html-1.22.1.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.2.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.3.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.4.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
+DIST numpy-ref-1.22.1.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.3.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.4.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
+DIST numpy-user-1.22.1.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 EBUILD numpy-1.21.1-r1.ebuild 3726 BLAKE2B c81ef764b3a069469783d3c005894bab1b552e1d638f3bf21692e8b3116d54e71bc5d0260112467427a0fd5a4172db950dae4679706fc503115c14ee13f2c387 SHA512 4ea551537644b20d252e5056bf8704ce872af0bdbd058be17b27f65225c1f8264ede22a8e06c754786322970ccdb7246cfae41e3ddb76287bba77882738f800e
 EBUILD numpy-1.21.2-r1.ebuild 3716 BLAKE2B 5e3358ef575cc4eb830f6ff0463250278581c7aeb370d10e283bdb4abc410190149709c9e28257f8683e54cb8f1cf221164607c1681b397af90f125565820c47 SHA512 0cba076a427f2d93387f176287de7c7cec07bcfc698532366221810e6aa4040a84006b420718276441c9d96b7a73d7bf474a91c746eb437b49fdca9ec49ffcc6
 EBUILD numpy-1.21.3-r1.ebuild 3944 BLAKE2B 8c946e32d5743994a702b6887929b4709c462af2524d0f179390866496fb449d6728574f184c768c37b1431b175bf64a1f847746ac691b36868cfe2688599f7e SHA512 a323dd2db55634826d6ded1448e7f43eb56ca7ab453746fef8ad9f85200e3de690109389485026c608b1e8931fbe58b929e5f29f4681fc47dba98b07e758223e
@@ -34,4 +39,5 @@ EBUILD numpy-1.21.4-r2.ebuild 4300 BLAKE2B 57d1e35b092af83be85ea6983b9bd9e167f7a
 EBUILD numpy-1.21.4.ebuild 3902 BLAKE2B 52a370dc3c788eb51782b27c451ea5b96777f4cb1bb54d239bcdd807d5d944790429b904ccef1c7b131ad59ba61584c01903dffce06b899b0eb07e01e98e7af9 SHA512 ff3c0a57f5d3b7b2f74c4cb76fc6e39f045531ab754ac83c07894e3b71944f4e2c938a288227139073f5b495b14ba9c85c3ef8de321755509856a29bcd710fb6
 EBUILD numpy-1.21.5.ebuild 4258 BLAKE2B d5a8b9f09593169b1e114e8c0e0cf49ef2291c8429a81b40921c3cd1c2cf81681677b01ee4b39a5f51d078341992a2289e65735fe4eb0de7dfb43156499bccfc SHA512 8d189ab55bf3b79d73fce583998ac27ba57b7b9e53d59f02f56cdd3ac21c5452908d728c92e270c835f01d434c2aa6d0df30571f72ae7bf7589781b65b06985b
 EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
+EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch b/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch
new file mode 100644
index 000000000000..a2bc9c939aea
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch
@@ -0,0 +1,22 @@
+Revert https://github.com/numpy/numpy/commit/eb6be7c4765665724cd12431bfefb050ba0f2d4b.
+
+See also:
+https://github.com/pypa/setuptools/issues/2372
+https://github.com/numpy/numpy/issues/20692
+
+In the ebuild, we're forcing SETUPTOOLS_USE_DISTUTILS=stdlib which uses
+the distutils version from within Python (which will be removed in 3.11)
+rather than the bundled-in-setuptools-60 version which breaks numpy.
+--- a/setup.py
++++ b/setup.py
+@@ -80,10 +80,6 @@ if os.path.exists('MANIFEST'):
+ # so that it is in sys.modules
+ import numpy.distutils.command.sdist
+ import setuptools
+-if int(setuptools.__version__.split('.')[0]) >= 60:
+-    raise RuntimeError(
+-        "Setuptools version is '{}', version < '60.0.0' is required. "
+-        "See pyproject.toml".format(setuptools.__version__))
+ 
+ # Initialize cmdclass from versioneer
+ from numpy.distutils.core import numpy_cmdclass
diff --git a/dev-python/numpy/numpy-1.22.1.ebuild b/dev-python/numpy/numpy-1.22.1.ebuild
new file mode 100644
index 000000000000..9aedc3d4d368
--- /dev/null
+++ b/dev-python/numpy/numpy-1.22.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+# For when docs aren't ready yet, set to last version
+#DOC_PV=1.22.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.22.0-no-hardcode-blasv2.patch
+	"${FILESDIR}"/${PN}-1.22.1-revert-setuptools-upper-bound.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local deselect=(
+		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		deselect+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		deselect+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+		)
+	fi
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index e45176091dfb..4567afb174de 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -4,5 +4,5 @@ DIST pandas-1.3.4.tar.gz 4734599 BLAKE2B a71b5b57198defcf4f6d848f445c7112668994f
 DIST pandas-1.3.5.tar.gz 4736591 BLAKE2B 7c7de1485028d7c610c5a23ca1cc98551b24e824b609b7a624469f2471bb8d3984a25db48ab7413aa7cdd0057c5c5c9f1eb2b59cfc5cbf6d30177e12e2acc7b3 SHA512 cf3f76894cae19784af6393d4a575d114b55621a3d594edd7e95ac6d5c8588a580135789c859c618acfeceeb710d2a1fdd94188a839a90be6b58af929e00a726
 EBUILD pandas-1.3.3.ebuild 6405 BLAKE2B febec6c5f64825e4979d016c24d3862489f8398a75b56e2f475085e2e7b47b3e7c1f52e6f14a22dc330b596037941660c33074e1895cfc9b3f70baff2ac92a01 SHA512 9922f2a2982b8c2fbcdca8ffd60cf5af99d6dd083eb2324665eaffd6c1259d2de5edb2a04503df90a92f180faa50efef9a9364e291ae9c4a906a41f585e548dc
 EBUILD pandas-1.3.4.ebuild 6682 BLAKE2B 35b9e8f4a7711542007aa3f5a2fcb6a405809b80d38ba831d7d5b1136d4cfc15ae93f92ab420051187842b7509bce59c917dcf386911c118bfa3e721cf913b38 SHA512 183696d80180fe8d68696258981717ca946a450aae9ec1bc6dcdd005c555d649dee721a4fa758bc683f2b6b52548c1f6c98db98afb2929b5481accd963adc8b0
-EBUILD pandas-1.3.5.ebuild 6584 BLAKE2B 88aaf30486e1ce49f3fb0f77d1240927f28c021ca022b252bdd981b5ebeea49ab3c4afd2acbece96c4cc968e0b897cda6556d504d151a73d0d66c8ed00fc2061 SHA512 1a8c82846804abd8ef4c048a0fa8820d85e7916f98f3496682849560d5e534091e5bfd55f6f90b94bfa46d356cb111488519bdd4339cdd690ff1623491c624bf
+EBUILD pandas-1.3.5.ebuild 6581 BLAKE2B f772f6430251cfbe23a4c024977d386bff7d7125a0912b41f9ca27f1442487add94d130f434752f515ab96d71ab4cb8fd5e5f9761591242f0e60bae2264838b2 SHA512 2b7c4fade2f48c574011c153861f2d832256f60da019220122ea078aec32aa9ae073119d4a9dedba08bd98a16bcdd64e2a4ea822ca52aec9affe689c4d613c84
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.3.5.ebuild b/dev-python/pandas/pandas-1.3.5.ebuild
index 68ec1d34ffd1..ff9112b541e0 100644
--- a/dev-python/pandas/pandas-1.3.5.ebuild
+++ b/dev-python/pandas/pandas-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 5908aac8cb86..7c2727cc5afd 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -3,7 +3,9 @@ AUX paramiko-2.7.1-tests.patch 4119 BLAKE2B 516417ae1b3ee7a5d189defaf37a397045ed
 DIST paramiko-2.8.0.tar.gz 332217 BLAKE2B fcd691159b0306204064806881f8a42e7310fe23daf22c5de5ce8124d1496d48606247ab03c7657ff01560f801121a35011e0e615c5e142c41d191568f5b2300 SHA512 15f6e1cab9afdf3285804ce09b3af6c20ffc1f8e50d2549272f0ea545d1fdc858e72c7cba085db85c69aad2033655ae2f025e8ed2bd0dff574bcc03156bdb6ed
 DIST paramiko-2.9.0.tar.gz 344160 BLAKE2B b3436934143971b8a16f6100b6d1633b8ce37303d9be16fd228d7c8c83849e3ef8875cb5d3a3cfa8f08e9e72822ed1dfd310782f1fea0b32051758030b7a1f70 SHA512 3385f837ad36131f4508021b4ee0f073f293c0c1005768071becdfa0b9897dc7dd05467009329160f1eee709d32da72fe9e45fb6d61ea099f64748b00cffce14
 DIST paramiko-2.9.1.tar.gz 344470 BLAKE2B b750cf27d3a1324193f4c9bb39cbf773a4ad859dd3af3065da82d35177b2be9561c5175e15e9dcf4612a109849b5cfeea0d6a5f08098d3a6f3e529310ea8abc8 SHA512 d86824451be417322e0cdd073b31c103e737663af89f31abb1de21b5fbb9bdaa4b2e49505d2bc599114173df2457dcea308eb5c445fc5191248eb13e4c1eb500
+DIST paramiko-2.9.2.tar.gz 345088 BLAKE2B b3b95ec222ac5386fba311c2f0878a44a92bfd0d6edd45c928e2c681fccaf66f2bcfb185cf3eafd37361dc119127623d2c690a981e9f30bfe280eb4c1a0f66e6 SHA512 5b0810358376e4a42ba38ffa4a713f104b122fd77d463a80937dd6dc529da70825d6741fec16f93071aefe4bbfa6f0dbdb2eabd125663c19ba4d35ac06ecfa90
 EBUILD paramiko-2.8.0.ebuild 1321 BLAKE2B ac97798cf13221023a18f0dc6d26ea29abf2af40bbc480d997d6884897dcf72a2f6956fc2b6e3ce8c41f4688a6331227da276aefbc4d7a06dfd5ab5e30acfb9f SHA512 2f3f0b8258ad5ce654a5c73c33109464b60e20cabfb514e4664281db1fe36de17b2e3f8318d01dc7b6384c956f1a64fa766c14acd7662b53e12391114bb45993
 EBUILD paramiko-2.9.0.ebuild 1360 BLAKE2B 73594d93299e034820e48c9d541b833b8db2a77f26834bb890f9e2bb039e6f975b66d19f094315307dae19ec1830fb05d901daada43fa055e05f0f07958eb03d SHA512 51e54a7c706579542c5ed291bb83b148be5b681eb9261bc6037693d6bd3a44ff0d76f3b608e5418042c4b961f3bfbf542d3373bce851bcd61427bfa3044fb8e5
 EBUILD paramiko-2.9.1.ebuild 1360 BLAKE2B 73594d93299e034820e48c9d541b833b8db2a77f26834bb890f9e2bb039e6f975b66d19f094315307dae19ec1830fb05d901daada43fa055e05f0f07958eb03d SHA512 51e54a7c706579542c5ed291bb83b148be5b681eb9261bc6037693d6bd3a44ff0d76f3b608e5418042c4b961f3bfbf542d3373bce851bcd61427bfa3044fb8e5
+EBUILD paramiko-2.9.2.ebuild 1360 BLAKE2B 2c50f435c4f3b4cf9ac5bb3bd81960010fd390b4c31744d1b81b2b4787345003d492a247f43532412ae3829e0175243615fec5b08cca269ad16275800894e511 SHA512 3e7521aa1d0f266aabf489e078cb47667627055658d8bea2fdaf9cefe8eb5e376b3d976b0f06670d021ad6ab838d2f5591ea53bb25830387f52028051aeae879
 MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
diff --git a/dev-python/paramiko/paramiko-2.9.2.ebuild b/dev-python/paramiko/paramiko-2.9.2.ebuild
new file mode 100644
index 000000000000..1d232671c798
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.7.1-tests.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
new file mode 100644
index 000000000000..b7f386bca431
--- /dev/null
+++ b/dev-python/pdm-pep517/Manifest
@@ -0,0 +1,3 @@
+DIST pdm-pep517-0.10.0.gh.tar.gz 189457 BLAKE2B 5a51b62dbc828aec5bca6ada8c7ecb479dd7491f22251392198a3d8e183f2d3d86fd4264addd9a428c37a24041365f3eeecec0a33c3f1a39ea8a1a8e6827be91 SHA512 7eb76bdf3db99ec1cf76a467617ce15423eaa465800efa9ccb248efb3c3cb5644b8e6a9ce04d6181dc9f3b5287a167f62f25d5e3334929f3e947a62ca9633d01
+EBUILD pdm-pep517-0.10.0.ebuild 1002 BLAKE2B d712807a535cecccf0a87b21d654c20952bd8296bd5b4d1b685dd9c5e7c79d84ebadf7e85916cca37cb14e4609a16ddfd6c9d9ef7aa42fb979b29a83d828be78 SHA512 1d65f76806f5bcde4f574bdb8aaf13d381ef3f45da40bc607f1e3f6c11719f27fd776b6be3636f074c62f68d9bdb2113f5f482fb8c349045ee32dc4ec69cc624
+MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/metadata.xml b/dev-python/pdm-pep517/metadata.xml
new file mode 100644
index 000000000000..f00d2775021c
--- /dev/null
+++ b/dev-python/pdm-pep517/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>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pdm-pep517</remote-id>
+		<remote-id type="github">pdm-project/pdm-pep517</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild
new file mode 100644
index 000000000000..9c1dcf99a0c9
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-pep517/
+	https://github.com/pdm-project/pdm-pep517/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# setuptools are used to build C extensions
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_DESELECT+=(
+			tests/test_wheel.py::test_override_tags_in_wheel_filename
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/pep517/Manifest b/dev-python/pep517/Manifest
index f0b0b5381212..fcd516afd8fb 100644
--- a/dev-python/pep517/Manifest
+++ b/dev-python/pep517/Manifest
@@ -1,3 +1,3 @@
 DIST pep517-0.12.0.gh.tar.gz 24726 BLAKE2B 7d022ab88c68b7254df5d922db2f571e2bab2ee58b8a2ed0ce1adeadf89f22f11f6a609b558133acfed5342a9cf6a398d805949bdfb485a4abf272e2b9322e05 SHA512 6b224759733c1f5e346909788233b0acf49c60a0b6ef2d99d953b2e7bb570b2913fd0b133d5bc6884ec3de98adf2e41fa9506fed344b8fd76cc58dfcd1778e80
-EBUILD pep517-0.12.0.ebuild 807 BLAKE2B f8c87463ce241175830051a1f88d1467df464f494827a5146c5e2806900097300a2625280d6575712e6896f855f9f5c42857403fdd97001853c0f2759aa1dfc8 SHA512 9a48d577b9cfd5a18621a1335ae291ce023fa766853098628ba79a9cf247efd7ca2d04efe77387791fc8bed1acda536b50c6bd1f3e4d3e55b5f67cd6e34d1e36
+EBUILD pep517-0.12.0.ebuild 892 BLAKE2B 486c85471f6a0aa69bdb30803504035acbfce7795e5bbb2a713193e9389051417b50c2a2358c5504d3f88a8c6fdf98cbae496590ccc8a0a0fafa147387050f7c SHA512 9835348e1bbb3a3cef97b68ed967970d65c5268139a0e79c6caba1d1c79c5d6c298d77e061b9736d94cf7b0d95995f1430615813510715f46c6e897ed6921ec8
 MISC metadata.xml 362 BLAKE2B c19b7fbaab66a9386739cc04aa7dc8aaae541b6c1c2cb7863da4926cde6ac87727271bd984fe086f33c6b468dab3955ea066360df5d66795c46ab36517222423 SHA512 62e5d9e1ea81219e89bfc28b0fb2adce043bb34b22621c9272cbf1035fbd15e0002fb0f3d4f8b9bacfc7a0f02ab24ff0b428cd414a3a534777ddd72d16625e7d
diff --git a/dev-python/pep517/pep517-0.12.0.ebuild b/dev-python/pep517/pep517-0.12.0.ebuild
index a349eed8f2d8..b46283a07d87 100644
--- a/dev-python/pep517/pep517-0.12.0.ebuild
+++ b/dev-python/pep517/pep517-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/tomli[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index ed93aac6df9c..a8c86c19591a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.12.38.tar.gz 2268865 BLAKE2B 491e8e881a2c938c77053a16c7af6e01bf19eb83d1abc94e08eb23dd8ed6d3e864509d98a95f0300dff66a242cae01c6b158e0e1d5085334b4cb2de1e3b6bb1e SHA512 e5ff96fa803180f0843959db7337b9a2c23fe1ba60e4de50b2d679430b160c16a47f1a666c06ae9e8b35980a42fface89a55d866d824ce6db61cef8220ac0e1b
-DIST phonenumbers-8.12.39.tar.gz 2268929 BLAKE2B b89250a8f2df77302bd57ead7bc2d3c1bc3dfb87d246f235e5c53f40fb6cbe6f7b525f3af3f6412bb6a44858aba4def492c3e3bbc25a0e129cf021ad27633ac1 SHA512 018c33a0d602cc4d4e4a6a154d2fcf15cd036a1d247e5bc79ff0e6932a7ca6ef452a193b2e6d090cfe43a3347d374b183d203763247c9653f9ea1af3a7d980d1
 DIST phonenumbers-8.12.40.tar.gz 2269926 BLAKE2B 87163e927719441430ba9665085245a7664feed9bda66995d7d27203eda3d729e8b50409745efe2eaffb656b2998b952c6ee7a05576cd6144e7d52d23773089f SHA512 38fb914a23b0a683f0ef77da33360a594cf9c198e1b0143271d9615bd97089097bab5f4718f837bbbd89f8010ce2641a3b56b165b2c64845a8d2979af859fb7e
-EBUILD phonenumbers-8.12.38.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
-EBUILD phonenumbers-8.12.39.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
-EBUILD phonenumbers-8.12.40.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+DIST phonenumbers-8.12.41.tar.gz 2270004 BLAKE2B 469922ea194c08f76e9b6899f9fc6d50eb552fa6404330df4ffaa607e82457485b7fee775f236b64da6cd1af3638d46e1c76c4609d8e59f4735830b13f828937 SHA512 1b05a7d12c900de6f280c15cebcefa6463fd531629ee545461ded0c813c9fa1044773cb2844f09a71ebfa940e49b0a3f5847baeee67cdf16579421be291cf812
+EBUILD phonenumbers-8.12.40.ebuild 433 BLAKE2B f528b6c3591fb4089b5560871dd72f5cceb806ab1874bf9675f98edbb18acb10eba3f7bbda893c35963ec2c7b685500d1b13b8a076f96efc628d025050c0b976 SHA512 1cbb029731fa9e4157ba07b4fc5856cc0a162bc37280b50800acb87217a5ad4f9bc5c53af4afc8a4bebe976c93c9d28cd21c097356af5c77a830cac08bfebe06
+EBUILD phonenumbers-8.12.41.ebuild 435 BLAKE2B 95ac45d4de9620038f06ec91b5066107b975e254bd2db18d3a9ea6ab48822b89523ab0f5bd75df98576a8a897f1e94047189804e5fe5031be736cf7c3e0ec74b SHA512 e08ef83118a874fdd06844fdb8d9b1c8fe48ac306d7fed24680f7c0f7b995969a57a3bc702ae3df6d03cd68d2de6da0da372b99c413cb9354564f5b055bf1973
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
deleted file mode 100644
index b1997c3749bd..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild
index 4df0c54c7011..eee4c996628c 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.39.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.41.ebuild
index 4df0c54c7011..7ec6e7ca1edf 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.39.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index 3e88cd9166e4..35d703f413cf 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1,3 +1,5 @@
 DIST pika-1.1.0.tar.gz 139407 BLAKE2B 2a2bb71d7f1222ca06dd6202a26e502f1e1e1977651e4fb405a938d493e4f525904568fb57ad5eea0f5117f02c7fa9f1b1c971d7d911d0d62a24b161b2cb2ef5 SHA512 15eab619cffe5b6d62a65a66730b03ee3de24978268afd82f608a96b96cc29695159e228dbbbc21c06f4c02a9591c73a686d9d283ceaa725f53782c3460140a7
-EBUILD pika-1.1.0.ebuild 456 BLAKE2B 1aa8ccbd2dca8bcaf981f6afebdabdb6454161e329a98d6204f056b4f1c45c05c956a8b99af7a293214b3f9e34464b7e3c96f0fcf301d7feb69fdf14e87c2248 SHA512 aff60d3b4dba5ef2c915cb5df4055e777c687587cd491341db8f6f910d5115268b91567a761d6510cf28ef8a5efe8cb4bb3cc774d9137e7758ced952c4caab86
+DIST pika-1.2.0.tar.gz 144945 BLAKE2B c8b163e4efeb4630da7f1901dfc087c2f3e53d5828eba7ee519e6f696d6c86d48d72c8c1ed98df9c3c0a6889265b072f5c709abec98522992ba699691e96acb1 SHA512 3ea4ecc3b2c722e8b1ec7d220e0cad7c7ed315a4800cbff6903d351885dc6a792318da1767f4bf1a4a40510be444ee18f3881f654c4ec84de8c3005aa2a404bf
+EBUILD pika-1.1.0.ebuild 457 BLAKE2B 02f9093d48e87bfef87b29fd8237b13d6a9abfad8d2a0ce70ceb4669d2706a0ea54df8cf5d3bc18fcf6d7ad392eadfc2ae3448e220149d86b758d3e889eea30b SHA512 f5a18de35d936b5307772cfb70831e7453e522e0935fdee3bd6ed192ca66fc61e8ffed3245a4ebdf46b4a14fac7b88e5234b0b3d2f16289d3188b97cdb301ff5
+EBUILD pika-1.2.0.ebuild 457 BLAKE2B 59cde6e440a37ebaf4ad3e2c972d0cc204c5d979115d8d01f4cb19d27c8924ef2cf7cec0bb3e64b12e74a1dbed65f0cab810b4c7b0f737bd95749b92a25ab58b SHA512 9d4913db97ed2c10f346c98ac89b178442b26bcf4083d7a0ebc801a38610951205ca8120c52b249925aed5f7d6336050b907c64b6659aa08ab6bc496259405b8
 MISC metadata.xml 679 BLAKE2B 1db50c96bdf43def09d0e2fbd0a9ca50eeee10dca95cadb0ed942fe3d6d376e55131fdcff03195ecd3531afe6f7580aab345939f11f0c98166b2d779b46572be SHA512 3b72153d645da660448e2b9a36d0f5eec9052529a6209c8740cd418cc57743033fcef3f9db12cd0158d601c1bdfa15ff125396aca9dfc5635a1557f99af6fa70
diff --git a/dev-python/pika/pika-1.1.0.ebuild b/dev-python/pika/pika-1.1.0.ebuild
index 1bed10429589..caa31224cbae 100644
--- a/dev-python/pika/pika-1.1.0.ebuild
+++ b/dev-python/pika/pika-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/pika/pika-1.2.0.ebuild b/dev-python/pika/pika-1.2.0.ebuild
new file mode 100644
index 000000000000..d84dd6dba9c9
--- /dev/null
+++ b/dev-python/pika/pika-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the AMQP"
+HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c7a3412ff0a6..038d18834b72 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 EBUILD pillow-8.4.0.ebuild 2630 BLAKE2B 35acb4e2123562d6060a3987ace19eef820440419d6a12e12b45d49b43c97db02874b18161e40eb5fc528142b06564d90ff02c40efc4eaaba18d939bc0684ede SHA512 c92d71605566aed06473690ccfc80b4c7fea02b877e1a8cf287f35b6a263cb5ca28577cddc2a07d8487219a9573e0359eb7f6cd8cf47bedbc303775184f6c8bb
-EBUILD pillow-9.0.0.ebuild 2648 BLAKE2B 8d421470d09feb1602f69f6a0a419b6709187bc9ca5b24dd958020b6332051d387dc6e10e89b145f39d372adfa77d7d4df495bfcd5c7824ec41476fc807e4abf SHA512 55090f6ce934803074d35630752a64639023c971905d66cf463ad3ce260f63869414a858762f9392d91280b5989763397b485e347eda87ee2b01b86e51dc8942
+EBUILD pillow-9.0.0.ebuild 2642 BLAKE2B 39ade08a223b2cee7577be64bab2e6baa47719a00f35e0028c7ccc669dda04953177349330345b2f61160248da4286590a03dc019ff39dda44248f3772266547 SHA512 abf6bbdf0eb5651e0e1b48019734103ece569634740e73061876f94ccbf8f1ff8467a31e2cf9835cdd31c73d0cc3b8970f7cb083dc769d8b9779954251255a1b
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.0.ebuild b/dev-python/pillow/pillow-9.0.0.ebuild
index caa5fbbcd092..b85f6bef35ec 100644
--- a/dev-python/pillow/pillow-9.0.0.ebuild
+++ b/dev-python/pillow/pillow-9.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k 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/pipenv/Manifest b/dev-python/pipenv/Manifest
index dc09b089d5e2..e289cdae75f5 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,9 +1,10 @@
 AUX pipenv-2021-11-9-remove-attr-vendor-import.patch 628 BLAKE2B 2f94b5d3a45cf4cf8eb01e8f73e920c21c6487357cfcab34d8ab13d4ff77f803c5b1da6ac737cf595a23c536bb07f4cd321ca38aa57bdb266a5c066c2227c7b6 SHA512 81be2f0a8eed43da73ee1dab43e7597702e6f01c539381a80ab1cf75aa9285a26d269cf3f36417184a4e2e2499ea2799bcfeb8bdb61bdfa145b2baf253405676
 AUX pipenv-2021-11-9-remove-colorama-vendor-import.patch 2310 BLAKE2B 8cb032ab0d1018f0ce047ef5cfdb6ab729a227f569d6e513dd7a8c9ac0548fbc5f6db6b59e33c03095684d918a34879f8163f6e3a0213a0a4ef009bb423687ed SHA512 e692c0b544639fc820c647e3c267b58cf5669a16ec3a7ee89dbee93036a2add027b41c39edad6b62aa4273f332678dea302e35896868fee7fb28ad105a963790
-AUX pipenv-2021-5-29-r2-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
-AUX pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch 506 BLAKE2B 30447546cbf87a99d7914340708ef7cb8c60247957f0ee41b2cead21a476e7b9a8238661376d39fc60569478571b365f19c27b489511f744f8387f24f51319fc SHA512 57eee158b006f44a8676bc870f940a1b98a95eee2c50c1ce127d99add129b8bc02a2e4cd98f49912629c376c9119b3234d8bf418b19452ae9c8c4080f4d53682
+AUX pipenv-2022-1-8-remove-first-vendor-import.patch 4988 BLAKE2B 4550cac73864b93b874be208f625fd3ecf825d7e5675cb61c1c151f0ac3af4790c0a797784296fceaef09c031d374c1a3c7e20a36c5f5ede5cbd634866fb7c13 SHA512 857de77a5a885c530f6a9f8b42aa65b38c5b703183cf4f4a6637c1e2afda2a560abf79364395baf60082e9f5622ce0131aef8600303030a26ea185aedd3653fc
+DIST pipenv-2021.11.23.tar.gz 11378116 BLAKE2B aa30c86aa3b20333d0bffc8c49761869cc9e86b69920abe5e58a0aa7ccf35a8faf6b8b29ce408c85239624a999ca4e67f4a687e1e9aa15271bea31a135acdb7d SHA512 3873a3e7de33677b63bb133e397f46030ec28a24479b38009a4c409d93277327e8f53694fa56fdb8120f9cd632e849fde6f4205e29d9f5704c8844101e8e8298
 DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189
-DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
+DIST pipenv-2022.1.8.tar.gz 11379235 BLAKE2B b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0 SHA512 9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0
+EBUILD pipenv-2021.11.23.ebuild 2551 BLAKE2B 3633bd637db21a8830b388f1438d9531ffa2cf99fd43a1664ea9bdf9a555c695e29c84701d7b2241bdeafeb0ae449d8f709f1fd2a40ec137a97af8a7739e7be8 SHA512 03e32c60df6889d5d710d96fd84dbef61723c938337c8cd5684402517e90160b75a4aa14462c2a1cff22c8e9af0ca783e5d5894aeb3966bac697f2c102300a4c
 EBUILD pipenv-2021.11.9.ebuild 1793 BLAKE2B e17672eacd26f09bd912adeb2fc5995cd28899a2e7f7e04b94d6af12a4468a1248897c1ce587a2f88c36d002de74d90447a0fcf9713398f36dc36d6965e077ba SHA512 e07d6ab4da4c1868cb412cf8987b23490c70665b3d71b4b603ff45fff812d66967cd91dac21333497eba9edc77a2516c2839eecb78707a6c7725ca6838fc1ba2
-EBUILD pipenv-2021.5.29-r2.ebuild 1680 BLAKE2B d510881c66e8b17e057b1cec72721f603e36c95ed63599ced8456db1aa9b425869aaec34f827b8db1573e00f0c4aca168010749883c7605e034af3a6f4ad70cc SHA512 e65004e4a88165179b4c48acd59c2f4870dbd79809b7d31d82e23e62d0c498e0cf51a9fcc770872a21b1521ce3c2345d7d8163de97e57ce096b3816444c61aab
+EBUILD pipenv-2022.1.8.ebuild 3133 BLAKE2B bfa7572b1c005fba1982d69ce7728705c74b1afcdcb771fd61da5b1069774a6febf189b8b7e45355beed656092b8571465a54dc6f5fbd2951793bc22cc8ee73c SHA512 6f5c816b6c5f8ae6bc9be7bfa9f5c49a6ce773b9515b367a7f6cc9162b25e7c0af928e8931213a63a82696d7c19967faaeafe947489b921a27fb9916829cc7eb
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
deleted file mode 100644
index 3437c2a2f33f..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 1e81047d..ccfd639c 100644
---- a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod
- 
- 
- from .environments import PIPENV_INSTALL_TIMEOUT
--from .vendor import attr, delegator
- from .utils import find_windows_executable
-+# future version of pipenv drops this
-+# hence, this stays here for a while
-+from .vendor import delegator
-+import attr
- 
- 
- @attr.s
-diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
-index c7807c05..f6e037d6 100644
---- a/pipenv/vendor/passa/models/projects.py
-+++ b/pipenv/vendor/passa/models/projects.py
-@@ -6,7 +6,7 @@ import collections
- import io
- import os
- 
--from pipenv.vendor import attr
-+import attr
- import packaging.markers
- import packaging.utils
- import plette
-diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
-index aeba0443..76327115 100644
---- a/pipenv/vendor/pythonfinder/models/mixins.py
-+++ b/pipenv/vendor/pythonfinder/models/mixins.py
-@@ -5,7 +5,7 @@ import abc
- import operator
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- import six
- 
- from ..compat import fs_str
-diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
-index e8c13429..7a197181 100644
---- a/pipenv/vendor/pythonfinder/models/path.py
-+++ b/pipenv/vendor/pythonfinder/models/path.py
-@@ -7,7 +7,7 @@ import sys
- from collections import defaultdict
- from itertools import chain
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from cached_property import cached_property
- from ..compat import Path, fs_str
-diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
-index 4f7e5563..d001a1e5 100644
---- a/pipenv/vendor/pythonfinder/models/python.py
-+++ b/pipenv/vendor/pythonfinder/models/python.py
-@@ -7,7 +7,7 @@ import platform
- import sys
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from packaging.version import Version
- 
-diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
-index c69b9484..fb36a272 100644
---- a/pipenv/vendor/pythonfinder/models/windows.py
-+++ b/pipenv/vendor/pythonfinder/models/windows.py
-@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
- import operator
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- 
- from ..environment import MYPY_RUNNING
- from ..exceptions import InvalidPythonVersion
-diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
-index bcea7f3e..41d2d59a 100644
---- a/pipenv/vendor/pythonfinder/utils.py
-+++ b/pipenv/vendor/pythonfinder/utils.py
-@@ -10,7 +10,7 @@ from collections import OrderedDict
- from fnmatch import fnmatch
- from threading import Timer
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from packaging.version import LegacyVersion, Version
- 
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
deleted file mode 100644
index 5c50788d0320..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
-index d7644a21..19b0d695 100644
---- a/pipenv/patched/crayons.py
-+++ b/pipenv/patched/crayons.py
-@@ -13,7 +13,7 @@ import re
- import sys
- 
- from pipenv.vendor import shellingham
--from pipenv.vendor import colorama
-+import colorama
- 
- PY3 = sys.version_info[0] >= 3
- 
-Submodule tests/pypi f5530013..1881ecb4 (rewind):
-  < Update setuptools version
-  < Add sha256 checksum files
-  < Update url reference
-  < Add pep 508 subdirectory fixtures
diff --git a/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
new file mode 100644
index 000000000000..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Sun, 9 Jan 2022 23:52:06 +0100
+Subject: [PATCH] Remove vendored first
+
+While first is nice to have, it adds a lot of code in vendor.
+This patch achieves the same with less code in vendor (~80 lines less).
+---
+ pipenv/core.py              |  4 +-
+ pipenv/vendor/first.LICENSE | 19 ---------
+ pipenv/vendor/first.py      | 78 -------------------------------------
+ pipenv/vendor/vendor.txt    |  1 -
+ 4 files changed, 2 insertions(+), 100 deletions(-)
+ delete mode 100644 pipenv/vendor/first.LICENSE
+ delete mode 100644 pipenv/vendor/first.py
+
+diff --git a/pipenv/core.py b/pipenv/core.py
+index 92811f74..1c04047c 100644
+--- a/pipenv/core.py
++++ b/pipenv/core.py
+@@ -2525,7 +2525,6 @@ def do_check(
+     args=None,
+     pypi_mirror=None
+ ):
+-    from first import first
+     from pipenv.vendor.vistir.compat import JSONDecodeError
+ 
+     if not system:
+@@ -2569,7 +2568,8 @@ def do_check(
+     if not system:
+         python = project._which("python")
+     else:
+-        python = first(system_which(p) for p in ("python", "python3", "python2"))
++        interpreters = [system_which(p) for p in ("python", "python3", "python2")]
++        python = interpreters[0] if interpreters else None
+     if not python:
+         click.echo(crayons.red("The Python interpreter can't be found."), err=True)
+         sys.exit(1)
+diff --git a/pipenv/vendor/first.LICENSE b/pipenv/vendor/first.LICENSE
+deleted file mode 100644
+index a9c8c9db..00000000
+--- a/pipenv/vendor/first.LICENSE
++++ /dev/null
+@@ -1,19 +0,0 @@
+-Copyright (c) 2012 Hynek Schlawack
+-
+-Permission is hereby granted, free of charge, to any person obtaining a copy of
+-this software and associated documentation files (the "Software"), to deal in
+-the Software without restriction, including without limitation the rights to
+-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-of the Software, and to permit persons to whom the Software is furnished to do
+-so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in all
+-copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-SOFTWARE.
+diff --git a/pipenv/vendor/first.py b/pipenv/vendor/first.py
+deleted file mode 100644
+index 8cf9d2d1..00000000
+--- a/pipenv/vendor/first.py
++++ /dev/null
+@@ -1,78 +0,0 @@
+-## -*- coding: utf-8 -*-
+-
+-"""
+-first
+-=====
+-
+-first is the function you always missed in Python.
+-
+-In the simplest case, it returns the first true element from an iterable:
+-
+->>> from first import first
+->>> first([0, False, None, [], (), 42])
+-42
+-
+-Or None if there is none:
+-
+->>> from first import first
+->>> first([]) is None
+-True
+->>> first([0, False, None, [], ()]) is None
+-True
+-
+-It also supports the passing of a key argument to help selecting the first
+-match in a more advanced way.
+-
+->>> from first import first
+->>> first([1, 1, 3, 4, 5], key=lambda x: x % 2 == 0)
+-4
+-
+-:copyright: (c) 2012 by Hynek Schlawack.
+-:license: MIT, see LICENSE for more details.
+-
+-"""
+-
+-__title__ = 'first'
+-__version__ = '2.0.2'
+-__author__ = 'Hynek Schlawack'
+-__license__ = 'MIT'
+-__copyright__ = 'Copyright 2012 Hynek Schlawack'
+-
+-
+-def first(iterable, default=None, key=None):
+-    """
+-    Return first element of `iterable` that evaluates true, else return None
+-    (or an optional default value).
+-
+-    >>> first([0, False, None, [], (), 42])
+-    42
+-
+-    >>> first([0, False, None, [], ()]) is None
+-    True
+-
+-    >>> first([0, False, None, [], ()], default='ohai')
+-    'ohai'
+-
+-    >>> import re
+-    >>> m = first(re.match(regex, 'abc') for regex in ['b.*', 'a(.*)'])
+-    >>> m.group(1)
+-    'bc'
+-
+-    The optional `key` argument specifies a one-argument predicate function
+-    like that used for `filter()`.  The `key` argument, if supplied, must be
+-    in keyword form.  For example:
+-
+-    >>> first([1, 1, 3, 4, 5], key=lambda x: x % 2 == 0)
+-    4
+-
+-    """
+-    if key is None:
+-        for el in iterable:
+-            if el:
+-                return el
+-    else:
+-        for el in iterable:
+-            if key(el):
+-                return el
+-
+-    return default
+diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt
+index 0530062e..3d7b39ea 100644
+--- a/pipenv/vendor/vendor.txt
++++ b/pipenv/vendor/vendor.txt
+@@ -10,7 +10,6 @@ colorama==0.4.4
+ distlib==0.3.2
+ docopt==0.6.2
+ dparse==0.5.1
+-first==2.0.2
+ funcsigs==1.0.2
+ idna==3.2
+ importlib-metadata==4.6.1
+-- 
+2.32.0
+
diff --git a/dev-python/pipenv/pipenv-2021.11.23.ebuild b/dev-python/pipenv/pipenv-2021.11.23.ebuild
new file mode 100644
index 000000000000..091b0495a4ac
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.11.23.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+
+	local jobs=$(makeopts_jobs)
+	local packages=( attr colorama idna pexpect dateutil requests urllib3 zipp )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e 's/from pipenv.vendor import '"${pkgName}"'/import '"${pkgName}"'/g' \
+				-e 's/from pipenv.vendor.'"${pkgName}"'\(.*\) import \(\w*\)/from '"${pkgName}"'\1 import \2/g' \
+				-e 's/import pipenv.vendor.'"${pkgName}"' as '"${pkgName}"'/import '"${pkgName}"'/g'
+	done
+	assert "Failed to sed sources"
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		 find ./pipenv/vendor/ -name "${pkgName}*" -prune -exec rm -rvf {} + || die
+	done
+
+	# not actually used by pipenv, but included in pipenv
+	rm -vR "${S}/${PN}/vendor/wheel/" || die
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}
diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
deleted file mode 100644
index 77de678dfaf3..000000000000
--- a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( 
-	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
-	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch"
-	)
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# remove vendored version of PyYAML that is backported to Python2
-	rm -vR "${S}/${PN}/patched/yaml2/" || die
-	# remove vendored versions
-	# see https://bugs.gentoo.org/717666
-	rm -vR "${S}/${PN}/vendor/attr/" || die
-	rm -vR "${S}/${PN}/vendor/colorama/" || die
-	rm -vR "${S}/${PN}/vendor/jinja2/" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}
diff --git a/dev-python/pipenv/pipenv-2022.1.8.ebuild b/dev-python/pipenv/pipenv-2022.1.8.ebuild
new file mode 100644
index 000000000000..ed11a603ff9d
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.1.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 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 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV//./-}-remove-first-vendor-import.patch"
+	)
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+
+	local jobs=$(makeopts_jobs)
+	local packages=( attr cerberus cached_property colorama docopt first idna pexpect dateutil requests \
+						toml tomli urllib3 zipp )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e 's/from pipenv.vendor import '"${pkgName}"'/import '"${pkgName}"'/g' \
+				-e 's/from pipenv.vendor.'"${pkgName}"'\(.*\) import \(\w*\)/from '"${pkgName}"'\1 import \2/g' \
+				-e 's/import pipenv.vendor.'"${pkgName}"' as '"${pkgName}"'/import '"${pkgName}"'/g' \
+				-e 's/from .vendor import '"${pkgName}"'/import '"${pkgName}"'/g'
+	done
+	assert "Failed to sed sources"
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		 find ./pipenv/vendor/ -name "${pkgName}*" -prune -exec rm -rvf {} + || die
+		 # package names can be foo-bar, their module will be however foo_bar
+		 find ./pipenv/vendor/ -name "${pkgName/_/-}*" -prune -exec rm -rvf {} + || die
+
+	done
+
+	# not actually used by pipenv, but included in pipenv
+	rm -vR "${S}/${PN}/vendor/wheel/" || die
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 1fed3161a1fa..d2cf9521d233 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,3 +1,5 @@
 DIST plyvel-1.3.0.tar.gz 149379 BLAKE2B 0a4fc8c3073cc8e103ab217f8e7971f04d9e6d1862dea7ce3d2634ba9646bdeebdda740fe6cb2e83aeeab513601bddef374355c4f6c9f320ce6b4b14ff2b2bf6 SHA512 fc1b84f0e98bf3edcdc2d7eda4f18313186538bb419bd297f694330e60512a6ab63e8d2fabaa825023eb5570f175ebbc22b8ae81e29603b1a94c1abb37774e99
+DIST plyvel-1.4.0.tar.gz 151155 BLAKE2B 1bba3fef97518d5ec291f0ebc0ebd54511678ef16e2925a1027706c917e89bbdeb20b63bcf8d1e22f8c3ef41a88695d8d64065ac9ffb9bebdc652be0f4de4eed SHA512 6532007bb103f2b0121c41ae0a23fa67dfd2c27b1472b43265f6fb5928e4f28514744887f190fb087c8640cba2e62923a1ffe14f59a70b123dc9ad7798e329d5
 EBUILD plyvel-1.3.0.ebuild 713 BLAKE2B 397c1c4e9b762253a7ac4675af405a6689c8e674f47b875fd60dd8ef1bb388ea811a2a2278f63fcfb79bb507f2a231d79ecaea519b68d0489f6a9d366f809d66 SHA512 01b93baaa9d813babfae8bac99b087c15762309d0b6475800fe3a3b0a4a5946b11c6ad22051700ed329622f09af1cef09baa90d2407fd32f895eec193505340a
+EBUILD plyvel-1.4.0.ebuild 812 BLAKE2B 0168f1e5f0c74a5aa8cb445b223fa8e4d42b49559f0f7a422745c6cf5426f39c65327b71c61bbd73ef0b1086d8de6142088d97cdafbbe2ff2025ee19ff30e382 SHA512 4a2e19c143417f389cd552b5cd0482060c4b268b4f6b11a88d62163373e7c2fc70a83a29ffdb8f3723b55b1ea28e8199e81c88fc99a5e9395541227487fba2cd
 MISC metadata.xml 433 BLAKE2B be3fe545cf9ead9b5b9aed9e30afbc773f607837acf207159f1db535aa8fa2b3dceeda8c1f72f22a071af09184f99283a6ffc8895a40648ebc7e1a939c615a42 SHA512 11bab5550ddfad3874f7fdec20d130e4ae490d700500225f9015e76fd2ede33fe6fae302fba15f73465af8f03ac035a7815fb757f5dee575e1b89476038b99e7
diff --git a/dev-python/plyvel/plyvel-1.4.0.ebuild b/dev-python/plyvel/plyvel-1.4.0.ebuild
new file mode 100644
index 000000000000..d519b1159a59
--- /dev/null
+++ b/dev-python/plyvel/plyvel-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Disable PyPy3 for now because it is not stable enough:
+# https://github.com/wbolster/plyvel/issues/140
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to LevelDB"
+HOMEPAGE="https://github.com/wbolster/plyvel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/leveldb-1.21:="
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	# With the default import mode, plyvel is imported from ${S} which causes
+	# a failure because it doesn't contain the compiled _plyvel extension
+	pytest --import-mode=append -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 48a38f5d9462..83869806d025 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,3 +1,3 @@
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
-EBUILD pmw-2.0.1-r2.ebuild 1106 BLAKE2B 6fbdc326d74a00396f1e487a224091c566cd1ee44f3003d3762c56c3bea82edb22b504420dadb1c2916c0bc5f10daf2d2aa4e396f730c60498ad8640f3e023f2 SHA512 55200bf7f8d95bd9a149cb8686efe93b79127ad533d9799b4a1eb8ee49b4fcdea8cc00f7349d82213613ecac1bee6f8f75749737d0fba080ab322c530e795041
+EBUILD pmw-2.0.1-r2.ebuild 1107 BLAKE2B bdfd68ec23822835e2c6c18db3db40ee107e9d1145470c9dbfcf48649ae4ea057c0cfcc0af48c284f4ba1ec87110c42175c000b17038563816c3b0af7ef3c2b7 SHA512 90af072444604f1827ae50567a316006e3e623ba0ed7afa384074dc196798b31d4bb68f39081276cd26eb8fb753960c972ca5a3777d86cc66732b9a746dd6b23
 MISC metadata.xml 387 BLAKE2B 99c3a902dae4415dd912cad8aad2e27721685de791aa8957bec02ab02e21fc2d7fdefb058c8c1f0ea8068bf32f85067915b709b9f862ae08559578e2078ffb22 SHA512 d0347142c16a2de1e49ca50e30f474abbf7e41eac7ca080c26a5457b8da5fb8808c6b9c2103052eb6772585663037e9fc57ae15bbb42e574b6958b8ce2f968e2
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index 94b2b97025c9..8469d86b5509 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
new file mode 100644
index 000000000000..273eb6746ac2
--- /dev/null
+++ b/dev-python/poetry-core/Manifest
@@ -0,0 +1,3 @@
+DIST poetry-core-1.0.7.gh.tar.gz 414539 BLAKE2B 570f13e3c7298fd822a38b75c49c623bde4fa780b3787c3c9cfa3939bb68fee3eeaf6190013117a6e751cb6f87a15b343ba183529fcc07d30e37988097954d4a SHA512 40a8b17ae7c51135eb5f96ec76426f075075de7dafff8ab828fe3b47d13759856a7fd2e7504c1216c4f942befde2c6d42c3976978202ce7aa224e966162bd8e5
+EBUILD poetry-core-1.0.7.ebuild 1563 BLAKE2B 1f05b868f1c9f2216f776f8c7c775312708851691b0cbe8f65984025ef317ccadbcc4e79044f1e467ed84e14efc3ad02b32b4f84ad914b62d50e34a2d68b5fa5 SHA512 c6571c376b9528f0b0167433bfbee1c6dce22f0fd71abc2944a6450709b8c3750ab455059bb40a67193f867f19fa98f2a1fc1ea2e84665dcab24dadc22dbb6f4
+MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/metadata.xml b/dev-python/poetry-core/metadata.xml
new file mode 100644
index 000000000000..fe238cb762d0
--- /dev/null
+++ b/dev-python/poetry-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">poetry-core</remote-id>
+		<remote-id type="github">python-poetry/poetry-core</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/poetry-core/poetry-core-1.0.7.ebuild b/dev-python/poetry-core/poetry-core-1.0.7.ebuild
new file mode 100644
index 000000000000..4684a4b24975
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.0.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="https://pypi.org/project/poetry-core/ https://github.com/python-poetry/poetry-core"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark-parser[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pep517[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Those "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 8d92688d2b71..095cfea6d482 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -9,5 +9,5 @@ EBUILD prettytable-2.2.1-r1.ebuild 724 BLAKE2B ee6d7f2911b6961caf7caa38ec0792d73
 EBUILD prettytable-2.3.0.ebuild 712 BLAKE2B d8d49d6e021584bbfee35d9869fecf78c283ebf5a9917a810d401c4908c6640eb687cb8440f0396b75ba6b82a1fdc52e8a1fe35d2ffda72867043e3746bdcc38 SHA512 b0ddaa4db38497a0e05ef5f59b76b98f48fa349b744e1329ff9de6e2a29f320670c6c4da19b068d5f10a202067849b19e91cdfb6752c1eceae5a847a820de6bf
 EBUILD prettytable-2.4.0-r1.ebuild 738 BLAKE2B 2951d8b52cb1086162a7bfd9879d4bd3a78967ffafdfe02cf97e71d9571143774ba4e75a9e20fb13b61088a17078076896b8d95caddacd888dd75b6f033f2c7d SHA512 e433889002c61db5730988c6809fb8a17e5cb8cebce6bde5a9e9e3f1ec53e76b6f0d767db650ef66d82335749c6ff86d424fe639ad60d79a5d168ada1444fbd7
 EBUILD prettytable-2.5.0.ebuild 750 BLAKE2B 8106a23954b2522391ebf759d85c7c04b0a136d1642e6553c700ba8e6f3eec7bbcf0a28a2f97f1b5b1232b01faf025f2a4c57c6f06bd49ca0ca0d444a9033b67 SHA512 3de663b5ba3a386c76be91a09e70320d3882ba7d14c6523dee66243c199a3b9e6fecdd61c393d776bdf820f307affe5bee13da85adbab701c8f451a4eb9ef7a9
-EBUILD prettytable-3.0.0.ebuild 750 BLAKE2B 0b3cccf64e4f0ead2a18e9ca1c78dff1d750210931a9c5bba2bfeb844ed002b14d51695d729004e576cc12bd9867a12a6c9ba2f23e5136890501579f24e72ad1 SHA512 7012cafe8164004f4fb1915640c9d06c0fd35c6e22080ebe365ad7c0b2f80a02df6316b9104b38f060e3053a09b69aec4b53baf9efc0c80d52e70802168a3c7d
+EBUILD prettytable-3.0.0.ebuild 756 BLAKE2B 0831f58986d166490081901acd2994efca8334f09cdd80fec3113c8940e87eeea1b04e68a41f84ab3b99f194101ee2849bae279c3bda1ab9ce11756fb7b1b71d SHA512 b2d19879c286e835566584476fe3c8b7133ec534684e8d58a7e2595bba1da3b2e6b6f3b74b7b1c295df8761f47d945a265bbcf90d26ad9dfd9c7fc4df963a61d
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.0.0.ebuild b/dev-python/prettytable/prettytable-3.0.0.ebuild
index 51b2783bead9..08011d4926c8 100644
--- a/dev-python/prettytable/prettytable-3.0.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.0.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 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pure_eval/Manifest b/dev-python/pure_eval/Manifest
new file mode 100644
index 000000000000..e9b086f21506
--- /dev/null
+++ b/dev-python/pure_eval/Manifest
@@ -0,0 +1,3 @@
+DIST pure_eval-0.2.1.tar.gz 19430 BLAKE2B 6907cf2fc2a7118274a80dacdebeae163be57cc31086bc66f8ad9960f4624accde78149db9098bfba902774b367e2e0e9c5aac53c4e75119465d5f07cabbf17d SHA512 938d5bc5676ca39b728ab5a9c98d33a1eb7a2e8a66e61e3ae16e516a7c3bcc1b6d73c402faaec44581baeec6fee7297092c2473c257588948fabf786b14a7204
+EBUILD pure_eval-0.2.1-r1.ebuild 473 BLAKE2B dd0254c6c3920bf264eccb4d10359f41f7efa8496c9b36b7966937b767e8894ac5e1284414b292cb2dc3051ef38a9c19635cde122fbd4af75663a411cff772c6 SHA512 ac8824f921bd70558582d722a6d51a2b6f1d75fc3a5836ef8ed2f8827e7c4c49883007720c9f5300b95f2516b99ec6a3fd84bc2a1c30dde738bbc9763d3adf16
+MISC metadata.xml 373 BLAKE2B 56f08bfb33fbfefff3f37063133e1a5dab14daf3d30b0674e9b39d8ed72e5d1468f02ed3d353d508a28c4af1c5c7f858043246e043a9ce0da4937aa2b07d4993 SHA512 69be5163434e36fed944075b834e8fba4745698759e12258cdb9ed968e523528e1e11d291892f3a8992390edd9c54cc08b5fbb70d7473db5e274329cfceea101
diff --git a/dev-python/pure_eval/metadata.xml b/dev-python/pure_eval/metadata.xml
new file mode 100644
index 000000000000..5358127a149d
--- /dev/null
+++ b/dev-python/pure_eval/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pure-eval</remote-id>
+		<remote-id type="github">alexmojaki/pure_eval</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild b/dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..310d725f3a8c
--- /dev/null
+++ b/dev-python/pure_eval/pure_eval-0.2.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Safely evaluate AST nodes without side effects"
+HOMEPAGE="https://github.com/alexmojaki/pure_eval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~riscv"
+
+BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index bdb31ac4ce5e..0b34e6efd89c 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,9 +1,3 @@
-DIST amqp-5.0.6.tar.gz 126856 BLAKE2B 3eae4d0f97477dc7b72eba65ee95ab74afa051bf2d745f86944c4236b4a90ff6c2a38f18a5bdc8441215f4607ed4e8eb867144695619eb08e0f1065e7a624415 SHA512 bf15fad413bedb2f57dfaa03986f4abfc8fb169d5e324d5741b94a1e3776f2590e7686774c69dfdda848b484dbc1e6d0fa78a4a3125cf08ab20eaf7192885252
-DIST amqp-5.0.7.tar.gz 127139 BLAKE2B 51fe6448b61c0899ef49c212ddea5eea108812ad744ffe8ab7ba2392177ef1b6cd6481c424530fb9111899c425081ad96988d36e872c6d32ee72c44a28de51e0 SHA512 3c0d051ad677fa410e4301ab86478583affc1e42651ce5c9b34a07a179aa4fb15811a81884facbdc393b0646a23cab20ee7943b276b8ef770e9707b9bd23d06a
-DIST amqp-5.0.8.tar.gz 127472 BLAKE2B f158b19c3844302151f6683758a78ec28150eb5204ddcde344f2313b2ac76d1b683aa25f2a7088e4b91d0a83928b343490677f9d7f2a327f8384520e52ac1dc0 SHA512 c71fc506cd0f3269956cb3e10ca8a27bc9eae30a0e1f5b1bbbfff3c3d2fff1fd206554c027ae0cf22eda5f43b64c12df8c0b2b31df21b8e4962a8620ce5edc39
 DIST amqp-5.0.9.tar.gz 127478 BLAKE2B f4e23c43ad66cf88e076e9542d8825daac9ad3cf93ca954fe0f1baf3648bfc00afa0002b86d73a95936fad7c859b0a75ee2996cc0d19c6bfcd3ec556e0c1eab3 SHA512 b94bf176e816b1dad4bbc2891a5324f7eb8e27fd475c34a01e6f39d27caf66447cfceab6a3cb3538fd1b610a250eed1423682deef4a174fdd201e0b3a7368bc9
-EBUILD py-amqp-5.0.6.ebuild 995 BLAKE2B 7e980a808b9c245a0da37cebf64d736bf8d47f291566042c385f928d3291ef764ca4842def7486c4b89993d58fed5f30775ec576c4db7b2397a6dd0ca8e987e7 SHA512 9ef5f33252f542679c3dbfbbe8bf17462a158cf8776fa55c6e4bd8848a845f429c944ef195ea2a31ea5619d4969caa60568b378b3543ab553141d5f85d10266b
-EBUILD py-amqp-5.0.7.ebuild 1139 BLAKE2B 37156a187ba4fa8a8fb96e44e06e715efb4eb0137862f7b824c907579ed544b5e55d4810b28735f77a732fe6d5f626ac617610c03f3ae0aa69330506c6729e6f SHA512 2cd4bab8f7fc42244ce067887e99833a2322040f799e249abdd0acbef49cf15c019da9065d93ed873c769a7537ef3e7dd13fc189e73a8ad0d76b9594c3daf30d
-EBUILD py-amqp-5.0.8.ebuild 1139 BLAKE2B 37156a187ba4fa8a8fb96e44e06e715efb4eb0137862f7b824c907579ed544b5e55d4810b28735f77a732fe6d5f626ac617610c03f3ae0aa69330506c6729e6f SHA512 2cd4bab8f7fc42244ce067887e99833a2322040f799e249abdd0acbef49cf15c019da9065d93ed873c769a7537ef3e7dd13fc189e73a8ad0d76b9594c3daf30d
-EBUILD py-amqp-5.0.9.ebuild 1139 BLAKE2B 37156a187ba4fa8a8fb96e44e06e715efb4eb0137862f7b824c907579ed544b5e55d4810b28735f77a732fe6d5f626ac617610c03f3ae0aa69330506c6729e6f SHA512 2cd4bab8f7fc42244ce067887e99833a2322040f799e249abdd0acbef49cf15c019da9065d93ed873c769a7537ef3e7dd13fc189e73a8ad0d76b9594c3daf30d
+EBUILD py-amqp-5.0.9.ebuild 1137 BLAKE2B b9d0049187d067af40405204549dd446b31e680f967116cec120af0b608dd36a09a31d095cadb6a7658a658def2ce32b15e58b2202d49a22f40baa586742cbf0 SHA512 1c35351dd0b9df3faf915c25b6c2078cce87f2b38ce58affa7deb04828b522f18add8f1f8df71fe208e7a456d1a0ea6a8ea764a2350d5ffb2b95d0f38f4f24aa
 MISC metadata.xml 505 BLAKE2B edee860b2641c1f220cca3efcf400391018389615234d72cf2a48e499c410608ddb664d65c7a3aba925b882bab96ba7b4f0c1173e28c385fe0a73b377e950af9 SHA512 b9b969cfcdc38791dec5c54ce96dcddc2eaf29bd023dc6a7c8e2f95dd00ece57abf02bf7d9e0179eb5716a20a041c2216dda94904e5d0a73007e775c14149552
diff --git a/dev-python/py-amqp/py-amqp-5.0.6.ebuild b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
deleted file mode 100644
index 82ee3c01e5e4..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P="amqp-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.7.ebuild b/dev-python/py-amqp/py-amqp-5.0.7.ebuild
deleted file mode 100644
index eb3c94be5008..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.7.ebuild
+++ /dev/null
@@ -1,48 +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
-
-MY_P="amqp-${PV}"
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.8.ebuild b/dev-python/py-amqp/py-amqp-5.0.8.ebuild
deleted file mode 100644
index eb3c94be5008..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.8.ebuild
+++ /dev/null
@@ -1,48 +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
-
-MY_P="amqp-${PV}"
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.9.ebuild b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
index eb3c94be5008..6b40a30bd15d 100644
--- a/dev-python/py-amqp/py-amqp-5.0.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
 BDEPEND="
diff --git a/dev-python/py-zabbix/Manifest b/dev-python/py-zabbix/Manifest
new file mode 100644
index 000000000000..9d37d6af1bca
--- /dev/null
+++ b/dev-python/py-zabbix/Manifest
@@ -0,0 +1,3 @@
+DIST py-zabbix-1.1.7.tar.gz 11447 BLAKE2B a61450f4d1783bbf6879b94300ae71fbecded5f232c234402d19c59af9bea5f1ef164c549a433a4b221032b6105d4ecd0f3515104ed8f02d3da8888ee3c45a90 SHA512 eaa8c5e5ad5604ad4ad41de439ab7856f6907346caa56bed67520df3316f313038e300cbf96f8389dca5be30079392406bcbb26f3ba40d2ef39ccd2fc99c11b6
+EBUILD py-zabbix-1.1.7.ebuild 394 BLAKE2B f1dd24fa68e87f849cb7456d0d1f8bb57a00b632c4419603105e91c91de2ce1ddeb9fb7197d506222cbea009a49ba0a9acd0449f1a88c30c4c74cdc3f2f67c6b SHA512 551c6f9c4e6ed8581eba02b1d8ad1785cd2a4a1751ec3dcad54b0f28a48521aeaeab7c2c5034dc1fc7079cf9cb0dd441945b3869fe0bf96ab89ba97e22585467
+MISC metadata.xml 522 BLAKE2B 09ad473a52931bc301ba1c793bbe31bdd193a371ac88a888006ef2bd4bae13d66d33a339abe8328c6c3b51f4028c2896ae13cd3ad54b2d4372ccd6020d3d4f62 SHA512 9e4f85b09f4595eaa6119a633fb0d435c33bb70ca6af137b122be3a51eff82ceee35403b9433b8ebd8fc02e7690e5ea77858c2238841da75fd84921f3f5074f8
diff --git a/dev-python/py-zabbix/metadata.xml b/dev-python/py-zabbix/metadata.xml
new file mode 100644
index 000000000000..359f1d2181fa
--- /dev/null
+++ b/dev-python/py-zabbix/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alexxy@gentoo.org</email>
+    <name>Alexey Shvetsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">py-zabbix</remote-id>
+    <remote-id type="github">adubkov/py-zabbix</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild b/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
new file mode 100644
index 000000000000..98d6f4182470
--- /dev/null
+++ b/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 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="Zabbix module for Python"
+HOMEPAGE="https://pypi.org/project/py-zabbix https://github.com/adubkov/py-zabbix"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 27cf738f8151..4d643d9bf265 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,6 +1,4 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
-DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 DIST pyalsa-1.2.6.tar.bz2 40171 BLAKE2B d142d5818527b30b333d2552045892854df25eb14a7983320fe56e30a6239d3fe947ef1f0e1202ed3b5aad7722002e0e5e82ab9f89564bb9640aca2dc03c7887 SHA512 11b8eed822e0f8acc96ff0e10eeec0ba26b2997c7a0000b1d82561661f59931cd6b6aa6397b46c5944a0853344517878ede6c9ba13bea241cefc72b72bf1d9ff
-EBUILD pyalsa-1.1.6-r1.ebuild 662 BLAKE2B 31d89cafb31fcaf30007a2cbbee4c50cc7288f3f2389e3540a91dfb15f17fcc368590692422051225c7a2f69975293939dfb90e38244976da959c6ca3be6bd93 SHA512 f9d083b2df8e12bcf1725839bd38fa5416d42a83f9868e2e3da1292123ff767927ae7ebddd988a38c08595bd043e6684b19a51782eebac361b35d9568c79f9fb
-EBUILD pyalsa-1.2.6.ebuild 668 BLAKE2B 2c2fdd6b412df6fec4fb0be91d02bafa5fe7bc38dc769d0cc75066a494d73aa18a569dc4e3940a522fd38a1e4bc30c4f698543ce8d22f6588a13fcc8d7e3fb53 SHA512 550d8c6ab18b25c278e544429bcacf2700fc1cce9a3f2fbff586a7d45c8b711e3f627c622548db889214afe14f784649ecc080c49440f2393e23813ab9521962
+EBUILD pyalsa-1.2.6.ebuild 663 BLAKE2B 50e244254a4016f0146e8618d6869971b0804758146f93ea770733d2274659228b38244e0c8a4be2cb2578bf00e8b10ebafb18bd5473b0762bd929ff5edca38e SHA512 94ca6808022477fe84ee8e20eb3a403ea59c04110bdeea297573ed12fc7aec8eebda387f6aa0a64108a56bb50f4dade6e06025125619af792d1abecb118a8d36
 MISC metadata.xml 427 BLAKE2B bce956560d50c4bf87eb6ef026903b4d860350851d0124dbc6df20c8ad5a62851eddf5736b3e44fe0bf596bd82d3bae465041b2a53c9884bba1469b99fae3875 SHA512 6c6a1a1acffe544b1c4b39ec98fa3892ec53fc7c2137d5d987cbb6f026e69df638e3c3b43bda01434ecf4a202559c81aefe5b2d2113cf26da3e9636b31a4331a
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
deleted file mode 100644
index 48178de1924d..000000000000
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.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..9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for ALSA library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
-
-# Testsuite appears to require installed state
diff --git a/dev-python/pyalsa/pyalsa-1.2.6.ebuild b/dev-python/pyalsa/pyalsa-1.2.6.ebuild
index 342afe92b6d7..7c1ccb1db259 100644
--- a/dev-python/pyalsa/pyalsa-1.2.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 37cae7d7c47e..5f4401018a63 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,4 +1,6 @@
 AUX pycountry-20.7.3-fix-tests-for-pypy3.patch 740 BLAKE2B 64113481df5b7fb385604f16d7b3be066a12b6a5e1dab38cdf879101da132bcacf407fdf773d5f15381789114be265c7e1ee3ab880c38dae6e904e6820923ee5 SHA512 0df7756ac4d3dd3ccc409307f21a95021c93851ad3b6ce07ce244eade4957d9906dc6aaabdbafe671cf6f9619623cdd22097119642c0c926376e4991eb6a1a4f
 DIST pycountry-20.7.3.tar.gz 10137217 BLAKE2B 2b32d450a1d16eab95e0c1ab6cae3bf89c07742d48cf6f8473854119ac0483b5490523e03e823c9b314231983f39d1c8bf595aac201756fee9897a8d15a84c08 SHA512 df88a34307a4275267a7f3af282b73ca5e762c49ad158bfcd39b97c5d852bf045bcfe72351fc6f232c55003a7c4b0a04801eb562ba65ed5d599bd45b2bd3bc58
+DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4
 EBUILD pycountry-20.7.3.ebuild 762 BLAKE2B 040b1bb776c97ffbc408c8ddc7ac239c823b4c75888994cc908856d1674fb24a68b50c1518a1c66d3c5ca36e278d6d7bb625be5d6f4306ad102da3ea9278a3e8 SHA512 ce6776284be36e5e05a667f6db244a2ef8da30248af0bbebd66a41d9c6e152292d0fc4b521eec5ec3df0b5c9b08dcc5b1098e60f681358277a369ad08891047d
+EBUILD pycountry-22.1.10.ebuild 778 BLAKE2B c5f8fdec23537bce893810fca49c8ec1cdbc76707062befe81e57023d30bc979b544f1835883eca72b77f93818b426a0fb0c8c79ef1fc2c7f632ed456f3562cd SHA512 c1d7bd6b4212203895dc264e5c152a0a0f6b79a6ae3644f32f4aa547d241bafa07cd2305d80ed39b1860ef55d810f84b3a51ea8b8ffa51d5178dc33d44ebd1a9
 MISC metadata.xml 473 BLAKE2B d0b559ee14fa944b040388608d545a32952eac9ca3dd4d9c96b21b2457f195dda3034a2df4c3c3f54ac4f19b828e10eb603806ba6442aeff1d1ca93e9c67b5f5 SHA512 a4ef64a3474ced295324a04b292e892e5d4bfabaf850c38421b7d45d1a35a40bc8ca9a452e792d4a33b195896a8f29292b8a019a81b3e86f822ae792ecedba7f
diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild
new file mode 100644
index 000000000000..4fdb4fe48709
--- /dev/null
+++ b/dev-python/pycountry/pycountry-22.1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
+HOMEPAGE="https://github.com/flyingcircusio/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests --install pytest
+
+# https://github.com/flyingcircusio/pycountry/pull/51
+PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" )
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index c615a349dce0..1fb4417f03de 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,6 +1,4 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
-DIST pycryptodome-3.11.0.tar.gz 15555515 BLAKE2B fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5 SHA512 9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
 DIST pycryptodome-3.12.0.tar.gz 15130980 BLAKE2B 5eb34a03523652d990ddfdd1eebcbbacea30bffbe4838289c195b07658a98814ebec322aaffbed7b3fa564bc005d52ea1e483dedcb9f40b65d00e50c28d78582 SHA512 67f2a814d74305614fdf9dfb633c4fd9d80d2064119d0ecab24ae52fd8ce4b6de1a1e82c6ba7bcf22fb7db1a5a850adf078e22317b4c07229cd7cb8cb7f1ffd4
-EBUILD pycryptodome-3.11.0.ebuild 1129 BLAKE2B 056c7b2398f90792d0789065d053681705eaa5cf9fe6f90dad15bc17d014f9669d9397a0500566b40e63330198cf15f471e636c138dd130deba9ffc862f83682 SHA512 eb9b2874efe1b7142442ab88cede0c620e57e14cfe2c3d0f2462aa7175c60e51084b9304f6de51757ad4631d42919c411c094ea0cfc9bbf761756a4f20bd059c
-EBUILD pycryptodome-3.12.0.ebuild 1130 BLAKE2B 51d04088878d1af2d03c38e511f3f9ec8a168920872da675756c564b9347e15b5eaa38e9d905121d9a8bc53c5ec7d2b237a1eb94763e0d371a3ab079c20046a8 SHA512 d06289f6f3e415f216f23aa3322ef295126344d67b1d085d76cc8c7a7ca84cbb405494de7bc5409e54b158c70a5dc9da28b7042dae13e7e810898c0b76c80faa
+EBUILD pycryptodome-3.12.0.ebuild 1129 BLAKE2B 6f3f139140f6b83ce89b36a6706eab46dcd5dc3c5fbcb95be54ad05487837cd79266eed12681bb1af834410cf52859dac42acbc53f77ca7edeeaebd33f0ff1c3 SHA512 a982ed5b2f7c12b99f136ed20b6bfa92ee654923072b9a519fd56d2ea43a7ffcfb953989b446df8ae2801eb6615ae65b354e663b2d231089998a9a1b34890edc
 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
deleted file mode 100644
index a4233f5822ce..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( 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/pycryptodome/pycryptodome-3.12.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
index e116386f00b8..d5c03423b9a8 100644
--- a/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 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"
+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="
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 704266ee6314..c51fd3012267 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,5 @@
 DIST pyfakefs-4.5.3.tar.gz 204661 BLAKE2B 87340d98850cad83b5288d310a5e5d9774247bb71ce7fa314243e38ec3d8e0d42f50f73da2e8c732694c35359e36286c896cb7b2703aa91443d22df95aebbe6b SHA512 0fa42a81acb565292d8a9fde220f033100a4fc07eb8d095e79ed98af415fc285d4db46dd9b891e595f599a9ab48323ff7aad4928b47a6df0d5bbf94c975f605c
+DIST pyfakefs-4.5.4.tar.gz 205086 BLAKE2B c8d9273b351ce4db66764e8972afd4d221bba7735ae2796855c1a23825fe9d678b8e8bd8b8185b37779c5fd263a2109867f261157b61db20cb56b9622cf99ae9 SHA512 419452dae9de2c046be269f7d5f5c14e9a4e14ea6d4d1a9df4a3993ef4fd350011875d4b9484f180a760974a0123bcc7460a32a85d39708837261beeee8be93f
 EBUILD pyfakefs-4.5.3.ebuild 708 BLAKE2B a290ed95962f2d59ad583ca5efc2e18c6b373ad1df38a539264bb4ee71b3bfa38b507c24818573b6d19177350e043af27fe58ecd764997a22be764e8459ec4c5 SHA512 94d24e2a46ea2c8c775505821330cbb91553b4d5782ea1608f8f813e40d575ed93bc07739abbb4adc3e3d56025b375c80a1fcc9cd791ffa12c6b848f75aef241
+EBUILD pyfakefs-4.5.4.ebuild 716 BLAKE2B ee6ae9e723041258c300f4f9049ff0bd415a98586727821d4359b5cf428887e514c979c338fb75f8b7150f96e39a8cd26818600c716aa145bbf2bbc66ba8f465 SHA512 d37b083cc0fda9f86eceed2f114289c45aca0478eb56878757bf804867bc52af44ef17bffac0805e62926ca0fd3de8959c414657acaadfab727f21138485fa91
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild
new file mode 100644
index 000000000000..ef40e18432d8
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 42ee51a15bc2..37912f8ec707 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,7 +1,9 @@
 DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
 DIST pyghmi-1.5.31.tar.gz 236574 BLAKE2B 9ee7250bae2d87f552686845ae3056f0f646cd1a383587c195bfcc6dfa476b8582509c909f0008fc6751295e2e4e7d33bf822e8b529d67306fcc85412fc9af22 SHA512 d7c9c05b51780bef9d2b417c1a586f84ec87a9f1ff578ab019bfdc1a462decd907b2634fb1c830d0e369eb97122bfcba62ce79a4386c73c9854cde8f9fdeb65c
 DIST pyghmi-1.5.32.tar.gz 236662 BLAKE2B e2a58d1eb9c5000d1a7f6b795836fa617ac0847ff2e7c817a6bd65ffb9a1162546a25f890ba20400e4c8d5f72dda538f696c17a35542506cc171b80f99cb5a30 SHA512 b30ad1e200d23ed99280794e4e8e12c1a2412daa27e435183edbdcf57cb1d8ace8790845dd5ab0579f2a22b26eabc11e1d1f5845fb94fed019f461b9419d2763
+DIST pyghmi-1.5.33.tar.gz 237980 BLAKE2B 3599c0f56b665129e0432faa9aaab8fdbc831ec8398a3eea2034e68cbf1f75638ecad7ce7ae4e7ac0d51a4a7ac502837da8d3c421e836c88214d82ed7d0bc901 SHA512 1e187f5824491e9d4f48c2f0a5578ced6916764b6bc4f442045e34f37bff85bf16e3ab88df29f8797b15293282112aa04e2f0a375498e96c8aa7b3c7005d22dc
 EBUILD pyghmi-1.5.22.ebuild 1116 BLAKE2B 0d96964ae13baa9be846aaf23d1dddc9f8364edc68a56aa57d3ae71588eed61712ac0af7800bae9109e448ecc9ec773abf1716b7be4dafb7ce3a238f2b87ad7e SHA512 959e0352c804d14a947009c1cbecdf76e306aad9b1d4f6c7b162147cb4e44475dc067ba11adc50d69ff5f794f2bf9dd97533b6ba19ac091f9b33f6484d837a98
 EBUILD pyghmi-1.5.31.ebuild 926 BLAKE2B c5f51260e37a649e0b96cf7615fc3e26b9cd13c1f993ae84d6787fa6c0c026fbf461751306c1456470d4516f57906a4b58416ee9c5888c27139fdae5a99bd76e SHA512 4e1734960b8b5458380e20ce75fada6aa7bf7e2b678ffbe0087bc756bef36b034cd897a6f66c21bcfed47c9e765bd8fc305b4baae968bfbcedf463a256ac2ef9
 EBUILD pyghmi-1.5.32.ebuild 926 BLAKE2B 13abf28137bdc5cf790245e3da6b6e248eace5bfee1ccd092994f4e70ff9cba9547fe50259cf013d022045e9c29e786b21c0a16cf07aca11ef60c9063060e5fc SHA512 df407e2f894a3a50cb1530b3ff4e7f78aa86688a4b8e51e8617dbc92ffc282bb72510416385b6705c54b87fd15ad090fe665b535cbce071117d27c3cd720cd1f
+EBUILD pyghmi-1.5.33.ebuild 926 BLAKE2B 13abf28137bdc5cf790245e3da6b6e248eace5bfee1ccd092994f4e70ff9cba9547fe50259cf013d022045e9c29e786b21c0a16cf07aca11ef60c9063060e5fc SHA512 df407e2f894a3a50cb1530b3ff4e7f78aa86688a4b8e51e8617dbc92ffc282bb72510416385b6705c54b87fd15ad090fe665b535cbce071117d27c3cd720cd1f
 MISC metadata.xml 402 BLAKE2B 066a72f969a0f47e94441c75fb078fad0bbbd8a28520a4a309f15f30c5993c52042efe207f60b66460488296336fb0c94520ed66247a7de636b2b040b76788c7 SHA512 25d7b4fba1980d03289330d65623cd00f0a81d693234a624e23c6c9991a2764a8d704011de2fb7a54d0cc6165558519dec26b893d1c93b4b76ffbf1957ba20f0
diff --git a/dev-python/pyghmi/pyghmi-1.5.33.ebuild b/dev-python/pyghmi/pyghmi-1.5.33.ebuild
new file mode 100644
index 000000000000..8c831160b805
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.33.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 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 pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack-archive/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 22481211d5fe..6febd7198ac5 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -5,5 +5,5 @@ DIST Pygments-2.11.2.tar.gz 4206258 BLAKE2B d9b7ac03ab564051df8eebf390586387d824
 EBUILD pygments-2.10.0.ebuild 911 BLAKE2B fb910522498e3303072b67f2a4a70fb6e1644b76cd737a4897ad8c3a766807d718e25a57c981abd922a0d57fe3ef64def519dd4d64f52ec16cad0b83474334cf SHA512 fd273c2cfa43daec4adc42a8cf04f20bf08efcbfc7fe15a1eaa83f22c5d2e0155677d4f155092aba35683123b3c1d45ac631a2f24f094b5c7e4aa743c58d5265
 EBUILD pygments-2.11.0.ebuild 926 BLAKE2B 541ccd3809727ff287283d2d048ffe77bfc1042c2b1d76871b3da6fe8bd957f5e6df5ab6df900752821536237c6cf56b4d9f2838cc5fb88e070f959af2506112 SHA512 6320b2d9822b0df84d5d2d7d56e61a1abbbeeafabfa07351ab3f6c2a289b667d475ab0d674031af169e4f6d87d426dc48534d2fa85870f8bdb39f658d27ca5f2
 EBUILD pygments-2.11.1.ebuild 939 BLAKE2B b95f0d718a732c39f3a3a26612b7a042a23ac0bdf519dca2c1d4840b4ba0803d26a8de5d9e6628def55047caff063200f1d2c61f0213b4edbff437b5e9c23ce1 SHA512 240c0d700e351bf007191244ff7ff5c7ca06bf83f23f3b181fca87a1967e2f48c304068aac0d92cc8112f69ae65ac6501f456485802893a6eaf1d92feea1f9d1
-EBUILD pygments-2.11.2.ebuild 951 BLAKE2B 4b716b6ffbfc6f066e80a7cb50ed2d9ac8131bc298bcb50e46b2b91499c4675d3b3825ad3959ea0dbb8645239f47596fedc067dd92fe96e7ade0735c5f1b37c4 SHA512 dd9ceb1f3ca588020ca380fa8cfca081358e9945b307cb031ecff827f0c5870abf7c859277e87277b303883dcd5d597985650cfd2b9b88fade3151e5f5c77a10
+EBUILD pygments-2.11.2.ebuild 957 BLAKE2B f7c8d51a9dc7493068e1e1180dc1a0a48260de50f9c77ebd1c849eee17a165703f3de9b4e27b18e7c272a6ca85cb53aaba149eaaa3025c6ccc4f82c980e53f9b SHA512 ccbd9bf1a05931ea286ee7f77ba7248ac403f13fd544c8171233df7c2f312f947a16383c2eaaa7725e57fb44a61822ead7f62ec5760ff55542674cc7a67ef1ae
 MISC metadata.xml 557 BLAKE2B 59b5fbb74f5d0b8f65127b36871561853ec6afde94f0a31986067c1f6f24aa18e648c38752ae7bcaebe0ef43fc457ef32d017e463006f1c2c9e92932675e03ca SHA512 0810f5412085ff458230b3137845bebf5841a1bab0f729f2bc5152ee44b570e855323cefbc24eee54c5febb1ea2c90a5a4357106a15c8fa250d77eaa057c01fe
diff --git a/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
index 933278c2e707..7954dfcca190 100644
--- a/dev-python/pygments/pygments-2.11.2.ebuild
+++ b/dev-python/pygments/pygments-2.11.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 13d2b4090db2..c0c25c44e217 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,3 @@
-DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
 DIST PyHamcrest-2.0.3.gh.tar.gz 59353 BLAKE2B b393f250f1a5f3f2d3014ae8a6e20ec659e034d8e681fcbb16f4e9fbe69ba7a94ce342a79584cfc99dff6af57e1d9763efd5ff8b5d891951289d9047cab4270c SHA512 4a28c0ae04db11a86c44dff001e919a5bb6b820af8ffd60b1a1f2846f257d79daac76fbdeac4a0039d149e643043258a0685382a3a4b52c6d4586b8be95e1657
-EBUILD pyhamcrest-2.0.2.ebuild 765 BLAKE2B bc7dd401630a9b05911ed3b25f84a1dbc980bb7bb1ae7f200e9acb8945a09c52ce08963b854fed7d49dd715c66dc608b30530e16e5dc434efa46874b63d7f474 SHA512 a1355f20b7ed7cce9148f09ca652b14648682b589256e488e951ca87744d3c5eae17471ab18233628313873dd5f371b34f1fa7980eddddc742915337bdc98c4a
-EBUILD pyhamcrest-2.0.3.ebuild 766 BLAKE2B 85aafc90e40827fdab5718bc34a3896ebe6918803a3e6a62035e4a7cce07ea3cc2e5f1af74f1984da2f1a4ef942ede93ff51859f5309807ebbdccd220bf2e2fe SHA512 973c45d174235e4fd71dcc2fc67e4d3d1e28f8454d093d15741f086c58829a1180c22da9ed3cadf250224af340e509f7df630e967f73e36bdd2c1bc164ca0703
+EBUILD pyhamcrest-2.0.3.ebuild 758 BLAKE2B c667d847198759e92275baa9116f861df390e1ec315042f082ce5a2445581762d19344720d35a23a83785ddf178e7ce1d3865e06bd566d4b43e345dff4993771 SHA512 ac04ac8cc65190fd8e6efb8b9bfd502280d2f921d7a2f92ebb3255863491cb079661961b4cd22b10e25da81932a9bc516e0658f0ec09060c32bd776d92158c8a
 MISC metadata.xml 397 BLAKE2B cfdb950c34749dd9fa17d822df0194a8f35e477902947cf568f76aed96588c0e5a903ea5448f9772faef06ddc66df3c3c971978c6f4431861bf3586702d610db SHA512 024f24f466f0212a7ac599638bcd42b858e2cc786b7bf2641d0e0d4cc3df5dc97c958d4d85930cbd1c32e023f755f844a2675e2c820839729c54ad5e8fb40cd6
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
deleted file mode 100644
index 95693a93178d..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.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..10} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
index d7f479376a63..b788e41820f5 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 70ce8e55c03e..8aca1aa6a5d2 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
-EBUILD pyjsparser-2.7.1_p20190421.ebuild 761 BLAKE2B a21f450e7b7f02c308524b67a48376e664781e3f3eebb44f6e698fefab9618d2a1ec4bbaf2d4ddbc714d7040b9b6e519e41c062fd2963d1a8fb9de339d14c5c3 SHA512 ddaa6c8d8fe0184bbe74da7aa8a4f77c478ff3b673adb4a293dd65f690e55a79ef4779fb087a0d72b9eda9c3f5d0c20b09b857c675ff68e02de43dd771ee8c8e
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 791 BLAKE2B 879758f28c8a847142c2d32bb71e39777a6872d6bcb6ffae79e8d2cc10874b012ebd5bc8cfe7b0e0395fe07dbb50a684191767e57e3c4f5738753e828506141f SHA512 01915f23e79274a50d19da43a37910fb9618f66545f851d3f0d6ea4ebb1fc37dbe776e5c524782bf1c32d93b579dd8ecbe1ef0ec66ec0d47e1006e9e13bf821b
 MISC metadata.xml 395 BLAKE2B 6606412ce6f1f62dee494cb6d08ca6f33d83831a6c1bd5c81fdcfe4a3e519d72b668b358d4bb48652268f7d2c89acea5572f5d8d1b6ec51c7b078f2c58e73823 SHA512 7ddc64f189b8a567823b8dbb827c2f701325ae205c7836f2fc93728a6e70820d5f8a05cb28382e6144c670a2aec3a14f63a445ee20f421236c30bf071e45fe94
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index a057878c5ea9..ce40d0c38636 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 229f33906506..d9354be2e66c 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,7 +1,9 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
 DIST pylama-8.0.6.tar.gz 34223 BLAKE2B 690a0a1197f6512e9511083aa079843f2ca99c9bdb5d74756531db79f7d39e8e0f60a0955b24bc7739edce0376eb79821a796978fb2365789a97628f03f240f8 SHA512 5bc75e5b2a0b141dbe2ca993d13833914980c735b84f3df766bf750909af1eeaba0d554845d8c09f0d8186ff48c8330d9ffa5b565a577ef6506f32672a2c9209
 DIST pylama-8.3.6.tar.gz 36190 BLAKE2B f0c9944d3aa205c9f52fdfab6b47ad5ad08f1865db22eef20add0652fcb4355f878026aad9f1babbfcb4f98c13bc5cbaa069d9d7b5c7a775d994a8952f8a8cc5 SHA512 c279f3005e354be448f42addcfeae6025e1dd4acf84e5de0c3ae707ceac4f98e43a07f43be347b26bfb8db4167945db1db547ed7bd9eb73ca78bbc92d26fdfff
+DIST pylama-8.3.7.tar.gz 36264 BLAKE2B 8092320c039b5cd45a379a2718443cf03f5cef931767ae765c90096e3b23d5b7242034009eecb40413f05e2de2fd72a4285a91ebbc1fb474d232cffc9c992b94 SHA512 acfab9584e7bd8b146350e6af83975e91391e39c00a0fea23d4e55f46dd684b519088ed68c90e335e334e8526aecab2ad2286a0c082d26a4b867eadcbd8866c8
 EBUILD pylama-7.7.1-r1.ebuild 1265 BLAKE2B 59690378b80f2a9dba5a7fdeb2abb1d518c94edde05a87b63e68309cfbd7293c672a01225dd325dfc46bd04542eadc4b0b46fedad8c4da9a6b627d8f8f47097e SHA512 2535a1bc10f6e15268befa691c177831e4595a429af11c23cbb38327560ae9ebbb7941b32369f9ef2a04a8e7cc9d2a31c2c330cefbe644e85111be3b3e1db1f6
 EBUILD pylama-8.0.6.ebuild 939 BLAKE2B e73e48cfc3729928c111a6bbe69da8da8ba76d3c7b38614f3e6abf1fdbfab7b01c0e26766924ce8ddd8b218f2ad6e9ea5cadedaad235dfd724bdbd4ea28cce7f SHA512 4e1cfa1e1d6b9ab00704a0a689899306d14059f35b2f0c17e3d48214ae135a15387e864df6b60bad37fe18358f9e11f5602b0cf49a9346f184e11832e7391698
 EBUILD pylama-8.3.6.ebuild 981 BLAKE2B 4629454cbe80e27d7ca64a9559a1f1f82ad3bdddc759d6e684427805be34cd85e9862332d9563a41527edaba469d0b67550a68f9a081f4a531326cb659338420 SHA512 0ed01f4605f3e6642aa8b4b236b2246f2b62b8242c2503b26f2d3a580bfc3eb28738246aef96559dce6c4139d2c1b1e10cc5c661c1a2cecd69d562fd0025ef49
+EBUILD pylama-8.3.7.ebuild 981 BLAKE2B 4629454cbe80e27d7ca64a9559a1f1f82ad3bdddc759d6e684427805be34cd85e9862332d9563a41527edaba469d0b67550a68f9a081f4a531326cb659338420 SHA512 0ed01f4605f3e6642aa8b4b236b2246f2b62b8242c2503b26f2d3a580bfc3eb28738246aef96559dce6c4139d2c1b1e10cc5c661c1a2cecd69d562fd0025ef49
 MISC metadata.xml 389 BLAKE2B 4320ff9500cf2ec3d896d0ae766fd5c850b72c773a1626df243904f779db7ab9c28c2db462ab90f72e99b1da96b1131d8da207f9e3d14766ef9c33fe92c4ca76 SHA512 024823ccef87858b76df67e12452882ba523cc05a09fc128d8fe943ac92dc45abd9f3912cf6232fe411874555eec205b2623419d9e0d3247bae7663fa3775894
diff --git a/dev-python/pylama/pylama-8.3.7.ebuild b/dev-python/pylama/pylama-8.3.7.ebuild
new file mode 100644
index 000000000000..989238c5c87e
--- /dev/null
+++ b/dev-python/pylama/pylama-8.3.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/eradicate[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/radon[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# not packaged
+	tests/test_linters.py::test_quotes
+	tests/test_linters.py::test_vulture
+)
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 6223d15c8bb3..14e9ba129116 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,4 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-DIST pylint-2.11.1.gh.tar.gz 967223 BLAKE2B 435bb4589fa6dbfadfa234f8cb968a1d5c39efaf9b37fd20dfadc6feb1e997b34124386dab777b1aa1657bd9a36055d535e231181c71834517528cbbc04c698f SHA512 fe283b6eb8090414ea99809158b4e7f9fe85187ef6488ec37c5f34430793b0b4ff8afd9c97452fe0bb88efb9be001c0fd9f9a09a23081cb79084ae409b277f34
 DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
-EBUILD pylint-2.11.1.ebuild 1455 BLAKE2B 58acfc0c54021ddf56ce16cb7788e621807418d4054278ab33852cc41150921b3da2a8851c4a9b7978e839ae85faca611fc5e9c0e8a69007e1d11700d0854abc SHA512 a46543d41dcde85017cbcc8cab08ac8e74c24cd9ec7d6489d33982c9f8233d9dbaed4f231d647c31883200e2ddec7a79dc189243d64091deca1dbc18b4856f0e
-EBUILD pylint-2.12.2.ebuild 1725 BLAKE2B f43be54f1bd55b286a0b94571de2a74ed52999ae803db94bdee3dab79339c4bb9b7d968f503f1cbaf23bac96ad90a129e218405c9d2074f1c62f7665062de32e SHA512 2b12bb303414f561b9e6971b1d1dca74e788d5eca2356732ceb35bb45be89fe9d18e609303ac668acf254bc5ba29c266f2e71869e9b0d758d3b22743a5c669b4
+EBUILD pylint-2.12.2.ebuild 1724 BLAKE2B 289f62e0ad940e80b8b7de06a9ee52d043d4e2f6f16d99fd17f0d97dae0cac9687d960688a622db8159daae22e579c21bdee56c24acd40685a43446a365de22f SHA512 9798ca63f8d988f1a2818e36f059e644372d9a6c8d60dcc34e3042dd8360da75d2b8bfcedbc4b69e9a079b077885595586dc6ddfb41345fb5165847f15655df0
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.11.1.ebuild b/dev-python/pylint/pylint-2.11.1.ebuild
deleted file mode 100644
index 5d8bf6a9f5e8..000000000000
--- a/dev-python/pylint/pylint-2.11.1.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.9[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.12.2.ebuild b/dev-python/pylint/pylint-2.12.2.ebuild
index a0daced3712e..21083c4d3e9f 100644
--- a/dev-python/pylint/pylint-2.12.2.ebuild
+++ b/dev-python/pylint/pylint-2.12.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 7228eefec4db..4ac2a6cb470d 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1,5 @@
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
+DIST pynacl-1.5.0.gh.tar.gz 20350195 BLAKE2B 56ca4f47867cce6e22fdacb0558b5f901aae318b47bacfe5f4ad02d8923e1c86d0a2dd186ec29c820a786ab844d928479fca2d1472a8345b82be6bcbc67c3328 SHA512 905d3a7ce7f758b31a5d34471d5a0202fd2ba3d904a7ec59a158bcd1ea572fc87e29fc144c733d151cbaa48788c939808bc51d00acc973fe6d190eefdd3bfd59
 EBUILD pynacl-1.4.0.ebuild 965 BLAKE2B 10ac5a2ec11518295e37240400ef2273a2b329ac69f9f96c86828506a45f3bb2554d6ee74f0ac29bfd26630ee8a6c47945a5834a48dcd4e7cea3ddfaa30632bb SHA512 b50859709068d1280f2a9a47512564ce98e62fa14e53bf798bfb99d27e01a0ea159d9a64cf3c6208a26c8d47f198649b9e4f1d592584323836a94c3fd9bc0412
+EBUILD pynacl-1.5.0.ebuild 887 BLAKE2B b68bee359ae82b33d198dbb525de27e3dcd83dde804cdcbd3103971a3883087095359011773756047b08d650cc9fba462d4121882973b287b7bfa746e007aca9 SHA512 53906d6cdad70c3a7555aec3e1288c380e207e7a9eda9cac0848189c65771ea0c5a1187fbdcfc1faff06327ac20f3fcd30c6915108eedb4ec69a60c86e14f8e1
 MISC metadata.xml 674 BLAKE2B 676d246f5dac0a5f34c272e29b742a3a454e0ccef4a1ccecbacdfb652070c81bc145ee3d100f9c5e5ac025c183e80d937a4d9d8c6e0b5f26ac2c8225962681f0 SHA512 b5afb7450c64aace06974d98ce3cb172e2e4d7b343a0bcdf1b34505d3d9e180b774f359de1762a1b15127d23e5808289258e2333ab73f5cde04513015409c1a2
diff --git a/dev-python/pynacl/pynacl-1.5.0.ebuild b/dev-python/pynacl/pynacl-1.5.0.ebuild
new file mode 100644
index 000000000000..d96988d6b304
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 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 binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/23
+"
+BDEPEND="${RDEPEND}
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 449bd5ce7d2f..c41880a433b6 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,3 +1,5 @@
+DIST pypugjs-5.9.10.tar.gz 48890 BLAKE2B 474a7d4bffaac17e282d7cd910cafc58d9d25d2d1250159cafe454e6a706eaaa9937c31129061c96b8a1f5eb008344e446ea3d86d0e9f02cefc614653ce6cdfe SHA512 f7bfe3567c40f485e048710c31d40ed008a85353f48169056a6f5e48907bf7999b0142b32b45ff413e08aef81811039af9384c86c259adb4d8458cbca422eefb
 DIST pypugjs-5.9.9.tar.gz 49022 BLAKE2B 26bdad4bd951eb8e515a0c181a56f68a8fdf8131dbd9e61c32c266bd91575143006f3cb6c2f477a2406110b22ed279a1167821a1b1f403a73bb333013173db2a SHA512 f34fab60e4f9d0680a36e5d2a28c5f99668c13b296a1bb70778dced235d223c592d49adbadc2f70b1a7e350f28a2f29dbce8febe2b8e99d60a0e050254180c71
+EBUILD pypugjs-5.9.10.ebuild 1117 BLAKE2B 4b3a9425c683be947ac5421d8c2dbc43f664ba330bf9f5e8ad597aa40060b8b2b7259858b0dbb0167f3e14949f78a047a0e0648db337ee6b3ae212d3e793eb2d SHA512 c06c1af016fd843fc302b7ececafd967a084a8728df63529cbb0a459f9633f479f2e325b1e15a4382e49adf2c9c086009cb0996ec17da8ae002b87f15cbb46f5
 EBUILD pypugjs-5.9.9.ebuild 1117 BLAKE2B 81d4c83a00f438b23a5e3e969291309d61185b5c7559f626c5d53746a0c6161d84fb5451321bf533bae5b94cabfae48fbb1ee48867f8c5ede4ccbd8e0cfd81da SHA512 1e3894ecafdaa82d6af1c928f026e3711186e2344def94c791bd5022163935fa0dbed8ab6040986ce3640bf6f8b29b7f3d22bd8c36989d24f1d69a2b69157080
 MISC metadata.xml 755 BLAKE2B 9ff779edea415203b9433d398d03a465465e53dd1cf767914d870b1e0388f691d40e30eab978485373835a959d2104e41d1918c99bceb09063b671566149e4c1 SHA512 a8b75ce0bfa50bdfa05ed7744e1600c1e427f5b850fadcb2631d041d78beb48291726e87c981cc0594e8d56ef7a53255db4a32cb32c4965a4f9ba6f558c49618
diff --git a/dev-python/pypugjs/pypugjs-5.9.10.ebuild b/dev-python/pypugjs/pypugjs-5.9.10.ebuild
new file mode 100644
index 000000000000..d56f4b88fa06
--- /dev/null
+++ b/dev-python/pypugjs/pypugjs-5.9.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/kakulukia/pypugjs"
+SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# Remove pyramid backend as pyramid isn't packaged
+	rm -r pypugjs/ext/pyramid || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "converting to Django output" dev-python/django
+	optfeature "converting to Jinja2 output" dev-python/jinja
+	optfeature "converting to Mako output" dev-python/mako
+	optfeature "converting to Tornado output" www-servers/tornado
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 474ec1035217..f84935826ee5 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8
 DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2
-EBUILD pypy3-7.3.7.ebuild 5285 BLAKE2B d58184b3aab901ca3699a6c62027ee53ff3775d60dd51b07208a20a2ff27fe8313b4735b1c7a6db65f88d36f9379d83b018e3d0b016b3a6ca41a1887dfb37f14 SHA512 b9e220a36f7d85e206ba749be81a14c2a496a54e711b569e3173b6bc1804b8b3a15e1f9ef45414dfc553f0e2a385e923f7552d15277aa4b1d854f16babb8a5f2
+EBUILD pypy3-7.3.7-r1.ebuild 5332 BLAKE2B a096f5cbe2cd11561e1f8d8e06a4d4c1d426f09a7498b254a2826053d5d10c4ba69ed8f5eb94931a08559e3f3612a65375adb28006d063664c4865558d8364f0 SHA512 38e7bda1dbbf4e91b5b787c988b9bc8f08a38a3a49bc2af83c9e4f0571705bd34d3b201f2b2e3f8f7be351146b68aae10c40f104a3fe0f4d1da5cc3313629406
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.7.ebuild b/dev-python/pypy3/pypy3-7.3.7-r1.ebuild
index 6b88b1199e43..ccc3af660ca2 100644
--- a/dev-python/pypy3/pypy3-7.3.7.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
 		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
 	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
 	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index a7d5125edf44..4047dfe41ae2 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,5 @@
 DIST pyrsistent-0.18.0.tar.gz 104215 BLAKE2B 028c26a6b4bcaa8c3e3e1ad1748a6b45f664355c66f0f97c70e4d26c66946a55b346d0340c2e697e9890039692580c03032055cab7c198c39530e5561be83801 SHA512 f56062430f914a884a9317ecf5278ccc09d98f1d6867716f89173db47996b8d4c1ef4f5c0121c955d81fc4fe8aba7d30f38679baea6208168c3952846064cfeb
+DIST pyrsistent-0.18.1.tar.gz 100522 BLAKE2B 75632d254993666076a68d81b8b5a7aced8601146fed5cd63f1d56c5e0578650a197aca7630855de32a8447eab972203aa7d83009398f96e6f374c0a4b2cc1ba SHA512 353ad6e9165e1afdde37730a9289cf8dde28491abb688d702a8c8f5279e24f5ce387a5d00ac4a077322299f9c1a535781bcacdcd1cb914ddb317b3ca9641778b
 EBUILD pyrsistent-0.18.0.ebuild 609 BLAKE2B 29d33fc3f1be3b40150b8bfaa43fd43546825380973aa306df494939aa69061031b0061225c49031dd04a07c9b5997801ad4e940f8219811fa24fabfd2ba85de SHA512 86044f2c87ce9ba4c8b2a747de42ed7d77575fc5ff67e2dce9d1eef2d205c9e477287f5c2d989890d7daa4c0b9f723933fa9da8fc482653c558c9fe37c263000
+EBUILD pyrsistent-0.18.1.ebuild 617 BLAKE2B 87c5e77170192aca3cb57fe3565ad3d9ae11cf232448b9fdd042281af6264e6ae956f13623a4df09bdcb8704c281951871c0d9b7a3aeb14170a20dfff7c6e5d9 SHA512 5309f7f1e7efedbd13fefbe0b0aafaa57f83641fad5264a50216fd9a9e781df9e44751f8986b9f0594880a1c63c763bdea1927ca6b67a9ee45747ee6ef436b2b
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
new file mode 100644
index 000000000000..e573b42db8e5
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 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="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index c07c4ec02740..a3d85bb5588a 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.2.tar.gz 149302 BLAKE2B bb1203aea42a0caca5212780f1312e51a4cf1a2b2842e3e33f25c17e57e3400d44c387620ec4a1dc9ca7a4ef5747900981971c87d1e37b6523a5990362645f5a SHA512 f6ab42a0aa037189f2fefe4001dde7f49125fdf63358352af956e58da9a51744a884ff1f7173b71e035a1a4a20825a906ee5d94f314b760333d1110c898a6644
-EBUILD pyscard-2.0.2.ebuild 703 BLAKE2B 5bbf159532f700588da0e554a056af01e1e3b42b078b0bae02fdadd66e4e8d2d9790641fc80da490fbbb09c08b0923541908bcf3df4d0c3f53794128d688025b SHA512 4c24062845e81890852ccc9df5ab0c2fe310018ada6b05eb983d3b13c774b17ba7c4cf6bf76320b12736b26ace23c6d04571d9829269014c478ff7161f0be8da
+EBUILD pyscard-2.0.2.ebuild 710 BLAKE2B 4962e8f42cf403351c450c9a02df985d6bbd4ce7cdea2d86609966d76b9b3be1cb1da114971aeb2b054e5ea85003a354f0ef2dac2cbfd65a243eca09da94f6c0 SHA512 d0aa85b22a359a43b5e28db32a1c688b081197c8d928f4b271df2bab3d60dc2bba83a7461718a1c4c86f99a46ff81df7cbf94ff554705574f8a9018d009bc287
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.2.ebuild b/dev-python/pyscard/pyscard-2.0.2.ebuild
index 96ca5c3fa0f5..3e7340a1891f 100644
--- a/dev-python/pyscard/pyscard-2.0.2.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index d34161de0c5a..e3144b4ab2ca 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-asyncio-0.16.0.tar.gz 15819 BLAKE2B c999b8680a45704bcb6f4690a910aa3d2edd9965e53cf4eb59dc8119696add4553d6b3e1b010c3cac52c8fd8563be8c86afe0616132a274e73df673630b032a7 SHA512 f0059a6d05bf0c4e208f0058e30d5baf8284e630b8b91fa217f52eec18abe6b057dabfdadce2c5282e02bd4ea4cdb27f9ef62c4c308375cce1795d75a036db22
+DIST pytest-asyncio-0.17.0.tar.gz 22275 BLAKE2B 0151b7e264b2c2435735bdc184020b6997d20b0ed82224b0b528ec366ab7554a0282619c5268d92f2544d700bed2dbaf85adaaf1752e333c417cc044bffb6aac SHA512 cfff79cf0632153819c511d3751777858e87081b074bfb49f3fe49417d1be647b4d07a4b64149acec36b4e6b1872ac03f1055703c70cccce18648482c9b727db
 EBUILD pytest-asyncio-0.16.0.ebuild 715 BLAKE2B b02ffaf3af6a84598a95cd09e6186d733efb51ddccf77bf496c6b65c0e761fae0336aafa99710bfa6ddab4f654175025318a82ec17bea6f4369efafda992bdc5 SHA512 cd249bc7eeefcc1e98c2332a284965c68341a181f38c2c32ea7ed1cb5aefe3cc8ec8c4376cf9e88fed9e1165ef91ef38b0ae868732e9cf4cbec8de21017ee6f2
+EBUILD pytest-asyncio-0.17.0.ebuild 939 BLAKE2B 2c13ae8d2c708f4077f368084cd9ac818260cfc989fc462e9a97be9080dbbb4f8e383fa5233a54e22dd9d5de69e3b79fdbd965cdef8cbb1800f7e6f43a4b01f9 SHA512 2584443b8e72f04ae45585ea4356c33b8f83053b9ed2e6e99c81b1fecbc7936f5a9fe08c3636b0c9cbe28e74d95b3cb7f0803bf205f764acbfc82d8e7ad0aac7
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
new file mode 100644
index 000000000000..eba2bcf7d5c3
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2022 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="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# rely on precise warning counts
+	tests/modes/test_legacy_mode.py
+)
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index f608643de557..69a6bfbe590d 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
 DIST pytest-forked-1.4.0.tar.gz 10197 BLAKE2B 7a6ec42f7ad1323eea243739a9186fb87eac3016afef844ec39a6e3fd55f7d40b1410fcc27074624f8468e6dabddffcc22ea0597bbbd898fab71c82c06e25b46 SHA512 ba402aec6dbec7a94815913192a49390b637a123d3557f48d809ae2e871e9e0cff8f9d0feb99e2bd06fe9486520b5e539f397d39475a720f8283b1bd21c751c7
-EBUILD pytest-forked-1.3.0-r1.ebuild 935 BLAKE2B 55fa6f0134ca91c17164c797b60f9742ca28b8d93d15af25a2c8a7239f78e44f22edcd4949d06a5fee5c227be9051ac8a7c895c433e1ea4ced1d35bf2c87bc84 SHA512 5bed1117b5d7575785d36e13e2a51e5d89d531cc3eccef7ed99b804e821b477c1479dc2aca51a37613cf2ead610dcbfe3579dbdfc37547ac68cd1a9a32a87a88
-EBUILD pytest-forked-1.4.0.ebuild 860 BLAKE2B afbf7a639e559b6a680ed30f9d9d593e83a4f8fd94328d1642f8dea3b4acb85c8ff6364789bec6a825f0546e283cf21aa51a7f06ccced272bc28cd43d92f654d SHA512 747de247c4f72720419c7294b59f552fb06893dff1392b1a22b5e6bac34b7cefbaf7b13538835c8a92826cb38d98e8bccfd5a793366d0eda76b6a68c3d8e65d3
+EBUILD pytest-forked-1.4.0.ebuild 852 BLAKE2B 770a1d2950c06fd6cb6ad6596df0f9558b1b853053e0eeddc3b926b3452fb8d87b4bb6078ae52e054cdfab25cb65f26424a713d0b636c7adb9eac4d9d6c3d882 SHA512 fcd0e427a1342120c83b2fd96977cf2ca3d6ed2e23bdc381f49d5183ca20bdd980555a4e74a48bbfcacb2fe9eb66fea6a3ff9a035aaa1885d2649db2a5616e8f
 MISC metadata.xml 405 BLAKE2B 8cb6b3e3b440bc53f5d02a9638b00356f64bc02a8d7444ec5e295fcf91507f94c2460acd02008e6b11ca3bc2dd3d2f96ffb61c583fade0ff4ca00a182c01f903 SHA512 4a1dda1d8ada98b57881884ec6e982c308b54ab29e2cfa104f398876a1bd8ee2015dc7de4891c305f65030e30259079667d42c7a80d14d5148feeb5b7cf5904f
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
deleted file mode 100644
index 1047da546dfa..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.3.0-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..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Please do not RDEPEND on pytest; this package won't do anything
-# without pytest installed, and there is no reason to force older
-# implementations on pytest.
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-3.10[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
index c65d14f14759..0a182595e8c9 100644
--- a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Please do not RDEPEND on pytest; this package won't do anything
 # without pytest installed, and there is no reason to force older
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 86531ea89578..b10447aa762b 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 522 BLAKE2B 840ad34feada103ce17e5c2d629e274ee12da823f0fad548133124d2ab8d7553c8f83ef1f19c253b535ec6a8136af51a6b00b2af17010b9d820edaa036b49d8d SHA512 8e69f92616e07921a3ac31cc0bb9ffa49d31aae5793f42176ab92cab8aa84083754b6c77b6e84f57cd5b98a125c8f0c5bf26c04e6374a74f73374f534e4cd2f1
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 528 BLAKE2B 6c2380e368fccc594319e1c52f115ae47ed49783082b6486fffc2efdb8f641751baff7f87438735253fd475da89b083efba16396d2528d7d6f0cff57be917cfd SHA512 8513172039298489b45e92261cc637add54af8abf01fae6c0603e22d82ffaab640fd6f7c175e3bd41197cef5917c5687f84b7b1592b60b54dfab3c0b353e84dd
 MISC metadata.xml 466 BLAKE2B ed3b8b14f649b2bd165f688ceddcb7c75846e3ec75c5629678d1777d9d2df8e784b0c076d497a38dcf457607d739710c8d6f7069643d802d175ca8dae5f955d5 SHA512 09173c651b8b9ee5ac5928117da08ec7a318402bc76e94c14c27116f6a44c07a8a85f83d222de9a5fd09f1224fa256ae2338c5021e6d4893cc8ce6a1b1540b39
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 7a2cf6c6ca6d..b335a63a3c1b 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 8c8b86939fd8..d9e826c4faf0 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-rerunfailures-10.2.tar.gz 15863 BLAKE2B 9f317f3a39ac234e145a14d532d2727bb9fb5fead65c05372cf95268e0f589f9de994cd3c47e75dcb354c996595698c43fccdea5134d2e1921429c8ea7b71451 SHA512 8830610276e2cc172ee372ae4d8376bc6329138751ea2737a4def6af32d05c112c872a7a180ff554018058c05ed0d109927dbac61f748586257e40b0243f03c8
-EBUILD pytest-rerunfailures-10.2.ebuild 630 BLAKE2B 6816154eccfd97c9011695649b03be5730e053b3996d428c768b0e52361bd1344b7cc6a1a0837b31114bc061c10d205fe5dbb1ad52eab80d6337290299eef9f1 SHA512 77f405afad6e2cd52703720a6d1d0c905a475dcb04cb2b3fd45ceb6026aa502036ebcd779c0cc9cb483c566db4c7af8545fd3ce35b0df41448b4dd8fc1a98430
+EBUILD pytest-rerunfailures-10.2.ebuild 838 BLAKE2B 08334775c8f53286eae0a253cbf11850b83c994887340d07751727c0e2aae08e95e978a96c34252b7b0a8780464e8e360104f731a320e5de3c0e6777e9334a40 SHA512 b022b7a9014d6981fced09cfdb4d8a6d8b3473f0475a901427a90cc391391b10952426eb303880c54fe46602473715d5dac5c879274b918a629d8ab29bb454aa
 MISC metadata.xml 432 BLAKE2B 3bbb0bd303a26d2a336563f187160b3b023e6d7a3a776922dee4853164d7461f395e840b2c0ba1349687d24050ccb5fd18166aeec397c9b21a1aa0e6b536b795 SHA512 f372a1f73a4dc3e60f66bd6049cddb4d8cd8fe53bebff2a6d194eb3d5872adab9b7ac226971696fb24a8d4e4744427c4d4148054fc51a94f63320d428ef80d52
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
index 08446f32f44d..9bb95d7201ad 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,11 +13,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
-	test? ( !!dev-python/flaky )
 "
 
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_rerunfailures
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=,xdist.plugin
+	fi
+	epytest
+}
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 9075c8e52ec4..0ebca46f771f 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-subtests-0.5.0.tar.gz 9793 BLAKE2B c671eb14189c0fd34180a636592b20c9e2b4225c5faf3b702103164e60bdbac4c9644e464f1e0c783da3da1263f7b841ea7a4149bcbf1de23325a8ef3ce5c030 SHA512 e3d7e90c3ab66950eb80d25049bc6f6f75b08b3da5ce0de5f3fc55d6a176a8d1fdcb19a19f7d9d137aeadcc82b214550474f76d5611bc5592ca649ddd8257a2a
+DIST pytest-subtests-0.6.0.gh.tar.gz 9698 BLAKE2B 7b8f8c78ca503d107466d1ff34830aa08c3c5ec9b0f9e962b0e61472bf4f7413eb7e71db5768d898d476eb186a5a14c6703f14a990eb57c8664153a4ac384678 SHA512 9b4fa2e1957388f0e61a13a3cce95976fb5fdea64def627c5a1bf75049a0272e82f19ed9aa117bac0d02c6fd8832f22e7cfe409694ea81920def49742142eb93
 EBUILD pytest-subtests-0.5.0-r1.ebuild 856 BLAKE2B b62cd02c2bb085da51ffc21e11c290a3a3b4aa1b28d8689872b4db6e427ad095c05c79c08debf2b1d30349519c54ca1c53b7cd9d0b1abcf8fceaa1b18431c651 SHA512 0fc9342070a13eba5dbf329179b077b6bb5232192d03b4f6ac0567cc9246429a92e4563de79ece32b5ad2e8016cb3d1589389f795dded5c332d343c51dbd6ed8
+EBUILD pytest-subtests-0.6.0.ebuild 1035 BLAKE2B 31ce4ca9dd32fc3475328b37c3540922b6aa29cba055830a58cc5fbab8694298a7e56be6e9a3453653756906a05d1ee04111366ee0805a25de636dd8b7472927 SHA512 7f7826cd69c7203b4cf6d37d5f31a697bcfca1c0550f55d493304ab7009bf89b6bd4be7fbf0a8772836155c801f07fd1dcc0725f1c6b6d3bcb704a7dbbad4f48
 MISC metadata.xml 409 BLAKE2B ca267dc80fa124c3c8ba82f5e46356492e8cadefcf8001469c3c076b079844ae72829b5b527658bea341c3fee3f173421c9f2e7ec7042a171e234070113f4734 SHA512 57c12735a910107b53dbe54969f15ce70eafda3df096c78082d91d5bedc53b015ecae3e3d901e0a2a90841370916f6e4e94041e0b5589ffdce323144375e6c20
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild
new file mode 100644
index 000000000000..61159d2864ef
--- /dev/null
+++ b/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 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="unittest subTest() support and subtests fixture"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-subtests/
+	https://pypi.org/project/pytest-subtests/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+# pytest-xdist is used to test compatibility
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked,pytest_subtests
+
+	distutils_install_for_testing
+	epytest
+}
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 39427a8d9c56..99666a553726 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-testinfra-6.4.0.tar.gz 77516 BLAKE2B 2baf5940e8736cbe78d8017a82b3a8fdb6df95b89acccd49ecd354447b7ea88079f48211e0acea46a0d8702b67609fe6f85f730c66e781a99d8a92b52b3c99b9 SHA512 acd2c7f9daeb391815a32c972a3542c0d643a716f3cffcb66f4203435ebac789333edb91c83d2778ae8da93b676b245fd47821bca9218faa3e7b50e6764087f4
 DIST pytest-testinfra-6.5.0.tar.gz 77177 BLAKE2B 98a8f10f7cf62f204c117d295496a7dfa4de476f5cde457af6f5bc71b22e12e9f02b4893adc6b0d1be11915ed652f628c2574fd44750c82c690e3d8326e29c4c SHA512 f7fcf8facafc0d99b06f55f4241c39b610ff7648b0049c584a75b46944b522b957c98c353f147d74bc8a72f677a179380c456b0868f9dae9af514a9c95d55b13
 EBUILD pytest-testinfra-6.4.0.ebuild 894 BLAKE2B 1027b8c0a4d13d2db3612bd989f32414316fef63fb7a265682ae8dc5b992f886e6c2592f2645789abdf70bad3a4a12742c584645bbce974fe513b680cc5890cc SHA512 2b957be685f8e7961aa05093dfaa14783e79107becf42c6668a7b3c0d75b660bff45c05ac9f7f9c50e4c2cf068cefb8d3e4d6f78477ac5f9553ae8478c0438e0
-EBUILD pytest-testinfra-6.5.0.ebuild 894 BLAKE2B 1027b8c0a4d13d2db3612bd989f32414316fef63fb7a265682ae8dc5b992f886e6c2592f2645789abdf70bad3a4a12742c584645bbce974fe513b680cc5890cc SHA512 2b957be685f8e7961aa05093dfaa14783e79107becf42c6668a7b3c0d75b660bff45c05ac9f7f9c50e4c2cf068cefb8d3e4d6f78477ac5f9553ae8478c0438e0
+EBUILD pytest-testinfra-6.5.0.ebuild 1205 BLAKE2B d83a040bd2d0ef6574868f4cd11aed122ba7d1e706780d1e900e652294124c06faeb6b655387fe314c092a7b9a310a89a6b5f7e6d1f3dc5cd0e211340a02ec6e SHA512 08d9b9ceb8c48be5aeff346272775aabd6e915776bf50261a8db9146f73e832eb18e68e86bc336c9cbc0211357a90e057643e7a80551891fe4e462dd9d2539ad
 MISC metadata.xml 680 BLAKE2B feb779de8bbaf041a3aa00046c4b17fcad0e863ebd365732c9f1e0bbdf6c68edf7ec2b7d546c2bdf458c134f7cb17a65ba07fe6edb5af7675d4bb79af75a23a6 SHA512 386a4877ca43ef6a1408ecc0871ba40c40b4654ee3824b4a99f5ff6f4769284d54c9377cebcd5456815fc5470110a337d83f8016a6598cef8ce29d93cd3645fc
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild
index c336646d0373..a10a5d492b91 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -20,13 +20,25 @@ RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		app-admin/ansible
-		app-admin/salt[${PYTHON_USEDEP}]
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pywinrm[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			app-admin/salt[${PYTHON_USEDEP}]
+		' python3_{8..9} )
 	)"
 
 distutils_enable_tests pytest
 
+python_test() {
+	if [[ ${EPYTHON} == "python3.10" ]]; then
+		ewarn "Some of the tests are skipped on ${EPYTHON} because it still isn't supported by app-admin/salt"
+		local EPYTEST_DESELECT=(
+			test/test_backends.py::test_backend_importables
+		)
+	fi
+	epytest
+}
+
 pkg_postinst() {
 	elog "For the list of available connection back-ends and their dependencies,"
 	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index dffb93f00c12..ecc262e5dca9 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-timeout-2.0.0.tar.gz 16210 BLAKE2B 8e3c0436147b6cc680540329daabd7269d301c95663599f7e9c64313bc3a45fde5cc5ea297d5b8c85f43d1a80c2db44b8e150877c3c7b29eef5e38426dfd4efc SHA512 96e9b545b4ac1e4a615863f69d190e0265e85f23dc12df51e9035b8e6bceff23279bb042eed83aa0ddd6d06b0e02a2dcc29ee352fd44cc86f0682fb328264645
 DIST pytest-timeout-2.0.2.tar.gz 16683 BLAKE2B bc6ee17832dfa5c3e5a35efc34bda630f1f1f7e7ece5a71d68110ab12c08566ee89c3b0f68967807967d17e2622ca1d2bce24baf51986ad8921fd55df091b376 SHA512 ee151a55f6323ae23ddd7e54e39e1c014de2aa2a142a0e3ba81c80b5d36435fc6c2809e383df8c49e62df70361a03dbe73e4d96d03798323fe7f1304a197f770
-EBUILD pytest-timeout-2.0.0.ebuild 733 BLAKE2B d2166cca30ca78378c59d4d97eae751a07c02744d9af462ae3d0bf68186d8524aa628bedeb8b4cd6dec5d9ddf42beb37ccd11ab40ad6e3b322ace82b07dae34a SHA512 d1b0736069581e1f9c09467ee44b2f322f17153112de59ec84801428cf5ffb2d686f4dc21f963590521e790788531ad868b39504c39d8e524f844c4633733312
-EBUILD pytest-timeout-2.0.2.ebuild 741 BLAKE2B 6de6780693c9093002057a80b2115d666c3d0f8d4d3f7490555f94fbbc780cd12ef23628b21162e3b8e41f99ac5762e5756c4b64d2dfeb8e5a1ca1c75e5a29f1 SHA512 70e729b6a241a24defbc03b78fee26a832b740e47424d4de86a3f2134b2eb155285355e9382bbd516b5fd865544294ea648e63f77ed4e70e75a4ab188b0aecca
+EBUILD pytest-timeout-2.0.2.ebuild 733 BLAKE2B b31c403b5de75befa4b4d43f660cbc991e4d0546ca61965ea7e9ec088034cd5a53b5487ddb81ff40a035c63502dfab293b2190cc9466287826e355b52cd8c683 SHA512 8e3e4a06b312c8175cf28aac097531f6aadfbb6ff4fdc61d04b5617cf87ce47f8b66026d98756ec7cf232bf6a5dcfeefaf1e5b446c82fa2d3eb257c0d0538187
 MISC metadata.xml 353 BLAKE2B 4865119ec7c91f6d9ac1ab4ce5b1cb73b784f29f7efd669c629062cca2d433eaabb51af1d0ddb3275d414a99413eb8aa76c8639d484c7846ea33c4f53a013bad SHA512 764118890125a80df18e5d9a1bbf6bb35261c0cbcc04e6c9c67ee7b307cdbc31979b831910022a1caef97deee6830d7236f258f524a95a9494229dcd4a14c8ad
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
deleted file mode 100644
index 96562f417271..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# do not rdepend on pytest, it won't be used without it anyway
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		!hppa? (
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
index 5be23064f839..f11adfbb8c3a 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 40af6e4cfbc2..3baa8d18a1c8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
 DIST pytest-xdist-2.5.0.tar.gz 72455 BLAKE2B 4d7427e8a7d85d7b0dcae2697fae0f51913a3a2414fabbb192a8e3938431f5f121677dd43adecfb1fc7f3dd6feb94901e28b0a96787a2c2eadc1504aac55068f SHA512 22da4db7cdd6173fb8377b6adc30b5617ccb0bb308cb5d30980484dd7ddff87cf2a485ae8522c7957d8954dd2f8a5542b9f63b0fa7184cc44e50dbafc3f4e909
-EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0
-EBUILD pytest-xdist-2.5.0.ebuild 1170 BLAKE2B 41b563f4a7bae951c236b7167c54d3b4fdedc6e6072c8ef51b2d722e5b3b873b31fe15c31d75eda96d569df70d92106acd5d8fedfb3a7c35e095f2c910966172 SHA512 890e80a9997191489aed4b17d3b7b168079fc1e93b335535706317c69ed16b1d28949aeb1e8521954204975b07d037ed3ea415003d10ce6cc3f74bfb2a41fcec
+EBUILD pytest-xdist-2.5.0.ebuild 1162 BLAKE2B e759800b95073ef2adcf0e65f6e2adaf4e2b763f647131048f87203568440d8cf1120d9c73dc1b009c48f9c4668291587838a51d6cd26c7c4b4ff53e91e68eb4 SHA512 f84daed8092f781ffec31c7e8ad6283ef6934034b9d5721a19848bb1e184123e03993e7c5a380d11773a2751f3d74cbb9f33deefa5aa55aa402fa85d9c786529
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
deleted file mode 100644
index 50b0a8e3c26e..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
index 25372acff9aa..d1cc99c0a7ff 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 36058469c47f..35b9f7d097f4 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,5 @@
 DIST python-bugzilla-3.1.0.tar.gz 115259 BLAKE2B d3eed35aeb9778e23266fb3ce1fc477a93c09533c78e478292b90cd49668f2627d7ef47afd46973898b4d5de474399aae5e94e5cd776d5608d32325dc826c12c SHA512 8f95a60e559cc5b4576d81f37c7104d6bd4afae21986db3c5ef05c6021e601690a01ca97d67fa37e97026f0b97762594e8edd0454953e31930fa841696f65121
+DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
 EBUILD python-bugzilla-3.1.0.ebuild 661 BLAKE2B 2a9454546d6689871b16ce4942cb6368444eb62a8ab720a0727b5714447da75b023ffc64c88ba882262feff474f09eefa3f91cf33e61d94fe17a1a168f1c170d SHA512 8fc8a9ccc52c9ce1f12eef73e118151768723987d14b03ab323e3f8b55dea32821ec02004a77a62358f73ded134d42e16cf66e0a7e49f8869431e1379fb3598a
+EBUILD python-bugzilla-3.2.0.ebuild 668 BLAKE2B f10d1462807047156f0ef4ce0cf3e4dfa396a7f605bab62ddcd2f692cc8fee4c1511406d00510b38c323b5b7b4bf9b78cd0bf50638036d51964d3d8102a9818a SHA512 55728c3d546c5b6bae3600f4106f82370d13fd450b2d440addff2f78c2ca48bfcdcc5f85423e3cbbcc7bf8eea16e8235406254b87090bf94590eaf8649ac958f
 MISC metadata.xml 662 BLAKE2B ef0a5692d9d4f3ca0f474eb012ef97cccba5fa9c8737ac85852d9bb3214160d69fc95eca8239de8d08bf6ea04b5004097ce6b192c2276bc574f441766042c7b3 SHA512 e4ce0016e9ab606c8233759992ea2daa8b20df9b60f129c0b3e210536f0697b46469828de321fa7a09e56889747da67cb38242b739aed227d4a60657207e7f8b
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
new file mode 100644
index 000000000000..a579f6e25b75
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 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 module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index bc53d65340c4..1226b23af081 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,7 @@
 DIST python-engineio-4.2.1.gh.tar.gz 297657 BLAKE2B 0a634cec9f71a3b8659e5b07cc326fb3d7801c8a834248d6f2ea5a48bcd058f8d0b86c2e43c110ea18ef641e3ace273a2ebd20f350aec9360d38ffe0f32f2778 SHA512 f0ea7cb0a34f49d2e3de58dc1038f41cda099fba0033af7020b9ccacd34fbf44fd1613ef14d4d05013dd99a2d35330769e6c3d2f532556fd39262229e40714f6
 DIST python-engineio-4.3.0.gh.tar.gz 299122 BLAKE2B 929b16650aaf4a429e9a1353a994cc87022644bef48c59aac9c448ec32533a7a7360413143159809042915f69c4f0ae0c2a13e5fe2d61b729c09890508107948 SHA512 c34688f1dcaf4a1a02dea03d2746b0b0e089387d4ac55024e783ee2dbafb59ac43437138747b63b0710425601b27e1a10c56df7c57c1ed16ab2f812a773c8ec4
+DIST python-engineio-4.3.1.gh.tar.gz 299321 BLAKE2B a5234a12ad4434e0793154569f4c3f7d3c416d6334acf6af6de03336861797a42d6930350944a4ed6cca089daaad731b209878b08c61b29a97793afbcea473ac SHA512 6e00134191ff39e3e2f3f8cd933562be8ee9db1512f6b7d3cc2d52283ee2ea329d942edcde0bbfdfed71348d96c62067c423d666ad32a789eab760b583fc75af
 EBUILD python-engineio-4.2.1.ebuild 806 BLAKE2B d60930d1c909b2e118f3a40129d2cc528413a4b8bbc3c88cb9b6135bcf3fc7ad4e43987cbddbcbb5e3b6fa6c051d6b1fcd97dc0152b3eca91bda803bf5d58cbd SHA512 9209cb156ec5ac19748033ec8b9a017ae135c90ed29c543e892e14e310fa8045e506b00be52a2494b3f3b178cd2da987f635583bf7bbb1890a5b7be685180e37
 EBUILD python-engineio-4.3.0.ebuild 806 BLAKE2B d60930d1c909b2e118f3a40129d2cc528413a4b8bbc3c88cb9b6135bcf3fc7ad4e43987cbddbcbb5e3b6fa6c051d6b1fcd97dc0152b3eca91bda803bf5d58cbd SHA512 9209cb156ec5ac19748033ec8b9a017ae135c90ed29c543e892e14e310fa8045e506b00be52a2494b3f3b178cd2da987f635583bf7bbb1890a5b7be685180e37
+EBUILD python-engineio-4.3.1.ebuild 806 BLAKE2B 5c37425ce0b6bf3cbd83e6eda36011c6cb566cdf8b2f34bf8363d14fa8705ada1b08e4cc5ae422a6c069bb5c418210b8e5583230def202654e0ead4ed18065d3 SHA512 cec781696e1fba977eae392856ca97305f04c8276badc47995ba2c7cd3893077156743348007908a1594b309f9b75b0df198fbd74fdea926be6b58b556fdded6
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.3.1.ebuild b/dev-python/python-engineio/python-engineio-4.3.1.ebuild
new file mode 100644
index 000000000000..f087b877255a
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index c2d0c4ca0a87..48e26d10a294 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,5 @@
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 DIST python-slugify-5.0.2.tar.gz 11728 BLAKE2B 701fb3f679cd4f714b5c57c14fb8cbfefa5b8268e9c4b877dd1e558e8a7dac325d69519b8e666043b70540908dcb250f561cebf0c5f444f9a3cfae34d97456b1 SHA512 79cdd1d0312c9e34b07dca2e898f177a85b31d3f290403375032ae962df61f3a9c4167f4bdf10f47afd17d544731d6961810f8a081ef615d76d8758c1207e6b7
-EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
+EBUILD python-slugify-4.0.1.ebuild 550 BLAKE2B 1886b4fa8f1f975496bab5f18cffab13002f7e7ff4ec23bf8b54cfe284dec1d51f8111a07bf06b14ae1591ef9bf0e152cf12207dd6a7583c239c59643416ae47 SHA512 c03a77d1b8b3b4c192eabd919f4d2230290d7358492cff6c596ca04a94ba5f93a2698b90b748a3b6ae2a22e4b7a7e1b66a10a71aa01ce72f329abd901e86ae4e
 EBUILD python-slugify-5.0.2.ebuild 543 BLAKE2B 97e438eb813bce17e76dbf7379eb967af083fcaef20c71799db30411a7e2a53aa2dd95906b773d6e3692124b519710ef10278ab54891c58138de04b33e0f0913 SHA512 4792d41186e9d0d67746d8b994583a431523021271d9c4c1c58ad0ac59bb7ae5a465f99abdecb5e64eb84da353a2bdb996e9a07beedb4bc3d2f5b78e3286daa9
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-4.0.1.ebuild b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
index 4463c603e80d..0f9dcf8dacc5 100644
--- a/dev-python/python-slugify/python-slugify-4.0.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 9d0ad26158d8..dc86bf4a0360 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,7 +1,9 @@
 DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
 DIST python-socks-2.0.0.gh.tar.gz 38176 BLAKE2B 84711bd6747dd9ef8d7f47d90e7e1beeb99db7c51a370c01a272789e7d5356cdf3d0e3b1e822e1beb88a29ebbe23acac8f68206cf7a3f8b924f79d3783426f93 SHA512 088a606ca6e13de79cfa8b180d76e91cca129b3e1ffad2243e5924dc10530340924ea815eb9af0e53b5369daa9cf3e66b2f623da6913ed32916b91d24a47c1e4
 DIST python-socks-2.0.1.gh.tar.gz 40710 BLAKE2B 185131be6e2ef85e3d1cb41ff03e57c1d3e8921c04d11df4d3e1d3c7ed6f3cd10459730d0cc5ad63981dcfe0f8cd987f0f287a70f6727727550d63c0ff6040bc SHA512 08afe55b9a5e8d1c0aa5150511e7d3918fd8c6da10bb80037baa4f3c8004fa9e50b30ce7bda26e73f77208b64cb85544029ffd2edf197f6a23614b3c7f56114b
+DIST python-socks-2.0.2.gh.tar.gz 40722 BLAKE2B cfcb3bf26ad9b306ea74ede172d4c8e7cf5412c1e212fb2b806e61bd5fa085c53c47a5846105bc84e9a197198f00d85689dee55c97c691cd1b8b48bad56cc449 SHA512 fac699e2d5898553cfb0045990e5f56c16f910a5434a2e5f9c549872761835170ad7e505833f1cbc4b31cba864c1c0dddc95a530c5b0a7c2002afe0766dd6029
 EBUILD python-socks-1.2.4.ebuild 884 BLAKE2B 64d3fb69d6584dc4f4289ebf2f3b4d86aaff665dc86fc3d32f0d812379dbbcd2d7ff470fe51b991aaa9b2a39489543619d19ad3a196cdcb21d4e65c7d9f52c59 SHA512 8718ab31aca5e7362d63792fb4335ff064cfa4ca604842f85cf9cd0178464f3079c8b8c8c866b9815b8f4c5165b5d795f3e0c251eae74462f10f59254725d1c3
 EBUILD python-socks-2.0.0.ebuild 894 BLAKE2B ada356b419329dcf94701c08c10aeefd7a8c481f5759adc509886b2f91a2991a2d3345a7ce939bcef9090f94a99d406b7e7cbc2c16a409de0a866e3c47ac8b13 SHA512 65fc2444b6090495a8f2caa9daf53def4025e8944553fb8cc4f54ca604d7900a15c54a22fd6e9efdb7b8bf47661332818b8908ad377d56a8d6b1ae7b2751a510
 EBUILD python-socks-2.0.1.ebuild 1025 BLAKE2B 14514d5773ab8666ceab3cb47538c972387863f8bb85bf712343b0e4c4c6f41b6b7655d61eeb22328d8c5eaf5cfb02d5cd6d61efd276bc6b65d26e2599a05957 SHA512 8f3a2a3aa74b7c0e9e7e5a8c2a73437ba4b1119397073b44cc98e514f34e1a2329dd3835b621ecada13f69d7ef438e7627a5d51d15aef3619b808c91df4d33be
+EBUILD python-socks-2.0.2.ebuild 1027 BLAKE2B 4aea717d324ce989492f0eefad4ff172adfbd5bb8c2db7bd77f070bb59ba8d1431f8b39fd7093ef72e7704ed6054db51204f679b9404e9134e0f7c75a9f6078a SHA512 7f36d26276b5a43a2a441305803121511403652a665abf73a97b6957de871e3a28f9155629ea3f0dce883926f06ff809486a9b6afc39d392ff9de7ebbe2f055a
 MISC metadata.xml 380 BLAKE2B 2209abdbafd26baae585840e774843c37e0c6103fa93d75e8c1ddbc8dd1b96f269a3e76f14c39a55294d4d642d7fbe9f87c6b1a0b64152c671590a9e0a6ef959 SHA512 ccbb1a5c9fd05ae1da346f4f92efe156921f7adf9f5544635a407ba4a8154c896bda2e445e05e70a8e46c2829b8d4a38d3bf5d73804a3641c811acd2be62099a
diff --git a/dev-python/python-socks/python-socks-2.0.2.ebuild b/dev-python/python-socks/python-socks-2.0.2.ebuild
new file mode 100644
index 000000000000..df3a8952fe8d
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2022 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="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# curio is not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+# TODO: revisit
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index cba71dbffde5..9d64016f0546 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -4,10 +4,12 @@ DIST python-utils-2.6.3.tar.gz 14914 BLAKE2B 6df19348feba000dccc516704db38af2996
 DIST python-utils-2.7.0.tar.gz 27743 BLAKE2B 5cd0671ad1e003932aed0bf0b69326d907013d3f739e833f218600ee056d76bc87dd2a424f5459654de30dacc3378c14f10af1664344ac66813410d261718c61 SHA512 3401c9ad2e4933d0d40d4bc90f1dbe212e672289e7239a4a46d79a04e80f85bb0def67324f0184ca397ec3708cb935839ffe922a202de9c911198ea86d88e2c5
 DIST python-utils-2.7.1.tar.gz 28997 BLAKE2B 3da11dcb297cace3c2c48ae91e6011be2f484a83f264be375437775eb99d9bafe703626ab0d2217da79ec096f90648d387ec7b41611e915ef33fce152553a18c SHA512 9f74a33089886dcd28dfd45602c53a7c6cfc90b151a053dd7e49a5fd502479e889d08bd8b10fdd2ec3bc26e334ae66238740ff59291f4ac95fb486b64f925d4a
 DIST python-utils-3.0.0.tar.gz 23243 BLAKE2B 640ebc1b3e59a30be5a5c40291d121919b9f90a71476acf66741cb4b8af691c50c3826d9e8e6b30464f2be8e5ba0ac4683f79962c8833073b8a43a108ead281d SHA512 b03f97b66b71af8eb023ecfa1b671f2d566d139464f63cd512b129a5830651172843285fe7ef028047ca03f345221f5208eac8e1647361f173f1c7b3aed866a6
+DIST python-utils-3.1.0.tar.gz 24251 BLAKE2B c00f4c45480f0948cddfa65d4f1ce17ac6831e29b24913d225544619ebedaca67c0f143b55698f8e2edd658e5f90ac39e005a5c29e09d75b5643f79992ba878a SHA512 e22ea0dc7aa0e6c5b45c55843011971c5075639424d38a712703b0d5ef8af32e3661d39af63b6015c4edfe11fca7a256f4f02c3705e1724fe8b9015931d85cbf
 EBUILD python-utils-2.5.6.ebuild 574 BLAKE2B 49716b98a6d7a997149be3fb8b0daf5386c5ab180b9eb7c022fff18c73101314807f498f332db2a6b555bdbe67be68bddcf48ac28860727baa10f2c54cd1ea6a SHA512 6a91b1a761fe2f60d6810d6cd3b676dfb87a34982be3284a7d74fda7794874f358fcd4e97b89189e0db4839d6b0f126889abca8c0b6b926fc0db33c3849d3201
 EBUILD python-utils-2.6.0.ebuild 575 BLAKE2B ffb8a2711fb4f8fc1f96ce30f2425619d0849af1d42ec8bcaa97d9c7f0a737d475255f76cceb8e93a55e5bccde4988b0e4ecd7bc1deb2b65b7b230595088b3e4 SHA512 85e20c3c8cd71d72039a1c0c83bcf10aa390c712b47c219dfa67c2de00bb68b0700f9a0a3ab140955d0ae320c6d7160946640d7f4202a28ba09ae342af7a5d78
 EBUILD python-utils-2.6.3.ebuild 575 BLAKE2B 5791d01204f77da103781b305bbf1e4b88e5377fca285b03835886b9f26f04900ca436a11b4653a9d240d934b160a3268b4e3ebaa7b58b59e6b219c31dab55ec SHA512 a1cad83a0ba5ccabad120e4a65c9712bb1824b7ff8db6b9a64222bce4e4e141a6af94214ae2791109c875a078caaea494ed6d33fce6c2fd81e8bdc9b0ca28e00
 EBUILD python-utils-2.7.0.ebuild 601 BLAKE2B d54cb31071edb852dbd7867c2d1922881aaebc3d312a38f8b53809a4e305a2d34d663c9938868f936ea08bd72c62fb6eaff19b10769b2745e78551f2628ecc04 SHA512 11416eee8cce36e4d4776e5890a514e108879ffa56303a01d25f9a04757463689a5b2933b2418188fc7c7aae0a0cc227f831de75d840ba186dfd23dad993fac5
 EBUILD python-utils-2.7.1.ebuild 601 BLAKE2B d54cb31071edb852dbd7867c2d1922881aaebc3d312a38f8b53809a4e305a2d34d663c9938868f936ea08bd72c62fb6eaff19b10769b2745e78551f2628ecc04 SHA512 11416eee8cce36e4d4776e5890a514e108879ffa56303a01d25f9a04757463689a5b2933b2418188fc7c7aae0a0cc227f831de75d840ba186dfd23dad993fac5
 EBUILD python-utils-3.0.0.ebuild 663 BLAKE2B ed14d748640a91c766b1a293eba5aafb0a623556ae540988b5b63e9db3640daf6ddce676e38fe5d378b56645dedd96abcefeb04702502cba0a60d2131cba338a SHA512 3c967b4035b58371c13a06be7ddacb1d861e6cce74575ed8ff8688f9ecfa3588503202b978026ca2ffab80c0ba22ba9c2f90c4528ca5200b22cf322ef1112059
+EBUILD python-utils-3.1.0.ebuild 620 BLAKE2B d2481135ea530e819b5aad78b3aa25caa06cbc0edc43257a7406be76b32775cfc8dd69742c6846b0ad1677e4e23d2fc62fea8436810596c7a31851233cdf9452 SHA512 cce7ff6d7ea48d14f84378710c390c43af2c9a4ff12880cadd473ae567d9481b308e760cc4dbd66cfd561c2ab48cb8bcf07cfa751144d8fbe1bd993c5a91b56d
 MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/python-utils-3.1.0.ebuild b/dev-python/python-utils/python-utils-3.1.0.ebuild
new file mode 100644
index 000000000000..abb04012919a
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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 small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytz_deprecation_shim/Manifest b/dev-python/pytz_deprecation_shim/Manifest
index 02e96e77dbfe..efc1f9ff5e7b 100644
--- a/dev-python/pytz_deprecation_shim/Manifest
+++ b/dev-python/pytz_deprecation_shim/Manifest
@@ -1,3 +1,3 @@
 DIST pytz_deprecation_shim-0.1.0.post0.tar.gz 60190 BLAKE2B a6d186ca6fff17a3fb787ad6164fcf45fbac272e6123491a6822699cf54a115c9941f2b1ee3d227f531a0ab1d11846300dc24974611cc1671c77405606704754 SHA512 201eea777f4da9def1b060911da5eaa89652f6716d5608278fdc94a2f67af5ea23a8b667cb181e03d5edd7f0a07f4954047621668f4c2e7bb325dd07f454d0b6
-EBUILD pytz_deprecation_shim-0.1.0_p0-r1.ebuild 1027 BLAKE2B 9c9f88ca13abfdf545eff5482a42cfc0ed7b06d5031c0dfda88394cc528a8649d96424d046a6675a37a7223034ad74d5b6b65356e13ba90cd04590f6de9fb988 SHA512 c3f1754acb3eef5f673a48dcb6ed31cea37135ae45147c6adb298142c740b29286ab998a32a9b633f362edc328f1a711df289ea408f94e47f57d855dfb670897
+EBUILD pytz_deprecation_shim-0.1.0_p0-r1.ebuild 1062 BLAKE2B fba38abad2380f361f38d26213948a162fd1160f596522c9f601d783a8f29d762fbf56fa55fb24b5a64e6d1f797d6b5e1827074d339787209e48ab2efbc2b568 SHA512 cca5aceaad23719f54498d30670379cf22a9b2744b12e26e1dd4c502a89209469c8edc13b6a2e7a19895ad88ddb6d8974f73796de00d2176f287bb9d3d411d4c
 MISC metadata.xml 419 BLAKE2B 2840524ff112ed60eeca8162297a1d4c0c3ecb47a5abaa440d237832f90a823789f07400200d2a0d31b25f6d2484a85d448549f32ccd7b4a1d755ff263c7df7b SHA512 3c75ed2c66ae13d4f67d50f07eb5e17fea8d4f8a3252d3a4d52ebe0c688c9253c61dc065ac6cda6120909e625fc1b6eb74a6f2d7dfc8cf25c8aed075a4f75bbc
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
index 584e9e158982..2eaf520d9ebb 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 5fec2b42f473..657cf4ff1b43 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -3,5 +3,5 @@ DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bf
 DIST qdarkstyle-3.0.2.tar.gz 8330772 BLAKE2B c64524e2ecc23b714d6f5df6cea007846c6a9b1d5805d12e23c53e27c0411900730c656583bb5446bc343018e4fb1e110994c646e277ee0f3a3a7553df77f3ca SHA512 ef4ffc82fe3b72d89deb5dc98fc7319dbd6dc0bae530bdf612477c44934f587c497f8a9ec9d060fc8fcafdc918447f4dbbab20225f1e5cbf2146bcde83d0ce20
 EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B b22052ffed55f621e0485e5408ac225a30aa8512c7067c7fe7ecd51aa370f7c2aa9a3f791d6af99b3f3e3ce0d595d618ef8d3c28488cdf55c48dbcc384b3cc6e SHA512 310b02d55f42ae6c7df703636ef6eb02a874958515d5e5c341db8f9cc4f8d777b179b4e2ddaa21761938e7a6e8920ebe1075ab637188a8cb4fe18aae5ac81f70
 EBUILD qdarkstyle-3.0.2.ebuild 1236 BLAKE2B 0c83ad8fdcd8ba37e215477727a809b08c7f7527a762199dd60c73c9c22262251198cd719ebf90bce89297d40080e5f69efa4d0ee7d071b6c66ebcaa38ee492b SHA512 1b6d40e34e7bc7e4df1a737854980fdf3cec8ad7df25ccc5e8c1c852861f2fcfd4cf820b491664ba8d0d4eb44a4122bac9ad127a5e3da88a0aaa4de25d1cb4eb
-EBUILD qdarkstyle-3.0.3.ebuild 1153 BLAKE2B 77c2b725340320caced8c3c7da613765f57aa3eefa32a335c69d7956be73b97ce6c7066622edf261451d995e0c731f1cb9260d39216897e584fdd2e49500d797 SHA512 8100e91bfacb4285b2f8567cf2e976f768978e383793aab73256cfb9efed9f8228dd0b1f74a44ba9440ace761b38286a9369775d21e494e2342ae1700b0ce7f1
+EBUILD qdarkstyle-3.0.3.ebuild 1151 BLAKE2B 8aa4d862fd9e1a27f896062eb9428cecdb98d3ce3516d8d6696efbdb702482af106a5467d1e3f06d3178957e756df485317347badc596130a19fb5002bed97f9 SHA512 451928b6dccb5efb1ee9be0b2fb421a2e1d2a20aa09725f1833a5813f8aa15bfb3ffa92bf8912b855e17800769fa874ae261751bd7064261e0fee0174b37b140
 MISC metadata.xml 356 BLAKE2B 16d4b6d558d5acf0b812a0e739f6073445ee1a9c02fa9cf334d74f29cda84e3a1cbe9e8a5f6c9d09c68606a0273f83f528b738c524aad97fe2365d855d627984 SHA512 487500f2a0f1d7b2389f5a0b2b9da6185746a4a1702037ed3ab982635c9663925cf999a7df400aa98aa0d4ff2b2d2bb0fae7c14f1a6c4d47d4cd8964f8e1471c
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
index 25c68c9ea48f..9e8e925e3e59 100644
--- a/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Figure out how to get this to work
 # Please pass a palette class in order to create its qrc file
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index df4ad333d0c5..67bd2d4914e4 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,4 +1,6 @@
 AUX quantities-0.12.5-numpy-1.21.patch 1081 BLAKE2B cad600d3961359dcfe3ae0534510e03300a81d0d7e8911c037abe556ae8d81e2cf813712c042c6663624103af1eb08fca144ff34c8c16680ff0450d8b340f3da SHA512 b0b027a80c121d9f9fe453f3663b46e1ef4f38781a107025a201ae18f6bee9b1d3473fe25eb74a2e79e10097f93cb06f34493cfafb7c2a35bd64704f3fb6a351
 DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
+DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217
 EBUILD quantities-0.12.5.ebuild 768 BLAKE2B 1d4392e23350526440d3e07289496f8ccc2c4a31feb235c6242904738a9171e3287f89f928658d2f83062560332c02f4205f99f3f075ebf026efc25c556d9c26 SHA512 2944d20b6adceb9303cccb45ad6ef1f3754f0cd03b5af74ed2ebcd1c3ee42346c1e300af039c1dec83fc93ee70d336e5ff8e460a693e26cce1632f0630277d47
+EBUILD quantities-0.13.0.ebuild 630 BLAKE2B a8f58f7e927d1c29ca5acab53604fa070a03d4441d4c3842440f82047cb163fbb761867086c1a745d722380209207c9a179c909ee940d969c971f48efe9912aa SHA512 d62d10caab82f76021e5038f3038e8297149d009233d6dbeb81aca2ec55915b061e17540ebdefb907a06741844a3f548ca897215d32a68b375a81f6657aebfbd
 MISC metadata.xml 646 BLAKE2B df1d2cf46f590a90d168f7024d52942531f8b570418aeb9e5ba82882b8b8be86f57a15e3c652246ce08e42ddcaa2813ea594a45ba15e9db9bb80795736e0eff3 SHA512 0ba5443c1554361cf079ae651ffd70b979bb70f6f22049470bccd07537aa967a7e3c1d46b7c580319c4941aae984906a40216c5eb108a9f1aa95fa0680c75248
diff --git a/dev-python/quantities/quantities-0.13.0.ebuild b/dev-python/quantities/quantities-0.13.0.ebuild
new file mode 100644
index 000000000000..29b2720ff0ff
--- /dev/null
+++ b/dev-python/quantities/quantities-0.13.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+MY_P="python-quantities-${PV}"
+DESCRIPTION="Support for physical quantities with units, based on numpy"
+HOMEPAGE="https://github.com/python-quantities/python-quantities"
+SRC_URI="
+	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 8d2d72d6b6b7..a7a63b0e73f5 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -3,5 +3,5 @@ DIST rdflib-6.0.2.tar.gz 1273100 BLAKE2B aefd98c480710ece6fc5e621ebc0526eb24c61d
 DIST rdflib-6.1.1.tar.gz 1587670 BLAKE2B f13831124a8f292f0481f5ee9995b6b7ba82992cbe51abb0067703b2acee9f13ce5a62379636ac9f36823afa5b841799c1f26358efb6c12eca2df333611d5488 SHA512 049608dc37dba929eac1e40431885d319311f27be9fddc292d768e3703927e61a646a73137e4a1eaa16836cfba4606ea2cfd8fe3a86cfbf10e3271cee2ee251f
 EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
 EBUILD rdflib-6.0.2.ebuild 1311 BLAKE2B c33814cdc50ce492d5ea03af76b55b1b45bc3a0fade7187224c4d9bf6c19cf87e06d7de32ef1c85c7b33cb4cf5d2b87303e5ff1067e5e2238ff21c953689fd49 SHA512 f452812e17101d84525fc191808940991567222b64010aafe4a253b20835a9fd61503164ad0de93c0420eb42a360a8509b597c6174fd4f5da106a7017d9e5e8c
-EBUILD rdflib-6.1.1.ebuild 1389 BLAKE2B fbac14c9699d44c7a3cd6b30820974bd55eba64c8716545bf1bbbe6f5042cb88564e72e17e911cf6cbd45a39ba1e54c8b287616753cd9c4036214663dbcb6c1f SHA512 842b0b6e7a054ab3315ab7932fb1b3d1682ee3292464304354e32d9b557eb620608cd27cb2c2ce9b3c724401265fe4cb0f8d899e35ca5d50d71ed2b98be91f43
+EBUILD rdflib-6.1.1.ebuild 1395 BLAKE2B 5d3bacc8f241ea7420a645bb3860f57abd567a7106caafeba9f19103c8ef944ca327476690102a7fe98922753b38ed9d22fe39343e63cfd203462497fb898fdb SHA512 c52b142347a8a96994e31368633fc1e253d470f929655242e63145f7f17881e5144c5fd19a6dc453a0d57bcfea1e3bcf981a66a3c1895c4036158491e9cf7554
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.1.1.ebuild b/dev-python/rdflib/rdflib-6.1.1.ebuild
index e41b8c48c036..564680caefad 100644
--- a/dev-python/rdflib/rdflib-6.1.1.ebuild
+++ b/dev-python/rdflib/rdflib-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 5084cfa1cb28..0d50a9c44e08 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,7 +1,3 @@
-DIST readme_renderer-30.0.tar.gz 27065 BLAKE2B 974d6070e2704e293701101a99161b7a23b97799b0bb841bc196e603eb97314fe5dcc93329aea2c67921f3ad6afc8f66c6b3742b4de966547ecc5ba2027421a8 SHA512 fafaae9a9ed61338611c509fd907f6314b97d13a30fb5cdfa2b8dd5d08097fa05d8edd27fd880725f783cf96326dee40e85da60bb4948bc810162b53528d18e4
-DIST readme_renderer-31.0.tar.gz 27617 BLAKE2B 2705157cb0cb04e8891ac5b0c363dbe30559ce3fd5bd5c0014e9746d6334c68b458fc1dad69c8da3088ccf5c70dff31bcc957fb01c26ee37f7370d3ac7dbffc7 SHA512 8399d478f46c58a3abecbbc3242c7cc4801fc84c04dc4ab35b88159e65373fe91ccebb1ab6eba505651b0dcab6f12283f55aad902379a2b0056ddcbce5e76897
 DIST readme_renderer-32.0.tar.gz 27812 BLAKE2B 9e5052bd6d14c9ae6c405934919b2e2555094892f569c3acae2149607c5d94c9522e994110b1b9607429eaf865925a3fbbda5eb78e3ac9ce66024d229c6b223f SHA512 58f3dfe6e19074e8f0c5bb8125c9b414651008cc1246a5100018f24dbb199f5d9d920a0201afe06fc9921d86fca339bd1ebd1b4d8c0606aa59e6e2edd1e8bf56
-EBUILD readme_renderer-30.0.ebuild 772 BLAKE2B 3aa951a47e7a0461b11e25a47eba165e4624c7580aad8b578a091f1e074c7c09fe17c7d287d18d00ff44dca6bde508720918110fc9cc4797c3a07a6bbb593e49 SHA512 66430e60cc77043cc07415391f7b4d01189c9033e369c7532aa9a89e26734ec21fb49c4f027daa2483e2a9202af47a4e40897b4025b0de4ec6d2706df564cd22
-EBUILD readme_renderer-31.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
-EBUILD readme_renderer-32.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
+EBUILD readme_renderer-32.0.ebuild 772 BLAKE2B bed2426ded206f5d0d5fdffe17280084a2f16fe3ddadb595a97c4a6e8b8e669776bb0c9d1297bf2e81a121c11b8610a82abb1753a5c974d8adaec541f6d93b55 SHA512 9911fff61aaebb5abb80db1a2d3493c1fc36ab2ab36dd2502f61a881daa59d5b6a467ce4d25a6764a2a16891fba68264f31daf02300950c8b53f936997bbd59e
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-30.0.ebuild b/dev-python/readme_renderer/readme_renderer-30.0.ebuild
deleted file mode 100644
index 110c64785058..000000000000
--- a/dev-python/readme_renderer/readme_renderer-30.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-31.0.ebuild b/dev-python/readme_renderer/readme_renderer-31.0.ebuild
deleted file mode 100644
index 1b1eb632f04d..000000000000
--- a/dev-python/readme_renderer/readme_renderer-31.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-32.0.ebuild b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
index 1b1eb632f04d..a2eea87a8145 100644
--- a/dev-python/readme_renderer/readme_renderer-32.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index d4e0e747cbd9..67b9839d0352 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,5 +1,7 @@
 DIST requests-cache-0.8.1.gh.tar.gz 1540290 BLAKE2B ac9d7cdaa553400484776236b13f356e4e80a7c3aa5e63563dad860302cb421b7ceeb61e80af436cf9559467c4b2cd5e8363ae05e703661b88bf3ac04601ee30 SHA512 245ee7059afab50f32af9c8831fe11c14d5bd53fe6bbf02e5844974e0e5ea6c33e005f234485f245ee418ae03277c6e2cc41046a385ff138e58785cf37b119ea
 DIST requests-cache-0.9.0.gh.tar.gz 1539360 BLAKE2B 9eb09e84f53dc31fdaee2e72f961bff1582fe58cf0d33285e3d291ee10615c59cb9942a5480af48d840b7d4e3bcd8a7ec3367472478333c39cde579943b1b3ba SHA512 1f4879ddae34a10f014deb31c62fbe18c3d6a30ea10823d122aec4920ea4024eaf86c0b1a6f369b71f827ee87f049a5c2dad9fabe61aa6a5a62093fb08fa4a7c
+DIST requests-cache-0.9.1.gh.tar.gz 1539483 BLAKE2B 9adb6710cda7fb6ae9dba9b6ce57351b9817419f7108da328f4ac206534c6c5453d79592ecbe1108d3d5d78862ed109630fdce518025a42b1db101c906253d16 SHA512 829488f68f10be8f84203d488d5dab68c477d02bc4419b49b38851693f2bd1d0ec0b86bc5d953b951b9c7d4372b2bc179f096014f69eb6356f87a2b1d025d3a0
 EBUILD requests-cache-0.8.1-r1.ebuild 1794 BLAKE2B 04abb4fb246fa326a2c7fe2a0de21dc2afc63013dbf63feec008e0a881bb01395922e0f428089a89de3b32514f5f51776e0ecbb3e39622e143a5a61de205b4b9 SHA512 fa3fcf504be9b36dc985238380e60b239c35c6d8eec87150b3928bea01354380d803c30b417f38f5a7acfa384a91a6dc2f632c903a713075307a38c60ad0d97e
 EBUILD requests-cache-0.9.0.ebuild 1796 BLAKE2B 6af346758c97498dc4e7863fc80c3c312f60c7cde8b85f4d8c11a6946375d435d2f7fd7379c450df9c7823f4adb4085422bc1593e89500bd09653bc01ba49afd SHA512 75d1c1dd1833df63d28d054d2401ff8bc41c64a15c39a11e78122e1ffe394a372c72d6a92a3182c072dabcec07856d316c7e9ca08e0cd9e74dd5d7e5cad3d7ec
+EBUILD requests-cache-0.9.1.ebuild 1796 BLAKE2B 6af346758c97498dc4e7863fc80c3c312f60c7cde8b85f4d8c11a6946375d435d2f7fd7379c450df9c7823f4adb4085422bc1593e89500bd09653bc01ba49afd SHA512 75d1c1dd1833df63d28d054d2401ff8bc41c64a15c39a11e78122e1ffe394a372c72d6a92a3182c072dabcec07856d316c7e9ca08e0cd9e74dd5d7e5cad3d7ec
 MISC metadata.xml 470 BLAKE2B 83ea1b65050486c1ff410664b87a19e514102ec030ea0f3d4076d435503f6ad2dd16caf8ff0c947d064c93955a743fe45d14c4d64471613c9de65c33f6708b93 SHA512 54160c5daeea03d90c896e30f35ed6ce8e7a29280a5e1bb1d1b0c04b5899a48ed3261d400762bf9c92bb73ddb554bcaa533b620ecda691e43fe89c1d943b7b54
diff --git a/dev-python/requests-cache/requests-cache-0.9.1.ebuild b/dev-python/requests-cache/requests-cache-0.9.1.ebuild
new file mode 100644
index 000000000000..bf43d1b00ca4
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.9.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/itsdangerous[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "redis backend" "dev-python/redis-py"
+	optfeature "MongoDB backend" "dev-python/pymongo"
+
+	optfeature "JSON serialization" "dev-python/ujson"
+	optfeature "YAML serialization" "dev-python/pyyaml"
+	optfeature "signing serialized data" "dev-python/itsdangerous"
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index cf2067450c48..850333d7aa2b 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,5 @@
 DIST responses-0.16.0.tar.gz 41943 BLAKE2B cca1d4d0f5bf6980776a9373ac51f5305d8db439eb1c1dca61985704da2dc8d62839e2aa1fde30f9e8aaaf785c0e7cdae56662270ced0627ff1c236c3cf252ad SHA512 b2363cd7c9aad84bfce814fe815663babfe584fa390f95a1d5e01118c8749e98777bf283a7200ea96a7ce5fa1ad6d85ee329e4bd999f3dca0317476b7e976f12
+DIST responses-0.17.0.tar.gz 45064 BLAKE2B dcfa702209df3d62fc3fcc2fd012fa15a75c9a7b9757b99c886265de582924452746b3ed86da7b293897b489ceb48dbf99e74bc008d4aa3932714aed3676ae08 SHA512 238c7b4926857c13a4192bbb38eb0dbd65d110ae86c19c59c1504bdfc912fefebdc3e59c7646ce4f0228a1a080201b11d336bae56fc190665f816c6251de579c
 EBUILD responses-0.16.0.ebuild 766 BLAKE2B e41eb7dc4d95fbb5981e8227909aca0654ad338c48ea52ec6c1e4a1bc6cae00e590824c9e8e1d4ee90f5d2a5b8c2e0e5819ce38baedbfaf202f85256812a9b34 SHA512 15418fb751833c9e73e98c6a4f19a8fbf4066a90ce25eada1c9c915dbaaeac2b572433e9f17dfebc07d2b3457b9a1ab3cfde07780b8e20d67ae93fd484f11c4a
+EBUILD responses-0.17.0.ebuild 774 BLAKE2B e47ab15c00bbd8b7af95dbc62bfeabd74a2c718ce3bd7de24eaf7c311d846b9a80e4ef311bdcdd985274c195b491806ce85941b41c3ece3805ec68b5e699bbba SHA512 82ad6960ed52bb6337208c3462c10333390ce3105ba5b1557eccc4534c1a16663f74d603143c670f7cc6dae94920e92d2f2f973f3e4d8f954287fe318306287b
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.17.0.ebuild b/dev-python/responses/responses-0.17.0.ebuild
new file mode 100644
index 000000000000..9066717c3083
--- /dev/null
+++ b/dev-python/responses/responses-0.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 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="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 379c3c9fbc41..9f197f87b33f 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,3 +1,5 @@
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
+DIST rfc3986-2.0.0.tar.gz 49026 BLAKE2B 41e1ab9d1ad878336dc93fa0924c6cc90930d5fd3ba0bbb238be402512d3227cacfa555828c5d698810bee74b3b77f045abb7fcb5c854a4f49922f4cbe05004f SHA512 5c8370cb1e21811eaab91269b9a30972b8fbcbe1fa1d806fd3ceabe0e1937de856d757146137fee470fbdbcc7e948b236f72a42306da41a6d03807e7333983df
 EBUILD rfc3986-1.5.0.ebuild 684 BLAKE2B 4c9643c65709e7be8d0532bcfe9302b6ef3f5cf1709ef9e490589e213dc7a4d70bcbff21d01554aa716d839cff8b9c46a2bd9d3d7d26f733b36fd6ee879148b2 SHA512 57b8d28250ce0cde9d437f2d42d32b49714a1f0da6d0a82d8d438edded99d07921d6dc6666992da61148bc52c81e22a95f1613951bd4f6db2d4619906c989bdf
+EBUILD rfc3986-2.0.0.ebuild 692 BLAKE2B 2858341a1838b234e08f287e6788463eae3904aa2038ac0da3e575229f08bb82085efb549aad504c9051e0e7280e07cf88f3c8d60911bf5581d71046f3d29a71 SHA512 a89e493e92c65a727da5ccef58d1e3d74131f4fe02e7e7c57617c2df53dc7ee3706c58141ce7970899a1c265c744778b6190dc4f448ab840aee0c6573c88a8b1
 MISC metadata.xml 741 BLAKE2B e493181d32969459e23997ab0d48e5c1fd42f2bbe61ed04a5107697a61090d109b6133618c5ef153c92b88eccad0eb93c02073f1ffa9e763aa8518a85de8a19a SHA512 34ef9d54aa2dd6cca1f4d3abcc45d3147c0fdca559a9d30b28ef86e6e9d908ef0fb82384f10abb535fab1a0aed2b81f78b517cce73e5b947501ec9be331af13f
diff --git a/dev-python/rfc3986/rfc3986-2.0.0.ebuild b/dev-python/rfc3986/rfc3986-2.0.0.ebuild
new file mode 100644
index 000000000000..ac5f51cdb658
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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="Validating URI References per RFC 3986"
+HOMEPAGE="https://tools.ietf.org/html/rfc3986
+	https://github.com/python-hyper/rfc3986
+	https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="idna"
+
+RDEPEND="
+	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 8f31b95746c9..86b73ce028ae 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,9 @@
 DIST rich-10.16.0.tar.gz 16280103 BLAKE2B af66398a4bc6e3e5503418721906679dc6f964b6dcbb56195f64d0ef4f504d9e0002f8b727c4fba7b42dda8790a03bb12a85150b99d5294712e38dea2800f841 SHA512 48c9e4d0b733cf79e9bceac284ca3cf37c14f52c0f3590f08acd9b0ea791da0200753f3cbae13a619b9c42fdb1167d55724c80123e2935bf2ed7133a15639ac8
 DIST rich-10.16.1.tar.gz 16280385 BLAKE2B dda2e6a64f9ecfe99fdda3a2e24c6a859e25eca48ebc2af63dbea3c8b90f977e10253721e85b876165c9f51c52ceed057e77b08cf2c77c28de67b8a2c49c4617 SHA512 341aa3fdb7fe608d15c867eb50f36fcc250e041a256e4bee86f0c69e7e0f9239c84be88833dad56f05edeb09a734d64f423b9080bd13b88c3a59d958e8ff1f4c
 DIST rich-10.16.2.tar.gz 16282443 BLAKE2B ccc7292e265770880539d6a1a6b2e819b45e2e3d4d152f1a16c56f2da74c9a472ae49ea0a4a677ad71c4dd087fade2c415484073b4b2cd86869ad7c43c32b162 SHA512 9cb8b0c8105589db22d7efdc47cbfa20531cd184f07855db4bfafb667299c7d3e520b19e3b33e7818affb7a5674805849ee9f2e770927e285ccd7f4f838982c3
+DIST rich-11.0.0.tar.gz 16293684 BLAKE2B bd38f84a7e0623dc9474bdc369b452fc668cd4756f00f6dd1b185f95dffb3d55f6b95a7f6dfaed5ee1ec5f2d9514af6080835b9ffd010f150005b15afb761d97 SHA512 bf8218ff43a101c4624baff1ecc316eb95912d0b634c41293b44de135ea4c6ead0fa2c6a96ab1403ce4dd80961915dbe7753415a74c7d41fc1f2d227113e9ff3
 EBUILD rich-10.16.0.ebuild 743 BLAKE2B 3f9b348de8da37dae056fdb7ac0284fda112d940a3b8e8a91cef075567f9d3243be1869d17eaeb570b64b113a5e3dbd523423c852971f464de55ff948a1b3687 SHA512 c9a18a846ec538dc6cf9f8763084d17e1c560b2ec9e62845c29ed85156362e497e79b447850e7a2b04a5ab67f732534aa037aca441d6be6b43a3b0bbf7f3004e
 EBUILD rich-10.16.1.ebuild 824 BLAKE2B 064c0fe120f736cd9e063c5ba9f6392eec3020f5d08dc3fd0b604400f71b51b4cb58c2e8c2429d2598958d2bc68c20025845a2a3f2e0a9c9afd004c2047ab80b SHA512 b767c2bb0533d719a96c186d8c244cd8cc80b8a7a61d61ad2369cadfbae43bbdf4197b9a621e222469592816789a08e9181321362a1f8433cb11475703023890
 EBUILD rich-10.16.2.ebuild 1080 BLAKE2B 6742e4db58498f8cfca5907b168ba9d507234e7f1dbc2255c9ff32e9716731a87c1c77b1130063c7cba84aaf9266e3306a01b8a47aabb34334c3e9e6be600cd3 SHA512 d94fff24a57819c7c411de54695c17eed8c51fd16de702785b314589c45640893aff81e476d4f197eb00ca389e7a7d7a78e9265866ec3b63a6be9e3ab0bb3f17
-MISC metadata.xml 388 BLAKE2B 9d57523a8babbcd81afad320ed91201aa1235a19bcd305b3102888f17d24666fbf94df2eae06af746a62e167c139258088d7116d52064ec022294c7ad4a9cb48 SHA512 a2a11fa0ab987f8b661176e88980dcf7335298d80a3cbe7c910accb9ecd9ee33e3add0389b23224fee88467092298db9176adde09935fd466ebbf97bdc58b8db
+EBUILD rich-11.0.0.ebuild 1078 BLAKE2B 27f15447f6ede675694532b5d37bf07514cc25bb5dfcb17bf476c9db511a665c6a262f47b96f474cb4ded18efdfb23f1e1b7a8727b3a926959b06f1f346548ff SHA512 0e242ae01743c40d31a47ae340923366df509679d87d87adf6c0878563379038a12adf8e212788370196c524b97e3958c4b170cec74a73e420d099c650fc53ce
+MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml
index f39155ecdf42..baf8ac70a801 100644
--- a/dev-python/rich/metadata.xml
+++ b/dev-python/rich/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">rich</remote-id>
-		<remote-id type="github">willmcgugan/rich</remote-id>
+		<remote-id type="github">Textualize/rich</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rich/rich-11.0.0.ebuild b/dev-python/rich/rich-11.0.0.ebuild
new file mode 100644
index 000000000000..17a1b08bfda1
--- /dev/null
+++ b/dev-python/rich/rich-11.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 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/Textualize/rich"
+SRC_URI="https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# check for exact color render string, which changes across pygments bumps
+		tests/test_syntax.py::test_python_render
+		tests/test_syntax.py::test_python_render_simple
+		tests/test_syntax.py::test_python_render_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 9652f08ff68a..f6b062867fb1 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,4 @@
 DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
-DIST rq-1.10.tar.gz 598643 BLAKE2B 503c2e45d134434373eb89ce205dc1a82f16e0281c1f872046d51538b3352b0ffeeef72f64991d093f271c276c1a8a3be92fdda4d7db3e083549f69ea7a04560 SHA512 7e2de3e36309eb3c095d34c28d9cba340d0699b8b4b457491d12420bfc1370e0336dc10f4f1115e83ac0ea8884500750895417f8b5c2090105d3c9e32d1b5bec
-EBUILD rq-1.10.1.ebuild 1369 BLAKE2B 98a7ab255f22cf5d5f4f11df45f6a494783b28fe56978c394d6091e668d9cee3c810c07ed357158a3442be1c5e6d5e6edb0fbe87b6e73807d3dcc550525dbc06 SHA512 9535651198d5c58beae27b1b11d676715044148d4ef2bdab31909bb81094084c6144cc429ed857be511177e4715122a3ac41a44026cb6ddcc086452d82a81505
-EBUILD rq-1.10.ebuild 1365 BLAKE2B 0f65cd076e87bd75f20ce156741081fc6d586ad11a4e5f6b1fdbc8cf72e0c7a5fd07aeabf7a0f4225cdd24ebb73b266cfc6cdcd8b975a618119634a752bc3495 SHA512 71f26da6d8b968188a815934a7b3f4917e1758842bb9d9e11f381aa25d876eb248bffad7a0cd71663e18d1cccf6663fbf2fd8fe34b1d31ff3e39cfbfa1c21ebe
+EBUILD rq-1.10.1-r1.ebuild 1372 BLAKE2B d51a9f18f2820d2e525b92ff8799fc28ada6a8065647b9a474b68e4a4c5d8eaeb9f476fec0031d19a20a6e5cc8eb94ed61a1de53efaaac1e10679b55e0ad97e1 SHA512 0b50779734449c9d6e1626d6c421e7b908b66dc23583837e31f7ea28d691874d3c551a10cd7da16c8a8cd2b94699647a252df3221081afca92915fbc58c758fd
+EBUILD rq-1.10.1.ebuild 1365 BLAKE2B 3953f3844bc30aa69f7f8c8b3882b7de3211e4baea0210cc1acb2b364b79430e25a01a9f98d0dbed0fbc6c77c9cc3487ab5b30f539a3ffc9818e948185c41404 SHA512 d92e32a6fa048b7d43cb16b9e414f8843bbb3b3a940dbd1ff2bef2dd425294395e50d861e94a5d422dff106b403d249eac8c8c8890ca0df0c67856badeca593c
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.10.ebuild b/dev-python/rq/rq-1.10.1-r1.ebuild
index c21155fc3464..ec467b29af9a 100644
--- a/dev-python/rq/rq-1.10.ebuild
+++ b/dev-python/rq/rq-1.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
@@ -41,8 +41,8 @@ src_test() {
 	# Spawn Redis itself for testing purposes
 	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
 	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
 	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
 
 	# Run the actual tests
diff --git a/dev-python/rq/rq-1.10.1.ebuild b/dev-python/rq/rq-1.10.1.ebuild
index 165a441d99e5..0bba3322abb6 100644
--- a/dev-python/rq/rq-1.10.1.ebuild
+++ b/dev-python/rq/rq-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 7abfde23ae9d..ca2f450a40f5 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST sentry-sdk-1.5.1.tar.gz 234143 BLAKE2B 431216c66b195ef7f26fe74d5f2c6e4697d93209ccf650bc0f043f4e7c6bf38a3fa98f39f75d94bc66247a91d0b3e3b85f4fa1912c0f71827a912e65fb976468 SHA512 09e178e5abe2e47d29aee778c8fb48ea5e09efa278dd970e3c856dd04704ef63f3adba0edb68a73c09baa2291bae41cd6fd081dd9f0a2792c1edda480fe1f4b4
+DIST sentry-sdk-1.5.2.tar.gz 238538 BLAKE2B b5ec8da91e6eaf76e5501a3e97e6a06f67b6afb887fcc161ca4c5c6750e294cdb2c72eb7f8ff62b06cb27410f580d3a7ce3aa5981282719a4e4eba3892781394 SHA512 5bac6ce88a2a2f9b6269d6c2483568cbb627e7fb338044272785d1fcd574c7772e47c7304bdc3082058883d53d7ca458f65b3ceeb6d7a7fd70b752b335105193
 EBUILD sentry-sdk-1.5.1.ebuild 2541 BLAKE2B b3e538b030c3d885f5456d3176765f29eb5ec112544c7017e084d246ce8f2095f7657de052110b01650f45c24908abb46bb42c57cf229da859b51df51958e2cd SHA512 413a04501d5e8e66feaaa94a71a183486c3df4deac2ebf1375d7940555d484d41bb1abcd79b38c5d63414e9eba704187b6c82f36140865a2c7678f40165c6839
+EBUILD sentry-sdk-1.5.2.ebuild 2593 BLAKE2B c7223bc55e783f6b93e77ac031077bd27e271799884aa1e97daeddf383bdb774f5c58af41df990f1bcb4dce6d73c8801ead481e0793c8e87c70dc761e1f0c9a8 SHA512 691e050d257372c081eb9a7d9b33dd0d762e642cd9aa190991050399fa196ba6590f4ad7a051b83731af2dde6bebc22a6f40581c536d38dcc91098afbb23cfec
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild
new file mode 100644
index 000000000000..f7fe237c12d9
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 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 Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# broken by rq-1.10.1 (optional dep)
+		tests/integrations/rq/test_rq.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# hangs
+		'tests/test_transport.py::test_transport_works'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 31abd83967d9..d77adba042fd 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,8 +3,10 @@ DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0
 DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d70726ad00625994d78639665f41245cee6f92544d5d5fc9962841ac0b2db3302ebbf0b5c6ee8f544f003fa05358c7ccf2 SHA512 9c7185843ead283ef97311018f1bb683c2e969f0333d5b246c7f1687c5ec6a9d6a2dafc39540ea7354e969d5a3f84e74c07dbce010970dd0ed46ebb48300a0bf
 DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
 DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
+DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
 EBUILD setuptools-59.8.0.ebuild 2933 BLAKE2B d5f4b008152d6a1324ea2a63da229f71fda4f6e20f1d7790f69257e9945ad98c02d765dc5c4e76fe44b476eeb19df6b21f582c684ab13e7b6452e280babfa0fb SHA512 e627a7c69f998d01dcd24c446efddf1af40e97065b13df3398e1c6e8c320f42cf1d5b04d2e84325f32298e0c91c8d789def20d4e947d6aca6e66ddda8058d14e
 EBUILD setuptools-60.2.0.ebuild 2984 BLAKE2B 3cd9bfbbc75d022caf3c2b8e8596d58834a62325ad8089077775eccbf149c65a680a0fd3551e396d9ad9764379ee4d4850ac4a0ad4afeb75f342a0816f77acd6 SHA512 f609442d4acece1735eb444e91db94f2b6a49c48edad30fa58b8fd27bd02cc1583a873b9cbdd3608dc592bed69cc3b1d2a86c80c8589a99218e16b65ae7d589c
 EBUILD setuptools-60.3.0.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
 EBUILD setuptools-60.3.1.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
+EBUILD setuptools-60.5.0.ebuild 3400 BLAKE2B fc60c2f8fb51f47e40a656f2723640b7962e0c90d8843d80deb25ac2f8984142c29ec0aad437f2feb573e35f88bb33d2b187beb10da4ccbe1276ce88729abb1e SHA512 3750647aff60bf2f1b446a0f2c8e802d438cade32e1843437f693a735ddd44acdbe13a12339e9632ab2df8c024b43c096e70b0733990f4f6d94747037dafc16c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.5.0.ebuild b/dev-python/setuptools/setuptools-60.5.0.ebuild
new file mode 100644
index 000000000000..9b16c4d3e613
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 2af2110fe572..48e15c212d45 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,5 @@
 DIST simpleeval-0.9.11.tar.gz 21996 BLAKE2B f7721b06da05bd7e16f81366df5ce73d343f199a917a4741c3444e9c6f5623d584fdf5ebd1afbaddd4f33d200dbdf3e266d66661c53cb36b0f23280326b046d9 SHA512 cfa3f965eb3749a8bdfae93760bdeebcf3b7621ed1aa64b5f267cd8405dbfcd00a1613b6018e49bcf274d18914cec27ecc029f779035b1e8030d0e502f225307
+DIST simpleeval-0.9.12.tar.gz 22693 BLAKE2B 6c0b08859df8b7b55970d0d2a96d2b58a98c9bf43efed4952c7f0220594b1aa531398e881b9fa41caf40d2bd8d5d2e615c4da724a2850ddc05f9bfbda52c8841 SHA512 9b00bfd13a7c7bd05c1c68c43dcd2b52abe0ea648d640780a05499c95ff96bb4366add1d92086ec7e840075fcbff692e133ddbf4c2b8497dd80e115c24367641
 EBUILD simpleeval-0.9.11.ebuild 451 BLAKE2B 091d60c87fe265ff4ad4f232b90d64db03a077e1c80ce2fae3ddf0eb17794eaae071583a331955d119d20d1601d981b594a861ebdb8fc23f3a58fb1fd17e92e5 SHA512 b295742b9e0688668c8e1a3850060f1f37275ab2d72ebe706c19922d89208f24e4915e2dadee962e5024d749b3d0ba110bce7eba8cac03e4ececea9fa09bd9f5
+EBUILD simpleeval-0.9.12.ebuild 453 BLAKE2B 327cf7a077a65e286541dc2f36bc00232e3bf4c1fe676f4c0854a49353a8a52c07966bb987c730d4ffc6937f9f5e41459bafa1dbdc7ad2995aec905f919f24dc SHA512 cb0878c52e9105d83c05c976c95a8b57612440adee354452d80d10586c7db27bc1c1d07f717b7f302fb84c68a5904c76731cbd5a011936f795cc9752522387a2
 MISC metadata.xml 506 BLAKE2B 697e9acab14f80458e539abe119b70a47f4b97ff3e8e88cfc5b071a4403d80ed637976a2428512bcd6570ee37aad12cbf853b87988262548c09670c31dd7c970 SHA512 be74df1cba2c5c7684d767a229eed2f641747abee58f421ad437c33d40ebd55b360e7bee162a9464ea4443afc4de03c7dbc9c7db35c832f6cd531dcd151aa796
diff --git a/dev-python/simpleeval/simpleeval-0.9.12.ebuild b/dev-python/simpleeval/simpleeval-0.9.12.ebuild
new file mode 100644
index 000000000000..6619a0e5a19b
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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 simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 0081a7931aa4..372e6e519610 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1.ebuild 770 BLAKE2B 8f890613adf8dae433b3afc4567f456b85750d5a529eb6609f760a921f77d1532d4681a6b084c6501658c83b6a65f3fc9929be24b502107fff3e93f600610563 SHA512 ebd50ab5a858d1d29ddfddc36d2fa9820ac599c5f8c61221d148f66a015e5f399818c8300a630455abda68f2ec4dc3bf882d2b0342e53975d516b7061bb3e049
+EBUILD smartypants-2.0.1.ebuild 769 BLAKE2B 25cd50dfbd78d34ea27b20865b9db0bdb61dcec3757fa539e20b36bbe1b9b8456f4665a1364d1effae782c066bb455713461dbdab0022ab7e25c27398d6484d3 SHA512 04e02eb254ed92831fa75fd0e21e7f93aca4c69f4667c7438a8bc14f682106ccac64b52f5b6ddc17a1f7c43b8ba8b7dc579626ee990af5f40bbb63b3214fafe4
 EBUILD smartypants-9999.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
 MISC metadata.xml 533 BLAKE2B fbdcaba39094feabf10101304a6ad33c261042a49adbfb0610f3c3c0c3cb210d16f5cf7b7033d0092b567029194b40af3470bab472d068883e4800c550c72d30 SHA512 72b1d23d6a0e0b25679cf5de859398606004891308a316e549cac1c615381e3c89bcb79428e21346856cddbd28740b9423abefbe9b55b397dbaf41a56d7763df
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
index 301e986c42b5..25c2dd0b2cad 100644
--- a/dev-python/smartypants/smartypants-2.0.1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 3c436af94d03..ab11755b8da2 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
-EBUILD smmap-5.0.0.ebuild 538 BLAKE2B 4aeb4db363ccab5383a25f87a4b456153b256be093435796b42dce1df25237ae771ebd0dd5fddddaa6236e9c9926378f6551535db6d78913633fc01729cc4230 SHA512 f73f09614c1fdd8ca7793cad5f0dbc4d113b64724323f696bc87ad96f42af2de826e279d52b384b68a52f967238350af70ee7ff1eda71b41ba22d3a31be0201f
+EBUILD smmap-5.0.0.ebuild 537 BLAKE2B f7ad1a227797e81b38e9804d4ef103ad2f71455737e4f23f11974de4b01417c996bb36d00f524b7be2c97b218d5af2072c5f020f457672738422d7a4c7e2e348 SHA512 cd5d1173974b9c9af7c8b707815517a75fd71764de776755945fcd48a5f616564784ee4b5c15e184588a9edd76c397c8595e7f06bff11846abf929a6dc1a7581
 MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index e6b08bef95e2..7ad9fb65e343 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index f5447afdd976..d7b653cb738d 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -3,9 +3,13 @@ DIST sphinx-autodoc-typehints-1.13.0.gh.tar.gz 19898 BLAKE2B a927802a9daec5a2755
 DIST sphinx-autodoc-typehints-1.13.1.gh.tar.gz 19923 BLAKE2B d0f72b814c83dd8987b80bdbaffbab5c3a7c671d9e56e9bb62d3cf44dec1df7b5fb9c591928b89680427069ce8d5953f4dea52de9eb4a4add07a332be96c730a SHA512 50e2958aafaa661cb209da04bb456dadddc4782dd2168c3f6524fba26d906479c66e5b22b3f49fff0c4022acb4b5b99ff73b250cb3e4d5dd9f083c4a5ab12531
 DIST sphinx-autodoc-typehints-1.14.0.gh.tar.gz 21541 BLAKE2B 77b0e80e5518d64be9dde3d3d2af3d9e0e325daa6683ce8aabe6ac88373ee76e11273b98cf3a18c1391a451354b9cec164c8c14e81354092181b959223500669 SHA512 eba927531b074edd1bf4ce0f3e5af53b07d1be3f013b5f39babc81101b32a942040f7b72380f9f485a99bdb8bfec69f7f81d50b0ceaf73b2859f292e47416d59
 DIST sphinx-autodoc-typehints-1.14.1.gh.tar.gz 22095 BLAKE2B 43fff7ad0ce83d4a7b50da7b3d0f9936754cb1897defe5d91bfef44dfae4df7bb6a0472fe5012bd2526a642149710e96b407fee3096dfb1474187273133079be SHA512 a720195d8792f3b6f5b8b5ce84b709872e7034c38640c15ab83b1676b5f0c26c650b0e74c34dbf9652e32f8b7f66edb94dcf4447ff2e0a1b196b721583294f49
+DIST sphinx-autodoc-typehints-1.15.1.gh.tar.gz 23279 BLAKE2B 3ba75560111025d2a468572312bd1953315acc55aff4d80f069dcc8fb31fe6253b2dfd3d3f36a75be4dddb3573dd1282d949e5e99df9d4c6cb679c50e7a375d9 SHA512 6cf5750839d550af99ae74c9d31c403aa322108f81b779b8514c90beb315803d5fe550d65bb4cb8861ce224b220ef16b5627198aa0f46b68000c916a2c99983a
+DIST sphinx-autodoc-typehints-1.15.2.gh.tar.gz 23567 BLAKE2B 5febaf00b5d8230196e0c0218b91f82a2a23bac4b3004569f877e55228943e1f25774363a063bfc67bab73d6f92f3a0c6e3a6a473451cee2fec38600962b15b3 SHA512 b200460a50fc4d636365a7438d3a4937592eaf672ccb18c80f5e5a83a64fdaabb1a92d95321edf76ba0fa1ea6b0c66710e6f18ee330631c03c84d3277b2eeeda
 EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1095 BLAKE2B db30b26cc511a28979f07d8509209c124c37b5cb3625dd5bee615b4799bb8574c775a6cf4d19193845be408506f1179ccd3741827066199caf9a55bdfb0edf23 SHA512 b6a223d1c0ad0154485613c17044fb3d482aee2a65c28de8f44dce5aa079bc61685b1feef744bc79f035b2b797afc0e62b85357d6f1aa0fb6383169e7de1d419
 EBUILD sphinx-autodoc-typehints-1.13.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.13.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.14.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.14.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
+EBUILD sphinx-autodoc-typehints-1.15.1.ebuild 958 BLAKE2B 1646c7932b7ccc4e6121e53e2d1c5860202cbec20e88f3756919444d0da34ef37e43418bbfa3fff834bce6f96feb1b78ed704fd4e5fa266b334d86f377a5c787 SHA512 7c89e7659694060c62cc2a0324a47ce6b811cd8e35fa46d6464643a67642e0304726499c55e9064d239985c743becfa655668e95bb0e1eaca1c4711ec3fe97d1
+EBUILD sphinx-autodoc-typehints-1.15.2.ebuild 958 BLAKE2B 1646c7932b7ccc4e6121e53e2d1c5860202cbec20e88f3756919444d0da34ef37e43418bbfa3fff834bce6f96feb1b78ed704fd4e5fa266b334d86f377a5c787 SHA512 7c89e7659694060c62cc2a0324a47ce6b811cd8e35fa46d6464643a67642e0304726499c55e9064d239985c743becfa655668e95bb0e1eaca1c4711ec3fe97d1
 MISC metadata.xml 700 BLAKE2B 6e748d584e7640fa73a7f481ba91d37e983e97b332416acae73a87043693e5174b0f98c667e0a41abb7684a29b1136ccf681080b84a7bb8a7db73cbb14b85b69 SHA512 a149590e27acdc56ec0de8d57b5f378134480d24df0f0406a641b27b6cdff14a05dddb99a8e58781c23cc5112b1468fe06e9df28e8532a23b33ca817bd05c137
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild
new file mode 100644
index 000000000000..d294c9d62eb8
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.2.ebuild
new file mode 100644
index 000000000000..d294c9d62eb8
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 422a89bb4735..c939bb902112 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-gallery-0.10.1.tar.gz 6546135 BLAKE2B 1f4ead74b848f28944820a77717183d845d1fba7459d11fa9bece16c5cd83742e012cce6906f8f5cd357e5c7db01107b6c7c32e2f7d5b7ce46dcd8d6a4b36e9c SHA512 da3b35907782846a58402fddf2a7f507eba76cd708725ff0ba097ec7bda6e9029252c9fb4df6d192aa7f64c6873465d4ff5e634b5c4cc6c4294e0d38c6db2f02
-EBUILD sphinx-gallery-0.10.1.ebuild 1054 BLAKE2B 2b554e552640c4152966587567aa2824d5a4de188fe1049e2c2ad92b9abb223fc2318f6a58b6f0a306456e06e25c53d81d163e12300a2ffc49ba88a47dbb8f4a SHA512 875d7334d9c487be4c6be15467f6f64109a0c49ac969ea0750e0a80773235fd6ab1e171e5fa7b0a8c056649fd1393c14897a474d5760f5fa1de779e25b21e52b
+EBUILD sphinx-gallery-0.10.1.ebuild 1055 BLAKE2B 4b03d191760f92eb3bc2563a11d05f7f41d45f4f5372eb11fd88d41eecf5c545b98ae57d91d2346f5682a92052a75e57a250843a3cee765d069f0aad8909059e SHA512 ec79ae83df2361599eab7f3b0509719c720c64db56b57b6d8fbadd79b6e233d1948a312b95b95038c41fee6907a1a3c014d921860abe06f5a840c3d9b16e3875
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
index 09cd037c8e88..cd6c79e83ffa 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
 
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 33912c192cc2..e524edeeebbd 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,5 +1,9 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
 DIST sphinx-issues-2.0.0.tar.gz 8594 BLAKE2B da85535649ba3bfccb12472757619ae71f5db346fab9a08ecfbf8d8aa5140d36881a79c4f615845a2c16062095f4d1fcb56258d2eba3ca4098c3aa2ed5d90f44 SHA512 951970465cd92dee9cec7788faa067a6270aded8b48b41aae64f5c803576904ab06b19d8cf5c7a32724a6ca658799dd106a53d61a21f735ceaa6490fb3523328
+DIST sphinx-issues-3.0.0.tar.gz 10483 BLAKE2B 9201ca02d6d02ddd22ba72531ed27b478686f9b0a2395f049beac5f10e38d96bddaeffe62abd199dc01d4f4747adda96df552e9cabfef0978ade56bfbbca21fc SHA512 273d34bf34b6632e3d50e9499e3681f2f1b3d082527fcf137d8cab1eeab239a9fe67354f82c6a500106c354ddf0fc211f7daf91b4490a0a2c43108b2603901d2
+DIST sphinx-issues-3.0.1.tar.gz 12320 BLAKE2B 770aa19a443bacd489157244f087fdb99740d5eae2f45246ab0fd0596260f249dcf7fb0642acf0a925d1a1def08f6d944a2ec67017334843b636623b05df8327 SHA512 dd64e1611eb58fc455bedb1658473fd71e4deab1371d8a42e6fa7fe3b128a991251add12e463b9a5826fd4eb5aa12e9a117dcf953feeb8df980a7951e43d8baa
 EBUILD sphinx-issues-1.2.0.ebuild 644 BLAKE2B 3015eb9f65e342c4d12214ee5e956196ce50fba5e73cdf4a82461791bd8290c56936ceb81531804793c83f60e809c4df361482473a53193227d6b2f7a8f26d6c SHA512 78a0b68f732f8746f6102f929c9ee9037e45d36f3efda39610c19ac8fa5c32de9060e1d72155185c615a45d2db15bcbd8dfc681ead7b2599a70261bfd6bb1b0d
 EBUILD sphinx-issues-2.0.0.ebuild 653 BLAKE2B 984309d35fd587ec92337b910b70e6ee6bf44d2c1daa533f13179b2554fb2d2fb1c587abca8d436a896db8909a9732a59dbe92725274f99ed094649aa9fe8a6a SHA512 226f98af7f3e3988f9c47ac16610a94ac3a4a91c3ce0ae313bfcf93a9fc121db477a06268092a8231b37734cfcf0431df84780cae4b0ba724376ead664ab625f
+EBUILD sphinx-issues-3.0.0.ebuild 653 BLAKE2B 984309d35fd587ec92337b910b70e6ee6bf44d2c1daa533f13179b2554fb2d2fb1c587abca8d436a896db8909a9732a59dbe92725274f99ed094649aa9fe8a6a SHA512 226f98af7f3e3988f9c47ac16610a94ac3a4a91c3ce0ae313bfcf93a9fc121db477a06268092a8231b37734cfcf0431df84780cae4b0ba724376ead664ab625f
+EBUILD sphinx-issues-3.0.1.ebuild 653 BLAKE2B 984309d35fd587ec92337b910b70e6ee6bf44d2c1daa533f13179b2554fb2d2fb1c587abca8d436a896db8909a9732a59dbe92725274f99ed094649aa9fe8a6a SHA512 226f98af7f3e3988f9c47ac16610a94ac3a4a91c3ce0ae313bfcf93a9fc121db477a06268092a8231b37734cfcf0431df84780cae4b0ba724376ead664ab625f
 MISC metadata.xml 459 BLAKE2B dca0c83085ed9f180d31b936693309735911db589aac1b77f82b1a9be330326622f78a4432f7a7048bcf37a41ebcfe73ab2ecfa5edf39ba8b322e0899c6aa2e9 SHA512 c3ced9fc9bb009df9c5a3b567058f39dd8e4f075ca1a8427db8a3cba7fb1fb9766f6f6e134298533edbd0e14482d9f7c1b9d0a434484177757dc4add4115db99
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.0.ebuild
new file mode 100644
index 000000000000..5ec9fc718819
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-3.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
+HOMEPAGE="https://github.com/sloria/sphinx-issues"
+SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild
new file mode 100644
index 000000000000..5ec9fc718819
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
+HOMEPAGE="https://github.com/sloria/sphinx-issues"
+SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 8a598a7b7238..b89be5882549 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-notfound-page-0.7.1.gh.tar.gz 50670 BLAKE2B b438413585fce3623451015d873242de3e6d7c466aa06b0b6398d7e337d2a0d3c2041973b1f1c8491b1f382d8e87a2da00b6a97e3a857b60cb345e715d2aa27b SHA512 f2894b19f8ccee22ac7f6e3a34f8270923e8cc4b2182d490e6ec46477460555de9b67b0075f74cc089b0b9e7474c6db9373d107d272d161d98a3c5609edfa7a0
 DIST sphinx-notfound-page-0.8.gh.tar.gz 57650 BLAKE2B e57634ba9a7faf81e6ee8d9b082d96742b580606f2e2fd559842049ba2e80bcb44bb6bd7a9c7eed6038e4c3ddb0416e32fceb4d47a72b8a600443e0020ff33d6 SHA512 eeb5b8da24ecb8f9814540a126f08204ae623705068608c2ee32a4f90303bdaab5f3934bdc36dd06dff047beb0225603f8cfc9b736769836385837047a36a674
-EBUILD sphinx-notfound-page-0.7.1.ebuild 654 BLAKE2B 200c779ac276a65206a877f470f5a5bd65d81efcd8f92033a25d984cc4b33fa53af12e6ec2f593177404f9039ab9b000e2473623e66cde49e0a64800c0df18a9 SHA512 c427f3e66b30e67e7c6967c892000035e6f70454afb081a9a31791dc7b67bd60f20e9bf10290e2b4a7ad279295f11203fb78bac417bd19dc52a75a469977bb8e
-EBUILD sphinx-notfound-page-0.8.ebuild 686 BLAKE2B 0176bf93efb8f90fec2113f43a6012e47e91e9dc36cb60b2921bc894b6bea11ef975ce88d499151bf7dfb99adda201375c77419f80b72dabb745192f0c5555c4 SHA512 921224e2e1bbf2aa44a5328972c1213e1661e3a4170ee2c2605d74c79591cc67c851b0ac5ebb3061f0350fe73168eb7a8efed3b871af65117313b4a1073486e5
+EBUILD sphinx-notfound-page-0.8.ebuild 680 BLAKE2B 8204733056d6aecd892e698712f7b88b585a04c26581da794b0c068cf1767fd7d98d977afde298e7f20784ac218a10a4b27d504e2c9877939e9131205787228f SHA512 eebaf2f9b37658c0ef3f1472f7d59a6a214ef065fcb33132ee9963dfc70b678f026650fb93f3c93af1eb7576cdf403fa97d7da991ac21bc96e38b53f92028f40
 MISC metadata.xml 651 BLAKE2B 7b4c1c58782b6a1e6118744d4933d8bfc1391fef578350f9622dddfb911a4319be8fc2cd2a297d5ac84bb97249d520a1cb740ed00d6314cb3cbf1dce5c119dfd SHA512 4b531fde722c6f0f0709405669efe61cfe2fd14e52f627ee67001b81d5268444b226630f55c6dc6a149ea86699379289368826429754abbad6cdaf36f1f4a673
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
deleted file mode 100644
index e0e5014bf924..000000000000
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019-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="Create a custom 404 page with absolute URLs hardcoded"
-HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
-# PyPI tarballs lack tests
-# https://github.com/readthedocs/sphinx-notfound-page/pull/110
-SRC_URI="
-	https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
index 29b071af32ec..26f0070e5c11 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index e553e379be93..35b19152eacf 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
+DIST spyder-unittest-0.4.1_p20220106.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
 EBUILD spyder-unittest-0.4.1-r1.ebuild 1173 BLAKE2B d64d8c767b2885c207195d69f00788a2fb236bae5ae4a460c3fbffd140a8e3efbdc1b7fe02f8496b646664de2fd9013fde853385155b81dc922b45f3032be06e SHA512 01c3be4900ebf154a9c5287bb0cebaeb0c7940ff8046c64a089b869b322d24298e8906abd3769424061274cffd62cd286938bb286c1125dc6e292b461e31a87b
+EBUILD spyder-unittest-0.4.1_p20220106.ebuild 962 BLAKE2B d208963967af955ad561728a41571174ec6ab345ef66668125a65ecb9597f6fe187dc822a3fa49956c16ad7c75bfddf6364cd925c54bbb389bcbf962b74b178b SHA512 cef521c41084a7522fcf57c466cc7a4ca581a45914bd389f3332e2e16968791043385227b697debe601686e3bf6a278303546dfecde3e1f01ec55c615222dd28
 MISC metadata.xml 361 BLAKE2B 9d9ab5a6fcc2bd47042aaca2342fe7603ccf68929f35e45d2f4435b62bdbee2fcfc8ebf236b3e6930154387a2c83b775cb9782d50db13343ac96f7a325bb9a82 SHA512 4227a170633b961a20a045cdbd39dd2438d02fdfe94b41e9801198f126fe4578285bc16097a8377357ea70ff625b7e47e5a2573af88ca6dd27ab1fac0235d05c
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild
new file mode 100644
index 000000000000..e60fa49b0a8b
--- /dev/null
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1_p20220106.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+COMMIT="d210d9fe6c4efbb21d680a040cc4741d76a81f49"
+
+DESCRIPTION="Plugin for Spyder to run tests and view the results"
+HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# AttributeError: 'NoneType' object has no attribute 'split'
+RESTRICT="test"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 25254b4c0fc7..da593cd571cb 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -9,6 +9,6 @@ EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa1
 EBUILD sqlalchemy-1.4.26-r1.ebuild 1249 BLAKE2B 706ba01625b89f675bbf51d8f5361d9f516831f35b2265bb4c73f20e42102ae537261ea9f6224fcad679faf760c550d4ee5a5cc4ce0e78d5bb7d81cd756651c1 SHA512 59f36d922f00a51f707b6e80a54f11f102ce20e41746ff430b33bcfcbfe78403a4f70451bb40a71917d5c02f845287d0f0a9fb6be09c08358917b4a73215194f
 EBUILD sqlalchemy-1.4.27-r3.ebuild 1472 BLAKE2B 7b8c6859ffff98a8f6a61d12144be71fb621f49b7091bde8ff87d5e74b7c7308ac2a667a3bc8792aae61db8e7eb4f0e21df08cfe920fe15d109556d17ef567bc SHA512 36be55aeb27a0b01778a93ec9796421c0818aa175ef0d1e83c9a6aa8414884227935a95e8a00a8ac216b90495d552cbd12a9712ec70a5a1907db4a1f1b664a6b
 EBUILD sqlalchemy-1.4.27.ebuild 1257 BLAKE2B 2acc083acaf78a5811a2d602e9e6ae4f19f8feea99fb882d0e79675d29d2e514d79eef0283d6b9968941bbffa73a514c125ad86ae2ffac7c2367a748f5176a37 SHA512 13cfbd30ab3478af1d5558182381d0185b29929f6e7c281e38bc0d317583afe780ef42841bba06c150b001b394f5bc567bf424c8ffee03242b1d4fac2bf0540b
-EBUILD sqlalchemy-1.4.28.ebuild 1476 BLAKE2B 0144e5780f13a789466925812d2af43a82864248e5e429fbcf37402e27d3ceba11dd96252a3ef2768e519520799eef1c78ae89af783904cd2b654c891755fb84 SHA512 e19afc6a5a0bbbfa3a25dc4a3c535b34ec7304f4ea19f38e056e4cb8fb27066db480b09831f7cc28de2848d24368eb573cd61d79229db16f9872abf28afd5254
+EBUILD sqlalchemy-1.4.28.ebuild 1471 BLAKE2B 7d629f1f4230c069872f4e0daad0f51f279374d60a290e00d345f9fbccf9811f0d32bcc727ef194007057607e73b242ebfa2184deffcc60465abe749f3bb74fa SHA512 21c35d8008fcb371ff93cb854184a618e5f8dccd94d8cc936cf85d50a7232b00fdc1f75f6030a915d1247a8d44a8559d68007e0482c6dcf355908b61ad502bef
 EBUILD sqlalchemy-1.4.29.ebuild 1382 BLAKE2B fec8393e744263dcf476779ebd34ed6a9b71a1b0b5f4fac17e509fa263e0891cade06657d24275f24f7505d1270d93a4a0859928311bd6958089970c1a5a58d6 SHA512 d8233d0d9a7d379033ffc90fc07521ea18c0d2e7602d27979dee3c2a763f2b116a7ebc3ed58bb120cd3908b8e73b5c0ec197b7cd043439b65ed305d3db77a30a
 MISC metadata.xml 559 BLAKE2B ea16915a919a696aeb113a3c13077053765cda94a3bd661734713f9ddec74220bd58d0646cba810c7571a738d3c3f5716634e1d83b3225c0b44fc837eaae1990 SHA512 21507feb9afa0e2dff2fad85e61c1245faa9d1ac0140074bec1cfb58b0895e07365ff65e1be9059a37fa1706365ed5d1e0fd6153bf95ab7648b0e45fd11de97c
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
index ae9f2f013d72..3773127b985a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
new file mode 100644
index 000000000000..60379ffb77db
--- /dev/null
+++ b/dev-python/stack_data/Manifest
@@ -0,0 +1,3 @@
+DIST stack_data-0.1.3.tar.gz 35593 BLAKE2B 8d60f7c589f75dc8362c25ce88c3d46935768033373fd22846e81cce26609c8137ff64d346904ed38181dc27d24e14ed4c4d0217a1229881b6f7373ea359161f SHA512 89f6fcc680b245747c505fac81780834280d3c67aa37f8ba5e782552d074566fe5d8645ccf1e0e47563593b842a4f4dbe50c0ee100773e1888475728ee0007bb
+EBUILD stack_data-0.1.3-r1.ebuild 717 BLAKE2B 99529cea4f34aa4df4b29f10e3e3e218b2b2f5c99a611405c2923ea5608aa4d4f097714e23b6952904b6c54dbc8c2cc74e7e0cddae634b31a42f24c968139be7 SHA512 2a255266910d283c3a1af8f57effdbec640923fa34c44dee99c2180be6a4929686aa396eb20bf2c3eaabf70a8ccf0c46dd0328fcecad6759c99e81b625c1c4bb
+MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/metadata.xml b/dev-python/stack_data/metadata.xml
new file mode 100644
index 000000000000..d9203f16e337
--- /dev/null
+++ b/dev-python/stack_data/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">stack-data</remote-id>
+		<remote-id type="github">alexmojaki/stack_data</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stack_data/stack_data-0.1.3-r1.ebuild b/dev-python/stack_data/stack_data-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..18e299fbd26d
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.1.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract data from Python tracebacks for informative displays"
+HOMEPAGE="https://github.com/alexmojaki/stack_data"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~riscv"
+
+RDEPEND="dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 978a056517f6..38b6a97a76c2 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,5 @@
 DIST tempora-4.1.2.tar.gz 19243 BLAKE2B 4014fce1abf24231c79bfa80db7ecf80303bca43902aa68a880c3e0a29cb9d6f7bd1d9e02c4f93d43db2a7810f0fd7a26de31383057dcf63b5b8a42fe8e6810e SHA512 dc03db61af973645f8f89c13eb1a0b696275a7a2768f82cd61d1602891d4bb0d4b45725404f39da242362346eb0dc6c38892a117f150f32517a2ac8d3436f5db
+DIST tempora-5.0.0.tar.gz 18532 BLAKE2B f3d59b7d7d2974564b0c7cf25d5bf8716610aa09dd134e37289648e71c4dd6989bfecfafd258da01875de0560cef31fcb8ee0ec85e16d642ff56d10915da6132 SHA512 e95fff8c460329c8369f8f819a95341ec4e1641d2ecc88251c9681ac5e9678eded0f320aa1bff98a980fc552cb214ea3f40c249ea25b54d8fbe34849fffff7b6
 EBUILD tempora-4.1.2.ebuild 930 BLAKE2B 37ec9ed8d5ba1b872c0422f636d1eb176e1d1725778b1e30165be4582266a06ec0ff9889659ab83fc32a443dcb94f12726b4b67070c1b9d971308c2cbc276a55 SHA512 939a2ea2606fbc58c5fc7bed1e820b2dae33792a92f061d88a582254e717a3778d6f1f797c4003fbbdcaea6cb7976dc91d36bd60d65211e66a48c70fb52f1276
+EBUILD tempora-5.0.0.ebuild 938 BLAKE2B f1c2bbb05080a7340761458a9f2fd31f78b6b454ee23538eea8d54223b6edcb5ec8d3e2348c30b274e3cb214a2c2d2a260120f509e9f14a452d223c781dc3e91 SHA512 fed18d5d6e2e4eb0095626fbfd847b8fe4eb961cbe269aa7da4cbd1b732155c7f264732cc1402b8740ebed76c736b6d9a1c3b7a854751331ba9914d1f96f9849
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-5.0.0.ebuild b/dev-python/tempora/tempora-5.0.0.ebuild
new file mode 100644
index 000000000000..5c4cc27982ef
--- /dev/null
+++ b/dev-python/tempora/tempora-5.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 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/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index df487176667d..8fcb168f3bdb 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,7 +1,5 @@
 AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
-DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
 DIST terminaltables-3.1.10.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
-EBUILD terminaltables-3.1.0.ebuild 682 BLAKE2B 276e25b200a4423954205a63272d886ad61b1929cccd64a0925403697ece767189e5d186ed1f2aeca44255edfd41ca2b601f76ee27bd86c9899cfa54d53f7d1c SHA512 5d550588536a736497a25e15650a37dfe7baffaaffdaded4b4c1045acce3281e67a45f3c836af709db9c7381a6b0adc5341af8f228d8d183ee00d9476fedcc61
-EBUILD terminaltables-3.1.10.ebuild 954 BLAKE2B 26e32579fed298d1df1958798bbd3b46076a7bccb635ffca1c1fbdf49238edd701869115e2a181e0b18b8ca283541f849e196acf4917abf4f00030732fe429c5 SHA512 a35555f1ab3cf61d0398898aa954c6bd41b7b7ce9e7566e59ba49e6f5f431a4b79b7aa5f95b8c00456b36a3ba63dcc852d4bee7d8146cd5d02a9e8537c9a2f32
+EBUILD terminaltables-3.1.10.ebuild 952 BLAKE2B 4142561b5dae9b74502ad1984ad04366f2c0e9050859906842aa308e0059359aa8fd6b3caea352a07959d1bdcfd00c017f57225850ed6af08f22c903b8689e59 SHA512 d9157a24433ac7517a5650e6802f157fa8ad33b54b2d3d5ba5e6b62feca78f3fe7938e4d344ccd1529e036cb16894551102c7741feed5df6172eaa415ca07438
 EBUILD terminaltables-9999.ebuild 628 BLAKE2B 798fefdd5c8353834b47b3f389dde52eeb8ae334c9efc676faab22c63a8f85be0ab4f34827580d2269ff06ac167a28e46f524264e068644e4fe190c8e874a5c9 SHA512 848c7ef097cc0bd15c9d0535fce2baebf315002b95eefb3c69b753a361059e4e1fdb660150d07c32a40a1756bf0185668bb49f25ab9f50e2d8b09135b7085b34
 MISC metadata.xml 499 BLAKE2B c69faec6e90ce8d085d4ab222b09bbf69ff55415e8a596ec9a940191a5df96cfbc7ac0c2ce087c4d1c8199941c844a4e28ad4783bd9a8c106edb75537f781db9 SHA512 71bf75a76067bed905cd34d1f0eeae629a2362b8cfa33b54f06b228314274467795f8e1a34a7adb02d54d7976635a420dcd40ea6e1b6dc6f256b4179af7eb76d
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
deleted file mode 100644
index 3e9791892e66..000000000000
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-HOMEPAGE="https://robpol86.github.io/terminaltables/"
-SRC_URI="
-	https://github.com/Robpol86/terminaltables/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/terminaltables-3.1.0-stdout.patch
-)
diff --git a/dev-python/terminaltables/terminaltables-3.1.10.ebuild b/dev-python/terminaltables/terminaltables-3.1.10.ebuild
index a1a015395675..030c0351a71d 100644
--- a/dev-python/terminaltables/terminaltables-3.1.10.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 2e730b800081..051f6d76400a 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -6,5 +6,5 @@ DIST tomli-2.0.0-py3-none-any.whl.zip 12127 BLAKE2B 1a680c2baa158db3892fc616e4fa
 DIST tomli-2.0.0.gh.tar.gz 123262 BLAKE2B cddd21e3297ee71608f2f3e08023ec8d86f8295133ee78a16bf3c4dca080d94ade1f7d8c43d262d5a5f0287ea743068f57d47336d5d9ec684cdfaf485194a2e6 SHA512 dc7cdfadaca74f39dd6cb00686ec2e5b47b8ee3dbec9bd0a289a6ff78619cfdbf125adb6253d838f197722f4389690872a3ca870664b7785c19f3c2bb1a18231
 EBUILD tomli-1.2.2-r1.ebuild 965 BLAKE2B c15022609eeb199cd41140aaf9a1cf2280b94306b2e95b6be052cabe7222ab84ad4e15e25bf1564523a9336e420eed404da0db616ebebd58ef08715eae345c8f SHA512 ead7429b878ab3409ba9f438d66f55ccf7815c35b03c02915ad97298ff505a3e6798608e9c92747a05def3635de5cb883b8b3fe91d85b219acd29018ab38698e
 EBUILD tomli-1.2.3.ebuild 973 BLAKE2B 2a2a18d1b950e22dfcee3cff644b253e821fec7987860170693dca6e854b2095fba8e757fa65de195284072a1ec03e3e9e2ab9f69cd61bf1b9dc18518626519e SHA512 e4e22e78dda9c6464a5c6adb5d6fdd903d288dbfbd53cd88f6230844a7cbca5a5efe350d73b96d15edc9831d405fb3041d3ee315b4c1cb620362af5cf36447f5
-EBUILD tomli-2.0.0.ebuild 973 BLAKE2B 2a2a18d1b950e22dfcee3cff644b253e821fec7987860170693dca6e854b2095fba8e757fa65de195284072a1ec03e3e9e2ab9f69cd61bf1b9dc18518626519e SHA512 e4e22e78dda9c6464a5c6adb5d6fdd903d288dbfbd53cd88f6230844a7cbca5a5efe350d73b96d15edc9831d405fb3041d3ee315b4c1cb620362af5cf36447f5
+EBUILD tomli-2.0.0.ebuild 970 BLAKE2B dc403488f2a26afca0c906ae3381c9e04dda98ecbaa9ad86fd8a47f5c7c00101b2cb122590596c906404bc1bbfc3060260986dc2a1d2c93d8b14cf1fb1f69a11 SHA512 add9773f100a5ab4b2db3968eca3b0fecefca3404ab8a52577b7dd8c70d855f41e9ce943852f2188853ca7d6518f8d22e5eebb9c95e3b6e84c58e5e86f79aa89
 MISC metadata.xml 363 BLAKE2B 2c80a2c2a8959a93e392da0e03303ffdae0a3291624c284f91d747d13983cbc188d8a64f8763ea484f792d5a42e355381034f69fa0acde382779e4ae53ac2154 SHA512 42e8d4b4d1ec773b53e8e119ce6afb74acd64de998c372c6f6ab64f70713dd825420d1e1af83b5f647dc03a917b1904d65f0cd06cbddea47a33a558be2c89562
diff --git a/dev-python/tomli/tomli-2.0.0.ebuild b/dev-python/tomli/tomli-2.0.0.ebuild
index c62c576ca961..6aa051210329 100644
--- a/dev-python/tomli/tomli-2.0.0.ebuild
+++ b/dev-python/tomli/tomli-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 0ab77a8b80e6..93af6bba570f 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,5 +1,5 @@
 DIST tomlkit-0.7.2.tar.gz 159643 BLAKE2B 6946cdc4c991671eb9e38cf836196a0dfdb7aba2697db95f3fcee58652d3c8ba96295df447b8145f0143447339834015abbd60928d7588c68ae31c298fd6d2d4 SHA512 cfb17d133463c22ae8b76dd03587f23f6dafedfd2decdf15ae29fe5c05117ebd3e17057f49bdb17345386f5ce3073b1e5b1937c6ab6683aefb0fc0abd7571580
 DIST tomlkit-0.8.0.tar.gz 179067 BLAKE2B 871eb8371d94c76552d78a56adfbde5ebb9da4b93aa29229ae9aa279ae35fac488a1b4986169b818d2e5366883b8f246b44dc9075d0d9785b2d7d6f97e222ec1 SHA512 77b267201021e740d8134d0d5edfbef2cf077adac0b320d80887fdedda3f63f74df1957e8230976f16c80fcc58fd4cfabb195cccf0eda7d6cd29f5f65d362147
 EBUILD tomlkit-0.7.2.ebuild 444 BLAKE2B 0a8dbca12d6669c9ee9e41270a59cdc4155ddff1946c316532086f5d84cbd429d36b8e58f58b61dcb8ac89d268545e2246ce9de57d72f6cc9e0db9806223fa03 SHA512 8f294383a829e5ecce547f19a6865e264a517dd433e0a035b51c2bdd9e623e61a1c0827d29a7b91adc59ef7e0c144657f77cca95f3f9afcbb22fcec8efcab1bf
-EBUILD tomlkit-0.8.0.ebuild 443 BLAKE2B e95ffed10b28456f87076749eb4bddfc5a3f4bfc4de82f063e5151c64c3edbeeb3ac425e1271688ff17b250bfb3e2d712a48ff21c7dea3de5c3a2e5ba01b92d1 SHA512 00dd83d7aede683cfa3bb7f8966321c0269ae470b9dd98883f306503779f409dcc9c032e6817c013e1a64a3c25d3bbab648a5b9319662984e812b3461a92ef20
+EBUILD tomlkit-0.8.0.ebuild 497 BLAKE2B 013da6e62e9e0596a6ef5a1fb2e9910310fe80f8194c5c810fe7121fdbd248b5a3c378b569aaaae72edc0fa96e462771665ff4f5d527cbaf7eb7d2c7d1f64c5e SHA512 35221714d4c4774a6c36a5f2d7d4546c51cb08c451c39d7c76639c7cc1d3808907a2a1fad063997a522888192bb2f59b4841bb887c63b732494dca8c48ed94d8
 MISC metadata.xml 418 BLAKE2B 6013d98bdc27197495bc61306e7038b81c725d392ee57611d451b9289885f4b019c76721ef3877d5ec1183ceb8b40f8b199556b4e1b63ccc61ba033b33308140 SHA512 f2c3c72396d6c073701a5dfa574cbc95243649cb964a08e179e707ef23098f018c2b5de6c92a110a9329e78880541ef54590c50c31128c1ce6b4698e76388a16
diff --git a/dev-python/tomlkit/tomlkit-0.8.0.ebuild b/dev-python/tomlkit/tomlkit-0.8.0.ebuild
index 4f5efac12e87..ae8cfff5f075 100644
--- a/dev-python/tomlkit/tomlkit-0.8.0.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 8bb478d0afaa..dc3c50242ab5 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
 DIST translate-3.5.1.gh.tar.gz 1147898 BLAKE2B f9fc96065727e0016e61fd581690dafc3021471de9ccc9012b223c24778669b984e0bf0ab5f83a910af0e543b0e4793afa110c5b2ced890a257f72512bcaf58d SHA512 2125e3ab019a6b721327d6979482562d5984df28b04aaa69d11e44b6a7396ee387f79d8242a20a84157f9b62457839b52599eb0fe13abac33c9a312a84d55d30
 DIST translate-3.5.2.gh.tar.gz 1147847 BLAKE2B 6ca8458975018c3645f3fcead99812b5f91c2a3e621060c1cf9599ecd2fdee8914ae1d70b70f8bc76f5d941f43e69e55555a35a5792d0c8c9d9e06458e670617 SHA512 e04c195d0f33aaf9c2368955c4c399be3c23702ce0fcb41705f727b65e129b652b5637a9b56ad2879f836548b77c266382ce41220a23aa9058828ee2f2ba1b3e
+DIST translate-3.5.3.gh.tar.gz 1148120 BLAKE2B e848a089281ab7f1e17b28beefbea50245025bc3db0616bab3f5e1d288b2aacc0df636dca11f17481af863a4845594ecff9fc66dbc33d403a8fe0575ff90581d SHA512 3ad1bc4742e4d91dbdd8b4662597d07c792e306426dac42b6f8720cefdf1f4cf502d587941df3e6a93dd5648a1b92f5951bd1b5e79a41e5476f1b9ca06624656
 EBUILD translate-toolkit-3.5.1.ebuild 2552 BLAKE2B 869dbfc79a91565e7a340d6e743f6cad1f1e46a0d5550fedc49cae0d87ae393347da7eab091f36375bed52ca2f326645c576f8fdf11a8219f991d6142fabd8f1 SHA512 824a78b456dfecf137d5b561b77710f2183dd2552eda82ea4777f9513905a014523df19d56e2c84517a7b1fe316969ba526ea17e4a45db6f95e59b07dd1003fb
 EBUILD translate-toolkit-3.5.2.ebuild 2557 BLAKE2B daf364d5d0ecd9be5c5023912159b449b61bbfc892063923ad00ebacc57f1edb68ce66052ba89a483bd7b5771e5408b7306c2b8dbdbf9c776878a71669ba8346 SHA512 ce8c0d106ecc240dff8e52a53bd8352e6910af0191fbeaea446bcd40963fbaaa5290ee7f03147dfea1498ff6ff6f88822ec629d3fddd9ea1e3f92f41c0157ddf
+EBUILD translate-toolkit-3.5.3.ebuild 2557 BLAKE2B daf364d5d0ecd9be5c5023912159b449b61bbfc892063923ad00ebacc57f1edb68ce66052ba89a483bd7b5771e5408b7306c2b8dbdbf9c776878a71669ba8346 SHA512 ce8c0d106ecc240dff8e52a53bd8352e6910af0191fbeaea446bcd40963fbaaa5290ee7f03147dfea1498ff6ff6f88822ec629d3fddd9ea1e3f92f41c0157ddf
 MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
new file mode 100644
index 000000000000..768d499ebbb3
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="
+	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND+="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
+)
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		translate/storage/test_fluent.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index ff732fb0f836..f930e16794fb 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,8 +1,10 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
+DIST py-tree-sitter-4f39f6919ca3be8efb420a338fd2cf9b8b68b156.tar.gz 14075 BLAKE2B b9a7a2247114c34e211f5098f04c456b25a3aee6cfde6d75bdd83427a379c5f339f1e897a3246ef7dafb2b512442bd0e7da18f391bc8283545e060dd00481421 SHA512 21629a147cda0c95a054c31223b082afa2d12491fee7a0d720187e5c390d9771c2e9b7d85fd35a56a2cf97a7addfa5332b58b3a36893aab2d7487f9522c5cddc
 DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2B fa7e7f969a9136286ef18220f5776def84404121f9b7cce35422c925e194380d4a5a3fadc3da50d2d52d85f4100abeab1456e9749f93be20af9f3dd0854d5177 SHA512 4de7084928990ae61628599a8d6440606d70589b8becef6ee58ffdc1ac632660d050cab3947727dab6161dd74ccf6b9f74e83bfe4ff30c41d01caf25fbf6b8e5
 DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
 EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1292 BLAKE2B 68477c979202614447523f41f75439b389a10dcaf5dac02f28b656898ebeb210f19264e05da11fda0b60e18987abce16a5bbc6c83658a9c61480959acfadd0a8 SHA512 1e353aa082b645354550ccbd90e683366967af2968942175b462c7be8bcdf0ec2fb7c27724a10175dca15ee27f66849353c82c8ce3db0631e8b5f88b206a2020
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
+EBUILD tree-sitter-0.20.0.ebuild 1324 BLAKE2B 5b03cbde9e2ead5664dec0aed459283a779d742aaec7a0a51226f6e75606f6f88035fd1d0ec1a696f79bd8559345a9bea9a4737919e2238c621263cf713473d7 SHA512 387c294a3eb072b0df16054e65aa00bd3568a1089c7ec4d397c5893f3318e888c509e41ce09148fa14577ac1c1048911df24005b896cd3907604caad06be3d05
 MISC metadata.xml 393 BLAKE2B 15f673391ad9e9aab93808392449ddf99ccc35fe1b345010a4373b46a56c8dad461042e0a2dd735e4d53f77059a5f7920fc3215f939aacd1455c61f0ecdfa3c0 SHA512 519fc8d6fbbf3709820b26b1f4786b16f6679e569ae4adafdc5e37b2dfbc03351bfd9c6750264300a0309406ffe20868d48c3ff488dde22f900d59e1813c15ef
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
new file mode 100644
index 000000000000..544fbb9e087e
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+EGIT_COMMIT="4f39f6919ca3be8efb420a338fd2cf9b8b68b156"
+MY_P=py-tree-sitter-${EGIT_COMMIT}
+FIXTURE_PV=0.19.0
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
+SRC_URI="
+	https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+	test? (
+		https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
+		https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-python-${FIXTURE_PV}.tar.gz
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-libs/tree-sitter:="
+DEPEND=${RDEPEND}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/tree-sitter-0.19.0_p20210506-unbundle.patch
+)
+
+src_unpack() {
+	default
+	rmdir "${S}/tree_sitter/core" || die
+
+	if use test; then
+		mkdir "${S}/tests/fixtures" || die
+		local f
+		for f in tree-sitter-{javascript,python}; do
+			mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
+		done
+	fi
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index 61def95ca29e..96040f0a6253 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -3,5 +3,5 @@ DIST typeguard-2.13.2.gh.tar.gz 37142 BLAKE2B 0aa3f53bc0d1aa485d071cd52d2458ab83
 DIST typeguard-2.13.3.gh.tar.gz 37436 BLAKE2B a3cb616692119c64a9dc0d0bae25cc661b7974a0b6cf6632fa403f7c5430873570b1aaa310bc03843deee6f77a831c303ea9d9091db596eb565fce43980bbb13 SHA512 26c31ee9670650d1969320187a924d29d986894a38f1026af58f705b132b64be3b6e2ac34729f966f5d302d486334b5a5d9e65fb206245b82b0ff0852020b609
 EBUILD typeguard-2.13.0.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
 EBUILD typeguard-2.13.2.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
-EBUILD typeguard-2.13.3.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
+EBUILD typeguard-2.13.3.ebuild 812 BLAKE2B c16e66f5bbe0338d620ee55e369f8d0ef0e38fe713947dff62641a85238f856d8ab6440ffac9f4e89979aba970ab890e16143a434df4281b1701ab75cb829b9b SHA512 e924307a5bd0238643e8ef1c880fb6f9d8afe818bc530e47d71ac28a0fb091ed1240537c107340f04b5871ebedfaa0d249afa2928ee087e559fa527b2c38e723
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
index 9ea46fa44506..86a6584a640d 100644
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~riscv ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index b286ba0e1eca..bfccc80725f2 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1,3 +1,3 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
-EBUILD typogrify-2.0.7.ebuild 683 BLAKE2B d70f9b6bd4d324742f05ad2205ed0f479695e30dd638b159bc4b7aab7d495bffa9759a343e43106730cd97acd32f990a311ccaa83f47f8c428be4b38443f3fd7 SHA512 18c4299fcd548c38599bc20a22b90b08e0ef8f804e523373f2c94b24e01c7af8f620ad08657c10ab0a782ac8fe4a5b153a72417cfe9b3eb3a1dca5455ca07566
+EBUILD typogrify-2.0.7.ebuild 687 BLAKE2B 418dddafb7e0a4a56ef2d814be9e57fb838a0c968dad89b831d4f6f21de7d5a8515878e2265ff6ba7d0d54bd4a5285ed280ba188406bb25294ccdb8f0ae50278 SHA512 d28cf6b3c515255513f73ee5df3891a1f783c81a7ab827549a3fa18583341c5c89658959d5c4f277efa5bda38e322948c78287c94c8da76d5f08eb70c6df988c
 MISC metadata.xml 464 BLAKE2B 444a374a2f105a3ca17c78e8ab53300ecf6ea64669031e493a5a211d035a40104a1b97306817f0d9d02bed770100a8cd39b73ebbc273dbfd9f8dae8922ebf92a SHA512 1016d229071882740becd626c26283fb113205c2e327d668aee7ad47a512618a9e5820fe795298bb44ac54d602fdc8b55a7062e84936d79a01e7dc3271f574f6
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
index 965450a43817..4528bdc47264 100644
--- a/dev-python/typogrify/typogrify-2.0.7.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index c04ed5b8e462..61403af1a56b 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,5 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
 DIST tzlocal-4.1.gh.tar.gz 23449 BLAKE2B 1ed3518395674af5b8066825f6a9f1dde411aa0bb534e65e9da44399042bb25ca45b61650bd7ce81d4912c3d5e1fde132d002d189fe388cd6bd4b7ed6d05bb79 SHA512 f6518c95b1e0ac0424a9f51f8ae0d39a50cacb510c8358a4fab077059e57959dd7b83d82ba455e9f7cca9bfc9224662f979d391a09d5516d172f1d6d3292779a
 EBUILD tzlocal-2.1.ebuild 560 BLAKE2B bec1fa354916a092e040524beab0626b96eb84692ae23ced8b2d007dca0a74d1c3dcf6b7bf487e378277dedc409414cc1403fc9fd5ef5ab5959e9cfeb92c1125 SHA512 bb842cde84a808b63fa0c54b9d7594b044b712dd47ecebc35ff1ab43884d9a586e1656232a6547553c3eaf6c7179314c4d5fc58f153ed849a14616454b4a439d
-EBUILD tzlocal-4.1.ebuild 676 BLAKE2B e268549e3d266e24b063da7891079fe67e6de190a1147d802b7f6eda918f8173cc49450286358ff151f68e773ddcc12534137d0628a719af04e8263babddc3cf SHA512 9685462763389045b862dfd1fa9464edecd1b60c3ae32a281d8f524aee1c2265e7b7be878571f3c1b6170f97ef54fc4ab54b7e332f79f8e65b69af121d424421
+EBUILD tzlocal-4.1.ebuild 706 BLAKE2B 97fc9919fcdd34d20e29f293d2f98a5000c70bf2339b637099fd7db477deb16cdfeb9caa39a5c0c53a89d2fa0f9aef539819c229a446e2da265e2c02f36deb42 SHA512 8eb493502a8db7fb9bad27c8e540d936b328375f455659b40e17b6ac796549ea0ab3ead15491a108d19e1dfd51b8bf0aebd8476f744b3e9f8ccb6641c9df7bdb
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-4.1.ebuild b/dev-python/tzlocal/tzlocal-4.1.ebuild
index 561b150324a1..3f269ac4abce 100644
--- a/dev-python/tzlocal/tzlocal-4.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 89bb330a212a..2981df20568c 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,7 +1,9 @@
 DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
 DIST ubelt-0.10.2.tar.gz 240069 BLAKE2B 34a24781264dd910e7a3afd87287f8ec9d1e4d1b4dd205f249fdc878861cd9c511121c61a5ca208b3f8ced785a0cec26c715b6a9ef3fee4a8f903e8557d3790f SHA512 8666a05f53d29d39ddd0fca213a9465948fd108bef9e95fc6160cb8331ae6876b9e7297d380cac37383c602d7ad4c248a4d7e03b4306dad5c6b26e0423720afb
 DIST ubelt-0.11.0.tar.gz 251931 BLAKE2B 628c62395b38da5fe70cf5c4eaef74f411cb431ca3837aadc0bfafd28d9ba15a75850d22b317d207e79d81c7e015a7adad28fb14804c25b3e9ef1a473d5af8c2 SHA512 ae95f719238e89ece2bd8ef525d7acc72058a770ff8c0be58e27d9fd0f50b1ae978d71589474133ce1065130562cae63282c4c97f69756ce1c64ce4330a5da1e
+DIST ubelt-0.11.1.tar.gz 255709 BLAKE2B 4d79981c4040685bc532aba0a9d85482169672ea05b010f34ed8eaae124c3e36f68d643f1f351cb05ef1ed3434c959f864cf0f6f56b32ba48a6dbe5c195581b5 SHA512 bb5b8f9ad63a7700c3489e20efde255b03c34cc954f12ec2d889d20c5c5e771fe39e9a9ee868ad0ac5a51eddb60565c283f31a9cc1467e956a578a7d454fe61b
 EBUILD ubelt-0.10.1.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
 EBUILD ubelt-0.10.2.ebuild 716 BLAKE2B ba7181bebb9772cca1d187331805221712160dc9be4157bf84204abc114b26355fb8150f41f584a3ee91af1f2fae933d1f31cf9b852fe48bf3c652f91287a2cc SHA512 57aaaef033c0b0b3c5cc707f3198bd214d02eda7372ac5794decbb24edbe6be8cea25a03d05b62f4ca6ba6fcbe36333feeb0ceaa9970bcf6b69d5382cd28e6a6
 EBUILD ubelt-0.11.0.ebuild 716 BLAKE2B d2ed8e7ac49d20c17634e968bf4de595029006fead40b612516c5ee1302ad75a5a1a2da2288669678b8ed50edd9f80281349c82489fbefc6c9dfdd112ea57597 SHA512 1c9903d7ce314b9727fb3ad0d42fd1d05b1b25a2d2948afc944eefa7398996984f17d7b549fce2f5d81e69a0a64908664629b83ed8d20d5b2701e9fe69db82f6
+EBUILD ubelt-0.11.1.ebuild 716 BLAKE2B d2ed8e7ac49d20c17634e968bf4de595029006fead40b612516c5ee1302ad75a5a1a2da2288669678b8ed50edd9f80281349c82489fbefc6c9dfdd112ea57597 SHA512 1c9903d7ce314b9727fb3ad0d42fd1d05b1b25a2d2948afc944eefa7398996984f17d7b549fce2f5d81e69a0a64908664629b83ed8d20d5b2701e9fe69db82f6
 MISC metadata.xml 322 BLAKE2B 99d2f0199fb7c359744ebc7cc3e285843c34c405c1a0e057ab9be81b8c662d01043f3ec0dd46903765b41bb8a69925b89fcbd91edfffb7f8872984ac4d59cd6b SHA512 ccc60ab6a64bf6cf92cc805f14df5ff46aa3af8024f32e764d6e98121ad6d96e506cc29e8ebde9696caa80d019a72e6f1f14803aba2eeb95dde5f9114bb34845
diff --git a/dev-python/ubelt/ubelt-0.11.1.ebuild b/dev-python/ubelt/ubelt-0.11.1.ebuild
new file mode 100644
index 000000000000..05531fa0f9eb
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.11.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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 stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 3d927fdad6c5..ea9dc6fe6f44 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,3 +1,3 @@
 DIST uritemplate-4.1.0.tar.gz 273924 BLAKE2B b21115c6db8f94c635dda1033b4650dd7d2d54b6f52f51bff31ae8cf89e0b3dbcfc1bd029eadc68f5f94eecbd167eabc652c24be6f0bb807beecb5f254520626 SHA512 e62812a4e9ff315a1b06ba9e88f3dd47aea8353cae4ead9ce7bf59b65c83cd6ae7c973cb29b8ddc25266c264f229df8f2d9e982ab489f2f37a5dbd460b87a5e0
-EBUILD uritemplate-4.1.0.ebuild 501 BLAKE2B 859659eb481049a23454728192a6b60afcf46e8564ab55ccd7222e829939167a38714c3beb1cd78cfa5b01d1cb5bd67871ab5c9ed39782a67a4ae3a7b5c43847 SHA512 654e21fd8de4882c50c2b4742fb5b6b71274e4ba488a1597579274625104e0a99fcf238cacf1e446938f9a7be464be720691190c96d52765beb2fa0977ae4ce0
+EBUILD uritemplate-4.1.0.ebuild 507 BLAKE2B 75424cb830bdcceb85f89babf4a3dc43591d446706174a8e82b4688242a0772b3067d813acab3236c19e0ab5a314e33986369cee381b45de519dfbfccf24d53d SHA512 145584d62e245cddf2c417f949e3e7a6274e0fba04181a1d30aa554cc39288661d21d9e8664ba387c2fe54e2025e5175164f117492d4ccbbb74a5e63ca28e2c0
 MISC metadata.xml 325 BLAKE2B 3f78902faa0347b112f36292a5da4d27915ea6d415c76feffbab8b7fb8361fcd8c9cd7045cd7155f6a7749a9d86335d600e094c2c326885f69ac5615a0be1b39 SHA512 908711f5d93c2c9cea94bdcdb072db8a47406e8c44459252d7166741dddebed2693f67ab5bbe6a6064b6fbb015d39b4be42a9bb7477cb931c6033569fcdcf37d
diff --git a/dev-python/uritemplate/uritemplate-4.1.0.ebuild b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
index 30c226c8ae75..d360fb382a57 100644
--- a/dev-python/uritemplate/uritemplate-4.1.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index ebfb69204d64..fa51c904f394 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,8 +1,7 @@
-DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 DIST uvicorn-0.15.0_p20210913.gh.tar.gz 542385 BLAKE2B 1e551ffccac6f92981b0ef62cc80fb494b57dc19bddf8430c54b8a06801ee81cdc31a3167a56e90dd8e0f318cc84dfc71443f74beb39dc68ccc252bc6d6c1042 SHA512 865fe148900c8c00847017bab3ef17a9514e7ef7878ad6220633e2bd6d89b2e65a79a82fdabb8beec83841346a175f0c20807bea07536071a06a884c74418e0d
 DIST uvicorn-0.16.0.tar.gz 707858 BLAKE2B 604aa23f8eac6409396ed603c89a524ce61630e3edd354cfe86950c535f3829aa1ececc8a91a8eeb8164d125e2b20add14f457ba0b23a0d0efd085c168739bee SHA512 68eb5daeb72b457a43fa89e352bfe281c79c1057ad9616ba083f96c1392aeb56759f13a3ee7e9eb90749f92df137f1db2bf8c90256751513d770d6679e971003
-EBUILD uvicorn-0.14.0-r1.ebuild 1278 BLAKE2B 2ea6efb964012ed977b132f0d9a56cd4d57ce4f88cf09a9761962c32e0ec0b76e7bbc1aeb545c102c20481b72a97219dc0074f79b537144079a574106c7ae6fc SHA512 26ba815edb28f854b0de52c5d2fb8dc6e4b2d2b817be191ad49bc7cd31a7745663123d8ac9049408b44aa1effce4bcc3c8964a6c08e3af0f82d58977a5452657
-EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
+DIST uvicorn-0.17.0.tar.gz 708241 BLAKE2B 77f87f0ecb911bb19d599fd48d6ea51105c19432f3bee59b3ccefca002fd7ca9e791ed20f1d92ba3ea755461d494cda3e6c26e08d628038594367c7fa7b6238d SHA512 dc67bc7f881cc98a753e1ee494d48860f5174a21c662673398f8c385897fc1a14f389b30e91f8a2d2ff71e0da1beba682315c83a588321f98fe87fa1e1ff7974
 EBUILD uvicorn-0.15.0_p20210913.ebuild 1357 BLAKE2B dcb1fb20863505c1b493e353dbec210704b66df6b95f584e6921386fb4e9cdc70a446d79007dd74ba7649adbe7653b417a36a1a8eddd5e740ccda7ed3499a6b7 SHA512 b0a15c3ea6aceca599976371212adf54fff4d26d814e4baba72e0b091b96372d425cfbd80dbc773f55f481c14674701fe887618f4d28d95dce038a6cfda936d9
-EBUILD uvicorn-0.16.0.ebuild 1277 BLAKE2B 6b1a9ee765efe094e59567fa38ef3fec312a87bf2bc65df2f58db5fbb32923f8acc54983b88fba90ee9ca346156997c43af52452b25b00c22e400848bb024484 SHA512 0a23e1b0abf98ea2ae7c87375a3f214f915746cc6aab3f9596cb633d51b12b2fb41cb355e6372f2282412e9d883376b47a3aaa6963389e5923833a3d8483217d
+EBUILD uvicorn-0.16.0.ebuild 1280 BLAKE2B 30023b2c77f53aeb59617035b6dbd6fa2f3888ded5d2815b5057ff3c7afd64ea704dedc06d2d4181fa648ddd54179b37931bb92f57618cbde14b0b08def252f3 SHA512 ce980d56a340ca666b3ccd2cfdec0cb19db7feaf372da4f3a1d925cb5b7804105f96c062205149c2650a65ab0d8d283e2437eeb8c482c2bd33f02654addfec62
+EBUILD uvicorn-0.17.0.ebuild 1288 BLAKE2B e68e4e1c023e8a56c61a63733cbcbe3e22c7ee942c82efc5a737842a5d5e74060a109c61022ac9fa4c7f47dc263d7739462257c8a132ba9a9a50329a46cc4ed6 SHA512 6a4be2a587e10b8ea981ed2c2be8c5db844e5bab9735dd5923004157695f4183dd3700cd0cf1e6a3e6631eee1595fe0f3bce85af9c35d5f1504a961653febb9e
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
deleted file mode 100644
index e93bdc3d15e6..000000000000
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-9.1[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# watchgod is not in the tree
-	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
-		-e 's/, WatchGodReload//' \
-		-i tests/supervisors/test_reload.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# requires python-dotenv that's not keyworded everywhere yet
-		# see 0.14.0-r1
-		tests/test_config.py::test_env_file
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/uvicorn/uvicorn-0.16.0.ebuild b/dev-python/uvicorn/uvicorn-0.16.0.ebuild
index 421bb98b4a2a..98e0f0d480c7 100644
--- a/dev-python/uvicorn/uvicorn-0.16.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.17.0.ebuild
index e06f7207c9f8..9b5c9de03b7b 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 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
@@ -12,13 +12,12 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
 "
 BDEPEND="
 	test? (
@@ -29,17 +28,17 @@ BDEPEND="
 		dev-python/python-dotenv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-9.1[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/watchgod[${PYTHON_USEDEP}]
 		dev-python/wsproto[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	# watchgod is not in the tree
-	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
-		-e 's/, WatchGodReload//' \
-		-i tests/supervisors/test_reload.py
-	distutils-r1_python_prepare_all
-}
+EPYTEST_DESELECT=(
+	# too long path for unix socket
+	tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+	# need unpackaged httptools
+	"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+)
diff --git a/dev-python/wcag-contrast-ratio/Manifest b/dev-python/wcag-contrast-ratio/Manifest
index 6625def0c6dd..e88b9a4ef771 100644
--- a/dev-python/wcag-contrast-ratio/Manifest
+++ b/dev-python/wcag-contrast-ratio/Manifest
@@ -1,3 +1,3 @@
 DIST wcag-contrast-ratio-0.9.gh.tar.gz 3347 BLAKE2B c32765e7011faf9128bd4c53673c4663b972e225e0f7249dd1b9f07b4184ae9ca93116f31de6a0538f04612a72ee1e805b37e1070ae62347508f29df2bbf9ec4 SHA512 70ff827b092cec884ba7e969deb8b5de944844b8d5536669f2c607061fbf569c217cec93268215deb9fdebc041efd992ed0cc89e0da013f9a1be8eeeb420cec5
-EBUILD wcag-contrast-ratio-0.9.ebuild 733 BLAKE2B 4d8ad4d971ee744bf7ee779eae91ee3303aa7ebe765547941002833a2d6ff483ff22f906963182fcd6df4b8ad591dae18ee0ab9625fb22d029a68e79987738b8 SHA512 13c87b751ee5d5d96b3474b2b6e6df6ef7accd178cdc0a4cab8d21213226088d10dc8c17c76bbb9705a9be3ee3e011b4cf107738828ff70f04d082adad89c8d5
+EBUILD wcag-contrast-ratio-0.9.ebuild 739 BLAKE2B 192a4e8fadca593b8a5ad6d691e38ce1f8904f9ae8d1756500c175651950444520bf861da570523b20026dcc975aaa10760a418631c7eff7007d995fc2f1f5af SHA512 c31b66d5e02fd009b2daa5545508e711d27161b5a46db56afdcec4d77308487af0b162eda6cc70d051d79a418969882f67b7125e99a87c608eb942e64a74cc9e
 MISC metadata.xml 416 BLAKE2B 5363613fc828bc1398b25b81947464f6c71a2d972914b14744da29c723493843fd0d949b0070c5af3d67428694b7c7a2b0a40c8884a62e56d9caf3fa8882ed42 SHA512 c416ea13e371d17d90bb2c1362119431eb0241dc89d0be5c003e92604c66125b7a66e5648a179d1c166b2a4e3a990be86e502da621ebca8e7ba560f1b0558f58
diff --git a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
index 3de21e6b6a7c..5b7af2bad83a 100644
--- a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
+++ b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 4364e4e81bff..b56ff8cb7245 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,3 @@
-DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
 DIST wcmatch-8.3.tar.gz 116600 BLAKE2B 8576a546278a69ba46af262bc925370e6d8b1828975d54fe3fe1a2e39fc8456134c7f7986e1674883ca0f0298c223be7efc67c7296a29d9a4f1b64e42614ce17 SHA512 64cd84e69ceb6c5953f281711d026540ac198256cda3ca32c90d2acb01b18c93ceaebd3440b395c3e77fc7ec38f350821b0095518ab5c065e698cfe0f2df4c1b
-EBUILD wcmatch-8.2.ebuild 1298 BLAKE2B a407e9dc3878ce0d0ee1b14600156b77d5a04de131d21cde63f5761601d9432f2f8e5db3e4a9809b7a429d168df6ea7cbb27656d73ffe0e544cd460315acfd10 SHA512 9435d1e43aa0608eef47e96add8dcd8f45b5c52303ab3eb58e8ba7eeebc27fdc92909a1c08684013715594c1167c9a3391526d729bee951aa2d2b0d6f2881a01
-EBUILD wcmatch-8.3.ebuild 1300 BLAKE2B c2b14167ba60e1851ee4e66ea1b154b38118e0f437085a9728ae4bdce0ae8ce550453e76c905b7390429fb52901e1ec2f08599cc9b230987be169209cdd2f30f SHA512 809f72df9b6459eace7924c714ae7ad74c418d37bc8edb36722f57cec33e01dd7cf1d577f6057090ad1616b97cc22edc53800f402be3fa9540a7d903c7917af0
+EBUILD wcmatch-8.3.ebuild 1298 BLAKE2B be2d3367c2123854c41eb251a53a2cb0adbdb92546c0796df93571a0be702f8323a727d8ff67d6efeb33aac3d585f24b3e72e2290b5ea68f5a530f7141f27da3 SHA512 3ec7ba1eaf35a80a709af752edfd64275021e540324574876ba21b3c80486580c1cd0393c0c13df5b544fdc67a57cd0c74d957e9d50fbd3e303fe61f7a3ddd79
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
deleted file mode 100644
index 83020ce9dad8..000000000000
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ /dev/null
@@ -1,57 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.3.ebuild b/dev-python/wcmatch/wcmatch-8.3.ebuild
index 61d6e0564f4d..8a9fe29ef3f2 100644
--- a/dev-python/wcmatch/wcmatch-8.3.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index bfe6ce814151..b32ce1a36519 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,5 +1,7 @@
 DIST weasyprint-53.3.tar.gz 387448 BLAKE2B bc575a150ce3af4b33dc36b1d4148d5059c8a61c2576b9305735ae192314d7df61bd9c92defaa65159933be489c262e8ac343090a840d1cf49ed5af1e5e669ad SHA512 28efd97c06572de3e82763400efee3d2415da03feafcb38158c35465823d6ee8df9be4e11b813beeb2e851a6affae668ee9eea8859ec5de6c4da9347d9f4216a
 DIST weasyprint-53.4.tar.gz 388163 BLAKE2B c4a15be4f11f7d6be1bc96da39defb3420f0e96181998f0f20a1da94ea2c942fd1b23f0c4257da122647a88c6950c519b01910476711d4b482a8a9ae0354d95c SHA512 7fcdedbecfa13434217b08491db62b9afd3e716d4ac6378490a04120c407ab1b20883227c32a77c9bd8c8dd7324fb505920264db3c9105d712fa4d7dcf3a1578
+DIST weasyprint-54.0.tar.gz 402453 BLAKE2B 57c086a0ddf71e5eecf3860f5efcac327c927689e726694d59122a1ad6e7065c828497eacc04866bd4896a12016a75fc227e5f278f7ee987c8c489db3f7474c4 SHA512 3f6595fa856a5ef97e6c0009de34c3c614b829618fc9a28d5728047bbb6edf4972576a5577ef57d588a645d09a76e87ceb8928cc5536fb3900e6525559bf643b
 EBUILD weasyprint-53.3.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
 EBUILD weasyprint-53.4.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
+EBUILD weasyprint-54.0.ebuild 1077 BLAKE2B d1a7363d7945cc5495380370b7c5241cb9172fe03abe20708293211e2707b40a95d80a3e661d401fafe4fefa78c61ce937205793b434a22804fe46a5642b9933 SHA512 08e8fc0fe59a71f48299c29fa70df7ac99f21c9f06f8f17aec1636d573d22c6f1bdc1382061b96b354aaf39be30209923637bf81bd36694ce389b859fdd09f0c
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-54.0.ebuild b/dev-python/weasyprint/weasyprint-54.0.ebuild
new file mode 100644
index 000000000000..93af36f9311c
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-54.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 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="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		media-fonts/ahem
+		media-fonts/dejavu
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 4baf843dff62..5ec45f33693f 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,7 +1,3 @@
-DIST websocket-client-1.2.1.tar.gz 45921 BLAKE2B 3717daac2aafcc13cfa71cd5678aeef7e6dd1933b072c40aa26bb315b2e2c84dea5734299fb954179b22a659fa271734ba78724e5f9d92be7a35efe1f611dd8b SHA512 fdbeb7ac2add27478a17b388ac62e9378094a368f29749d8b63c274ee41836506369dddd083956f42f1f2d74948392b3ddd59b801c98f9e028c126bdb54c636b
-DIST websocket-client-1.2.2.tar.gz 45971 BLAKE2B b62ba2d7b6d1b0d7a95f9350f1304cb178854a459bf4fb601b0c56404cfa2ec52824e6533b5f546b3f4e91a9b4a40072782640acdcdd170911a92efdea9c2ca0 SHA512 a47b70f754ee5b9f954a6b5a7cb788db21765776be8f3564e6a339ebd3a6b46c7b363eef208f92da4758f21e9923b97be08554586d3b30e9ad2251948a054add
 DIST websocket-client-1.2.3.tar.gz 46434 BLAKE2B e1e294938b41e6d82fa5cf8cd58fd9653e5170e11e546a04bce6dc0c8a9752cc25a21dbc1352fc614651f9fee43410a269a35e4c8dbacffec14f1ed8e8526f89 SHA512 5e5e00d43b7b4da5e2cb0d00d1e743e420791856e51e2b3d28d78219edcd7a2eace834ae4d7ee2faf89ab27c2b65f063e508f0e470a47ff9d88c36748b3dd113
-EBUILD websocket-client-1.2.1.ebuild 694 BLAKE2B 4c237d7dd6647bb2e5635f8c918869a874233900539903660c6fe2cce9bcb0b5c42fc26d5b2b8eaba510764c5a0b2e1f05635094a27039fdcfdbf248382c9fd4 SHA512 69543c3b2ae50ad8ae7a5553d093aad0dce3029e79594f2b30bbe69310be96a0ce062292aca67b4f345fa1dddc5410be7beab1ed87c44f692da4de7b6abc5d78
-EBUILD websocket-client-1.2.2.ebuild 697 BLAKE2B 3a11d13d34fce4dfc21bfe471483fe70fe74977620a56712dd84b3265e1aa8844f2e9dd7f35d2275a2b27ae78a12c0c8a63d7f6cf0899b72ae9d49241f78a383 SHA512 06c99a4ac2e46855e74557e55364cf45ac3d28fb1893d3df9780c11dd53d89d0a8ad52e15e05140d08bf56553b7df1d9b814639dcf783409a33b076ace1e668b
-EBUILD websocket-client-1.2.3.ebuild 704 BLAKE2B e9b5a579e7b0b813958a27ba51d3c5d12fe35052a5ae12b150d9be47ee071dcece58b3d4c57bb85bf7af30f2d3de718daf8607e6252bdbaa9c6560bdc7b02592 SHA512 3a67bbb8e1df12ddcfa0f5a434d8b98010b4cd679c71f7b06a82853587681951e0136c776e4a744d9104af7e30002b4c8b0af91d919baadf165175307a006326
+EBUILD websocket-client-1.2.3.ebuild 701 BLAKE2B c9d2e0f891ff30df2f18fd08f86786fd3c9ba6aa2cc6b946e0226a9ef7e3aff811dee40a5ee11a12610964beac2f730049e120a964c2a1b98f2503e475c5be89 SHA512 822dd0e1c74f5116acf959d4e3d0fb1fcff755693f4f5eb09e76abda0b4bfe86e70e7130b7ef0e7ade6e3bb0a252afa824421c61a620fcf4a96a5d22c94dc827
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.2.1.ebuild b/dev-python/websocket-client/websocket-client-1.2.1.ebuild
deleted file mode 100644
index 9e6b3be3022f..000000000000
--- a/dev-python/websocket-client/websocket-client-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.2.2.ebuild b/dev-python/websocket-client/websocket-client-1.2.2.ebuild
deleted file mode 100644
index 595cb1e81497..000000000000
--- a/dev-python/websocket-client/websocket-client-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.2.3.ebuild b/dev-python/websocket-client/websocket-client-1.2.3.ebuild
index 73b961624041..242d55925787 100644
--- a/dev-python/websocket-client/websocket-client-1.2.3.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9156652a5435..9ccbc91791e3 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,8 +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
-DIST xarray-0.20.1.tar.gz 2896122 BLAKE2B 75dbebab105fb2b0c78d09e6dba30bf90a87d1e0b97b96cacc7f880a34734811dae7ebd6b4858718d70f7e03d99c8d58de9b6091d354831ccd17c3946b44e9b6 SHA512 d2e6162286c7e7debed27f40082086dbb55467a953a2afa81b08313aa111c28ffa942785687ac57cb60241a1f45a5d9a937a10bcc7c3025860f7251bbac79c22
 DIST xarray-0.20.2.tar.gz 2906021 BLAKE2B 08ed46a27ce66ec1677e63000d74ecc4a01defa81b8ae1ec24595ff330713bf3e5585adce541e5e6769a74d64a4f5eb9d9aad27450e8088973681d0d60d00f83 SHA512 cd292af68ffd8016e01021e30a2ea83dd36e2f79bd9c3d8e7d83adc5a98a95615091d0102a19a0e3337ae334a701f575a142f476d1465804c8d5fe259ca35f1a
-EBUILD xarray-0.19.0.ebuild 1191 BLAKE2B 1f7651e4eeb28643c44e9aa6fef81fefb33498a82de72d25ede1f90da84bd84a0266a86599db1ca20a3219aeafc8f6fea184381f8918e3b137679fcf2029fcd7 SHA512 24cdbfc4117640a6502ccd77d346580515694cd63713424db9e1142889639f27a93e677bc6a69d9c8c1fc3b87fcc3196d27a74626178954b25fbc84fc89de889
-EBUILD xarray-0.20.1.ebuild 1204 BLAKE2B 9fe3d6c3fc93cc9dcc31634d250f8e58bfcbcf40f51d9d4f3b908e9a4806b06e31dfe72c6fc8bb138a0eb75a05aa8e3310449f7fcf9035e33fe4493c9c4097aa SHA512 8bec5553e9641ac2f12293c1de5f394d7809281379b61f44818a65d36d0d6ecc8de5f41a0b9e21da4504c8cb75d1e0db89da93ab62b4547c08905f9e571b0008
-EBUILD xarray-0.20.2.ebuild 1088 BLAKE2B ed2502b497613f90d8e04e11191494695fd2df2707c2668ecd973fe247a2cb6a7f349d1352bdd121812ec0f6fb49101eb6f32a211fd0e5b1b91b93099c511279 SHA512 13857ce3c4a982f9c0137e7291872d8585ee18f7a12c09181d8b9d6a7d944b931ea1eb63d5900a77b7c859f2c472313d685c9cb7ba5cfc162892b990e70551ea
+EBUILD xarray-0.20.2.ebuild 1082 BLAKE2B 9cec6781e283b773d2fc7cfb74a207647f094815101976d84d85d8a20cee06bf8cdb001669e7b33e02cf6108a421a92902a6f471d5f61b7417679188a3fdc618 SHA512 1105213e037c230861494b87a81ee0a9f9f24f88551d114361fe45a360a61ea1f8c106ef7f409c5f49ed614a3f95ddcfb6feacd64741cbdb0db750cc1ac7db93
 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
deleted file mode 100644
index 0315b612b3d6..000000000000
--- a/dev-python/xarray/xarray-0.19.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/xarray/xarray-0.20.1.ebuild b/dev-python/xarray/xarray-0.20.1.ebuild
deleted file mode 100644
index a4410243510a..000000000000
--- a/dev-python/xarray/xarray-0.20.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/xarray/xarray-0.20.2.ebuild b/dev-python/xarray/xarray-0.20.2.ebuild
index 19299520c970..432502e440f2 100644
--- a/dev-python/xarray/xarray-0.20.2.ebuild
+++ b/dev-python/xarray/xarray-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-python
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)